X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f6c517ca52cdb17cfb3930bc53c8b4e90f6c3fd..62d7be206678146e889a76e30537c74c0e2c0ecc:/src/msw/crashrpt.cpp

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 7f017f5a36..d57eac2f54 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -81,7 +81,7 @@ private:
     void Output(const wxChar *format, ...);
 
     // output end of line
-    void OutputEndl() { Output(_T("\r\n")); }
+    void OutputEndl() { Output(wxT("\r\n")); }
 
     // the handle of the report file
     HANDLE m_hFile;
@@ -130,7 +130,9 @@ void wxCrashReportImpl::Output(const wxChar *format, ...)
     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);
 }
@@ -146,7 +148,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
-        Output(_T("Context for crash report generation not available."));
+        Output(wxT("Context for crash report generation not available."));
         return false;
     }
 
@@ -158,14 +160,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     TCHAR envFlags[64];
     DWORD dwLen = ::GetEnvironmentVariable
                     (
-                        _T("WX_CRASH_FLAGS"),
+                        wxT("WX_CRASH_FLAGS"),
                         envFlags,
                         WXSIZEOF(envFlags)
                     );
 
     int flagsEnv;
     if ( dwLen && dwLen < WXSIZEOF(envFlags) &&
-            wxSscanf(envFlags, _T("%d"), &flagsEnv) == 1 )
+            wxSscanf(envFlags, wxT("%d"), &flagsEnv) == 1 )
     {
         flags = flagsEnv;
     }
@@ -195,7 +197,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
         }
         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
@@ -209,7 +218,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
                 NULL                        // no callbacks
               ) )
         {
-            Output(_T("MiniDumpWriteDump() failed."));
+            Output(wxT("MiniDumpWriteDump() failed."));
 
             return false;
         }
@@ -218,14 +227,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     }
     else // dbghelp.dll couldn't be loaded
     {
-        Output(wxDbgHelpDLL::GetErrorMessage());
+        Output(wxT("%s"), wxDbgHelpDLL::GetErrorMessage().c_str());
     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);
     wxUnusedVar(ep);
 
-    Output(_T("Support for crash report generation was not included ")
-           _T("in this wxWidgets version."));
+    Output(wxT("Support for crash report generation was not included ")
+           wxT("in this wxWidgets version."));
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;
@@ -236,14 +245,13 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 // ----------------------------------------------------------------------------
 
 /* static */
-void wxCrashReport::SetFileName(const wxChar *filename)
+void wxCrashReport::SetFileName(const wxString& filename)
 {
-    wxStrncpy(gs_reportFilename, filename, WXSIZEOF(gs_reportFilename) - 1);
-    gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
+    wxStrlcpy(gs_reportFilename, filename.wx_str(), WXSIZEOF(gs_reportFilename));
 }
 
 /* static */
-const wxChar *wxCrashReport::GetFileName()
+wxString wxCrashReport::GetFileName()
 {
     return gs_reportFilename;
 }
@@ -284,7 +292,7 @@ wxCrashContext::wxCrashContext(_EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
-        wxCHECK_RET( wxGlobalSEInformation, _T("no exception info available") );
+        wxCHECK_RET( wxGlobalSEInformation, wxT("no exception info available") );
         ep = wxGlobalSEInformation;
     }
 
@@ -322,7 +330,7 @@ wxString wxCrashContext::GetExceptionString() const
 {
     wxString s;
 
-    #define CASE_EXCEPTION( x ) case EXCEPTION_##x: s = _T(#x); break
+    #define CASE_EXCEPTION( x ) case EXCEPTION_##x: s = wxT(#x); break
 
     switch ( code )
     {
@@ -355,7 +363,7 @@ wxString wxCrashContext::GetExceptionString() const
                     (
                      FORMAT_MESSAGE_IGNORE_INSERTS |
                      FORMAT_MESSAGE_FROM_HMODULE,
-                     ::GetModuleHandle(_T("NTDLL.DLL")),
+                     ::GetModuleHandle(wxT("NTDLL.DLL")),
                      code,
                      0,
                      wxStringBuffer(s, 1024),
@@ -363,7 +371,7 @@ wxString wxCrashContext::GetExceptionString() const
                      0
                     ) )
             {
-                s.Printf(_T("UNKNOWN_EXCEPTION(%d)"), code);
+                s.Printf(wxT("UNKNOWN_EXCEPTION(%d)"), code);
             }
     }