Fixed some warnings

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

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 9edcd4524d061eeff26c7f044997319c82b6764a..e618107487f433121cc0a410f8cf8c9bcf0a7bfe 100644 (file)
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/crashrpt.cpp
+// Name:        src/msw/crashrpt.cpp

 // Purpose:     code to generate crash dumps (minidumps)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     code to generate crash dumps (minidumps)
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -81,7 +81,7 @@ private:
     void Output(const wxChar *format, ...);
 
     // output end of line
     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;
 
     // 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);
     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);
 }


@@ -146,7 +148,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
 
     if ( !ep )
     {

-        Output(_T("Context for crash report generation not available."));
+        Output(wxT("Context for crash report generation not available."));

         return false;
     }
 
         return false;
     }
 


@@ -158,14 +160,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     TCHAR envFlags[64];
     DWORD dwLen = ::GetEnvironmentVariable
                     (
     TCHAR envFlags[64];
     DWORD dwLen = ::GetEnvironmentVariable
                     (

-                        _T("WX_CRASH_FLAGS"),
+                        wxT("WX_CRASH_FLAGS"),

                         envFlags,
                         WXSIZEOF(envFlags)
                     );
 
     int flagsEnv;
     if ( dwLen && dwLen < WXSIZEOF(envFlags) &&
                         envFlags,
                         WXSIZEOF(envFlags)
                     );
 
     int flagsEnv;
     if ( dwLen && dwLen < WXSIZEOF(envFlags) &&

-            wxSscanf(envFlags, _T("%d"), &flagsEnv) == 1 )
+            wxSscanf(envFlags, wxT("%d"), &flagsEnv) == 1 )

     {
         flags = flagsEnv;
     }
     {
         flags = flagsEnv;
     }


@@ -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


@@ -209,7 +218,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
                 NULL                        // no callbacks
               ) )
         {
                 NULL                        // no callbacks
               ) )
         {

-            Output(_T("MiniDumpWriteDump() failed."));
+            Output(wxT("MiniDumpWriteDump() failed."));

 
             return false;
         }
 
             return false;
         }


@@ -218,13 +227,14 @@ 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(wxT("%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(wxT("Support for crash report generation was not included ")
+           wxT("in this wxWidgets version."));

 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;


@@ -235,14 +245,13 @@ 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);
-    gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
+    wxStrlcpy(gs_reportFilename, filename.t_str(), WXSIZEOF(gs_reportFilename));

 }
 
 /* static */
 }
 
 /* static */

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

 {
     return gs_reportFilename;
 }
 {
     return gs_reportFilename;
 }


@@ -255,6 +264,24 @@ bool wxCrashReport::Generate(int flags, EXCEPTION_POINTERS *ep)
     return impl.Generate(flags, ep);
 }
 
     return impl.Generate(flags, ep);
 }
 

+/* static */
+bool wxCrashReport::GenerateNow(int flags)
+{
+    bool rc = false;
+
+    __try
+    {
+        RaiseException(0x1976, 0, 0, NULL);
+    }
+    __except( rc = Generate(flags, (EXCEPTION_POINTERS *)GetExceptionInformation()),
+              EXCEPTION_CONTINUE_EXECUTION )
+    {
+        // never executed because of EXCEPTION_CONTINUE_EXECUTION above
+    }
+
+    return rc;
+}
+

 // ----------------------------------------------------------------------------
 // wxCrashContext
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCrashContext
 // ----------------------------------------------------------------------------


@@ -265,7 +292,7 @@ wxCrashContext::wxCrashContext(_EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
 
     if ( !ep )
     {

-        wxCHECK_RET( wxGlobalSEInformation, _T("no exception info available") );
+        wxCHECK_RET( wxGlobalSEInformation, wxT("no exception info available") );

         ep = wxGlobalSEInformation;
     }
 
         ep = wxGlobalSEInformation;
     }
 


@@ -303,7 +330,7 @@ wxString wxCrashContext::GetExceptionString() const
 {
     wxString s;
 
 {
     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 )
     {
 
     switch ( code )
     {


@@ -336,7 +363,7 @@ wxString wxCrashContext::GetExceptionString() const
                     (
                      FORMAT_MESSAGE_IGNORE_INSERTS |
                      FORMAT_MESSAGE_FROM_HMODULE,
                     (
                      FORMAT_MESSAGE_IGNORE_INSERTS |
                      FORMAT_MESSAGE_FROM_HMODULE,

-                     ::GetModuleHandle(_T("NTDLL.DLL")),
+                     ::GetModuleHandle(wxT("NTDLL.DLL")),

                      code,
                      0,
                      wxStringBuffer(s, 1024),
                      code,
                      0,
                      wxStringBuffer(s, 1024),


@@ -344,7 +371,7 @@ wxString wxCrashContext::GetExceptionString() const
                      0
                     ) )
             {
                      0
                     ) )
             {

-                s.Printf(_T("UNKNOWN_EXCEPTION(%d)"), code);
+                s.Printf(wxT("UNKNOWN_EXCEPTION(%d)"), code);

             }
     }
 
             }
     }