Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

No need to retry HRESULTs

Browse source
This commit is contained in:
Whindmar Saksit 2024-05-03 19:53:31 +02:00
parent 866d4d8001
commit 13e4451970
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sdk/include/reactos/shellutils.h
View file

@ -92,24 +92,17 @@ static inline UINT
SHELL_ErrorBoxHelper(HWND hwndOwner, UINT Error)
{
WCHAR buf[400];
UINT cch, msgId, u32_errstr = 2;
UINT cch, u32_errstr = 2;
if (!IsWindowVisible(hwndOwner))
hwndOwner = NULL;
if (Error == ERROR_SUCCESS)
Error = ERROR_INTERNAL_ERROR;
msgId = Error;
retry:
cch = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, msgId, 0, buf, _countof(buf), NULL);
NULL, Error, 0, buf, _countof(buf), NULL);
if (!cch)
{
if (HIWORD(msgId) == HIWORD(HRESULT_FROM_WIN32(1)))
{
msgId = HRESULT_CODE(msgId); // Extract ERROR_ from HRESULT_FROM_WIN32
goto retry; // and try again.
}
cch = LoadStringW(LoadLibraryW(L"USER32"), u32_errstr, buf, _countof(buf));
wsprintfW(buf + cch, L"\n\n%#x (%d)", Error, Error);
}
@ -120,7 +113,7 @@ retry:
template<class H> static UINT
SHELL_ErrorBox(H hwndOwner, UINT Error = GetLastError())
{
return SHELL_ErrorBoxHelper(hwndOwner, Error);
return SHELL_ErrorBoxHelper(const_cast<HWND>(hwndOwner), Error);
}
#endif