Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-01 21:08:38 +00:00
parent 1eae284d4f
commit 87baeeaff6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/crashrpt.cpp
View File

@@ -432,10 +432,10 @@ wxCrashReportImpl::FormatSimpleValue(BasicType bt,
{ {
static const size_t NUM_CHARS = 32; static const size_t NUM_CHARS = 32;
const wxChar * const pc = *(PSTR *)pAddress; const char * const pc = *(PSTR *)pAddress;
if ( !::IsBadStringPtr(pc, NUM_CHARS) ) if ( !::IsBadStringPtrA(pc, NUM_CHARS) )
{ {
s << _T('"') << wxString(pc, NUM_CHARS) << _T('"'); s << _T('"') << wxString(pc, wxConvLibc, NUM_CHARS) << _T('"');
handled = true; handled = true;
} }
@@ -674,7 +674,9 @@ wxCrashReportImpl::FormatSymbol(PSYMBOL_INFO pSym, STACKFRAME *sf)
pVariable = (DWORD_PTR)pSym->Address; pVariable = (DWORD_PTR)pSym->Address;
} }
s << pSym->Name << _T(" = ") << FormatAnyValue(pSym, (PVOID)pVariable); s << wxString(pSym->Name, wxConvLibc)
<< _T(" = ")
<< FormatAnyValue(pSym, (PVOID)pVariable);
return s; return s;
} }
@@ -916,10 +918,10 @@ void wxCrashReportImpl::OutputGlobals(HANDLE hModule)
bool wxCrashReportImpl::ResolveSymFunctions(const wxDynamicLibrary& dllDbgHelp) bool wxCrashReportImpl::ResolveSymFunctions(const wxDynamicLibrary& dllDbgHelp)
{ {
#define LOAD_SYM_FUNCTION(name) \ #define LOAD_SYM_FUNCTION(name) \
name = (name ## _t) dllDbgHelp.GetSymbol(#name); \ name = (name ## _t) dllDbgHelp.GetSymbol(_T(#name)); \
if ( !name ) \ if ( !name ) \
{ \ { \
Output(_T("\r\nFunction ") __XFILE__(#name) \ Output(_T("\r\nFunction ") _T(#name) \
_T("() not found.\r\n")); \ _T("() not found.\r\n")); \
return false; \ return false; \
} }
@@ -1044,8 +1046,8 @@ bool wxCrashReportImpl::Generate(int _WXUNUSED(flags))
} }
else else
{ {
Output(_T("Please update your dbghelp.dll version, " Output(_T("Please update your dbghelp.dll version, ")
"at least version 5.1 is needed!\r\n")); _T("at least version 5.1 is needed!\r\n"));
} }
} }
else else
@@ -1054,8 +1056,8 @@ bool wxCrashReportImpl::Generate(int _WXUNUSED(flags))
_T("from Microsoft to get more detailed crash information!")); _T("from Microsoft to get more detailed crash information!"));
} }
Output(_T("\r\nLatest dbghelp.dll is available at " Output(_T("\r\nLatest dbghelp.dll is available at ")
"http://www.microsoft.com/whdc/ddk/debugging/\r\n")); _T("http://www.microsoft.com/whdc/ddk/debugging/\r\n"));
#else // !wxUSE_DBGHELP #else // !wxUSE_DBGHELP
Output(_T("Support for crash report generation was not included ") Output(_T("Support for crash report generation was not included ")