diff options
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/Dlgcode.c | 18 | ||||
| -rw-r--r-- | src/Common/Dlgcode.h | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 48dc1dd2..73957fec 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -570,6 +570,8 @@ DWORD handleWin32Error (HWND hwndDlg, const char* srcPos) {
PWSTR lpMsgBuf;
DWORD dwError = GetLastError ();
+ wchar_t szErrorValue[32];
+ wchar_t* pszDesc;
if (Silent || dwError == 0 || dwError == ERROR_INVALID_WINDOW_HANDLE)
return dwError;
@@ -583,7 +585,7 @@ DWORD handleWin32Error (HWND hwndDlg, const char* srcPos) }
FormatMessageW (
- FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+ FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
dwError,
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
@@ -592,8 +594,16 @@ DWORD handleWin32Error (HWND hwndDlg, const char* srcPos) NULL
);
- MessageBoxW (hwndDlg, AppendSrcPos (lpMsgBuf, srcPos).c_str (), lpszTitle, ICON_HAND);
- LocalFree (lpMsgBuf);
+ if (lpMsgBuf)
+ pszDesc = (wchar_t*) lpMsgBuf;
+ else
+ {
+ StringCbPrintfW (szErrorValue, sizeof (szErrorValue), L"Error 0x%.8X", dwError);
+ pszDesc = szErrorValue;
+ }
+
+ MessageBoxW (hwndDlg, AppendSrcPos (pszDesc, srcPos).c_str (), lpszTitle, ICON_HAND);
+ if (lpMsgBuf) LocalFree (lpMsgBuf);
// User-friendly hardware error explanation
if (IsDiskError (dwError))
@@ -612,7 +622,7 @@ BOOL translateWin32Error (wchar_t *lpszMsgBuf, int nWSizeOfBuf) {
DWORD dwError = GetLastError ();
- if (FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError,
+ if (FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwError,
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
lpszMsgBuf, nWSizeOfBuf, NULL))
{
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h index 2b6aee18..af983a63 100644 --- a/src/Common/Dlgcode.h +++ b/src/Common/Dlgcode.h @@ -562,7 +562,7 @@ std::string IntToString (int val); std::wstring IntToWideString (int val);
inline std::wstring AppendSrcPos (const wchar_t* msg, const char* srcPos)
{
- return std::wstring (msg) + L"\n\nSource: " + SingleStringToWide (srcPos);
+ return std::wstring (msg? msg : L"") + L"\n\nSource: " + SingleStringToWide (srcPos);
}
// Display a wait dialog while calling the provided callback with the given parameter
|