check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 34eba9c5c91044f4dc1dfcdcf30ce04d114cf572..d1a372467de968562020a83fdcd85de816ab85a0 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);
-    ::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);
 }
@@ -198,8 +200,11 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
             // 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 |
-                                        MiniDumpWithIndirectlyReferencedMemory);
+            dumpFlags = (MINIDUMP_TYPE)(MiniDumpScanMemory
+#if _MSC_VER > 1300
+                                        |MiniDumpWithIndirectlyReferencedMemory
+#endif
+                                        );
         }
 
         if ( !wxDbgHelpDLL::MiniDumpWriteDump