add AdditionalLog

stepmania/src/arch/ArchHooks/ArchHooks.h

@@ -21,6 +21,9 @@ public:
 	/* This receives all logs.  'important' is set for Warn and Info. */
 	virtual void Log(CString str, bool important) { }
 
+	/* This receives a pointer to data to be included in diagnostic output. */
+	virtual void AdditionalLog(CString str) { }
+
 	/* This is called as soon as SDL is set up, the loading window is shown
 	 * and we can safely log and throw. */
 	virtual void DumpDebugInfo() { }

stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp

@@ -22,6 +22,11 @@ void ArchHooks_Win32::Log(CString str, bool important)
 	CrashLog(str);
 }
 
+void ArchHooks_Win32::AdditionalLog(CString str)
+{
+	AdditionalLog(str);
+}
+
 void ArchHooks_Win32::DumpDebugInfo()
 {
 	/* This is a good time to do the debug search: before we actually

stepmania/src/arch/ArchHooks/ArchHooks_Win32.h

@@ -8,6 +8,7 @@ public:
 	ArchHooks_Win32();
 	void Log(CString str, bool important);
 	void DumpDebugInfo();
+	void AdditionalLog(CString str);
 };
 
 #undef ARCH_HOOKS

stepmania/src/archutils/Win32/Crash.cpp

@@ -67,6 +67,7 @@ static VDDebugInfoContext g_debugInfo;
 BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 static void ReportCrashLog(HWND hwnd, HANDLE hFile);
 static void ReportStaticLog(HWND hwnd, HANDLE hFile);
+static void ReportAdditionalLog(HWND hwnd, HANDLE hFile);
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -433,7 +434,7 @@ static void SetWindowTitlef(HWND hwnd, const char *format, ...) {
 }
 
 static void ReportCrashData(HWND hwnd, HWND hwndReason, HANDLE hFile, const EXCEPTION_POINTERS *const pExc) {
-	const EXCEPTION_RECORD *const pRecord = (const EXCEPTION_RECORD *)pExc->ExceptionRecord;
+//	const EXCEPTION_RECORD *const pRecord = (const EXCEPTION_RECORD *)pExc->ExceptionRecord;
 	const CONTEXT *const pContext = (const CONTEXT *)pExc->ContextRecord;
 	int i, tos;
 
@@ -1351,6 +1352,7 @@ static void DoSave(const EXCEPTION_POINTERS *pExc) {
 	Report(NULL, hFile, "");
 
 	ReportStaticLog(NULL, hFile);
+	ReportAdditionalLog(NULL, hFile);
 	Report(NULL, hFile, "");
 
 	ReportCrashLog(NULL, hFile);
@@ -1572,6 +1574,7 @@ void StaticLog(const char *str)
 	staticlog_ptr += len-1;
 }
 
+
 static void ReportStaticLog(HWND hwnd, HANDLE hFile)
 {
 	Report(NULL, hFile, "Static log:");
@@ -1580,3 +1583,21 @@ static void ReportStaticLog(HWND hwnd, HANDLE hFile)
 //	Report(hwnd, hFile, "%s", staticlog);
 }
 
+static const int ADDLOG_SIZE = 1024*32;
+static char addlog[ADDLOG_SIZE]="";
+void AdditionalLog(const char *str)
+{
+	strncpy(addlog, str, ADDLOG_SIZE-1);
+	addlog[ADDLOG_SIZE-1]=0;
+}
+
+static void ReportAdditionalLog(HWND hwnd, HANDLE hFile)
+{
+	DWORD dwActual;
+
+	/* We crashed, so this data might well be bogus; don't use strlen. */
+	const char *p = (const char *) memchr(addlog, '\0', ADDLOG_SIZE);
+	int len = p? p-addlog: 0;
+
+	WriteFile(hFile, addlog, len, &dwActual, NULL);
+}

stepmania/src/archutils/Win32/Crash.h

@@ -32,7 +32,7 @@ struct VirtualDubCheckpoint {
 	inline void set(const char *f, int l, const char *m=NULL) { file=f; line=l; message=m; }
 };
 
-#define CHECKPOINT_COUNT		(16)
+#define CHECKPOINT_COUNT		(4)
 
 struct VirtualDubThreadState {
 	const char				*pszThreadName;
@@ -54,6 +54,7 @@ extern long __stdcall CrashHandler(struct _EXCEPTION_POINTERS *ExceptionInfo);
 
 void CrashLog(const char *str);
 void StaticLog(const char *str);
+void AdditionalLog(const char *str);
 
 /* Exactly as advertised.  (This will bring up the crash handler even
  * in the debugger.) */