Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)

Crash reporter changes

--HG--
branch : feature-crashreport

code/nel/CMakeLists.txt

@@ -83,7 +83,3 @@ IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
   ENDIF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(tools)
 ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
-
-IF(WITH_QT)
-  ADD_SUBDIRECTORY(rcerror)
-ENDIF(WITH_QT)

code/nel/include/nel/misc/report.h

@@ -21,8 +21,21 @@
 
 namespace NLMISC {
 
-/// Prepares the error report, writes it to disk and launches the error reporter
+/** Display a custom message box.
-void report ( const std::string &body );
+ *
+ * \param title set the title of the report. If empty, it'll display "NeL report".
+ * \param header message displayed before the edit text box. If empty, it displays the default message.
+ * \param body message displayed in the edit text box. This string will be sent by email.
+ * \param debugButton 0 for disabling it, 1 for enable with default behaviors (generate a breakpoint), 2 for enable with no behavior
+ *
+ *
+ *
+ * \return the button clicked or error
+ */
+
+enum TReportResult { ReportDebug, ReportIgnore, ReportQuit, ReportError };
+
+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 std::string &attachedFile = "");
 
 /** call this in the main of your appli to enable email: setReportEmailFunction (sendEmail);
  */

code/nel/rcerror/CMakeLists.txt

@@ -1,39 +0,0 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SRC_DIR} ${QT_INCLUDES})
-FILE(GLOB RCERROR_SRC *.cpp)
-FILE(GLOB RCERROR_HDR *h)
-
-SET(RCERROR_MOC_HDR
-rcerror_socket.h
-rcerror_widget.h
-)
-
-SET(RCERROR_UI
-rcerror_widget.ui
-)
-
-SET(QT_USE_QTGUI TRUE)
-SET(QT_USE_QTNETWORK TRUE)
-SET(QT_USE_QTMAIN TRUE)
-SET(QT_USE_QTOPENGL FALSE)
-SET(QT_USE_QTXML FALSE)
-
-INCLUDE(${QT_USE_FILE})
-ADD_DEFINITIONS(${QT_DEFINITIONS})
-
-QT4_WRAP_CPP(RCERROR_MOC_SRC ${RCERROR_MOC_HDR})
-QT4_WRAP_UI(RCERROR_UI_HDR ${RCERROR_UI})
-
-SOURCE_GROUP(QtResources FILES ${RCERROR_UI})
-SOURCE_GROUP(QtGeneratedUiHdr FILES ${RCERROR_UI_HDR})
-SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${RCERROR_MOC_SRC})
-SOURCE_GROUP("source files" FILES ${RCERROR_SRC})
-SOURCE_GROUP("header files" FILES ${RCERROR_HDR})
-
-ADD_EXECUTABLE(rcerror WIN32 MACOSX_BUNDLE ${RCERROR_SRC} ${RCERROR_MOC_HDR} ${RCERROR_MOC_SRC} ${RCERROR_UI_HDR})
-TARGET_LINK_LIBRARIES(rcerror ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-
-NL_DEFAULT_PROPS(rcerror "Ryzom Core Error Reporter")
-NL_ADD_RUNTIME_FLAGS(rcerror)
-
-INSTALL(TARGETS rcerror RUNTIME DESTINATION ${NL_BIN_PREFIX})
-

code/nel/rcerror/rcerror.cpp

@@ -1,33 +0,0 @@
-// Ryzom Core MMORPG framework - Error Reporter
-//
-// Copyright (C) 2015 Laszlo Kis-Adam
-// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#include "rcerror_widget.h"
-#include <QApplication>
-#include <QMessageBox>
-
-int main( int argc, char **argv )
-{
-	QApplication app( argc, argv );
-
-	RCErrorWidget w;
-	w.setFileName( "rcerrorlog.txt" );
-	w.show();
-
-	return app.exec();
-}

code/nel/src/misc/debug.cpp

@@ -83,6 +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 = false;
 static const bool TrapCrashInDebugger = true;
 
 #ifdef DEBUG_NEW
@@ -553,7 +554,7 @@ public:
 				// yoyo: allow only to send the crash report once. Because users usually click ignore,
 				// which create noise into list of bugs (once a player crash, it will surely continues to do it).
 				bool i = false;
-				report ( _Reason );
+				report (progname+shortExc, "", subject, _Reason, true, 1, true, 1, !isCrashAlreadyReported(), i, NL_CRASH_DUMP_FILE);
 
 				// no more sent mail for crash
 				setCrashAlreadyReported(true);
@@ -1193,7 +1194,13 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 		INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT));
 
 		sd = new CStdDisplayer ("DEFAULT_SD");
