include wx/crt.h needed for wxFprintf() (closes #9509)

[wxWidgets.git] / src / msw / crashrpt.cpp

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 7662ab077999224d901b068853e7f12a1da67789..795e7f6f02f6b836c6f5a8b5069267236299617e 100644 (file)
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -130,7 +130,9 @@ void wxCrashReportImpl::Output(const wxChar *format, ...)
     DWORD cbWritten;
 
     wxString s = wxString::FormatV(format, argptr);
     DWORD cbWritten;
 
     wxString s = wxString::FormatV(format, argptr);

-    ::WriteFile(m_hFile, s, s.length() * sizeof(wxChar), &cbWritten, 0);
+
+    wxCharBuffer buf(s.mb_str(wxConvUTF8));
+    ::WriteFile(m_hFile, buf.data(), strlen(buf.data()), &cbWritten, 0);

 
     va_end(argptr);
 }
 
     va_end(argptr);
 }


@@ -195,7 +197,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
         }
         else // minimal dump
         {
         }
         else // minimal dump
         {

-            dumpFlags = MiniDumpNormal;
+            // the file size is not much bigger than when using MiniDumpNormal
+            // if we use the flags below, but the minidump is much more useful
+            // as it contains the values of many (but not all) local variables
+            dumpFlags = (MINIDUMP_TYPE)(MiniDumpScanMemory
+#if _MSC_VER > 1300
+                                        |MiniDumpWithIndirectlyReferencedMemory
+#endif
+                                        );

         }
 
         if ( !wxDbgHelpDLL::MiniDumpWriteDump
         }
 
         if ( !wxDbgHelpDLL::MiniDumpWriteDump


@@ -218,10 +227,11 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     }
     else // dbghelp.dll couldn't be loaded
     {
     }
     else // dbghelp.dll couldn't be loaded
     {

-        Output(wxDbgHelpDLL::GetErrorMessage());
+        Output(_T("%s"), wxDbgHelpDLL::GetErrorMessage().c_str());

     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);
     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);

+    wxUnusedVar(ep);

 
     Output(_T("Support for crash report generation was not included ")
            _T("in this wxWidgets version."));
 
     Output(_T("Support for crash report generation was not included ")
            _T("in this wxWidgets version."));


@@ -235,14 +245,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-void wxCrashReport::SetFileName(const wxChar *filename)
+void wxCrashReport::SetFileName(const wxString& filename)

 {
 {

-    wxStrncpy(gs_reportFilename, filename, WXSIZEOF(gs_reportFilename) - 1);
+    wxStrncpy(gs_reportFilename, filename.c_str(), WXSIZEOF(gs_reportFilename) - 1);

     gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
 }
 
 /* static */
     gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
 }
 
 /* static */

-const wxChar *wxCrashReport::GetFileName()
+wxString wxCrashReport::GetFileName()

 {
     return gs_reportFilename;
 }
 {
     return gs_reportFilename;
 }