Backed out from fdc0d40

--HG--
branch : feature-crashreport

code/nel/src/misc/debug.cpp

@@ -83,7 +83,7 @@ using namespace std;
 #define LOG_IN_FILE NEL_LOG_IN_FILE
 
 // If true, debug system will trap crash even if the application is in debugger
-static const bool TrapCrashInDebugger = true;
+static const bool TrapCrashInDebugger = false;
 
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW

code/nel/src/misc/report.cpp

@@ -42,14 +42,25 @@ using namespace std;
 namespace NLMISC
 {
 
+#ifdef NL_OS_WINDOWS
+static HWND sendReport=NULL;
+#endif
+
 //old doesn't work on visual c++ 7.1 due to default parameter typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile = "", bool onlyCheck = false);
 typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile, bool onlyCheck);
 
+#define DELETE_OBJECT(a) if((a)!=NULL) { DeleteObject (a); a = NULL; }
+
 static TEmailFunction EmailFunction = NULL;
 
 void setReportEmailFunction (void *emailFunction)
 {
 	EmailFunction = (TEmailFunction)emailFunction;
+
+#ifdef NL_OS_WINDOWS
+	if (sendReport)
+		EnableWindow(sendReport, FALSE);
+#endif
 }
 
 #ifndef NL_OS_WINDOWS
@@ -62,24 +73,91 @@ void report ()
 
 #else
 
-TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
+// Windows specific version
+
+static string Body;
+static string Subject;
+static string AttachedFile;
+
+static HWND checkIgnore=NULL;
+static HWND debug=NULL;
+static HWND ignore=NULL;
+static HWND quit=NULL;
+static HWND dialog=NULL;
+
+static bool NeedExit;
+static TReportResult Result;
+static bool IgnoreNextTime;
+static bool CanSendMailReport= false;
+
+static bool DebugDefaultBehavior, QuitDefaultBehavior;
+
+static void sendEmail()
 {
-	std::string fname = "rcerrorlog.txt";
+	if (CanSendMailReport && SendMessage(sendReport, BM_GETCHECK, 0, 0) != BST_CHECKED)
-
-	std::ofstream f;
-	f.open( fname.c_str() );
-	if( f.good() )
 	{
-		f << body;
+		bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
-		f.close();
+		if (res)
-
+		{
-#ifdef NL_OS_WINDOWS
+			// EnableWindow(sendReport, FALSE);
-		NLMISC::launchProgram( "rcerror.exe", fname );
+			// MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
-#else
+#ifndef NL_NO_DEBUG_FILES
-		NLMISC::launchProgram( "rcerror", fname );
+			CFile::createEmptyFile(getLogDirectory() + "report_sent");
 #endif
 		}
+		else
+		{
+#ifndef NL_NO_DEBUG_FILES
+			CFile::createEmptyFile(getLogDirectory() + "report_failed");
+#endif
+			// MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
+		}
+	}
+	else
+	{
+#ifndef NL_NO_DEBUG_FILES
+		CFile::createEmptyFile(getLogDirectory() + "report_refused");
+#endif
+	}
+}
 