-        DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
+
+#ifdef NL_OS_WINDOWS
+		if (TrapCrashInDebugger || !IsDebuggerPresent ())
+#endif
+		{
+			DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
+		}
 
 #if LOG_IN_FILE
 		if (logInFile)

code/nel/src/misc/displayer.cpp

@@ -529,6 +529,114 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
 //                           in release "<Msg>"
 void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
 {
+//#ifdef NL_OS_WINDOWS
+
+	bool needSpace = false;
+//	stringstream ss;
+	string str;
+
+	// create the string for the clipboard
+
+	if (args.Date != 0)
+	{
+		str += dateToHumanString(args.Date);
+		needSpace = true;
+	}
+
+	if (args.LogType != CLog::LOG_NO)
+	{
+		//if (needSpace) { ss << " "; needSpace = false; }
+		if (needSpace) { str += " "; needSpace = false; }
+		str += logTypeToString(args.LogType);
+		needSpace = true;
+	}
+
+	if (!args.ProcessName.empty())
+	{
+		//if (needSpace) { ss << " "; needSpace = false; }
+		if (needSpace) { str += " "; needSpace = false; }
+		str += args.ProcessName;
+		needSpace = true;
+	}
+
+	if (args.FileName != NULL)
+	{
+		//if (needSpace) { ss << " "; needSpace = false; }
+		if (needSpace) { str += " "; needSpace = false; }
+		str += CFile::getFilename(args.FileName);
+		needSpace = true;
+	}
+
+	if (args.Line != -1)
+	{
+		//if (needSpace) { ss << " "; needSpace = false; }
+		if (needSpace) { str += " "; needSpace = false; }
+		str += NLMISC::toString(args.Line);
+		needSpace = true;
+	}
+
+	if (args.FuncName != NULL)
+	{
+		//if (needSpace) { ss << " "; needSpace = false; }
+		if (needSpace) { str += " "; needSpace = false; }
+		str += args.FuncName;
+		needSpace = true;
+	}
+
+	if (needSpace) { str += ": "; needSpace = false; }
+
+	str += message;
+
+	CSystemUtils::copyTextToClipboard(str);
+
+	// create the string on the screen
+	needSpace = false;
+//	stringstream ss2;
+	string str2;
+
+#ifdef NL_DEBUG
+	if (!args.ProcessName.empty())
+	{
+		if (needSpace) { str2 += " "; needSpace = false; }
+		str2 += args.ProcessName;
+		needSpace = true;
+	}
+
+	if (args.FileName != NULL)
+	{
+		if (needSpace) { str2 += " "; needSpace = false; }
+		str2 += CFile::getFilename(args.FileName);
+		needSpace = true;
+	}
+
+	if (args.Line != -1)
+	{
+		if (needSpace) { str2 += " "; needSpace = false; }
+		str2 += NLMISC::toString(args.Line);
+		needSpace = true;
+	}
+
+	if (args.FuncName != NULL)
+	{
+		if (needSpace) { str2 += " "; needSpace = false; }
+		str2 += args.FuncName;
+		needSpace = true;
+	}
+
+	if (needSpace) { str2 += ": "; needSpace = false; }
+
+#endif // NL_DEBUG
+
+	str2 += message;
+	str2 += "\n\n(this message was copied in the clipboard)";
+
+/*	if (IsDebuggerPresent ())
+	{
+		// Must break in assert call
+		DebugNeedAssert = true;
+	}
+	else
+*/	{
 
 		// Display the report
 
@@ -550,7 +658,69 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
 
 		body += args.CallstackAndLog;
 
-		report( body );
+		string subject;
+
+		// procname is host/service_name-sid we only want the service_name to avoid redondant mail
+		string procname;
+		string::size_type pos = args.ProcessName.find ("/");
+		if (pos == string::npos)
+		{
+			procname =  args.ProcessName;
+		}
+		else
+		{
+			string::size_type pos2 = args.ProcessName.find ("-", pos+1);
+			if (pos2 == string::npos)
+			{
+				procname =  args.ProcessName.substr (pos+1);
+			}
+			else
+			{
+				procname =  args.ProcessName.substr (pos+1, pos2-pos-1);
+			}
+		}
+
+		subject += procname + " NeL " + toString(LogTypeToString[0][args.LogType]) + " " + (args.FileName?string(args.FileName):"") + " " + toString(args.Line) + " " + (args.FuncName?string(args.FuncName):"");
+
+		// Check the envvar NEL_IGNORE_ASSERT
+		if (getenv ("NEL_IGNORE_ASSERT") == NULL)
+		{
+			// yoyo: allow only to send the crash report once. Because users usually click ignore,
+			// which create noise into list of bugs (once a player crash, it will surely continues to do it).
+			std::string filename = getLogDirectory() + NL_CRASH_DUMP_FILE;
+
+			if  (ReportDebug == report (args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)), "", subject, body, true, 2, true, 1, !isCrashAlreadyReported(), IgnoreNextTime, filename.c_str()))
+			{
+				INelContext::getInstance().setDebugNeedAssert(true);
+			}
+
+			// no more sent mail for crash
+			setCrashAlreadyReported(true);
+		}
+
+/*		// Check the envvar NEL_IGNORE_ASSERT
+		if (getenv ("NEL_IGNORE_ASSERT") == NULL)
+		{
+			// Ask the user to continue, debug or ignore
+			int result = MessageBox (NULL, ss2.str().c_str (), logTypeToString(args.LogType, true), MB_ABORTRETRYIGNORE | MB_ICONSTOP);
+			if (result == IDABORT)
+			{
+				// Exit the program now
+				exit (EXIT_FAILURE);
+			}
+			else if (result == IDRETRY)
+			{
+				// Give the debugger a try
+				DebugNeedAssert = true;
+ 			}
+			else if (result == IDIGNORE)
+			{
+				// Continue, do nothing
+			}
+		}
+*/	}
+
+//#endif
 }
 
 

code/nel/src/misc/report.cpp

@@ -22,39 +22,184 @@
 #include "nel/misc/report.h"
 #include "nel/misc/path.h"
 
+#ifdef NL_OS_WINDOWS
+#	ifndef NL_COMP_MINGW
+#		define NOMINMAX
+#	endif
+#	include <windows.h>
+#	include <windowsx.h>
+#	include <winuser.h>
+#endif // NL_OS_WINDOWS
+
+#define NL_NO_DEBUG_FILES 1
+
 using namespace std;
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 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;
-}
-
-void report ( const std::string &body )
-{
-	std::string fname = "rcerrorlog.txt";
-
-	std::ofstream f;
-	f.open( fname.c_str() );
-	if( f.good() )
-	{
-		f << body;
-		f.close();
 
 #ifdef NL_OS_WINDOWS
-		NLMISC::launchProgram( "rcerror.exe", fname );
+	if (sendReport)
+		EnableWindow(sendReport, FALSE);
+#endif
+}
+
+static string Body;
+static std::string URL = "FILL_IN_CRASH_REPORT_HOSTNAME_HERE";
+
+
+static void doSendReport()
+{
+    std::string filename;
+
+    filename = "report_";
+    filename += NLMISC::toString( int( time( NULL ) ) );
+    filename += ".txt";
+
+    std::string params;
+    params = "-log ";
+    params += filename;
+    params += " -host ";
+    params += URL;
+
+    std::ofstream f;
+    f.open( filename.c_str() );
+    if( !f.good() )
+        return;
+
+    f << Body;
+
+    f.close();
+
+#ifdef NL_OS_WINDOWS
+    NLMISC::launchProgram( "crash_report.exe", params );
 #else
-		NLMISC::launchProgram( "rcerror", fname );
+    NLMISC::launchProgram( "crash_report", params );
+#endif
+
+    // Added because NLSMIC::launcProgram needs time to launch
+    nlSleep( 2 * 1000 );
+
+}
+
+#ifndef NL_OS_WINDOWS
+
+// GNU/Linux, do nothing
+
+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)
+{
+    Body = addSlashR( body );
+
+    doSendReport();
+
+    return ReportQuit;
+}
+
+#else
+
+// Windows specific version
+
+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()
+{
+	if (CanSendMailReport && SendMessage(sendReport, BM_GETCHECK, 0, 0) != BST_CHECKED)
+	{
+		bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
+		if (res)
+		{
+			// EnableWindow(sendReport, FALSE);
+			// MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
+#ifndef NL_NO_DEBUG_FILES
+			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)
+		{
+			doSendReport();
+			NeedExit = true;
+			Result = ReportDebug;
+			if (DebugDefaultBehavior)
+			{
+				NLMISC_BREAKPOINT;
+			}
+		}
+		else if ((HWND) lParam == ignore)
+		{
+			doSendReport();
+			NeedExit = true;
+			Result = ReportIgnore;
+		}
+		else if ((HWND) lParam == quit)
+		{
+			doSendReport();
+			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.
@@ -63,7 +208,196 @@ void report ( const std::string &body )
 #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
+			doSendReport();
+			NeedExit = true;
+			Result = ReportIgnore;
+		}
+	}
+
+	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
+
 
 } // NLMISC