+static LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	//MSGFILTER *pmf;
+
+	if (message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED)
+	{
+		if ((HWND) lParam == checkIgnore)
+		{
+			IgnoreNextTime = !IgnoreNextTime;
+		}
+		else if ((HWND) lParam == debug)
+		{
+			sendEmail();
+			NeedExit = true;
+			Result = ReportDebug;
+			if (DebugDefaultBehavior)
+			{
+				NLMISC_BREAKPOINT;
+			}
+		}
+		else if ((HWND) lParam == ignore)
+		{
+			sendEmail();
+			NeedExit = true;
+			Result = ReportIgnore;
+		}
+		else if ((HWND) lParam == quit)
+		{
+			sendEmail();
+			NeedExit = true;
+			Result = ReportQuit;
+
+			if (QuitDefaultBehavior)
+			{
+				// ace: we cannot call exit() because it's call the static object dtor and can crash the application
+				// if the dtor call order is not good.
+				//exit(EXIT_SUCCESS);
 #ifdef NL_OS_WINDOWS
 #ifndef NL_COMP_MINGW
 				// disable the Windows popup telling that the application aborted and disable the dr watson report.
@@ -88,8 +166,193 @@ TReportResult report (const std::string &title, const std::string &header, const
 #endif
 				// quit without calling atexit or static object dtors.
 				abort();
+			}
+		}
+		/*else if ((HWND) lParam == sendReport)
+		{
+			if (EmailFunction != NULL)
+			{
+				bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
+				if (res)
+				{
+					EnableWindow(sendReport, FALSE);
+					MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
+					CFile::createEmptyFile(getLogDirectory() + "report_sent");
+				}
+				else
+				{
+					MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
+				}
+			}
+		}*/
+	}
+	else if (message == WM_CHAR)
+	{
+		if (wParam == 27)
+		{
+			// ESC -> ignore
+			sendEmail();
+			NeedExit = true;
+			Result = ReportIgnore;
+		}
+	}
 
-	return ReportQuit;
+	return DefWindowProc (hWnd, message, wParam, lParam);
+}
+
+TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
+{
+	// register the window
+	static bool AlreadyRegister = false;
+	if(!AlreadyRegister)
+	{
+		WNDCLASSW wc;
+		memset (&wc,0,sizeof(wc));
+		wc.style			= CS_HREDRAW | CS_VREDRAW;
+		wc.lpfnWndProc		= (WNDPROC)WndProc;
+		wc.cbClsExtra		= 0;
+		wc.cbWndExtra		= 0;
+		wc.hInstance		= GetModuleHandle(NULL);
+		wc.hIcon			= NULL;
+		wc.hCursor			= LoadCursor(NULL,IDC_ARROW);
+		wc.hbrBackground	= (HBRUSH)COLOR_WINDOW;
+		wc.lpszClassName	= L"NLReportWindow";
+		wc.lpszMenuName		= NULL;
+		if (!RegisterClassW(&wc)) return ReportError;
+		AlreadyRegister = true;
+	}
+
+	ucstring formatedTitle = title.empty() ? ucstring("NeL report") : ucstring(title);
+
+
+	// create the window
+	dialog = CreateWindowW (L"NLReportWindow", (LPCWSTR)formatedTitle.c_str(), WS_DLGFRAME | WS_CAPTION /*| WS_THICKFRAME*/, CW_USEDEFAULT, CW_USEDEFAULT, 456, 400,  NULL, NULL, GetModuleHandle(NULL), NULL);
+
+	// create the font
+	HFONT font = CreateFont (-12, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, "Arial");
+
+	Subject = subject;
+	AttachedFile = attachedFile;
+
+	// create the edit control
+	HWND edit = CreateWindowW (L"EDIT", NULL, WS_BORDER | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | ES_READONLY | ES_LEFT | ES_MULTILINE, 7, 70, 429, 212, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (edit, WM_SETFONT, (WPARAM) font, TRUE);
+
+	// set the edit text limit to lot of :)
+	SendMessage (edit, EM_LIMITTEXT, ~0U, 0);
+
+	Body = addSlashR (body);
+
+	// set the message in the edit text
+	SendMessage (edit, WM_SETTEXT, (WPARAM)0, (LPARAM)Body.c_str());
+
+	if (enableCheckIgnore)
+	{
+		// create the combo box control
+		checkIgnore = CreateWindowW (L"BUTTON", L"Don't display this report again", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_CHECKBOX, 7, 290, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+		SendMessage (checkIgnore, WM_SETFONT, (WPARAM) font, TRUE);
+
+		if(ignoreNextTime)
+		{
+			SendMessage (checkIgnore, BM_SETCHECK, BST_CHECKED, 0);
+		}
+	}
+
+	// create the debug button control
+	debug = CreateWindowW (L"BUTTON", L"Debug", WS_CHILD | WS_VISIBLE, 7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (debug, WM_SETFONT, (WPARAM) font, TRUE);
+
+	if (debugButton == 0)
+		EnableWindow(debug, FALSE);
+
+	// create the ignore button control
+	ignore = CreateWindowW (L"BUTTON", L"Ignore", WS_CHILD | WS_VISIBLE, 75+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (ignore, WM_SETFONT, (WPARAM) font, TRUE);
+
+	if (ignoreButton == 0)
+		EnableWindow(ignore, FALSE);
+
+	// create the quit button control
+	quit = CreateWindowW (L"BUTTON", L"Quit", WS_CHILD | WS_VISIBLE, 75+75+7+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (quit, WM_SETFONT, (WPARAM) font, TRUE);
+
+	if (quitButton == 0)
+		EnableWindow(quit, FALSE);
+
+	// create the debug button control
+	sendReport = CreateWindowW (L"BUTTON", L"Don't send the report", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 7, 315+32, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (sendReport, WM_SETFONT, (WPARAM) font, TRUE);
+
+	string formatedHeader;
+	if (header.empty())
+	{
+		formatedHeader = "This application stopped to display this report.";
+	}
+	else
+	{
+		formatedHeader = header;
+	}
+
+	// ace don't do that because it s slow to try to send a mail
+	//CanSendMailReport  = sendReportButton && EmailFunction != NULL && EmailFunction("", "", "", "", "", true);
+	CanSendMailReport  = sendReportButton && EmailFunction != NULL;
+
+	if (CanSendMailReport)
+		formatedHeader += " Send report will only email the contents of the box below. Please, send it to help us (it could take few minutes to send the email, be patient).";
+	else
+		EnableWindow(sendReport, FALSE);
+
+	ucstring uc = ucstring::makeFromUtf8(formatedHeader);
+
+	// create the label control
+	HWND label = CreateWindowW (L"STATIC", (LPCWSTR)uc.c_str(), WS_CHILD | WS_VISIBLE /*| SS_WHITERECT*/, 7, 7, 429, 51, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
+	SendMessage (label, WM_SETFONT, (WPARAM) font, TRUE);
+
+
+	DebugDefaultBehavior = debugButton==1;
+	QuitDefaultBehavior = quitButton==1;
+
+	IgnoreNextTime = ignoreNextTime;
+
+	// show until the cursor really show :)
+	while (ShowCursor(TRUE) < 0)
+		;
+
+	SetWindowPos (dialog, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+
+	SetFocus(dialog);
+	SetForegroundWindow(dialog);
+
+	NeedExit = false;
+
+	while(!NeedExit)
+	{
+		MSG	msg;
+		while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
+		{
+			TranslateMessage(&msg);
+			DispatchMessageW(&msg);
+		}
+		nlSleep (1);
+	}
+
+	// set the user result
+	ignoreNextTime = IgnoreNextTime;
+
+	ShowWindow(dialog, SW_HIDE);
+
+
+
+	DELETE_OBJECT(sendReport)
+	DELETE_OBJECT(quit)
+	DELETE_OBJECT(ignore)
+	DELETE_OBJECT(debug)
+	DELETE_OBJECT(checkIgnore)
+	DELETE_OBJECT(edit)
+	DELETE_OBJECT(label)
+	DELETE_OBJECT(dialog)
+
+	return Result;
 }
 
 #endif