code/nel/tools/misc/CMakeLists.txt

@@ -3,6 +3,7 @@ SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer)
 IF(WITH_QT)
   ADD_SUBDIRECTORY(words_dic_qt)
   ADD_SUBDIRECTORY(message_box_qt)
+  ADD_SUBDIRECTORY(crash_report)
 ENDIF(WITH_QT)
 
 IF(WIN32)

code/nel/tools/misc/crash_report/CMakeLists.txt

@@ -0,0 +1,39 @@
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SRC_DIR} ${QT_INCLUDES})
+FILE(GLOB CRASHREPORT_SRC *.cpp)
+FILE(GLOB CRASHREPORT_HDR *h)
+
+SET(CRASHREPORT_MOC_HDR
+crash_report_socket.h
+crash_report_widget.h
+)
+
+SET(CRASHREPORT_UI
+crash_report_widget.ui
+)
+
+SET(QT_USE_QTGUI TRUE)
+SET(QT_USE_QTNETWORK TRUE)
+SET(QT_USE_QTMAIN TRUE)
+SET(QT_USE_QTOPENGL FALSE)
+SET(QT_USE_QTXML FALSE)
+
+INCLUDE(${QT_USE_FILE})
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+QT4_WRAP_CPP(CRASHREPORT_MOC_SRC ${CRASHREPORT_MOC_HDR})
+QT4_WRAP_UI(CRASHREPORT_UI_HDR ${CRASHREPORT_UI})
+
+SOURCE_GROUP(QtResources FILES ${CRASHREPORT_UI})
+SOURCE_GROUP(QtGeneratedUiHdr FILES ${CRASHREPORT_UI_HDR})
+SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${CRASHREPORT_MOC_SRC})
+SOURCE_GROUP("source files" FILES ${CRASHREPORT_SRC})
+SOURCE_GROUP("header files" FILES ${CRASHREPORT_HDR})
+
+ADD_EXECUTABLE(crash_report WIN32 MACOSX_BUNDLE ${CRASHREPORT_SRC} ${CRASHREPORT_MOC_HDR} ${CRASHREPORT_MOC_SRC} ${CRASHREPORT_UI_HDR})
+TARGET_LINK_LIBRARIES(crash_report ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+
+NL_DEFAULT_PROPS(crash_report "NeL, Tools, Misc: Crash Report")
+NL_ADD_RUNTIME_FLAGS(crash_report)
+
+INSTALL(TARGETS crash_report RUNTIME DESTINATION ${NL_BIN_PREFIX})
+

code/nel/tools/misc/crash_report/crash_report.cpp

@@ -0,0 +1,92 @@
+// Nel MMORPG framework - Error Reporter
+//
+// Copyright (C) 2015 Laszlo Kis-Adam
+// Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#include "crash_report_widget.h"
+#include <QApplication>
+#include <QMessageBox>
+
+#include <stack>
+#include <vector>
+#include <string>
+
+class CCmdLineParser
+{
+public:
+	static void parse( int argc, char **argv, std::vector< std::pair< std::string, std::string > > &v )
+	{
+		std::stack< std::string > stack;
+		std::string key;		
+		std::string value;
+
+		for( int i = argc - 1 ; i >= 0; i-- )
+		{
+			stack.push( std::string( argv[ i ] ) );
+		}
+
+		while( !stack.empty() )
+		{
+			key = stack.top();
+			stack.pop();
+
+			// If not a real parameter ( they start with '-' ), discard.
+			if( key[ 0 ] != '-' )
+				continue;
+
+			// Remove the '-'
+			key = key.substr( 1 );
+
+			// No more parameters
+			if( stack.empty() )
+			{
+				v.push_back( std::make_pair( key, "" ) );
+				break;
+			}
+
+			 value = stack.top();
+
+			 // If next parameter is a key, process it in the next iteration
+			 if( value[ 0 ] == '-' )
+			 {
+				 v.push_back( std::make_pair( key, "" ) );
+				 continue;
+			 }
+			 // Otherwise store the pair
+			 else
+			 {
+				 v.push_back( std::make_pair( key, value ) );
+				 stack.pop();
+			 }
+		}
+	}
+};
+
+int main( int argc, char **argv )
+{
+	QApplication app( argc, argv );
+
+	std::vector< std::pair< std::string, std::string > > params;
+
+	CCmdLineParser::parse( argc, argv, params );
+
+	CCrashReportWidget w;
+	w.setup( params );
+	w.show();
+
+	return app.exec();
+}

code/nel/tools/misc/crash_report/crash_report_data.h

@@ -23,7 +23,7 @@
 #include <QString>
 
 
-struct RCErrorData
+struct SCrashReportData
 {
 	QString description;
 	QString report;

code/nel/tools/misc/crash_report/crash_report_socket.cpp

@@ -1,4 +1,4 @@
-// Ryzom Core MMORPG framework - Error Reporter
+// Nel MMORPG framework - Error Reporter
 //
 // Copyright (C) 2015 Laszlo Kis-Adam
 // Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
@@ -16,51 +16,46 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "rcerror_socket.h"
+#include "crash_report_socket.h"
 #include <QNetworkAccessManager>
 #include <QUrl>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-namespace
+class CCrashReportSocketPvt
-{
-	static const char *BUG_URL = "http://192.168.2.66/dfighter/r.php";
-}
-
-class RCErrorSocketPvt
 {
 public:
 	QNetworkAccessManager mgr;
 };
 
-RCErrorSocket::RCErrorSocket( QObject *parent ) :
+CCrashReportSocket::CCrashReportSocket( QObject *parent ) :
 QObject( parent )
 {
-	m_pvt = new RCErrorSocketPvt();
+	m_pvt = new CCrashReportSocketPvt();
 
 	connect( &m_pvt->mgr, SIGNAL( finished( QNetworkReply* ) ), this, SLOT( onFinished( QNetworkReply* ) ) );
 }
 
-RCErrorSocket::~RCErrorSocket()
+CCrashReportSocket::~CCrashReportSocket()
 {
 	delete m_pvt;
 }
 
-void RCErrorSocket::sendReport( const RCErrorData &data )
+void CCrashReportSocket::sendReport( const SCrashReportData &data )
 {
 	QUrl params;
 	params.addQueryItem( "report", data.report );
 	params.addQueryItem( "descr", data.description );
 	params.addQueryItem( "email", data.email );
 
-	QUrl url( BUG_URL );
+	QUrl url( m_url );
 	QNetworkRequest request( url );
 	request.setRawHeader( "Connection", "close" );
 
 	m_pvt->mgr.post( request, params.encodedQuery() );
 }
 
-void RCErrorSocket::onFinished( QNetworkReply *reply )
+void CCrashReportSocket::onFinished( QNetworkReply *reply )
 {
 	if( reply->error() != QNetworkReply::NoError )
 		Q_EMIT reportFailed();

code/nel/tools/misc/crash_report/crash_report_socket.h

@@ -1,4 +1,4 @@
-// Ryzom Core MMORPG framework - Error Reporter
+// Nel MMORPG framework - Error Reporter
 //
 // Copyright (C) 2015 Laszlo Kis-Adam
 // Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
@@ -21,20 +21,23 @@
 #define RCERROR_SOCKET
 
 #include <QObject>
-#include "rcerror_data.h"
+#include "crash_report_data.h"
 
-class RCErrorSocketPvt;
+class CCrashReportSocketPvt;
 class QNetworkReply;
 
-class RCErrorSocket : public QObject
+class CCrashReportSocket : public QObject
 {
 	Q_OBJECT
 
 public:	
-	RCErrorSocket( QObject *parent );
+	CCrashReportSocket( QObject *parent );
-	~RCErrorSocket();
+	~CCrashReportSocket();
 
-	void sendReport( const RCErrorData &data );
+	void setURL( const char *URL ){ m_url = URL; }
+	QString url() const{ return m_url; }
+
+	void sendReport( const SCrashReportData &data );
 
 Q_SIGNALS:
 	void reportSent();
@@ -44,7 +47,8 @@ private Q_SLOTS:
 	void onFinished( QNetworkReply *reply );
 
 private:
-	RCErrorSocketPvt *m_pvt;
+	CCrashReportSocketPvt *m_pvt;
+	QString m_url;
 };
 
 #endif

code/nel/tools/misc/crash_report/crash_report_widget.cpp

@@ -1,4 +1,4 @@
-// Ryzom Core MMORPG framework - Error Reporter
+// Nel MMORPG framework - Error Reporter
 //
 // Copyright (C) 2015 Laszlo Kis-Adam
 // Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
@@ -17,20 +17,21 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "rcerror_widget.h"
+#include "crash_report_widget.h"
-#include "rcerror_socket.h"
+#include "crash_report_socket.h"
-#include "rcerror_data.h"
+#include "crash_report_data.h"
 #include <QTimer>
 #include <QTextStream>
 #include <QFile>
 #include <QMessageBox>
+#include <QFile>
 
-RCErrorWidget::RCErrorWidget( QWidget *parent ) :
+CCrashReportWidget::CCrashReportWidget( QWidget *parent ) :
 QWidget( parent )
 {
 	m_ui.setupUi( this );
 
-	m_socket = new RCErrorSocket( this );
+	m_socket = new CCrashReportSocket( this );
 
 	QTimer::singleShot( 1, this, SLOT( onLoad() ) );
 
@@ -42,13 +43,44 @@ QWidget( parent )
 	connect( m_socket, SIGNAL( reportFailed() ), this, SLOT( onReportFailed() ) );
 }
 
-RCErrorWidget::~RCErrorWidget()
+CCrashReportWidget::~CCrashReportWidget()
 {
 	m_socket = NULL;
 }
 
-void RCErrorWidget::onLoad()
+void CCrashReportWidget::setup( const std::vector< std::pair< std::string, std::string > > &params )
 {
+	for( int i = 0; i < params.size(); i++ )
+	{
+		const std::pair< std::string, std::string > &p = params[ i ];
+		const std::string &k = p.first;
+		const std::string &v = p.second;
+
+		if( k == "log" )
+		{
+			m_fileName = v.c_str();
+		}
+		else
+		if( k == "host" )
+		{
+			m_socket->setURL( v.c_str() );
+		}
+		else
+		if( k == "title" )
+		{
+			setWindowTitle( v.c_str() );
+		}
+	}
+}
+
+void CCrashReportWidget::onLoad()
+{
+	if( !checkSettings() )
+	{
+		close();
+		return;
+	}
+
 	QFile f( m_fileName );
 	bool b = f.open( QFile::ReadOnly | QFile::Text );
 	if( !b )
@@ -57,6 +89,7 @@ void RCErrorWidget::onLoad()
 									tr( "No log file found" ),
 									tr( "There was no log file found, therefore nothing to report. Exiting..." ) );
 		close();
+		return;
 	}
 
 	QTextStream ss( &f );
@@ -64,12 +97,12 @@ void RCErrorWidget::onLoad()
 	f.close();
 }
 
-void RCErrorWidget::onSendClicked()
+void CCrashReportWidget::onSendClicked()
 {
 	m_ui.sendButton->setEnabled( false );
 	QApplication::setOverrideCursor( Qt::WaitCursor );
 
-	RCErrorData data;
+	SCrashReportData data;
 	data.description = m_ui.descriptionEdit->toPlainText();
 	data.report = m_ui.reportEdit->toPlainText();
 	data.email = m_ui.emailEdit->text();
@@ -77,17 +110,17 @@ void RCErrorWidget::onSendClicked()
 	m_socket->sendReport( data );
 }
 
-void RCErrorWidget::onCancelClicked()
+void CCrashReportWidget::onCancelClicked()
 {
-	close();
+	removeAndQuit();
 }
 
-void RCErrorWidget::onCBClicked()
+void CCrashReportWidget::onCBClicked()
 {
 	m_ui.emailEdit->setEnabled( m_ui.emailCB->isChecked() );
 }
 
-void RCErrorWidget::onReportSent()
+void CCrashReportWidget::onReportSent()
 {
 	QApplication::setOverrideCursor( Qt::ArrowCursor );
 
@@ -95,10 +128,10 @@ void RCErrorWidget::onReportSent()
 								tr( "Report sent" ),
 								tr( "The report has been sent." ) );
 
-	close();
+	removeAndQuit();
 }
 
-void RCErrorWidget::onReportFailed()
+void CCrashReportWidget::onReportFailed()
 {
 	QApplication::setOverrideCursor( Qt::ArrowCursor );
 
@@ -106,5 +139,33 @@ void RCErrorWidget::onReportFailed()
 								tr( "Report failed" ),
 								tr( "Failed to send the report..." ) );
 
+	removeAndQuit();
+}
+
+bool CCrashReportWidget::checkSettings()
+{
+	if( m_fileName.isEmpty() )
+	{
+		QMessageBox::information( this,
+									tr( "No log file specified." ),
+									tr( "No log file specified. Exiting..." ) );
+		return false;
+	}
+
+	if( m_socket->url().isEmpty() )
+	{
+		QMessageBox::information( this,
+									tr( "No host specified." ),
+									tr( "No host specified. Exiting..." ) );
+		return false;
+	}
+
+	return true;
+}
+
+void CCrashReportWidget::removeAndQuit()
+{
+	QFile::remove( m_fileName );
 	close();
 }
+

code/nel/tools/misc/crash_report/crash_report_widget.h

@@ -1,4 +1,4 @@
-// Ryzom Core MMORPG framework - Error Reporter
+// Nel MMORPG framework - Error Reporter
 //
 // Copyright (C) 2015 Laszlo Kis-Adam
 // Copyright (C) 2010 Ryzom Core <http://ryzomcore.org/>
@@ -21,19 +21,23 @@
 #define RCERROR_WIDGET
 
 
-#include "ui_rcerror_widget.h"
+#include "ui_crash_report_widget.h"
+#include <vector>
+#include <string>
 
-class RCErrorSocket;
+class CCrashReportSocket;
 
-class RCErrorWidget : public QWidget
+class CCrashReportWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	RCErrorWidget( QWidget *parent = NULL );
+	CCrashReportWidget( QWidget *parent = NULL );
-	~RCErrorWidget();
+	~CCrashReportWidget();
 
 	void setFileName( const char *fn ){ m_fileName = fn; }
 
+	void setup( const std::vector< std::pair< std::string, std::string > > &params );
+	
 private Q_SLOTS:
 	void onLoad();
 	void onSendClicked();
@@ -44,9 +48,12 @@ private Q_SLOTS:
 	void onReportFailed();
 
 private:
-	Ui::RCErrorWidget m_ui;
+	bool checkSettings();
+	void removeAndQuit();
+
+	Ui::CrashReportWidget m_ui;
 	QString m_fileName;
-	RCErrorSocket *m_socket;
+	CCrashReportSocket *m_socket;
 };
 
 #endif

code/nel/tools/misc/crash_report/crash_report_widget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>RCErrorWidget</class>
+ <class>CrashReportWidget</class>
- <widget class="QWidget" name="RCErrorWidget">
+ <widget class="QWidget" name="CrashReportWidget">
   <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
@@ -14,7 +14,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Ryzom Core error report</string>
+   <string>NeL Error Report</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0" colspan="2">