Ros-diffs

ros-diffs@reactos.org

81390 discussions

08/08: [USERSRV] Hard-error improvements 7/7
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29d56f2b296402179cf99… commit 29d56f2b296402179cf99ffd654c6cd76876aa2e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 23 23:50:50 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:13 2018 +0200 [USERSRV] Hard-error improvements 7/7 - Use a more descriptive "unknown hard error" string than Windows' one. - Improve the computation of the buffer size for the hard error message by using _vscwprintf() instead of just "guessing" which size the fully printf'ed message could be. --- win32ss/user/winsrv/usersrv/harderror.c | 317 ++++++++++++++++++++------------ 1 file changed, 201 insertions(+), 116 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 9248d60f92..62864ca695 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -61,6 +61,28 @@ RtlLoadUnicodeString( } +/* + * NOTE: _scwprintf() is NOT exported by ntdll.dll, + * only _vscwprintf() is, so we need to implement it here. + * Code comes from sdk/lib/crt/printf/_scwprintf.c . + */ +int +__cdecl +_scwprintf( + const wchar_t *format, + ...) +{ + int len; + va_list args; + + va_start(args, format); + len = _vscwprintf(format, args); + va_end(args); + + return len; +} + + /* FIXME */ int WINAPI @@ -349,9 +371,18 @@ UserpFormatMessages( OUT PULONG pdwTimeout, IN PHARDERROR_MSG Message) { + /* Special hardcoded messages */ + static const PCWSTR pszUnknownHardError = + L"Unknown Hard Error 0x%08lx\n" + L"Parameters: 0x%p 0x%p 0x%p 0x%p"; + static const PCWSTR pszExceptionHardError = + L"Exception processing message 0x%08lx\n" + L"Parameters: 0x%p 0x%p 0x%p 0x%p"; + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hProcess; + ULONG Severity = (ULONG)(Message->Status) >> 30; ULONG SizeOfStrings; ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS] = {0}; ULONG_PTR CopyParameters[MAXIMUM_HARDERROR_PARAMETERS]; @@ -361,8 +392,6 @@ UserpFormatMessages( PMESSAGE_RESOURCE_ENTRY MessageResource; PWSTR FormatString, pszBuffer; size_t cszBuffer; - ULONG Severity = (ULONG)(Message->Status) >> 30; - ULONG Size; /* Open client process */ InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); @@ -379,6 +408,13 @@ UserpFormatMessages( /* Capture all string parameters from the process memory */ UserpCaptureStringParameters(Parameters, &SizeOfStrings, Message, hProcess); + /* Initialize the output strings */ + TextStringU->Length = 0; + TextStringU->Buffer[0] = UNICODE_NULL; + + CaptionStringU->Length = 0; + CaptionStringU->Buffer[0] = UNICODE_NULL; + /* * Check whether it is a service notification, in which case * we format the parameters and take the short route. @@ -395,29 +431,15 @@ UserpFormatMessages( */ *pdwType = (UINT)Parameters[2] & ~MB_SERVICE_NOTIFICATION; - /* Duplicate the UNICODE text message */ + /* + * Duplicate the UNICODE text message and caption. + * If no strings or invalid ones have been provided, keep + * the original buffers and reset the string lengths to zero. + */ if (Message->UnicodeStringParameterMask & 0x1) - { - /* A string has been provided: duplicate it */ UserpDuplicateParamStringToUnicodeString(TextStringU, (PCWSTR)Parameters[0]); - } - else - { - /* No string (or invalid one) has been provided: keep the original buffer and reset the string length to zero */ - TextStringU->Length = 0; - } - - /* Duplicate the UNICODE caption */ if (Message->UnicodeStringParameterMask & 0x2) - { - /* A string has been provided: duplicate it */ UserpDuplicateParamStringToUnicodeString(CaptionStringU, (PCWSTR)Parameters[1]); - } - else - { - /* No string (or invalid one) has been provided: keep the original buffer and reset the string length to zero */ - CaptionStringU->Length = 0; - } /* Set the timeout */ if (Message->NumberOfParameters >= 4) @@ -493,7 +515,8 @@ UserpFormatMessages( FileNameU = g_SystemProcessU; } - /* Get text string of the error code */ + /* Retrieve the description of the error code */ + FormatA.Buffer = NULL; Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), (ULONG_PTR)RT_MESSAGETABLE, LANG_NEUTRAL, @@ -511,41 +534,40 @@ UserpFormatMessages( RtlInitAnsiString(&FormatA, (PSTR)MessageResource->Text); /* Status = */ RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } + ASSERT(FormatU.Buffer); } else { /* - * Fall back to hardcoded value. + * Fall back to unknown hard error format string. * NOTE: The value used here is ReactOS-specific: it allows specifying - * the exact hard error status value and the parameters. The version - * used on Windows only says "Unknown Hard Error". + * the exact hard error status value and the parameters, contrary to + * the one on Windows which only says: "Unknown Hard Error". */ -#if 0 - RtlInitUnicodeString(&FormatU, L"Unknown Hard Error 0x%08lx\n" - L"Parameters: 0x%p 0x%p 0x%p 0x%p"); -#else - RtlInitUnicodeString(&FormatU, L"Unknown Hard Error 0x%08lx"); - CopyParameters[0] = Message->Status; -#endif + RtlInitEmptyUnicodeString(&FormatU, NULL, 0); FormatA.Buffer = NULL; } FormatString = FormatU.Buffer; - /* Check whether a caption exists */ - if (FormatString[0] == L'{') + /* Check whether a caption is specified in the format string */ + if (FormatString && FormatString[0] == L'{') { /* Set caption start */ TempStringU.Buffer = ++FormatString; - /* Get size of the caption */ - for (Size = 0; *FormatString != UNICODE_NULL && *FormatString != L'}'; Size++) - FormatString++; + /* Get the caption size and find where the format string really starts */ + for (TempStringU.Length = 0; + *FormatString != UNICODE_NULL && *FormatString != L'}'; + ++TempStringU.Length) + { + ++FormatString; + } /* Skip '}', '\r', '\n' */ FormatString += 3; - TempStringU.Length = (USHORT)(Size * sizeof(WCHAR)); + TempStringU.Length *= sizeof(WCHAR); TempStringU.MaximumLength = TempStringU.Length; } else @@ -612,6 +634,7 @@ UserpFormatMessages( } } CaptionStringU->Length = 0; + CaptionStringU->Buffer[0] = UNICODE_NULL; /* Append the file name, the separator and the caption text */ RtlStringCbPrintfW(CaptionStringU->Buffer, @@ -620,19 +643,22 @@ UserpFormatMessages( &WindowTitleU, &FileNameU, &TempStringU); CaptionStringU->Length = (USHORT)(wcslen(CaptionStringU->Buffer) * sizeof(WCHAR)); - /* Free string buffers if needed */ + /* Free the strings if needed */ if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); if (hProcess) RtlFreeUnicodeString(&FileNameU); - // FIXME: What is 42 == ?? - Size = 42; + Format2A.Buffer = NULL; + + /* If we have an unknown hard error, skip the special cases handling */ + if (!FormatString) + goto BuildMessage; /* Check if this is an exception message */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { ULONG ExceptionCode = CopyParameters[0]; - /* Get text string of the exception code */ + /* Retrieve the description of the exception code */ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), (ULONG_PTR)RT_MESSAGETABLE, LANG_NEUTRAL, @@ -650,10 +676,12 @@ UserpFormatMessages( RtlInitAnsiString(&Format2A, (PSTR)MessageResource->Text); /* Status = */ RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); } + ASSERT(Format2U.Buffer); /* Handle special cases */ if (ExceptionCode == STATUS_ACCESS_VIOLATION) { + /* Use a new FormatString */ FormatString = Format2U.Buffer; CopyParameters[0] = CopyParameters[1]; CopyParameters[1] = CopyParameters[3]; @@ -664,6 +692,7 @@ UserpFormatMessages( } else if (ExceptionCode == STATUS_IN_PAGE_ERROR) { + /* Use a new FormatString */ FormatString = Format2U.Buffer; CopyParameters[0] = CopyParameters[1]; CopyParameters[1] = CopyParameters[3]; @@ -702,24 +731,64 @@ UserpFormatMessages( CopyParameters[1] = CopyParameters[0]; CopyParameters[0] = (ULONG_PTR)L"unknown software exception"; } + } - /* Add explanation text for dialog buttons */ - if (Message->ValidResponseOptions == OptionOk || - Message->ValidResponseOptions == OptionOkCancel) +BuildMessage: + /* + * Calculate buffer length for the text message. If FormatString + * is NULL this means we have an unknown hard error whose format + * string is in FormatU. + */ + cszBuffer = 0; + /* Wrap in SEH to protect from invalid string parameters */ + _SEH2_TRY + { + if (!FormatString) { - /* Reserve space for one newline and the OK-terminate-program string */ - Size += 1 + (g_OKTerminateU.Length / sizeof(WCHAR)); + /* Fall back to unknown hard error format string, and use the original parameters */ + cszBuffer = _scwprintf(pszUnknownHardError, + Message->Status, + Parameters[0], Parameters[1], + Parameters[2], Parameters[3]); + cszBuffer *= sizeof(WCHAR); } - if (Message->ValidResponseOptions == OptionOkCancel) + else { - /* Reserve space for one newline and the CANCEL-debug-program string */ - Size += 1 + (g_CancelDebugU.Length / sizeof(WCHAR)); + cszBuffer = _scwprintf(FormatString, + CopyParameters[0], CopyParameters[1], + CopyParameters[2], CopyParameters[3]); + cszBuffer *= sizeof(WCHAR); + + /* Add a description for the dialog buttons */ + if (Message->Status == STATUS_UNHANDLED_EXCEPTION) + { + if (Message->ValidResponseOptions == OptionOk || + Message->ValidResponseOptions == OptionOkCancel) + { + /* Reserve space for one newline and the OK-terminate-program string */ + cszBuffer += sizeof(WCHAR) + g_OKTerminateU.Length; + } + if (Message->ValidResponseOptions == OptionOkCancel) + { + /* Reserve space for one newline and the CANCEL-debug-program string */ + cszBuffer += sizeof(WCHAR) + g_CancelDebugU.Length; + } + } } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* An exception occurred, use a default string with the original parameters */ + cszBuffer = _scwprintf(pszExceptionHardError, + Message->Status, + Parameters[0], Parameters[1], + Parameters[2], Parameters[3]); + cszBuffer *= sizeof(WCHAR); + } + _SEH2_END; + + cszBuffer += SizeOfStrings + sizeof(UNICODE_NULL); - /* Calculate buffer length for the text message */ - cszBuffer = FormatU.Length + SizeOfStrings + Size * sizeof(WCHAR) + - sizeof(UNICODE_NULL); if (TextStringU->MaximumLength < cszBuffer) { /* Allocate a larger buffer for the text message */ @@ -737,6 +806,7 @@ UserpFormatMessages( } } TextStringU->Length = 0; + TextStringU->Buffer[0] = UNICODE_NULL; /* Wrap in SEH to protect from invalid string parameters */ _SEH2_TRY @@ -744,32 +814,45 @@ UserpFormatMessages( /* Print the string into the buffer */ pszBuffer = TextStringU->Buffer; cszBuffer = TextStringU->MaximumLength; - RtlStringCbPrintfExW(pszBuffer, cszBuffer, - &pszBuffer, &cszBuffer, - STRSAFE_IGNORE_NULLS, - FormatString, - CopyParameters[0], CopyParameters[1], - CopyParameters[2], CopyParameters[3]); - - /* Add explanation text for dialog buttons */ - if (Message->Status == STATUS_UNHANDLED_EXCEPTION) + + if (!FormatString) { - if (Message->ValidResponseOptions == OptionOk || - Message->ValidResponseOptions == OptionOkCancel) - { - RtlStringCbPrintfExW(pszBuffer, cszBuffer, - &pszBuffer, &cszBuffer, - STRSAFE_IGNORE_NULLS, - L"\n%wZ", - &g_OKTerminateU); - } - if (Message->ValidResponseOptions == OptionOkCancel) + /* Fall back to unknown hard error format string, and use the original parameters */ + RtlStringCbPrintfW(pszBuffer, cszBuffer, + pszUnknownHardError, + Message->Status, + Parameters[0], Parameters[1], + Parameters[2], Parameters[3]); + } + else + { + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, + 0, + FormatString, + CopyParameters[0], CopyParameters[1], + CopyParameters[2], CopyParameters[3]); + + /* Add a description for the dialog buttons */ + if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { - RtlStringCbPrintfExW(pszBuffer, cszBuffer, - &pszBuffer, &cszBuffer, - STRSAFE_IGNORE_NULLS, - L"\n%wZ", - &g_CancelDebugU); + if (Message->ValidResponseOptions == OptionOk || + Message->ValidResponseOptions == OptionOkCancel) + { + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, + 0, + L"\n%wZ", + &g_OKTerminateU); + } + if (Message->ValidResponseOptions == OptionOkCancel) + { + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, + 0, + L"\n%wZ", + &g_CancelDebugU); + } } } } @@ -781,8 +864,7 @@ UserpFormatMessages( RtlStringCbPrintfW(TextStringU->Buffer, TextStringU->MaximumLength, - L"Exception processing message 0x%08lx\n" - L"Parameters: 0x%p 0x%p 0x%p 0x%p", + pszExceptionHardError, Message->Status, Parameters[0], Parameters[1], Parameters[2], Parameters[3]); @@ -791,12 +873,12 @@ UserpFormatMessages( TextStringU->Length = (USHORT)(wcslen(TextStringU->Buffer) * sizeof(WCHAR)); - /* Free converted Unicode strings */ + /* Free the converted UNICODE strings */ if (Format2A.Buffer) RtlFreeUnicodeString(&Format2U); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); Quit: - /* Final cleanup */ + /* Free the captured parameters */ UserpFreeStringParameters(Parameters, Message); } @@ -850,40 +932,43 @@ GetRegInt( static BOOL UserpShowInformationBalloon( - IN PCWSTR Text, - IN PCWSTR Caption, - IN UINT Type, + IN PUNICODE_STRING TextStringU, + IN PUNICODE_STRING CaptionStringU, + IN UINT Type, IN PHARDERROR_MSG Message) { ULONG ShellErrorMode; - HWND hwnd; + HWND hWndTaskman; COPYDATASTRUCT CopyData; PBALLOON_HARD_ERROR_DATA pdata; DWORD dwSize, cbTextLen, cbTitleLen; PWCHAR pText, pCaption; - DWORD ret, dwResult; + DWORD ret; + DWORD_PTR dwResult; /* Query the shell error mode value */ ShellErrorMode = GetRegInt(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Windows", L"ShellErrorMode", 0); - /* Make the shell display the hard error message in balloon only if necessary */ + /* Make the shell display the hard error message only if necessary */ if (ShellErrorMode != 1) return FALSE; - hwnd = GetTaskmanWindow(); - if (!hwnd) + /* Retrieve the shell task window */ + hWndTaskman = GetTaskmanWindow(); + if (!hWndTaskman) { DPRINT1("Failed to find shell task window (last error %lu)\n", GetLastError()); return FALSE; } - cbTextLen = ((Text ? wcslen(Text) : 0) + 1) * sizeof(WCHAR); - cbTitleLen = ((Caption ? wcslen(Caption) : 0) + 1) * sizeof(WCHAR); + cbTextLen = TextStringU->Length + sizeof(UNICODE_NULL); + cbTitleLen = CaptionStringU->Length + sizeof(UNICODE_NULL); dwSize = sizeof(BALLOON_HARD_ERROR_DATA); dwSize += cbTextLen + cbTitleLen; + /* Build the data buffer */ pdata = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); if (!pdata) { @@ -893,31 +978,27 @@ UserpShowInformationBalloon( pdata->cbHeaderSize = sizeof(BALLOON_HARD_ERROR_DATA); pdata->Status = Message->Status; + pdata->dwType = Type; - if (NT_SUCCESS(Message->Status)) - pdata->dwType = MB_OK; - else if (Message->Status == STATUS_SERVICE_NOTIFICATION) - pdata->dwType = Type; - else - pdata->dwType = MB_ICONINFORMATION; - - pdata->TitleOffset = pdata->cbHeaderSize; - pdata->MessageOffset = pdata->TitleOffset; - pdata->MessageOffset += cbTitleLen; + pdata->TitleOffset = pdata->cbHeaderSize; + pdata->MessageOffset = pdata->TitleOffset + cbTitleLen; pCaption = (PWCHAR)((ULONG_PTR)pdata + pdata->TitleOffset); pText = (PWCHAR)((ULONG_PTR)pdata + pdata->MessageOffset); - wcscpy(pCaption, Caption); - wcscpy(pText, Text); + RtlStringCbCopyNW(pCaption, cbTitleLen, CaptionStringU->Buffer, CaptionStringU->Length); + RtlStringCbCopyNW(pText, cbTextLen, TextStringU->Buffer, TextStringU->Length); + + /* Send the message */ + /* Retrieve a unique system-wide message to communicate hard error data with the shell */ CopyData.dwData = RegisterWindowMessageW(L"HardError"); CopyData.cbData = dwSize; CopyData.lpData = pdata; dwResult = FALSE; - - ret = SendMessageTimeoutW(hwnd, WM_COPYDATA, 0, (LPARAM)&CopyData, + ret = SendMessageTimeoutW(hWndTaskman, WM_COPYDATA, 0, (LPARAM)&CopyData, SMTO_NORMAL | SMTO_ABORTIFHUNG, 3000, &dwResult); + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, pdata); return (ret && dwResult) ? TRUE : FALSE; @@ -926,18 +1007,21 @@ UserpShowInformationBalloon( static HARDERROR_RESPONSE UserpMessageBox( - IN PCWSTR Text, - IN PCWSTR Caption, - IN UINT Type, - IN ULONG Timeout) + IN PUNICODE_STRING TextStringU, + IN PUNICODE_STRING CaptionStringU, + IN UINT Type, + IN ULONG Timeout) { ULONG MessageBoxResponse; DPRINT("Text = '%S', Caption = '%S', Type = 0x%lx\n", - Text, Caption, Type); + TextStringU->Buffer, CaptionStringU->Buffer, Type); /* Display a message box */ - MessageBoxResponse = MessageBoxTimeoutW(NULL, Text, Caption, Type, 0, Timeout); + MessageBoxResponse = MessageBoxTimeoutW(NULL, + TextStringU->Buffer, + CaptionStringU->Buffer, + Type, 0, Timeout); /* Return response value */ switch (MessageBoxResponse) @@ -1028,7 +1112,8 @@ UserServerHardError( { if (Message->NumberOfParameters < 3) { - DPRINT1("Invalid NumberOfParameters = %d for STATUS_SERVICE_NOTIFICATION\n", Message->NumberOfParameters); + DPRINT1("Invalid NumberOfParameters = %d for STATUS_SERVICE_NOTIFICATION\n", + Message->NumberOfParameters); return; // STATUS_INVALID_PARAMETER; } // (Message->UnicodeStringParameterMask & 0x3) @@ -1062,8 +1147,8 @@ UserServerHardError( { /* Display the balloon */ Message->Response = ResponseOk; - if (UserpShowInformationBalloon(TextU.Buffer, - CaptionU.Buffer, + if (UserpShowInformationBalloon(&TextU, + &CaptionU, dwType, Message)) { @@ -1073,8 +1158,8 @@ UserServerHardError( } /* Display the message box */ - Message->Response = UserpMessageBox(TextU.Buffer, - CaptionU.Buffer, + Message->Response = UserpMessageBox(&TextU, + &CaptionU, dwType, Timeout);

1 0

07/08: [USERSRV] Hard-error improvements 6/7
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2363fee51f835e2087ea2… commit 2363fee51f835e2087ea2291f57250b062dc1478 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 24 23:07:35 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:12 2018 +0200 [USERSRV] Hard-error improvements 6/7 Make UserpFormatMessages() return the possible timeout for the hard error; use it when displaying the hard error message boxes. --- win32ss/user/winsrv/usersrv/harderror.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 9a1d2c7f32..9248d60f92 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -346,6 +346,7 @@ UserpFormatMessages( IN OUT PUNICODE_STRING TextStringU, IN OUT PUNICODE_STRING CaptionStringU, OUT PUINT pdwType, + OUT PULONG pdwTimeout, IN PHARDERROR_MSG Message) { NTSTATUS Status; @@ -418,6 +419,12 @@ UserpFormatMessages( CaptionStringU->Length = 0; } + /* Set the timeout */ + if (Message->NumberOfParameters >= 4) + *pdwTimeout = (ULONG)Parameters[3]; + else + *pdwTimeout = INFINITE; + goto Quit; } @@ -462,6 +469,9 @@ UserpFormatMessages( *pdwType |= MB_SYSTEMMODAL | MB_SETFOREGROUND; + /* Set the timeout */ + *pdwTimeout = INFINITE; + /* Copy the Parameters array locally */ RtlCopyMemory(&CopyParameters, Parameters, sizeof(CopyParameters)); @@ -991,7 +1001,8 @@ UserServerHardError( IN PHARDERROR_MSG Message) { ULONG ErrorMode; - UINT dwType = 0; + UINT dwType = 0; + ULONG Timeout = INFINITE; UNICODE_STRING TextU, CaptionU; WCHAR LocalTextBuffer[256]; WCHAR LocalCaptionBuffer[256]; @@ -1029,7 +1040,7 @@ UserServerHardError( /* Format the message caption and text */ RtlInitEmptyUnicodeString(&TextU, LocalTextBuffer, sizeof(LocalTextBuffer)); RtlInitEmptyUnicodeString(&CaptionU, LocalCaptionBuffer, sizeof(LocalCaptionBuffer)); - UserpFormatMessages(&TextU, &CaptionU, &dwType, /* &Timeout, */ Message); + UserpFormatMessages(&TextU, &CaptionU, &dwType, &Timeout, Message); /* Log the hard error message */ UserpLogHardError(&TextU, &CaptionU); @@ -1065,7 +1076,7 @@ UserServerHardError( Message->Response = UserpMessageBox(TextU.Buffer, CaptionU.Buffer, dwType, - (ULONG)-1); + Timeout); Quit: /* Free the strings if they have been reallocated */

1 0

06/08: [USERSRV] Hard-error improvements 5/7 - Implement STATUS_SERVICE_NOTIFICATION handling.
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d70697a39752c2ff6a8… commit 08d70697a39752c2ff6a8d82ee673671aef9d459 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 19 02:22:20 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:11 2018 +0200 [USERSRV] Hard-error improvements 5/7 - Implement STATUS_SERVICE_NOTIFICATION handling. - In UserpCaptureStringParameters(), always capture the parameter strings with a terminating NULL. Also, no need to convert them to ANSI if they are used with a STATUS_SERVICE_NOTIFICATION message. - Determine within UserpFormatMessages() the message box flags to be used, either from the message parameters (if STATUS_SERVICE_NOTIFICATION) or from the proposed response options and message status severity. These flags are then used by both UserpShowInformationBalloon()/UserpShellHardError() and by UserpMessageBox(). - Improve Message validation (especially for STATUS_SERVICE_NOTIFICATION). - Try to display the hard error status number if it's an unknown one. --- win32ss/user/winsrv/usersrv/harderror.c | 319 +++++++++++++++++++++----------- 1 file changed, 212 insertions(+), 107 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index ad3815a434..9a1d2c7f32 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -114,8 +114,8 @@ UserpCaptureStringParameters( continue; } - /* Allocate a buffer for the string */ - TempStringU.MaximumLength = ParamStringU.Length; + /* Allocate a buffer for the string and reserve a NULL terminator */ + TempStringU.MaximumLength = ParamStringU.Length + sizeof(UNICODE_NULL); TempStringU.Length = ParamStringU.Length; TempStringU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, @@ -140,36 +140,47 @@ UserpCaptureStringParameters( RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); continue; } + /* NULL-terminate the string */ + TempStringU.Buffer[TempStringU.Length / sizeof(WCHAR)] = UNICODE_NULL; DPRINT("ParamString = \'%wZ\'\n", &TempStringU); - /* Allocate a buffer for converted to ANSI string */ - TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); - TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TempStringA.MaximumLength); - if (!TempStringA.Buffer) + if (Message->Status == STATUS_SERVICE_NOTIFICATION) { - /* We failed, skip this string */ - DPRINT1("Cannot allocate memory with size %u, skipping.\n", TempStringA.MaximumLength); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - continue; + /* Just keep the allocated NULL-terminated UNICODE string */ + Parameters[nParam] = (ULONG_PTR)TempStringU.Buffer; + Size += TempStringU.Length; } - - /* Convert string to ANSI and free temporary buffer */ - Status = RtlUnicodeStringToAnsiString(&TempStringA, &TempStringU, FALSE); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - if (!NT_SUCCESS(Status)) + else { - /* We failed, skip this string */ - DPRINT1("RtlUnicodeStringToAnsiString() failed, Status 0x%lx, skipping.\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); - continue; - } + /* Allocate a buffer for converted to ANSI string */ + TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); + TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TempStringA.MaximumLength); + if (!TempStringA.Buffer) + { + /* We failed, skip this string */ + DPRINT1("Cannot allocate memory with size %u, skipping.\n", TempStringA.MaximumLength); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); + continue; + } - /* Note: RtlUnicodeStringToAnsiString returns NULL terminated string */ - Parameters[nParam] = (ULONG_PTR)TempStringA.Buffer; - Size += TempStringU.Length; + /* Convert string to ANSI and free temporary buffer */ + Status = RtlUnicodeStringToAnsiString(&TempStringA, &TempStringU, FALSE); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); + if (!NT_SUCCESS(Status)) + { + /* We failed, skip this string */ + DPRINT1("RtlUnicodeStringToAnsiString() failed, Status 0x%lx, skipping.\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); + continue; + } + + /* Note: RtlUnicodeStringToAnsiString() returns a NULL-terminated string */ + Parameters[nParam] = (ULONG_PTR)TempStringA.Buffer; + Size += TempStringU.Length; + } } else { @@ -293,11 +304,48 @@ UserpGetClientFileName( return STATUS_SUCCESS; } +static +VOID +UserpDuplicateParamStringToUnicodeString( + IN OUT PUNICODE_STRING UnicodeString, + IN PCWSTR ParamString) +{ + UNICODE_STRING FormatU, TempStringU; + + /* Calculate buffer length for the text message */ + RtlInitUnicodeString(&FormatU, (PWSTR)ParamString); + if (UnicodeString->MaximumLength < FormatU.MaximumLength) + { + /* Duplicate the text message in a larger buffer */ + if (NT_SUCCESS(RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &FormatU, &TempStringU))) + { + *UnicodeString = TempStringU; + } + else + { + /* We could not allocate a larger buffer; continue using the smaller original buffer */ + DPRINT1("Cannot allocate memory for UnicodeString, use original buffer.\n"); + + /* Copy the truncated string, NULL-terminate it */ + FormatU.MaximumLength = UnicodeString->MaximumLength; + FormatU.Length = FormatU.MaximumLength - sizeof(UNICODE_NULL); + RtlCopyUnicodeString(UnicodeString, &FormatU); + } + } + else + { + /* Copy the string, NULL-terminate it */ + RtlCopyUnicodeString(UnicodeString, &FormatU); + } +} + static VOID UserpFormatMessages( IN OUT PUNICODE_STRING TextStringU, IN OUT PUNICODE_STRING CaptionStringU, + OUT PUINT pdwType, IN PHARDERROR_MSG Message) { NTSTATUS Status; @@ -312,7 +360,7 @@ UserpFormatMessages( PMESSAGE_RESOURCE_ENTRY MessageResource; PWSTR FormatString, pszBuffer; size_t cszBuffer; - ULONG Severity; + ULONG Severity = (ULONG)(Message->Status) >> 30; ULONG Size; /* Open client process */ @@ -330,6 +378,90 @@ UserpFormatMessages( /* Capture all string parameters from the process memory */ UserpCaptureStringParameters(Parameters, &SizeOfStrings, Message, hProcess); + /* + * Check whether it is a service notification, in which case + * we format the parameters and take the short route. + */ + if (Message->Status == STATUS_SERVICE_NOTIFICATION) + { + /* Close the process handle */ + if (hProcess) NtClose(hProcess); + + /* + * Retrieve the message box flags. Note that we filter out + * MB_SERVICE_NOTIFICATION to not enter an infinite recursive + * loop when we will call MessageBox() later on. + */ + *pdwType = (UINT)Parameters[2] & ~MB_SERVICE_NOTIFICATION; + + /* Duplicate the UNICODE text message */ + if (Message->UnicodeStringParameterMask & 0x1) + { + /* A string has been provided: duplicate it */ + UserpDuplicateParamStringToUnicodeString(TextStringU, (PCWSTR)Parameters[0]); + } + else + { + /* No string (or invalid one) has been provided: keep the original buffer and reset the string length to zero */ + TextStringU->Length = 0; + } + + /* Duplicate the UNICODE caption */ + if (Message->UnicodeStringParameterMask & 0x2) + { + /* A string has been provided: duplicate it */ + UserpDuplicateParamStringToUnicodeString(CaptionStringU, (PCWSTR)Parameters[1]); + } + else + { + /* No string (or invalid one) has been provided: keep the original buffer and reset the string length to zero */ + CaptionStringU->Length = 0; + } + + goto Quit; + } + + /* Set the message box type */ + *pdwType = 0; + switch (Message->ValidResponseOptions) + { + case OptionAbortRetryIgnore: + *pdwType = MB_ABORTRETRYIGNORE; + break; + case OptionOk: + *pdwType = MB_OK; + break; + case OptionOkCancel: + *pdwType = MB_OKCANCEL; + break; + case OptionRetryCancel: + *pdwType = MB_RETRYCANCEL; + break; + case OptionYesNo: + *pdwType = MB_YESNO; + break; + case OptionYesNoCancel: + *pdwType = MB_YESNOCANCEL; + break; + case OptionShutdownSystem: + *pdwType = MB_OK; + break; + case OptionOkNoWait: + *pdwType = MB_OK; + break; + case OptionCancelTryContinue: + *pdwType = MB_CANCELTRYCONTINUE; + break; + } + + /* Set the severity icon */ + // STATUS_SEVERITY_SUCCESS + if (Severity == STATUS_SEVERITY_INFORMATIONAL) *pdwType |= MB_ICONINFORMATION; + else if (Severity == STATUS_SEVERITY_WARNING) *pdwType |= MB_ICONWARNING; + else if (Severity == STATUS_SEVERITY_ERROR) *pdwType |= MB_ICONERROR; + + *pdwType |= MB_SYSTEMMODAL | MB_SETFOREGROUND; + /* Copy the Parameters array locally */ RtlCopyMemory(&CopyParameters, Parameters, sizeof(CopyParameters)); @@ -351,8 +483,6 @@ UserpFormatMessages( FileNameU = g_SystemProcessU; } - Severity = (ULONG)(Message->Status) >> 30; - /* Get text string of the error code */ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), (ULONG_PTR)RT_MESSAGETABLE, @@ -368,14 +498,25 @@ UserpFormatMessages( } else { - RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); + RtlInitAnsiString(&FormatA, (PSTR)MessageResource->Text); /* Status = */ RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } } else { - /* Fall back to hardcoded value */ - RtlInitUnicodeString(&FormatU, L"Unknown Hard Error"); + /* + * Fall back to hardcoded value. + * NOTE: The value used here is ReactOS-specific: it allows specifying + * the exact hard error status value and the parameters. The version + * used on Windows only says "Unknown Hard Error". + */ +#if 0 + RtlInitUnicodeString(&FormatU, L"Unknown Hard Error 0x%08lx\n" + L"Parameters: 0x%p 0x%p 0x%p 0x%p"); +#else + RtlInitUnicodeString(&FormatU, L"Unknown Hard Error 0x%08lx"); + CopyParameters[0] = Message->Status; +#endif FormatA.Buffer = NULL; } @@ -444,7 +585,7 @@ UserpFormatMessages( /* Calculate buffer length for the caption */ cszBuffer = WindowTitleU.Length + FileNameU.Length + TempStringU.Length + 3 * sizeof(WCHAR) + sizeof(UNICODE_NULL); - if (cszBuffer > CaptionStringU->MaximumLength) + if (CaptionStringU->MaximumLength < cszBuffer) { /* Allocate a larger buffer for the caption */ pszBuffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -452,8 +593,8 @@ UserpFormatMessages( cszBuffer); if (!pszBuffer) { - /* We could not allocate a larger buffer; continue using the smaller static buffer */ - DPRINT1("Cannot allocate memory for CaptionStringU, use static buffer.\n"); + /* We could not allocate a larger buffer; continue using the smaller original buffer */ + DPRINT1("Cannot allocate memory for CaptionStringU, use original buffer.\n"); } else { @@ -496,7 +637,7 @@ UserpFormatMessages( } else { - RtlInitAnsiString(&Format2A, (PCHAR)MessageResource->Text); + RtlInitAnsiString(&Format2A, (PSTR)MessageResource->Text); /* Status = */ RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); } @@ -552,6 +693,7 @@ UserpFormatMessages( CopyParameters[0] = (ULONG_PTR)L"unknown software exception"; } + /* Add explanation text for dialog buttons */ if (Message->ValidResponseOptions == OptionOk || Message->ValidResponseOptions == OptionOkCancel) { @@ -568,7 +710,7 @@ UserpFormatMessages( /* Calculate buffer length for the text message */ cszBuffer = FormatU.Length + SizeOfStrings + Size * sizeof(WCHAR) + sizeof(UNICODE_NULL); - if (cszBuffer > TextStringU->MaximumLength) + if (TextStringU->MaximumLength < cszBuffer) { /* Allocate a larger buffer for the text message */ pszBuffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -576,8 +718,8 @@ UserpFormatMessages( cszBuffer); if (!pszBuffer) { - /* We could not allocate a larger buffer; continue using the smaller static buffer */ - DPRINT1("Cannot allocate memory for TextStringU, use static buffer.\n"); + /* We could not allocate a larger buffer; continue using the smaller original buffer */ + DPRINT1("Cannot allocate memory for TextStringU, use original buffer.\n"); } else { @@ -599,6 +741,7 @@ UserpFormatMessages( CopyParameters[0], CopyParameters[1], CopyParameters[2], CopyParameters[3]); + /* Add explanation text for dialog buttons */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { if (Message->ValidResponseOptions == OptionOk || @@ -642,6 +785,7 @@ UserpFormatMessages( if (Format2A.Buffer) RtlFreeUnicodeString(&Format2U); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); +Quit: /* Final cleanup */ UserpFreeStringParameters(Parameters, Message); } @@ -695,9 +839,11 @@ GetRegInt( } static BOOL -UserpShowInformationBalloon(PWSTR Text, - PWSTR Caption, - PHARDERROR_MSG Message) +UserpShowInformationBalloon( + IN PCWSTR Text, + IN PCWSTR Caption, + IN UINT Type, + IN PHARDERROR_MSG Message) { ULONG ShellErrorMode; HWND hwnd; @@ -741,7 +887,7 @@ UserpShowInformationBalloon(PWSTR Text, if (NT_SUCCESS(Message->Status)) pdata->dwType = MB_OK; else if (Message->Status == STATUS_SERVICE_NOTIFICATION) - pdata->dwType = Message->Parameters[2]; + pdata->dwType = Type; else pdata->dwType = MB_ICONINFORMATION; @@ -768,68 +914,17 @@ UserpShowInformationBalloon(PWSTR Text, } static -ULONG +HARDERROR_RESPONSE UserpMessageBox( IN PCWSTR Text, IN PCWSTR Caption, - IN ULONG ValidResponseOptions, - IN ULONG Severity, - IN ULONG Timeout) + IN UINT Type, + IN ULONG Timeout) { - ULONG Type, MessageBoxResponse; - - /* Set the message box type */ - switch (ValidResponseOptions) - { - case OptionAbortRetryIgnore: - Type = MB_ABORTRETRYIGNORE; - break; - case OptionOk: - Type = MB_OK; - break; - case OptionOkCancel: - Type = MB_OKCANCEL; - break; - case OptionRetryCancel: - Type = MB_RETRYCANCEL; - break; - case OptionYesNo: - Type = MB_YESNO; - break; - case OptionYesNoCancel: - Type = MB_YESNOCANCEL; - break; - case OptionShutdownSystem: - Type = MB_RETRYCANCEL; // FIXME??? - break; - case OptionOkNoWait: - /* - * At that point showing the balloon failed. Is that correct? - */ - Type = MB_OK; // FIXME! - break; - case OptionCancelTryContinue: - Type = MB_CANCELTRYCONTINUE; - break; - - /* Anything else is invalid */ - default: - { - DPRINT1("Unknown ValidResponseOptions = %d\n", ValidResponseOptions); - return ResponseNotHandled; - } - } - - /* Set severity */ - // STATUS_SEVERITY_SUCCESS - if (Severity == STATUS_SEVERITY_INFORMATIONAL) Type |= MB_ICONINFORMATION; - else if (Severity == STATUS_SEVERITY_WARNING) Type |= MB_ICONWARNING; - else if (Severity == STATUS_SEVERITY_ERROR) Type |= MB_ICONERROR; - - Type |= MB_SYSTEMMODAL | MB_SETFOREGROUND; + ULONG MessageBoxResponse; - DPRINT("Text = '%S', Caption = '%S', Severity = %d, Type = 0x%lx\n", - Text, Caption, Severity, Type); + DPRINT("Text = '%S', Caption = '%S', Type = 0x%lx\n", + Text, Caption, Type); /* Display a message box */ MessageBoxResponse = MessageBoxTimeoutW(NULL, Text, Caption, Type, 0, Timeout); @@ -846,6 +941,7 @@ UserpMessageBox( case IDRETRY: return ResponseRetry; case IDTRYAGAIN: return ResponseTryAgain; case IDCONTINUE: return ResponseContinue; + default: return ResponseNotHandled; } return ResponseNotHandled; @@ -895,6 +991,7 @@ UserServerHardError( IN PHARDERROR_MSG Message) { ULONG ErrorMode; + UINT dwType = 0; UNICODE_STRING TextU, CaptionU; WCHAR LocalTextBuffer[256]; WCHAR LocalCaptionBuffer[256]; @@ -907,16 +1004,24 @@ UserServerHardError( /* Make sure we don't have too many parameters */ if (Message->NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) { - // FIXME: Windows just fails (STATUS_INVALID_PARAMETER) & returns ResponseNotHandled. + // NOTE: Windows just fails (STATUS_INVALID_PARAMETER) & returns ResponseNotHandled. + DPRINT1("Invalid NumberOfParameters = %d\n", Message->NumberOfParameters); Message->NumberOfParameters = MAXIMUM_HARDERROR_PARAMETERS; } if (Message->ValidResponseOptions > OptionCancelTryContinue) { - // STATUS_INVALID_PARAMETER; - Message->Response = ResponseNotHandled; - return; + DPRINT1("Unknown ValidResponseOptions = %d\n", Message->ValidResponseOptions); + return; // STATUS_INVALID_PARAMETER; + } + if (Message->Status == STATUS_SERVICE_NOTIFICATION) + { + if (Message->NumberOfParameters < 3) + { + DPRINT1("Invalid NumberOfParameters = %d for STATUS_SERVICE_NOTIFICATION\n", Message->NumberOfParameters); + return; // STATUS_INVALID_PARAMETER; + } + // (Message->UnicodeStringParameterMask & 0x3) } - // TODO: More message validation: check NumberOfParameters wrt. Message Status code. /* Re-initialize the hard errors cache */ UserInitHardErrorsCache(); @@ -924,7 +1029,7 @@ UserServerHardError( /* Format the message caption and text */ RtlInitEmptyUnicodeString(&TextU, LocalTextBuffer, sizeof(LocalTextBuffer)); RtlInitEmptyUnicodeString(&CaptionU, LocalCaptionBuffer, sizeof(LocalCaptionBuffer)); - UserpFormatMessages(&TextU, &CaptionU, Message); + UserpFormatMessages(&TextU, &CaptionU, &dwType, /* &Timeout, */ Message); /* Log the hard error message */ UserpLogHardError(&TextU, &CaptionU); @@ -948,6 +1053,7 @@ UserServerHardError( Message->Response = ResponseOk; if (UserpShowInformationBalloon(TextU.Buffer, CaptionU.Buffer, + dwType, Message)) { Message->Response = ResponseOk; @@ -958,8 +1064,7 @@ UserServerHardError( /* Display the message box */ Message->Response = UserpMessageBox(TextU.Buffer, CaptionU.Buffer, - Message->ValidResponseOptions, - (ULONG)(Message->Status) >> 30, + dwType, (ULONG)-1); Quit:

1 0

05/08: [USERSRV] Hard-error improvements 4/7
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ea2783e5640598bf7155… commit 9ea2783e5640598bf7155372b84a7b0be0feebaa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 24 22:47:50 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:10 2018 +0200 [USERSRV] Hard-error improvements 4/7 - Make UserpFormatMessages() always succeed by falling back on static string buffers if allocating large string buffers fail due to lack of memory. Then the hard error popups will have truncated strings, but at least something will be displayed instead of nothing, thus alerting the user that something went wrong anyway. - Simplify a bit the code by moving the NtOpenProcess(), UserpCaptureStringParameters() and UserpFreeStringParameters() calls inside UserpFormatMessages(). This also allows simplifying its prototype. --- win32ss/user/winsrv/usersrv/harderror.c | 454 ++++++++++++++++---------------- 1 file changed, 225 insertions(+), 229 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 463911ba73..ad3815a434 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -73,117 +73,6 @@ MessageBoxTimeoutW( DWORD dwTime); -static -NTSTATUS -UserpGetClientFileName( - OUT PUNICODE_STRING ClientFileNameU, - IN HANDLE hProcess) -{ - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PPEB_LDR_DATA Ldr; - PROCESS_BASIC_INFORMATION ClientBasicInfo; - LDR_DATA_TABLE_ENTRY ModuleData; - PVOID ClientDllBase; - NTSTATUS Status; - PPEB Peb; - - /* Initialize string */ - RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); - - /* Query process information */ - Status = NtQueryInformationProcess(hProcess, - ProcessBasicInformation, - &ClientBasicInfo, - sizeof(ClientBasicInfo), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Locate the process loader data table and retrieve its name from it */ - - Peb = ClientBasicInfo.PebBaseAddress; - if (!Peb) return STATUS_UNSUCCESSFUL; - - Status = NtReadVirtualMemory(hProcess, &Peb->Ldr, &Ldr, sizeof(Ldr), NULL); - if (!NT_SUCCESS(Status)) return Status; - - ModuleListHead = &Ldr->InLoadOrderModuleList; - Status = NtReadVirtualMemory(hProcess, - &ModuleListHead->Flink, - &Entry, - sizeof(Entry), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - if (Entry == ModuleListHead) return STATUS_UNSUCCESSFUL; - - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - Status = NtReadVirtualMemory(hProcess, - Module, - &ModuleData, - sizeof(ModuleData), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - Status = NtReadVirtualMemory(hProcess, - &Peb->ImageBaseAddress, - &ClientDllBase, - sizeof(ClientDllBase), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - if (ClientDllBase != ModuleData.DllBase) return STATUS_UNSUCCESSFUL; - - ClientFileNameU->MaximumLength = ModuleData.BaseDllName.MaximumLength; - ClientFileNameU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - ClientFileNameU->MaximumLength); - if (!ClientFileNameU->Buffer) - { - RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); - return STATUS_NO_MEMORY; - } - - Status = NtReadVirtualMemory(hProcess, - ModuleData.BaseDllName.Buffer, - ClientFileNameU->Buffer, - ClientFileNameU->MaximumLength, - NULL); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ClientFileNameU->Buffer); - RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); - return Status; - } - - ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer) * sizeof(WCHAR); - DPRINT("ClientFileNameU = \'%wZ\'\n", &ClientFileNameU); - - return STATUS_SUCCESS; -} - -static -VOID -UserpFreeStringParameters( - IN OUT PULONG_PTR Parameters, - IN PHARDERROR_MSG Message) -{ - ULONG nParam; - - /* Loop all parameters */ - for (nParam = 0; nParam < Message->NumberOfParameters; ++nParam) - { - /* Check if the current parameter is a string */ - if ((Message->UnicodeStringParameterMask & (1 << nParam)) && (Parameters[nParam] != 0)) - { - /* Free the string buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); - } - } -} - static VOID UserpCaptureStringParameters( @@ -293,35 +182,165 @@ UserpCaptureStringParameters( *SizeOfAllUnicodeStrings = Size; } +static +VOID +UserpFreeStringParameters( + IN OUT PULONG_PTR Parameters, + IN PHARDERROR_MSG Message) +{ + ULONG nParam; + + /* Loop all parameters */ + for (nParam = 0; nParam < Message->NumberOfParameters; ++nParam) + { + /* Check if the current parameter is a string */ + if ((Message->UnicodeStringParameterMask & (1 << nParam)) && (Parameters[nParam] != 0)) + { + /* Free the string buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); + } + } +} + static NTSTATUS +UserpGetClientFileName( + OUT PUNICODE_STRING ClientFileNameU, + IN HANDLE hProcess) +{ + PLIST_ENTRY ModuleListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + PPEB_LDR_DATA Ldr; + PROCESS_BASIC_INFORMATION ClientBasicInfo; + LDR_DATA_TABLE_ENTRY ModuleData; + PVOID ClientDllBase; + NTSTATUS Status; + PPEB Peb; + + /* Initialize string */ + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); + + /* Query process information */ + Status = NtQueryInformationProcess(hProcess, + ProcessBasicInformation, + &ClientBasicInfo, + sizeof(ClientBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Locate the process loader data table and retrieve its name from it */ + + Peb = ClientBasicInfo.PebBaseAddress; + if (!Peb) return STATUS_UNSUCCESSFUL; + + Status = NtReadVirtualMemory(hProcess, &Peb->Ldr, &Ldr, sizeof(Ldr), NULL); + if (!NT_SUCCESS(Status)) return Status; + + ModuleListHead = &Ldr->InLoadOrderModuleList; + Status = NtReadVirtualMemory(hProcess, + &ModuleListHead->Flink, + &Entry, + sizeof(Entry), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + if (Entry == ModuleListHead) return STATUS_UNSUCCESSFUL; + + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + Status = NtReadVirtualMemory(hProcess, + Module, + &ModuleData, + sizeof(ModuleData), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + Status = NtReadVirtualMemory(hProcess, + &Peb->ImageBaseAddress, + &ClientDllBase, + sizeof(ClientDllBase), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + if (ClientDllBase != ModuleData.DllBase) return STATUS_UNSUCCESSFUL; + + ClientFileNameU->MaximumLength = ModuleData.BaseDllName.MaximumLength; + ClientFileNameU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + ClientFileNameU->MaximumLength); + if (!ClientFileNameU->Buffer) + { + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); + return STATUS_NO_MEMORY; + } + + Status = NtReadVirtualMemory(hProcess, + ModuleData.BaseDllName.Buffer, + ClientFileNameU->Buffer, + ClientFileNameU->MaximumLength, + NULL); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ClientFileNameU->Buffer); + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); + return Status; + } + + ClientFileNameU->Length = (USHORT)(wcslen(ClientFileNameU->Buffer) * sizeof(WCHAR)); + DPRINT("ClientFileNameU = \'%wZ\'\n", &ClientFileNameU); + + return STATUS_SUCCESS; +} + +static +VOID UserpFormatMessages( - OUT PUNICODE_STRING TextStringU, - OUT PUNICODE_STRING CaptionStringU, - IN PULONG_PTR Parameters, - IN ULONG SizeOfStrings, - IN PHARDERROR_MSG Message, - IN HANDLE hProcess OPTIONAL) + IN OUT PUNICODE_STRING TextStringU, + IN OUT PUNICODE_STRING CaptionStringU, + IN PHARDERROR_MSG Message) { NTSTATUS Status; - UNICODE_STRING FileNameU, TempStringU, WindowTitleU, FormatU, Format2U; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hProcess; + ULONG SizeOfStrings; + ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS] = {0}; + ULONG_PTR CopyParameters[MAXIMUM_HARDERROR_PARAMETERS]; + UNICODE_STRING WindowTitleU, FileNameU, TempStringU, FormatU, Format2U; ANSI_STRING FormatA, Format2A; HWND hwndOwner; PMESSAGE_RESOURCE_ENTRY MessageResource; - ULONG_PTR CapturedParameters[MAXIMUM_HARDERROR_PARAMETERS]; PWSTR FormatString, pszBuffer; - size_t cchBuffer; - ULONG ExceptionCode, Severity; + size_t cszBuffer; + ULONG Severity; ULONG Size; + /* Open client process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&hProcess, + PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, + &ObjectAttributes, + &Message->h.ClientId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenProcess failed with status 0x%08lx, possibly SYSTEM process.\n", Status); + hProcess = NULL; + } + + /* Capture all string parameters from the process memory */ + UserpCaptureStringParameters(Parameters, &SizeOfStrings, Message, hProcess); + /* Copy the Parameters array locally */ - RtlCopyMemory(&CapturedParameters, Parameters, sizeof(CapturedParameters)); + RtlCopyMemory(&CopyParameters, Parameters, sizeof(CopyParameters)); /* Get the file name of the client process */ Status = STATUS_SUCCESS; if (hProcess) Status = UserpGetClientFileName(&FileNameU, hProcess); + /* Close the process handle but keep its original value to know where stuff came from */ + if (hProcess) NtClose(hProcess); + /* * Fall back to SYSTEM process if the client process handle * was NULL or we failed retrieving a file name. @@ -389,7 +408,7 @@ UserpFormatMessages( else if (Severity == STATUS_SEVERITY_ERROR) TempStringU = g_ErrorU; else - RtlInitEmptyUnicodeString(&TempStringU, NULL, 0); + ASSERT(FALSE); // Unexpected, since Severity is only <= 3. } /* Retrieve the window title of the client, if it has one */ @@ -399,20 +418,20 @@ UserpFormatMessages( FindTopLevelWnd, (LPARAM)&hwndOwner); if (hwndOwner) { - cchBuffer = GetWindowTextLengthW(hwndOwner); - if (cchBuffer != 0) + cszBuffer = GetWindowTextLengthW(hwndOwner); + if (cszBuffer != 0) { - cchBuffer += 3; // 2 characters for ": " and a NULL terminator. - WindowTitleU.MaximumLength = (USHORT)(cchBuffer * sizeof(WCHAR)); + cszBuffer += 3; // 2 characters for ": " and a NULL terminator. + WindowTitleU.MaximumLength = (USHORT)(cszBuffer * sizeof(WCHAR)); WindowTitleU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, WindowTitleU.MaximumLength); if (WindowTitleU.Buffer) { - cchBuffer = GetWindowTextW(hwndOwner, + cszBuffer = GetWindowTextW(hwndOwner, WindowTitleU.Buffer, WindowTitleU.MaximumLength / sizeof(WCHAR)); - WindowTitleU.Length = (USHORT)(cchBuffer * sizeof(WCHAR)); + WindowTitleU.Length = (USHORT)(cszBuffer * sizeof(WCHAR)); RtlAppendUnicodeToString(&WindowTitleU, L": "); } else @@ -423,26 +442,32 @@ UserpFormatMessages( } /* Calculate buffer length for the caption */ - CaptionStringU->MaximumLength = WindowTitleU.Length + - FileNameU.Length + TempStringU.Length + - 3 * sizeof(WCHAR) + sizeof(UNICODE_NULL); - - /* Allocate a buffer for the caption */ - CaptionStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - CaptionStringU->MaximumLength); - if (!CaptionStringU->Buffer) + cszBuffer = WindowTitleU.Length + FileNameU.Length + TempStringU.Length + + 3 * sizeof(WCHAR) + sizeof(UNICODE_NULL); + if (cszBuffer > CaptionStringU->MaximumLength) { - DPRINT1("Cannot allocate memory for CaptionStringU\n"); - Status = STATUS_NO_MEMORY; + /* Allocate a larger buffer for the caption */ + pszBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cszBuffer); + if (!pszBuffer) + { + /* We could not allocate a larger buffer; continue using the smaller static buffer */ + DPRINT1("Cannot allocate memory for CaptionStringU, use static buffer.\n"); + } + else + { + RtlInitEmptyUnicodeString(CaptionStringU, pszBuffer, (USHORT)cszBuffer); + } } + CaptionStringU->Length = 0; /* Append the file name, the separator and the caption text */ RtlStringCbPrintfW(CaptionStringU->Buffer, CaptionStringU->MaximumLength, L"%wZ%wZ - %wZ", &WindowTitleU, &FileNameU, &TempStringU); - CaptionStringU->Length = wcslen(CaptionStringU->Buffer) * sizeof(WCHAR); + CaptionStringU->Length = (USHORT)(wcslen(CaptionStringU->Buffer) * sizeof(WCHAR)); /* Free string buffers if needed */ if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); @@ -454,7 +479,7 @@ UserpFormatMessages( /* Check if this is an exception message */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { - ExceptionCode = CapturedParameters[0]; + ULONG ExceptionCode = CopyParameters[0]; /* Get text string of the exception code */ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), @@ -479,24 +504,24 @@ UserpFormatMessages( if (ExceptionCode == STATUS_ACCESS_VIOLATION) { FormatString = Format2U.Buffer; - CapturedParameters[0] = CapturedParameters[1]; - CapturedParameters[1] = CapturedParameters[3]; - if (CapturedParameters[2]) - CapturedParameters[2] = (ULONG_PTR)L"written"; + CopyParameters[0] = CopyParameters[1]; + CopyParameters[1] = CopyParameters[3]; + if (CopyParameters[2]) + CopyParameters[2] = (ULONG_PTR)L"written"; else - CapturedParameters[2] = (ULONG_PTR)L"read"; + CopyParameters[2] = (ULONG_PTR)L"read"; } else if (ExceptionCode == STATUS_IN_PAGE_ERROR) { FormatString = Format2U.Buffer; - CapturedParameters[0] = CapturedParameters[1]; - CapturedParameters[1] = CapturedParameters[3]; + CopyParameters[0] = CopyParameters[1]; + CopyParameters[1] = CopyParameters[3]; } else { /* Keep the existing FormatString */ - CapturedParameters[2] = CapturedParameters[1]; - CapturedParameters[1] = CapturedParameters[0]; + CopyParameters[2] = CopyParameters[1]; + CopyParameters[1] = CopyParameters[0]; pszBuffer = Format2U.Buffer; if (!_wcsnicmp(pszBuffer, L"{EXCEPTION}", 11)) @@ -510,21 +535,21 @@ UserpFormatMessages( /* Skip '\r', '\n' */ pszBuffer += 2; - CapturedParameters[0] = (ULONG_PTR)pszBuffer; + CopyParameters[0] = (ULONG_PTR)pszBuffer; } else { /* Fall back to hardcoded value */ - CapturedParameters[0] = (ULONG_PTR)L"unknown software exception"; + CopyParameters[0] = (ULONG_PTR)L"unknown software exception"; } } } else { /* Fall back to hardcoded value, and keep the existing FormatString */ - CapturedParameters[2] = CapturedParameters[1]; - CapturedParameters[1] = CapturedParameters[0]; - CapturedParameters[0] = (ULONG_PTR)L"unknown software exception"; + CopyParameters[2] = CopyParameters[1]; + CopyParameters[1] = CopyParameters[0]; + CopyParameters[0] = (ULONG_PTR)L"unknown software exception"; } if (Message->ValidResponseOptions == OptionOk || @@ -540,53 +565,55 @@ UserpFormatMessages( } } - /* Calculate length of text buffer */ - TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + - (USHORT)(Size * sizeof(WCHAR)) + - sizeof(UNICODE_NULL); - - /* Allocate a buffer for the text */ - TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TextStringU->MaximumLength); - if (!TextStringU->Buffer) + /* Calculate buffer length for the text message */ + cszBuffer = FormatU.Length + SizeOfStrings + Size * sizeof(WCHAR) + + sizeof(UNICODE_NULL); + if (cszBuffer > TextStringU->MaximumLength) { - DPRINT1("Cannot allocate memory for TextStringU\n"); - Status = STATUS_NO_MEMORY; + /* Allocate a larger buffer for the text message */ + pszBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cszBuffer); + if (!pszBuffer) + { + /* We could not allocate a larger buffer; continue using the smaller static buffer */ + DPRINT1("Cannot allocate memory for TextStringU, use static buffer.\n"); + } + else + { + RtlInitEmptyUnicodeString(TextStringU, pszBuffer, (USHORT)cszBuffer); + } } - - Status = STATUS_SUCCESS; + TextStringU->Length = 0; /* Wrap in SEH to protect from invalid string parameters */ _SEH2_TRY { /* Print the string into the buffer */ pszBuffer = TextStringU->Buffer; - cchBuffer = TextStringU->MaximumLength; - RtlStringCbPrintfExW(pszBuffer, cchBuffer, - &pszBuffer, &cchBuffer, + cszBuffer = TextStringU->MaximumLength; + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, STRSAFE_IGNORE_NULLS, FormatString, - CapturedParameters[0], - CapturedParameters[1], - CapturedParameters[2], - CapturedParameters[3]); + CopyParameters[0], CopyParameters[1], + CopyParameters[2], CopyParameters[3]); if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { if (Message->ValidResponseOptions == OptionOk || Message->ValidResponseOptions == OptionOkCancel) { - RtlStringCbPrintfExW(pszBuffer, cchBuffer, - &pszBuffer, &cchBuffer, + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, STRSAFE_IGNORE_NULLS, L"\n%wZ", &g_OKTerminateU); } if (Message->ValidResponseOptions == OptionOkCancel) { - RtlStringCbPrintfExW(pszBuffer, cchBuffer, - &pszBuffer, &cchBuffer, + RtlStringCbPrintfExW(pszBuffer, cszBuffer, + &pszBuffer, &cszBuffer, STRSAFE_IGNORE_NULLS, L"\n%wZ", &g_CancelDebugU); @@ -595,7 +622,7 @@ UserpFormatMessages( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* An exception occurred, use a default string */ + /* An exception occurred, use a default string with the original parameters */ DPRINT1("Exception 0x%08lx occurred while building hard-error message, fall back to default message.\n", _SEH2_GetExceptionCode()); @@ -604,24 +631,19 @@ UserpFormatMessages( L"Exception processing message 0x%08lx\n" L"Parameters: 0x%p 0x%p 0x%p 0x%p", Message->Status, - CapturedParameters[0], CapturedParameters[1], - CapturedParameters[2], CapturedParameters[3]); - - /* Set error and free buffers */ - // Status = _SEH2_GetExceptionCode(); + Parameters[0], Parameters[1], + Parameters[2], Parameters[3]); } _SEH2_END; - if (NT_SUCCESS(Status)) - { - TextStringU->Length = wcslen(TextStringU->Buffer) * sizeof(WCHAR); - } + TextStringU->Length = (USHORT)(wcslen(TextStringU->Buffer) * sizeof(WCHAR)); /* Free converted Unicode strings */ if (Format2A.Buffer) RtlFreeUnicodeString(&Format2U); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); - return Status; + /* Final cleanup */ + UserpFreeStringParameters(Parameters, Message); } static ULONG @@ -872,13 +894,10 @@ UserServerHardError( IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { - ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS] = {0}; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING TextU, CaptionU; - NTSTATUS Status; - HANDLE hProcess; - ULONG Size; ULONG ErrorMode; + UNICODE_STRING TextU, CaptionU; + WCHAR LocalTextBuffer[256]; + WCHAR LocalCaptionBuffer[256]; ASSERT(ThreadData->Process != NULL); @@ -899,39 +918,13 @@ UserServerHardError( } // TODO: More message validation: check NumberOfParameters wrt. Message Status code. - /* Open client process */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - Status = NtOpenProcess(&hProcess, - PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, - &ObjectAttributes, - &Message->h.ClientId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenProcess failed with status 0x%08lx, possibly SYSTEM process.\n", Status); - hProcess = NULL; - } - /* Re-initialize the hard errors cache */ UserInitHardErrorsCache(); - /* Capture all string parameters from the process memory */ - UserpCaptureStringParameters(Parameters, &Size, Message, hProcess); - /* Format the message caption and text */ - Status = UserpFormatMessages(&TextU, - &CaptionU, - Parameters, - Size, - Message, - hProcess); - - /* Cleanup */ - UserpFreeStringParameters(Parameters, Message); - if (hProcess) NtClose(hProcess); - - /* If we failed, bail out */ - if (!NT_SUCCESS(Status)) - return; + RtlInitEmptyUnicodeString(&TextU, LocalTextBuffer, sizeof(LocalTextBuffer)); + RtlInitEmptyUnicodeString(&CaptionU, LocalCaptionBuffer, sizeof(LocalCaptionBuffer)); + UserpFormatMessages(&TextU, &CaptionU, Message); /* Log the hard error message */ UserpLogHardError(&TextU, &CaptionU); @@ -970,8 +963,11 @@ UserServerHardError( (ULONG)-1); Quit: - RtlFreeUnicodeString(&TextU); - RtlFreeUnicodeString(&CaptionU); + /* Free the strings if they have been reallocated */ + if (TextU.Buffer != LocalTextBuffer) + RtlFreeUnicodeString(&TextU); + if (CaptionU.Buffer != LocalCaptionBuffer) + RtlFreeUnicodeString(&CaptionU); return; }

1 0

04/08: [USERSRV] Hard-error improvements 3/7
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a1a35ca5a6fca02dcabc… commit 5a1a35ca5a6fca02dcabced12a5d19b020dc184d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 4 17:38:06 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:09 2018 +0200 [USERSRV] Hard-error improvements 3/7 - Cache localized hard error message components: the status severity, the system process name and the unhandled exception debug strings. - Try not to fail too much. In particular, don't fail if a string could not be correctly captured in UserpCaptureStringParameters() (we then use a default empty string). The next aim is to make UserpFormatMessages() not failing at all. - Use RtlStringCbPrintf(Ex)W where possible so that one can use counted (and not NULL-terminated) UNICODE_STRINGs where possible. This allows using counted resource strings without having to allocate memory. - If available, prepend the window title of the application that triggered the hard error to the hard error message box caption. --- win32ss/user/winsrv/usersrv/harderror.c | 285 +++++++++++++++++++----------- win32ss/user/winsrv/usersrv/init.c | 16 ++ win32ss/user/winsrv/usersrv/lang/bg-BG.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/cs-CZ.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/de-DE.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/el-GR.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/en-US.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/es-ES.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/fr-FR.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/he-IL.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/id-ID.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/it-IT.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/ja-JP.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/no-NO.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/pl-PL.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/pt-BR.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/ro-RO.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/ru-RU.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/sk-SK.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/sv-SE.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/tr-TR.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/uk-UA.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/zh-CN.rc | 17 ++ win32ss/user/winsrv/usersrv/lang/zh-TW.rc | 17 ++ win32ss/user/winsrv/usersrv/resource.h | 23 ++- win32ss/user/winsrv/usersrv/shutdown.c | 12 -- win32ss/user/winsrv/usersrv/usersrv.h | 8 + 27 files changed, 601 insertions(+), 117 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 19a8db644f..463911ba73 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -18,14 +18,49 @@ #include <undocelfapi.h> #include <ntstrsafe.h> +#include "resource.h" + #define NDEBUG #include <debug.h> -#define IDTRYAGAIN 10 -#define IDCONTINUE 11 /* FUNCTIONS ******************************************************************/ +/* Cache for the localized hard-error message box strings */ +LANGID g_CurrentUserLangId = 0; +UNICODE_STRING g_SuccessU = {0, 0, NULL}; +UNICODE_STRING g_InformationU = {0, 0, NULL}; +UNICODE_STRING g_WarningU = {0, 0, NULL}; +UNICODE_STRING g_ErrorU = {0, 0, NULL}; +UNICODE_STRING g_SystemProcessU = {0, 0, NULL}; +UNICODE_STRING g_OKTerminateU = {0, 0, NULL}; +UNICODE_STRING g_CancelDebugU = {0, 0, NULL}; + +VOID +RtlLoadUnicodeString( + IN HINSTANCE hInstance OPTIONAL, + IN UINT uID, + OUT PUNICODE_STRING pUnicodeString, + IN PCWSTR pDefaultString) +{ + UINT Length; + + /* Try to load the string from the resource */ + Length = LoadStringW(hInstance, uID, (LPWSTR)&pUnicodeString->Buffer, 0); + if (Length == 0) + { + /* If the resource string was not found, use the fallback default one */ + RtlInitUnicodeString(pUnicodeString, pDefaultString); + } + else + { + /* Set the string length (not NULL-terminated!) */ + pUnicodeString->MaximumLength = (USHORT)(Length * sizeof(WCHAR)); + pUnicodeString->Length = pUnicodeString->MaximumLength; + } +} + + /* FIXME */ int WINAPI @@ -133,15 +168,15 @@ static VOID UserpFreeStringParameters( IN OUT PULONG_PTR Parameters, - IN PHARDERROR_MSG HardErrorMessage) + IN PHARDERROR_MSG Message) { ULONG nParam; /* Loop all parameters */ - for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) + for (nParam = 0; nParam < Message->NumberOfParameters; ++nParam) { /* Check if the current parameter is a string */ - if ((HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) && (Parameters[nParam] != 0)) + if ((Message->UnicodeStringParameterMask & (1 << nParam)) && (Parameters[nParam] != 0)) { /* Free the string buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); @@ -150,14 +185,14 @@ UserpFreeStringParameters( } static -NTSTATUS +VOID UserpCaptureStringParameters( OUT PULONG_PTR Parameters, OUT PULONG SizeOfAllUnicodeStrings, - IN PHARDERROR_MSG HardErrorMessage, + IN PHARDERROR_MSG Message, IN HANDLE hProcess OPTIONAL) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG nParam, Size = 0; UNICODE_STRING TempStringU, ParamStringU; ANSI_STRING TempStringA; @@ -166,12 +201,12 @@ UserpCaptureStringParameters( *SizeOfAllUnicodeStrings = 0; /* Read all strings from client space */ - for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) + for (nParam = 0; nParam < Message->NumberOfParameters; ++nParam) { Parameters[nParam] = 0; /* Check if the current parameter is a unicode string */ - if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) + if (Message->UnicodeStringParameterMask & (1 << nParam)) { /* Skip this string if we do not have a client process */ if (!hProcess) @@ -179,14 +214,14 @@ UserpCaptureStringParameters( /* Read the UNICODE_STRING from the process memory */ Status = NtReadVirtualMemory(hProcess, - (PVOID)HardErrorMessage->Parameters[nParam], + (PVOID)Message->Parameters[nParam], &ParamStringU, sizeof(ParamStringU), NULL); if (!NT_SUCCESS(Status)) { /* We failed, skip this string */ - DPRINT1("NtReadVirtualMemory(HardErrorMessage->Parameters) failed, Status 0x%lx\n", Status); + DPRINT1("NtReadVirtualMemory(Message->Parameters) failed, Status 0x%lx, skipping.\n", Status); continue; } @@ -199,8 +234,7 @@ UserpCaptureStringParameters( if (!TempStringU.Buffer) { /* We failed, skip this string */ - DPRINT1("Cannot allocate memory with size %u\n", TempStringU.MaximumLength); - Status = STATUS_NO_MEMORY; + DPRINT1("Cannot allocate memory with size %u, skipping.\n", TempStringU.MaximumLength); continue; } @@ -213,7 +247,7 @@ UserpCaptureStringParameters( if (!NT_SUCCESS(Status)) { /* We failed, skip this string */ - DPRINT1("NtReadVirtualMemory(ParamStringU) failed, Status 0x%lx\n", Status); + DPRINT1("NtReadVirtualMemory(ParamStringU) failed, Status 0x%lx, skipping.\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); continue; } @@ -228,9 +262,8 @@ UserpCaptureStringParameters( if (!TempStringA.Buffer) { /* We failed, skip this string */ - DPRINT1("Cannot allocate memory with size %u\n", TempStringA.MaximumLength); + DPRINT1("Cannot allocate memory with size %u, skipping.\n", TempStringA.MaximumLength); RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - Status = STATUS_NO_MEMORY; continue; } @@ -240,6 +273,7 @@ UserpCaptureStringParameters( if (!NT_SUCCESS(Status)) { /* We failed, skip this string */ + DPRINT1("RtlUnicodeStringToAnsiString() failed, Status 0x%lx, skipping.\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); continue; } @@ -251,22 +285,12 @@ UserpCaptureStringParameters( else { /* It's not a unicode string, just copy the parameter */ - Parameters[nParam] = HardErrorMessage->Parameters[nParam]; + Parameters[nParam] = Message->Parameters[nParam]; } } -#if 0 - if (!NT_SUCCESS(Status)) - { - UserpFreeStringParameters(Parameters, HardErrorMessage); - return Status; - } -#endif - if (SizeOfAllUnicodeStrings) *SizeOfAllUnicodeStrings = Size; - - return Status; } static @@ -280,11 +304,13 @@ UserpFormatMessages( IN HANDLE hProcess OPTIONAL) { NTSTATUS Status; - UNICODE_STRING FileNameU, TempStringU, FormatU, Format2U; + UNICODE_STRING FileNameU, TempStringU, WindowTitleU, FormatU, Format2U; ANSI_STRING FormatA, Format2A; + HWND hwndOwner; PMESSAGE_RESOURCE_ENTRY MessageResource; ULONG_PTR CapturedParameters[MAXIMUM_HARDERROR_PARAMETERS]; - PWSTR FormatString; + PWSTR FormatString, pszBuffer; + size_t cchBuffer; ULONG ExceptionCode, Severity; ULONG Size; @@ -302,8 +328,8 @@ UserpFormatMessages( */ if (!hProcess || !NT_SUCCESS(Status) || !FileNameU.Buffer) { - RtlInitUnicodeString(&FileNameU, L"System Process"); - hProcess = NULL; + hProcess = NULL; + FileNameU = g_SystemProcessU; } Severity = (ULONG)(Message->Status) >> 30; @@ -324,7 +350,7 @@ UserpFormatMessages( else { RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); - RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); + /* Status = */ RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } } else @@ -354,23 +380,52 @@ UserpFormatMessages( } else { - /* FIXME: Use localized strings! */ - if (Severity == STATUS_SEVERITY_SUCCESS) - RtlInitUnicodeString(&TempStringU, L"Success"); + TempStringU = g_SuccessU; else if (Severity == STATUS_SEVERITY_INFORMATIONAL) - RtlInitUnicodeString(&TempStringU, L"System Information"); + TempStringU = g_InformationU; else if (Severity == STATUS_SEVERITY_WARNING) - RtlInitUnicodeString(&TempStringU, L"System Warning"); + TempStringU = g_WarningU; else if (Severity == STATUS_SEVERITY_ERROR) - RtlInitUnicodeString(&TempStringU, L"System Error"); + TempStringU = g_ErrorU; else RtlInitEmptyUnicodeString(&TempStringU, NULL, 0); } + /* Retrieve the window title of the client, if it has one */ + RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); + hwndOwner = NULL; + EnumThreadWindows(HandleToUlong(Message->h.ClientId.UniqueThread), + FindTopLevelWnd, (LPARAM)&hwndOwner); + if (hwndOwner) + { + cchBuffer = GetWindowTextLengthW(hwndOwner); + if (cchBuffer != 0) + { + cchBuffer += 3; // 2 characters for ": " and a NULL terminator. + WindowTitleU.MaximumLength = (USHORT)(cchBuffer * sizeof(WCHAR)); + WindowTitleU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + WindowTitleU.MaximumLength); + if (WindowTitleU.Buffer) + { + cchBuffer = GetWindowTextW(hwndOwner, + WindowTitleU.Buffer, + WindowTitleU.MaximumLength / sizeof(WCHAR)); + WindowTitleU.Length = (USHORT)(cchBuffer * sizeof(WCHAR)); + RtlAppendUnicodeToString(&WindowTitleU, L": "); + } + else + { + RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); + } + } + } + /* Calculate buffer length for the caption */ - CaptionStringU->MaximumLength = FileNameU.Length + TempStringU.Length + - 4 * sizeof(WCHAR); + CaptionStringU->MaximumLength = WindowTitleU.Length + + FileNameU.Length + TempStringU.Length + + 3 * sizeof(WCHAR) + sizeof(UNICODE_NULL); /* Allocate a buffer for the caption */ CaptionStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -382,17 +437,16 @@ UserpFormatMessages( Status = STATUS_NO_MEMORY; } - /* Append the file name, seperator and the caption text */ - CaptionStringU->Length = 0; - RtlAppendUnicodeStringToString(CaptionStringU, &FileNameU); - RtlAppendUnicodeToString(CaptionStringU, L" - "); - RtlAppendUnicodeStringToString(CaptionStringU, &TempStringU); - - /* Zero terminate the buffer */ - CaptionStringU->Buffer[CaptionStringU->Length / sizeof(WCHAR)] = UNICODE_NULL; + /* Append the file name, the separator and the caption text */ + RtlStringCbPrintfW(CaptionStringU->Buffer, + CaptionStringU->MaximumLength, + L"%wZ%wZ - %wZ", + &WindowTitleU, &FileNameU, &TempStringU); + CaptionStringU->Length = wcslen(CaptionStringU->Buffer) * sizeof(WCHAR); - /* Free the file name buffer */ - RtlFreeUnicodeString(&FileNameU); + /* Free string buffers if needed */ + if (WindowTitleU.Buffer) RtlFreeUnicodeString(&WindowTitleU); + if (hProcess) RtlFreeUnicodeString(&FileNameU); // FIXME: What is 42 == ?? Size = 42; @@ -418,7 +472,7 @@ UserpFormatMessages( else { RtlInitAnsiString(&Format2A, (PCHAR)MessageResource->Text); - RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); + /* Status = */ RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); } /* Handle special cases */ @@ -440,25 +494,23 @@ UserpFormatMessages( } else { - PWSTR pTmp; - /* Keep the existing FormatString */ CapturedParameters[2] = CapturedParameters[1]; CapturedParameters[1] = CapturedParameters[0]; - pTmp = Format2U.Buffer; - if (!_wcsnicmp(pTmp, L"{EXCEPTION}", 11)) + pszBuffer = Format2U.Buffer; + if (!_wcsnicmp(pszBuffer, L"{EXCEPTION}", 11)) { /* * This is a named exception. Skip the mark and * retrieve the exception name that follows it. */ - pTmp += 11; + pszBuffer += 11; /* Skip '\r', '\n' */ - pTmp += 2; + pszBuffer += 2; - CapturedParameters[0] = (ULONG_PTR)pTmp; + CapturedParameters[0] = (ULONG_PTR)pszBuffer; } else { @@ -475,18 +527,16 @@ UserpFormatMessages( CapturedParameters[0] = (ULONG_PTR)L"unknown software exception"; } - /* FIXME: Use localized strings! */ if (Message->ValidResponseOptions == OptionOk || Message->ValidResponseOptions == OptionOkCancel) { - // Tmp = FormatString + wcslen(FormatString); - // *++Tmp = L'\n'; - // *++Tmp = L'\n'; - Size += 1 + wcslen(L"Click on OK to terminate the program."); + /* Reserve space for one newline and the OK-terminate-program string */ + Size += 1 + (g_OKTerminateU.Length / sizeof(WCHAR)); } if (Message->ValidResponseOptions == OptionOkCancel) { - Size += 1 + wcslen(L"Click on CANCEL to debug the program."); + /* Reserve space for one newline and the CANCEL-debug-program string */ + Size += 1 + (g_CancelDebugU.Length / sizeof(WCHAR)); } } @@ -505,50 +555,50 @@ UserpFormatMessages( Status = STATUS_NO_MEMORY; } + Status = STATUS_SUCCESS; + /* Wrap in SEH to protect from invalid string parameters */ _SEH2_TRY { /* Print the string into the buffer */ - RtlStringCbPrintfW(TextStringU->Buffer, - TextStringU->MaximumLength, - FormatString, - CapturedParameters[0], - CapturedParameters[1], - CapturedParameters[2], - CapturedParameters[3]); + pszBuffer = TextStringU->Buffer; + cchBuffer = TextStringU->MaximumLength; + RtlStringCbPrintfExW(pszBuffer, cchBuffer, + &pszBuffer, &cchBuffer, + STRSAFE_IGNORE_NULLS, + FormatString, + CapturedParameters[0], + CapturedParameters[1], + CapturedParameters[2], + CapturedParameters[3]); if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { - /* FIXME: Use localized strings! */ if (Message->ValidResponseOptions == OptionOk || Message->ValidResponseOptions == OptionOkCancel) { - // Tmp = FormatString + wcslen(FormatString); - // *++Tmp = L'\n'; - // *++Tmp = L'\n'; - RtlStringCbCatW(TextStringU->Buffer, - TextStringU->MaximumLength, - L"\n"); - RtlStringCbCatW(TextStringU->Buffer, - TextStringU->MaximumLength, - L"Click on OK to terminate the program."); + RtlStringCbPrintfExW(pszBuffer, cchBuffer, + &pszBuffer, &cchBuffer, + STRSAFE_IGNORE_NULLS, + L"\n%wZ", + &g_OKTerminateU); } if (Message->ValidResponseOptions == OptionOkCancel) { - RtlStringCbCatW(TextStringU->Buffer, - TextStringU->MaximumLength, - L"\n"); - RtlStringCbCatW(TextStringU->Buffer, - TextStringU->MaximumLength, - L"Click on CANCEL to debug the program."); + RtlStringCbPrintfExW(pszBuffer, cchBuffer, + &pszBuffer, &cchBuffer, + STRSAFE_IGNORE_NULLS, + L"\n%wZ", + &g_CancelDebugU); } } - - Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* An exception occurred, use a default string */ + DPRINT1("Exception 0x%08lx occurred while building hard-error message, fall back to default message.\n", + _SEH2_GetExceptionCode()); + RtlStringCbPrintfW(TextStringU->Buffer, TextStringU->MaximumLength, L"Exception processing message 0x%08lx\n" @@ -559,8 +609,6 @@ UserpFormatMessages( /* Set error and free buffers */ // Status = _SEH2_GetExceptionCode(); - // RtlFreeHeap(RtlGetProcessHeap(), 0, TextStringU->Buffer); - // RtlFreeHeap(RtlGetProcessHeap(), 0, CaptionStringU->Buffer); } _SEH2_END; @@ -569,7 +617,7 @@ UserpFormatMessages( TextStringU->Length = wcslen(TextStringU->Buffer) * sizeof(WCHAR); } - /* Free converted Unicode strings if the original format strings were Ansi */ + /* Free converted Unicode strings */ if (Format2A.Buffer) RtlFreeUnicodeString(&Format2U); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); @@ -863,13 +911,11 @@ UserServerHardError( hProcess = NULL; } + /* Re-initialize the hard errors cache */ + UserInitHardErrorsCache(); + /* Capture all string parameters from the process memory */ - Status = UserpCaptureStringParameters(Parameters, &Size, Message, hProcess); - if (!NT_SUCCESS(Status)) - { - if (hProcess) NtClose(hProcess); - return; - } + UserpCaptureStringParameters(Parameters, &Size, Message, hProcess); /* Format the message caption and text */ Status = UserpFormatMessages(&TextU, @@ -930,4 +976,45 @@ Quit: return; } +VOID +UserInitHardErrorsCache(VOID) +{ + NTSTATUS Status; + LCID CurrentUserLCID = 0; + + Status = NtQueryDefaultLocale(TRUE, &CurrentUserLCID); + if (!NT_SUCCESS(Status) || CurrentUserLCID == 0) + { + /* Fall back to english locale */ + DPRINT1("NtQueryDefaultLocale failed with Status = 0x%08lx\n", Status); + // LOCALE_SYSTEM_DEFAULT; + CurrentUserLCID = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + } + if (g_CurrentUserLangId == LANGIDFROMLCID(CurrentUserLCID)) + { + /* The current lang ID and the hard error strings have already been cached */ + return; + } + + /* Load the strings using the current system locale */ + RtlLoadUnicodeString(UserServerDllInstance, IDS_SEVERITY_SUCCESS, + &g_SuccessU, L"Success"); + RtlLoadUnicodeString(UserServerDllInstance, IDS_SEVERITY_INFORMATIONAL, + &g_InformationU, L"System Information"); + RtlLoadUnicodeString(UserServerDllInstance, IDS_SEVERITY_WARNING, + &g_WarningU, L"System Warning"); + RtlLoadUnicodeString(UserServerDllInstance, IDS_SEVERITY_ERROR, + &g_ErrorU, L"System Error"); + // "unknown software exception" + RtlLoadUnicodeString(UserServerDllInstance, IDS_SYSTEM_PROCESS, + &g_SystemProcessU, L"System Process"); + RtlLoadUnicodeString(UserServerDllInstance, IDS_OK_TERMINATE_PROGRAM, + &g_OKTerminateU, L"Click on OK to terminate the program."); + RtlLoadUnicodeString(UserServerDllInstance, IDS_CANCEL_DEBUG_PROGRAM, + &g_CancelDebugU, L"Click on CANCEL to debug the program."); + + /* Remember that we cached the hard error strings */ + g_CurrentUserLangId = LANGIDFROMLCID(CurrentUserLCID); +} + /* EOF */ diff --git a/win32ss/user/winsrv/usersrv/init.c b/win32ss/user/winsrv/usersrv/init.c index 2e9ac5a66f..8ee21e6417 100644 --- a/win32ss/user/winsrv/usersrv/init.c +++ b/win32ss/user/winsrv/usersrv/init.c @@ -90,6 +90,19 @@ PCHAR UserServerApiNameTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] = /* FUNCTIONS ******************************************************************/ +BOOL CALLBACK +FindTopLevelWnd( + IN HWND hWnd, + IN LPARAM lParam) +{ + if (GetWindow(hWnd, GW_OWNER) == NULL) + { + *(HWND*)lParam = hWnd; + return FALSE; + } + return TRUE; +} + // PUSER_SOUND_SENTRY. Used in basesrv.dll BOOL NTAPI _UserSoundSentry(VOID) { @@ -256,6 +269,9 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization) /* Set the process creation notify routine for BASE */ BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); + /* Initialize the hard errors cache */ + UserInitHardErrorsCache(); + /* Initialize the kernel mode subsystem */ Status = NtUserInitialize(USER_VERSION, ghPowerRequestEvent, diff --git a/win32ss/user/winsrv/usersrv/lang/bg-BG.rc b/win32ss/user/winsrv/usersrv/lang/bg-BG.rc index 56728454be..52e986ec16 100644 --- a/win32ss/user/winsrv/usersrv/lang/bg-BG.rc +++ b/win32ss/user/winsrv/usersrv/lang/bg-BG.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "За да се върнете в РеактОС и да проверите състоянието на приложението, натиснете „Отказ“.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Ако решите да затворите приложението веднага, ще изгубите всички незаписани данни. За да прекратите приложението веднага, натиснете „Прекратяване веднага“.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc b/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc index 747e0dcd16..46b44808ed 100644 --- a/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc +++ b/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Kliknutím na Storno se lze vrátit do systému ReactOS a ověřit stav programu.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Pokud zvolíte okamžité ukončení programu, všechna neuložená data budou ztracena. Kliknutím na Ukončit okamžitě ukončíte program.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/de-DE.rc b/win32ss/user/winsrv/usersrv/lang/de-DE.rc index afb4741ecf..8d854f06c3 100644 --- a/win32ss/user/winsrv/usersrv/lang/de-DE.rc +++ b/win32ss/user/winsrv/usersrv/lang/de-DE.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/el-GR.rc b/win32ss/user/winsrv/usersrv/lang/el-GR.rc index 7468f527f3..4adb7d79df 100644 --- a/win32ss/user/winsrv/usersrv/lang/el-GR.rc +++ b/win32ss/user/winsrv/usersrv/lang/el-GR.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "Για να επιστρέψετε στο ReactOS και να ελέγξετε την κατάσταση του προγράμματος, πατήστε 'ʼκυρο'.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Αν κλείσετε την εφαρμογή τώρα , θα χάσετε όλα τα μη αποθηκευμένα δεδομένα. Για να κλείσετε το πρόγραμμα τώρα, πατήστε 'Κλείσιμο Τώρα'.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/en-US.rc b/win32ss/user/winsrv/usersrv/lang/en-US.rc index c245f75236..b876aea3e2 100644 --- a/win32ss/user/winsrv/usersrv/lang/en-US.rc +++ b/win32ss/user/winsrv/usersrv/lang/en-US.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "To return to ReactOS and check the status of the program, click Cancel.", IDC_STATIC, 7, 26, 178, 16 LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/es-ES.rc b/win32ss/user/winsrv/usersrv/lang/es-ES.rc index 781b485f5e..d502b8e19f 100644 --- a/win32ss/user/winsrv/usersrv/lang/es-ES.rc +++ b/win32ss/user/winsrv/usersrv/lang/es-ES.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Para volver a ReactOS y ver el estado del programa, haga clic en Cancelar.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/fr-FR.rc b/win32ss/user/winsrv/usersrv/lang/fr-FR.rc index 9edf599095..94fcabb2b9 100644 --- a/win32ss/user/winsrv/usersrv/lang/fr-FR.rc +++ b/win32ss/user/winsrv/usersrv/lang/fr-FR.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "Pour retourner à ReactOS et vérifier l'état du programme, cliquez sur Annuler.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Succès" + IDS_SEVERITY_INFORMATIONAL "Information système" + IDS_SEVERITY_WARNING "Avertissement système" + IDS_SEVERITY_ERROR "Erreur système" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "Processus système" + IDS_UNKNOWN_SOFTWARE_EXCEPT "Exception logicielle inconnue" + IDS_OK_TERMINATE_PROGRAM "Cliquez sur OK pour terminer le programme." + IDS_CANCEL_DEBUG_PROGRAM "Cliquez sur Annuler pour déboguer le programme." +END diff --git a/win32ss/user/winsrv/usersrv/lang/he-IL.rc b/win32ss/user/winsrv/usersrv/lang/he-IL.rc index 096191dbbc..50ec399ea9 100644 --- a/win32ss/user/winsrv/usersrv/lang/he-IL.rc +++ b/win32ss/user/winsrv/usersrv/lang/he-IL.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "כדי לחזור לReactOS ולבדוק את מצב התכנית, לחץ ביטול.", IDC_STATIC, 7, 26, 178, 16 LTEXT "אם תבחר לסיים את התכנית באופן מיידי, אתה תאבד את כל המידע שלא נשמר. כדי לסיים את התכנית עכשיו, לחץ סיים כעת.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/id-ID.rc b/win32ss/user/winsrv/usersrv/lang/id-ID.rc index 5e39167d4b..6a67e699c4 100644 --- a/win32ss/user/winsrv/usersrv/lang/id-ID.rc +++ b/win32ss/user/winsrv/usersrv/lang/id-ID.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "Untuk kembali ke ReactOS dan memeriksa status program, klik Batal.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Jika anda memilih untuk segera mengakhiri program, anda akan kehilangan data yang belum disimpan. Untuk mengakhiri program sekarang, klik Akhiri Sekarang.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/it-IT.rc b/win32ss/user/winsrv/usersrv/lang/it-IT.rc index 031887167a..7a2354fcf6 100644 --- a/win32ss/user/winsrv/usersrv/lang/it-IT.rc +++ b/win32ss/user/winsrv/usersrv/lang/it-IT.rc @@ -30,3 +30,20 @@ BEGIN LTEXT "Per tornare a ReactOS e controllare lo stato del programma, selezionare Annulla.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/ja-JP.rc b/win32ss/user/winsrv/usersrv/lang/ja-JP.rc index 2ac22bdb20..8bb5252d13 100644 --- a/win32ss/user/winsrv/usersrv/lang/ja-JP.rc +++ b/win32ss/user/winsrv/usersrv/lang/ja-JP.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "ReactOS に戻ってプログラムの状態を確認するには[キャンセル]をクリックしてください", IDC_STATIC, 7, 26, 178, 16 LTEXT "プログラムをすぐに終了させるよう選択した場合、保存されていないデータはすべて失われます。プログラムを直ちに終了するには[すぐに終了]をクリックしてください", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/no-NO.rc b/win32ss/user/winsrv/usersrv/lang/no-NO.rc index f8d0c3a1d4..a942692ef3 100644 --- a/win32ss/user/winsrv/usersrv/lang/no-NO.rc +++ b/win32ss/user/winsrv/usersrv/lang/no-NO.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "For å returnere til ReactOS for å sjekke statusen på programmet, trykk på avbryt.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/pl-PL.rc b/win32ss/user/winsrv/usersrv/lang/pl-PL.rc index 539e0a1b27..5f9dd73401 100644 --- a/win32ss/user/winsrv/usersrv/lang/pl-PL.rc +++ b/win32ss/user/winsrv/usersrv/lang/pl-PL.rc @@ -30,3 +30,20 @@ BEGIN LTEXT "Aby powrócić do ReactOS i sprawdzić status programu, kliknij Anuluj.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Jeśli zdecydujesz się zamknąć program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakończyć program, wciśnij Zakończ teraz.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/pt-BR.rc b/win32ss/user/winsrv/usersrv/lang/pt-BR.rc index 4b7b520f4c..320cc195d7 100644 --- a/win32ss/user/winsrv/usersrv/lang/pt-BR.rc +++ b/win32ss/user/winsrv/usersrv/lang/pt-BR.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Parar retornar ao ReactOS e verificar o estado do programa, pressione Cancelar.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Se você finalizar o programa imediatamente, você irá perder qualquer alteração não salva. Para finalizar o programa agora, pressione Finalizar Agora.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/ro-RO.rc b/win32ss/user/winsrv/usersrv/lang/ro-RO.rc index 2b802fc8dc..9ad34941d2 100644 --- a/win32ss/user/winsrv/usersrv/lang/ro-RO.rc +++ b/win32ss/user/winsrv/usersrv/lang/ro-RO.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Pentru a vă întoarce în ReactOS și a verifica starea programului, apăsați „Anulează”.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Dacă alegeți închiderea imediată a programului, riscați pierderi de date. Pentru a forța închiderea, apăsați „Termină forțat”.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/ru-RU.rc b/win32ss/user/winsrv/usersrv/lang/ru-RU.rc index 799da0aab7..0e54451831 100644 --- a/win32ss/user/winsrv/usersrv/lang/ru-RU.rc +++ b/win32ss/user/winsrv/usersrv/lang/ru-RU.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "Для возврата в ReactOS и проверки состояния приложения нажмите ""Отмена"".", IDC_STATIC, 7, 26, 178, 16 LTEXT "Если вы завершите программу сейчас, то вы можете потерять несохраненные данные. Чтобы завершить программу сейчас нажмите ""Завершить"".", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/sk-SK.rc b/win32ss/user/winsrv/usersrv/lang/sk-SK.rc index 6f3f14f8a4..672a571dc9 100644 --- a/win32ss/user/winsrv/usersrv/lang/sk-SK.rc +++ b/win32ss/user/winsrv/usersrv/lang/sk-SK.rc @@ -27,3 +27,20 @@ BEGIN LTEXT "Pre návrat do systému ReactOS a overenie stavu programu kliknite na tlačidlo Zrušiť.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Ak zvolíte okamžité ukončenie programu, stratíte všetky neuložené údaje. Ak chcete program ukončiť okamžite, kliknite na tlačidlo Ukončiť ihneď.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/sv-SE.rc b/win32ss/user/winsrv/usersrv/lang/sv-SE.rc index 418e45e7b2..925daf2f23 100644 --- a/win32ss/user/winsrv/usersrv/lang/sv-SE.rc +++ b/win32ss/user/winsrv/usersrv/lang/sv-SE.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "För att återgå till ReactOS och undersöka programmets status klicka Avbryt.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Om du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/tr-TR.rc b/win32ss/user/winsrv/usersrv/lang/tr-TR.rc index 4645381471..72cd661da9 100644 --- a/win32ss/user/winsrv/usersrv/lang/tr-TR.rc +++ b/win32ss/user/winsrv/usersrv/lang/tr-TR.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "ReactOS'a dönmek ve programın durumunu denetlemek için İptal'e tıklayınız.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Programı hemen kapatmayı seçerseniz, tüm saklanmamış veriyi yitireceksiniz. Programdan şimdi çıkmak için Şimdi Sonlandır'a tıklayınız.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/uk-UA.rc b/win32ss/user/winsrv/usersrv/lang/uk-UA.rc index acd1a2e046..3104e91127 100644 --- a/win32ss/user/winsrv/usersrv/lang/uk-UA.rc +++ b/win32ss/user/winsrv/usersrv/lang/uk-UA.rc @@ -24,3 +24,20 @@ BEGIN LTEXT "Щоб повернутися у ReactOS і перевірити стан програми, натисніть 'Скасувати'.", IDC_STATIC, 7, 26, 178, 16 LTEXT "Якщо завершити програму негайно, то можна втратити всі незбережені дані. Щоб завершити програму зараз, натисніть 'Завершити зараз'.", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/zh-CN.rc b/win32ss/user/winsrv/usersrv/lang/zh-CN.rc index c22137e50a..69b39c6e65 100644 --- a/win32ss/user/winsrv/usersrv/lang/zh-CN.rc +++ b/win32ss/user/winsrv/usersrv/lang/zh-CN.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "若要返回至 ReactOS 并检查该程序的状态，请点击“取消”。", IDC_STATIC, 7, 26, 178, 16 LTEXT "如果您选择立即终止程序，您将失去所有未保存的数据。若要立即结束程序，单击“立即终止”。", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/lang/zh-TW.rc b/win32ss/user/winsrv/usersrv/lang/zh-TW.rc index 8cf9dfa513..3fdf105aff 100644 --- a/win32ss/user/winsrv/usersrv/lang/zh-TW.rc +++ b/win32ss/user/winsrv/usersrv/lang/zh-TW.rc @@ -22,3 +22,20 @@ BEGIN LTEXT "若要返回至 ReactOS 並檢視程式的狀態，請按下“取消”", IDC_STATIC, 7, 26, 178, 16 LTEXT "如果您選擇立即結束程式，您將失去所有未儲存的資料。若要立即結束程式，請按下“立即結束”。", IDC_STATIC, 7, 53, 178, 26 END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Success" + IDS_SEVERITY_INFORMATIONAL "System Information" + IDS_SEVERITY_WARNING "System Warning" + IDS_SEVERITY_ERROR "System Error" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "System Process" + IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" + IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." + IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." +END diff --git a/win32ss/user/winsrv/usersrv/resource.h b/win32ss/user/winsrv/usersrv/resource.h index 187dca1134..670b20116f 100644 --- a/win32ss/user/winsrv/usersrv/resource.h +++ b/win32ss/user/winsrv/usersrv/resource.h @@ -1,8 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS User API Server DLL - * FILE: win32ss/user/winsrv/usersrv/resource.h - * PURPOSE: Resource #defines + * PROJECT: ReactOS User API Server DLL + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resource #defines. + * COPYRIGHT: Copyright 2012-2018 Hermes Belusca-Maito */ #pragma once @@ -12,5 +12,16 @@ #define IDC_STATIC -1 -#define IDC_PROGRESS 101 -#define IDC_END_NOW 102 +#define IDC_PROGRESS 20 +#define IDC_END_NOW 21 + +/* Strings */ +#define IDS_SEVERITY_SUCCESS 100 +#define IDS_SEVERITY_INFORMATIONAL 101 +#define IDS_SEVERITY_WARNING 102 +#define IDS_SEVERITY_ERROR 103 + +#define IDS_SYSTEM_PROCESS 104 +#define IDS_UNKNOWN_SOFTWARE_EXCEPT 105 +#define IDS_OK_TERMINATE_PROGRAM 106 +#define IDS_CANCEL_DEBUG_PROGRAM 107 diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index f8d5329652..5c2f464f84 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -413,18 +413,6 @@ ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeou /************************************************/ -static BOOL CALLBACK -FindTopLevelWnd(IN HWND hWnd, - IN LPARAM lParam) -{ - if (GetWindow(hWnd, GW_OWNER) == NULL) - { - *(HWND*)lParam = hWnd; - return FALSE; - } - return TRUE; -} - static VOID ThreadShutdownNotify(IN PCSR_THREAD CsrThread, IN ULONG Flags, diff --git a/win32ss/user/winsrv/usersrv/usersrv.h b/win32ss/user/winsrv/usersrv/usersrv.h index bb281e65de..76ed26925b 100644 --- a/win32ss/user/winsrv/usersrv/usersrv.h +++ b/win32ss/user/winsrv/usersrv/usersrv.h @@ -33,4 +33,12 @@ extern HANDLE UserServerHeap; extern ULONG_PTR ServicesProcessId; extern ULONG_PTR LogonProcessId; +BOOL CALLBACK +FindTopLevelWnd( + IN HWND hWnd, + IN LPARAM lParam); + +VOID +UserInitHardErrorsCache(VOID); + #endif /* __USERSRV_H__ */

1 0

03/08: [USERSRV] Hard-error improvements 2/7 - More failure path handling.
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b299f5fec3067b6bc1c5… commit 2b299f5fec3067b6bc1c5795f9efe3a35b158fd6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 4 17:39:44 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:08 2018 +0200 [USERSRV] Hard-error improvements 2/7 - More failure path handling. In particular do not always fail as soon as there is an error, because they may be the sign of an OS problem and this is precisely in this case that we want to display a hard-error. --- win32ss/user/winsrv/usersrv/harderror.c | 284 +++++++++++++++++++------------- 1 file changed, 167 insertions(+), 117 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 9889a54d85..19a8db644f 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -26,6 +26,18 @@ /* FUNCTIONS ******************************************************************/ +/* FIXME */ +int +WINAPI +MessageBoxTimeoutW( + HWND hWnd, + LPCWSTR lpText, + LPCWSTR lpCaption, + UINT uType, + WORD wLanguageId, + DWORD dwTime); + + static NTSTATUS UserpGetClientFileName( @@ -43,9 +55,7 @@ UserpGetClientFileName( PPEB Peb; /* Initialize string */ - ClientFileNameU->MaximumLength = 0; - ClientFileNameU->Length = 0; - ClientFileNameU->Buffer = NULL; + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); /* Query process information */ Status = NtQueryInformationProcess(hProcess, @@ -55,6 +65,8 @@ UserpGetClientFileName( NULL); if (!NT_SUCCESS(Status)) return Status; + /* Locate the process loader data table and retrieve its name from it */ + Peb = ClientBasicInfo.PebBaseAddress; if (!Peb) return STATUS_UNSUCCESSFUL; @@ -91,8 +103,13 @@ UserpGetClientFileName( ClientFileNameU->MaximumLength = ModuleData.BaseDllName.MaximumLength; ClientFileNameU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - ClientFileNameU->MaximumLength); + HEAP_ZERO_MEMORY, + ClientFileNameU->MaximumLength); + if (!ClientFileNameU->Buffer) + { + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); + return STATUS_NO_MEMORY; + } Status = NtReadVirtualMemory(hProcess, ModuleData.BaseDllName.Buffer, @@ -102,13 +119,12 @@ UserpGetClientFileName( if (!NT_SUCCESS(Status)) { RtlFreeHeap(RtlGetProcessHeap(), 0, ClientFileNameU->Buffer); - ClientFileNameU->Buffer = NULL; - ClientFileNameU->MaximumLength = 0; + RtlInitEmptyUnicodeString(ClientFileNameU, NULL, 0); return Status; } ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer) * sizeof(WCHAR); - DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU); + DPRINT("ClientFileNameU = \'%wZ\'\n", &ClientFileNameU); return STATUS_SUCCESS; } @@ -125,7 +141,7 @@ UserpFreeStringParameters( for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) { /* Check if the current parameter is a string */ - if ((HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) && Parameters[nParam]) + if ((HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) && (Parameters[nParam] != 0)) { /* Free the string buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); @@ -139,10 +155,10 @@ UserpCaptureStringParameters( OUT PULONG_PTR Parameters, OUT PULONG SizeOfAllUnicodeStrings, IN PHARDERROR_MSG HardErrorMessage, - IN HANDLE hProcess) + IN HANDLE hProcess OPTIONAL) { - ULONG nParam, Size = 0; NTSTATUS Status = STATUS_SUCCESS; + ULONG nParam, Size = 0; UNICODE_STRING TempStringU, ParamStringU; ANSI_STRING TempStringA; @@ -157,6 +173,10 @@ UserpCaptureStringParameters( /* Check if the current parameter is a unicode string */ if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) { + /* Skip this string if we do not have a client process */ + if (!hProcess) + continue; + /* Read the UNICODE_STRING from the process memory */ Status = NtReadVirtualMemory(hProcess, (PVOID)HardErrorMessage->Parameters[nParam], @@ -164,7 +184,11 @@ UserpCaptureStringParameters( sizeof(ParamStringU), NULL); if (!NT_SUCCESS(Status)) - break; + { + /* We failed, skip this string */ + DPRINT1("NtReadVirtualMemory(HardErrorMessage->Parameters) failed, Status 0x%lx\n", Status); + continue; + } /* Allocate a buffer for the string */ TempStringU.MaximumLength = ParamStringU.Length; @@ -174,8 +198,10 @@ UserpCaptureStringParameters( TempStringU.MaximumLength); if (!TempStringU.Buffer) { - DPRINT1("Cannot allocate memory %u\n", TempStringU.MaximumLength); + /* We failed, skip this string */ + DPRINT1("Cannot allocate memory with size %u\n", TempStringU.MaximumLength); Status = STATUS_NO_MEMORY; + continue; } /* Read the string buffer from the process memory */ @@ -186,12 +212,13 @@ UserpCaptureStringParameters( NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtReadVirtualMemory failed with code: %lx\n", Status); + /* We failed, skip this string */ + DPRINT1("NtReadVirtualMemory(ParamStringU) failed, Status 0x%lx\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - break; + continue; } - DPRINT("ParamString=\'%wZ\'\n", &TempStringU); + DPRINT("ParamString = \'%wZ\'\n", &TempStringU); /* Allocate a buffer for converted to ANSI string */ TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); @@ -200,10 +227,11 @@ UserpCaptureStringParameters( TempStringA.MaximumLength); if (!TempStringA.Buffer) { - DPRINT1("Cannot allocate memory %u\n", TempStringA.MaximumLength); + /* We failed, skip this string */ + DPRINT1("Cannot allocate memory with size %u\n", TempStringA.MaximumLength); RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); Status = STATUS_NO_MEMORY; - break; + continue; } /* Convert string to ANSI and free temporary buffer */ @@ -211,8 +239,9 @@ UserpCaptureStringParameters( RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); if (!NT_SUCCESS(Status)) { + /* We failed, skip this string */ RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); - break; + continue; } /* Note: RtlUnicodeStringToAnsiString returns NULL terminated string */ @@ -221,16 +250,18 @@ UserpCaptureStringParameters( } else { - /* It's not a unicode string */ + /* It's not a unicode string, just copy the parameter */ Parameters[nParam] = HardErrorMessage->Parameters[nParam]; } } +#if 0 if (!NT_SUCCESS(Status)) { UserpFreeStringParameters(Parameters, HardErrorMessage); return Status; } +#endif if (SizeOfAllUnicodeStrings) *SizeOfAllUnicodeStrings = Size; @@ -246,24 +277,33 @@ UserpFormatMessages( IN PULONG_PTR Parameters, IN ULONG SizeOfStrings, IN PHARDERROR_MSG Message, - IN HANDLE hProcess) + IN HANDLE hProcess OPTIONAL) { NTSTATUS Status; UNICODE_STRING FileNameU, TempStringU, FormatU, Format2U; ANSI_STRING FormatA, Format2A; PMESSAGE_RESOURCE_ENTRY MessageResource; + ULONG_PTR CapturedParameters[MAXIMUM_HARDERROR_PARAMETERS]; PWSTR FormatString; ULONG ExceptionCode, Severity; ULONG Size; - /* Get the file name of the client process */ - UserpGetClientFileName(&FileNameU, hProcess); + /* Copy the Parameters array locally */ + RtlCopyMemory(&CapturedParameters, Parameters, sizeof(CapturedParameters)); - /* Check if we have a file name */ - if (!FileNameU.Buffer) + /* Get the file name of the client process */ + Status = STATUS_SUCCESS; + if (hProcess) + Status = UserpGetClientFileName(&FileNameU, hProcess); + + /* + * Fall back to SYSTEM process if the client process handle + * was NULL or we failed retrieving a file name. + */ + if (!hProcess || !NT_SUCCESS(Status) || !FileNameU.Buffer) { - /* No, this is system process */ RtlInitUnicodeString(&FileNameU, L"System Process"); + hProcess = NULL; } Severity = (ULONG)(Message->Status) >> 30; @@ -334,8 +374,13 @@ UserpFormatMessages( /* Allocate a buffer for the caption */ CaptionStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - CaptionStringU->MaximumLength); + HEAP_ZERO_MEMORY, + CaptionStringU->MaximumLength); + if (!CaptionStringU->Buffer) + { + DPRINT1("Cannot allocate memory for CaptionStringU\n"); + Status = STATUS_NO_MEMORY; + } /* Append the file name, seperator and the caption text */ CaptionStringU->Length = 0; @@ -355,7 +400,7 @@ UserpFormatMessages( /* Check if this is an exception message */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { - ExceptionCode = Parameters[0]; + ExceptionCode = CapturedParameters[0]; /* Get text string of the exception code */ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), @@ -376,30 +421,30 @@ UserpFormatMessages( RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); } - /* Handle the special cases */ + /* Handle special cases */ if (ExceptionCode == STATUS_ACCESS_VIOLATION) { - FormatString = Format2U.Buffer; - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; - if (Parameters[2]) - Parameters[2] = (ULONG_PTR)L"written"; + FormatString = Format2U.Buffer; + CapturedParameters[0] = CapturedParameters[1]; + CapturedParameters[1] = CapturedParameters[3]; + if (CapturedParameters[2]) + CapturedParameters[2] = (ULONG_PTR)L"written"; else - Parameters[2] = (ULONG_PTR)L"read"; + CapturedParameters[2] = (ULONG_PTR)L"read"; } else if (ExceptionCode == STATUS_IN_PAGE_ERROR) { - FormatString = Format2U.Buffer; - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; + FormatString = Format2U.Buffer; + CapturedParameters[0] = CapturedParameters[1]; + CapturedParameters[1] = CapturedParameters[3]; } else { PWSTR pTmp; /* Keep the existing FormatString */ - Parameters[2] = Parameters[1]; - Parameters[1] = Parameters[0]; + CapturedParameters[2] = CapturedParameters[1]; + CapturedParameters[1] = CapturedParameters[0]; pTmp = Format2U.Buffer; if (!_wcsnicmp(pTmp, L"{EXCEPTION}", 11)) @@ -413,21 +458,21 @@ UserpFormatMessages( /* Skip '\r', '\n' */ pTmp += 2; - Parameters[0] = (ULONG_PTR)pTmp; + CapturedParameters[0] = (ULONG_PTR)pTmp; } else { /* Fall back to hardcoded value */ - Parameters[0] = (ULONG_PTR)L"unknown software exception"; + CapturedParameters[0] = (ULONG_PTR)L"unknown software exception"; } } } else { /* Fall back to hardcoded value, and keep the existing FormatString */ - Parameters[2] = Parameters[1]; - Parameters[1] = Parameters[0]; - Parameters[0] = (ULONG_PTR)L"unknown software exception"; + CapturedParameters[2] = CapturedParameters[1]; + CapturedParameters[1] = CapturedParameters[0]; + CapturedParameters[0] = (ULONG_PTR)L"unknown software exception"; } /* FIXME: Use localized strings! */ @@ -437,7 +482,7 @@ UserpFormatMessages( // Tmp = FormatString + wcslen(FormatString); // *++Tmp = L'\n'; // *++Tmp = L'\n'; - Size += 2 + wcslen(L"Click on OK to terminate the program."); + Size += 1 + wcslen(L"Click on OK to terminate the program."); } if (Message->ValidResponseOptions == OptionOkCancel) { @@ -454,6 +499,11 @@ UserpFormatMessages( TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TextStringU->MaximumLength); + if (!TextStringU->Buffer) + { + DPRINT1("Cannot allocate memory for TextStringU\n"); + Status = STATUS_NO_MEMORY; + } /* Wrap in SEH to protect from invalid string parameters */ _SEH2_TRY @@ -462,10 +512,10 @@ UserpFormatMessages( RtlStringCbPrintfW(TextStringU->Buffer, TextStringU->MaximumLength, FormatString, - Parameters[0], - Parameters[1], - Parameters[2], - Parameters[3]); + CapturedParameters[0], + CapturedParameters[1], + CapturedParameters[2], + CapturedParameters[3]); if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { @@ -478,13 +528,16 @@ UserpFormatMessages( // *++Tmp = L'\n'; RtlStringCbCatW(TextStringU->Buffer, TextStringU->MaximumLength, - L"\n\n"); + L"\n"); RtlStringCbCatW(TextStringU->Buffer, TextStringU->MaximumLength, L"Click on OK to terminate the program."); } if (Message->ValidResponseOptions == OptionOkCancel) { + RtlStringCbCatW(TextStringU->Buffer, + TextStringU->MaximumLength, + L"\n"); RtlStringCbCatW(TextStringU->Buffer, TextStringU->MaximumLength, L"Click on CANCEL to debug the program."); @@ -498,16 +551,16 @@ UserpFormatMessages( /* An exception occurred, use a default string */ RtlStringCbPrintfW(TextStringU->Buffer, TextStringU->MaximumLength, - L"Exception processing message 0x%lx\n" - L"Parameters 0x%lx 0x%lx 0x%lx 0x%lx", + L"Exception processing message 0x%08lx\n" + L"Parameters: 0x%p 0x%p 0x%p 0x%p", Message->Status, - Parameters[0], Parameters[1], - Parameters[2], Parameters[3]); + CapturedParameters[0], CapturedParameters[1], + CapturedParameters[2], CapturedParameters[3]); /* Set error and free buffers */ - Status = _SEH2_GetExceptionCode(); - RtlFreeHeap(RtlGetProcessHeap(), 0, TextStringU->Buffer); - RtlFreeHeap(RtlGetProcessHeap(), 0, CaptionStringU->Buffer); + // Status = _SEH2_GetExceptionCode(); + // RtlFreeHeap(RtlGetProcessHeap(), 0, TextStringU->Buffer); + // RtlFreeHeap(RtlGetProcessHeap(), 0, CaptionStringU->Buffer); } _SEH2_END; @@ -523,6 +576,54 @@ UserpFormatMessages( return Status; } +static ULONG +GetRegInt( + IN PCWSTR KeyName, + IN PCWSTR ValueName, + IN ULONG DefaultValue) +{ + NTSTATUS Status; + ULONG Value = DefaultValue; + UNICODE_STRING String; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + ULONG ResultLength; + UCHAR ValueBuffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + + RtlInitUnicodeString(&String, KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &String, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the registry key */ + Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Query the value */ + RtlInitUnicodeString(&String, ValueName); + Status = NtQueryValueKey(KeyHandle, + &String, + KeyValuePartialInformation, + ValueInfo, + sizeof(ValueBuffer), + &ResultLength); + + /* Close the registry key */ + NtClose(KeyHandle); + + if (NT_SUCCESS(Status) && (ValueInfo->Type == REG_DWORD)) + { + /* Directly retrieve the data */ + Value = *(PULONG)ValueInfo->Data; + } + } + + return Value; +} + static BOOL UserpShowInformationBalloon(PWSTR Text, PWSTR Caption, @@ -596,55 +697,6 @@ UserpShowInformationBalloon(PWSTR Text, return (ret && dwResult) ? TRUE : FALSE; } - -static ULONG -GetRegInt( - IN PCWSTR KeyName, - IN PCWSTR ValueName, - IN ULONG DefaultValue) -{ - NTSTATUS Status; - ULONG Value = DefaultValue; - UNICODE_STRING String; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE KeyHandle; - ULONG ResultLength; - UCHAR ValueBuffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - RtlInitUnicodeString(&String, KeyName); - InitializeObjectAttributes(&ObjectAttributes, - &String, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* Open the registry key */ - Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Query the value */ - RtlInitUnicodeString(&String, ValueName); - Status = NtQueryValueKey(KeyHandle, - &String, - KeyValuePartialInformation, - ValueInfo, - sizeof(ValueBuffer), - &ResultLength); - - /* Close the registry key */ - NtClose(KeyHandle); - - if (NT_SUCCESS(Status) && (ValueInfo->Type == REG_DWORD)) - { - /* Directly retrieve the data */ - Value = *(PULONG)ValueInfo->Data; - } - } - - return Value; -} - static ULONG UserpMessageBox( @@ -799,29 +851,27 @@ UserServerHardError( } // TODO: More message validation: check NumberOfParameters wrt. Message Status code. - /* Initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - /* Open client process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); Status = NtOpenProcess(&hProcess, PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, &ObjectAttributes, &Message->h.ClientId); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenProcess failed with status 0x%08lx\n", Status); - return; + DPRINT1("NtOpenProcess failed with status 0x%08lx, possibly SYSTEM process.\n", Status); + hProcess = NULL; } /* Capture all string parameters from the process memory */ Status = UserpCaptureStringParameters(Parameters, &Size, Message, hProcess); if (!NT_SUCCESS(Status)) { - NtClose(hProcess); + if (hProcess) NtClose(hProcess); return; } - /* Format the caption and message box text */ + /* Format the message caption and text */ Status = UserpFormatMessages(&TextU, &CaptionU, Parameters, @@ -831,7 +881,7 @@ UserServerHardError( /* Cleanup */ UserpFreeStringParameters(Parameters, Message); - NtClose(hProcess); + if (hProcess) NtClose(hProcess); /* If we failed, bail out */ if (!NT_SUCCESS(Status)) @@ -846,7 +896,7 @@ UserServerHardError( ErrorMode = GetRegInt(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Windows", L"ErrorMode", 0); - if (ErrorMode != 0) + if (Message->Status != STATUS_SERVICE_NOTIFICATION && ErrorMode != 0) { /* Returns OK for the hard error */ Message->Response = ResponseOk;

1 0

02/08: [USERSRV] Hard-error improvements 1/7
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6718a1aa83217585a9241… commit 6718a1aa83217585a9241a75e56e0d24a4a769dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 24 21:26:20 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:06 2018 +0200 [USERSRV] Hard-error improvements 1/7 - Use hard-error captions depending on the status code severity. - Improve handling of the STATUS_UNHANDLED_EXCEPTION error. Start implementing the display of the dialog button descriptions ("OK" to terminate the application; "Cancel" to debug the application). - Add support for the "ErrorMode" and "ShellErrorMode" registry values under HKLM\System\CurrentControlSet\Control\Windows. - Use MessageBoxTimeoutW() in UserpMessageBox() to support different message box timeouts. - Log hard errors into the System event log. --- win32ss/user/winsrv/usersrv/harderror.c | 416 ++++++++++++++++++++++++-------- 1 file changed, 313 insertions(+), 103 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 54d4b52764..9889a54d85 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -1,19 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS User API Server DLL - * FILE: win32ss/user/winsrv/usersrv/harderror.c - * PURPOSE: Hard errors - * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) - * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS User API Server DLL + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hard errors support. + * COPYRIGHT: Copyright 2007-2018 Dmitry Philippov (shedon(a)mail.ru) + * Copyright 2010-2018 Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Copyright 2012-2018 Hermes Belusca-Maito + * Copyright 2018 Giannis Adamopoulos */ /* INCLUDES *******************************************************************/ #include "usersrv.h" +#define NTOS_MODE_USER #include <ndk/mmfuncs.h> -#include <pseh/pseh2.h> -#include <strsafe.h> + +#include <undocelfapi.h> +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -27,7 +30,7 @@ static NTSTATUS UserpGetClientFileName( OUT PUNICODE_STRING ClientFileNameU, - HANDLE hProcess) + IN HANDLE hProcess) { PLIST_ENTRY ModuleListHead; PLIST_ENTRY Entry; @@ -122,7 +125,7 @@ UserpFreeStringParameters( for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) { /* Check if the current parameter is a string */ - if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam) && Parameters[nParam]) + if ((HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) && Parameters[nParam]) { /* Free the string buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); @@ -136,7 +139,7 @@ UserpCaptureStringParameters( OUT PULONG_PTR Parameters, OUT PULONG SizeOfAllUnicodeStrings, IN PHARDERROR_MSG HardErrorMessage, - HANDLE hProcess) + IN HANDLE hProcess) { ULONG nParam, Size = 0; NTSTATUS Status = STATUS_SUCCESS; @@ -169,7 +172,6 @@ UserpCaptureStringParameters( TempStringU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TempStringU.MaximumLength); - if (!TempStringU.Buffer) { DPRINT1("Cannot allocate memory %u\n", TempStringU.MaximumLength); @@ -196,7 +198,6 @@ UserpCaptureStringParameters( TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TempStringA.MaximumLength); - if (!TempStringA.Buffer) { DPRINT1("Cannot allocate memory %u\n", TempStringA.MaximumLength); @@ -248,11 +249,12 @@ UserpFormatMessages( IN HANDLE hProcess) { NTSTATUS Status; - UNICODE_STRING FileNameU, TempStringU, FormatU; - ANSI_STRING FormatA; + UNICODE_STRING FileNameU, TempStringU, FormatU, Format2U; + ANSI_STRING FormatA, Format2A; PMESSAGE_RESOURCE_ENTRY MessageResource; PWSTR FormatString; - ULONG Size, ExceptionCode; + ULONG ExceptionCode, Severity; + ULONG Size; /* Get the file name of the client process */ UserpGetClientFileName(&FileNameU, hProcess); @@ -260,10 +262,12 @@ UserpFormatMessages( /* Check if we have a file name */ if (!FileNameU.Buffer) { - /* No, use system */ - RtlInitUnicodeString(&FileNameU, L"System"); + /* No, this is system process */ + RtlInitUnicodeString(&FileNameU, L"System Process"); } + Severity = (ULONG)(Message->Status) >> 30; + /* Get text string of the error code */ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), (ULONG_PTR)RT_MESSAGETABLE, @@ -299,19 +303,29 @@ UserpFormatMessages( TempStringU.Buffer = ++FormatString; /* Get size of the caption */ - for (Size = 0; *FormatString != 0 && *FormatString != L'}'; Size++) + for (Size = 0; *FormatString != UNICODE_NULL && *FormatString != L'}'; Size++) FormatString++; /* Skip '}', '\r', '\n' */ FormatString += 3; - TempStringU.Length = Size * sizeof(WCHAR); + TempStringU.Length = (USHORT)(Size * sizeof(WCHAR)); TempStringU.MaximumLength = TempStringU.Length; } else { - /* FIXME: Set string based on severity */ - RtlInitUnicodeString(&TempStringU, L"Application Error"); + /* FIXME: Use localized strings! */ + + if (Severity == STATUS_SEVERITY_SUCCESS) + RtlInitUnicodeString(&TempStringU, L"Success"); + else if (Severity == STATUS_SEVERITY_INFORMATIONAL) + RtlInitUnicodeString(&TempStringU, L"System Information"); + else if (Severity == STATUS_SEVERITY_WARNING) + RtlInitUnicodeString(&TempStringU, L"System Warning"); + else if (Severity == STATUS_SEVERITY_ERROR) + RtlInitUnicodeString(&TempStringU, L"System Error"); + else + RtlInitEmptyUnicodeString(&TempStringU, NULL, 0); } /* Calculate buffer length for the caption */ @@ -330,77 +344,111 @@ UserpFormatMessages( RtlAppendUnicodeStringToString(CaptionStringU, &TempStringU); /* Zero terminate the buffer */ - CaptionStringU->Buffer[CaptionStringU->Length / sizeof(WCHAR)] = 0; + CaptionStringU->Buffer[CaptionStringU->Length / sizeof(WCHAR)] = UNICODE_NULL; /* Free the file name buffer */ RtlFreeUnicodeString(&FileNameU); + // FIXME: What is 42 == ?? + Size = 42; + /* Check if this is an exception message */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { ExceptionCode = Parameters[0]; - /* Handle special cases */ - if (ExceptionCode == STATUS_ACCESS_VIOLATION) + /* Get text string of the exception code */ + Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), + (ULONG_PTR)RT_MESSAGETABLE, + LANG_NEUTRAL, + ExceptionCode, + &MessageResource); + if (NT_SUCCESS(Status)) { - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; - if (Parameters[2]) - Parameters[2] = (ULONG_PTR)L"written"; + if (MessageResource->Flags) + { + RtlInitUnicodeString(&Format2U, (PWSTR)MessageResource->Text); + Format2A.Buffer = NULL; + } else - Parameters[2] = (ULONG_PTR)L"read"; - MessageResource = NULL; - } - else if (ExceptionCode == STATUS_IN_PAGE_ERROR) - { - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; - MessageResource = NULL; - } - else - { - /* Fall back to hardcoded value */ - Parameters[2] = Parameters[1]; - Parameters[1] = Parameters[0]; - Parameters[0] = (ULONG_PTR)L"unknown software exception"; - } - - if (!MessageResource) - { - /* Get text string of the exception code */ - Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), - (ULONG_PTR)RT_MESSAGETABLE, - LANG_NEUTRAL, - ExceptionCode, - &MessageResource); - if (NT_SUCCESS(Status)) { - if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); + RtlInitAnsiString(&Format2A, (PCHAR)MessageResource->Text); + RtlAnsiStringToUnicodeString(&Format2U, &Format2A, TRUE); + } - if (MessageResource->Flags) - { - RtlInitUnicodeString(&FormatU, (PWSTR)MessageResource->Text); - FormatA.Buffer = NULL; - } + /* Handle the special cases */ + if (ExceptionCode == STATUS_ACCESS_VIOLATION) + { + FormatString = Format2U.Buffer; + Parameters[0] = Parameters[1]; + Parameters[1] = Parameters[3]; + if (Parameters[2]) + Parameters[2] = (ULONG_PTR)L"written"; else - { - RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); - RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); - } - FormatString = FormatU.Buffer; + Parameters[2] = (ULONG_PTR)L"read"; + } + else if (ExceptionCode == STATUS_IN_PAGE_ERROR) + { + FormatString = Format2U.Buffer; + Parameters[0] = Parameters[1]; + Parameters[1] = Parameters[3]; } else { - /* Fall back to hardcoded value */ + PWSTR pTmp; + + /* Keep the existing FormatString */ Parameters[2] = Parameters[1]; Parameters[1] = Parameters[0]; - Parameters[0] = (ULONG_PTR)L"unknown software exception"; + + pTmp = Format2U.Buffer; + if (!_wcsnicmp(pTmp, L"{EXCEPTION}", 11)) + { + /* + * This is a named exception. Skip the mark and + * retrieve the exception name that follows it. + */ + pTmp += 11; + + /* Skip '\r', '\n' */ + pTmp += 2; + + Parameters[0] = (ULONG_PTR)pTmp; + } + else + { + /* Fall back to hardcoded value */ + Parameters[0] = (ULONG_PTR)L"unknown software exception"; + } } } + else + { + /* Fall back to hardcoded value, and keep the existing FormatString */ + Parameters[2] = Parameters[1]; + Parameters[1] = Parameters[0]; + Parameters[0] = (ULONG_PTR)L"unknown software exception"; + } + + /* FIXME: Use localized strings! */ + if (Message->ValidResponseOptions == OptionOk || + Message->ValidResponseOptions == OptionOkCancel) + { + // Tmp = FormatString + wcslen(FormatString); + // *++Tmp = L'\n'; + // *++Tmp = L'\n'; + Size += 2 + wcslen(L"Click on OK to terminate the program."); + } + if (Message->ValidResponseOptions == OptionOkCancel) + { + Size += 1 + wcslen(L"Click on CANCEL to debug the program."); + } } /* Calculate length of text buffer */ - TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + 42 * sizeof(WCHAR); + TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + + (USHORT)(Size * sizeof(WCHAR)) + + sizeof(UNICODE_NULL); /* Allocate a buffer for the text */ TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -411,78 +459,124 @@ UserpFormatMessages( _SEH2_TRY { /* Print the string into the buffer */ - StringCbPrintfW(TextStringU->Buffer, - TextStringU->MaximumLength, - FormatString, - Parameters[0], - Parameters[1], - Parameters[2], - Parameters[3]); + RtlStringCbPrintfW(TextStringU->Buffer, + TextStringU->MaximumLength, + FormatString, + Parameters[0], + Parameters[1], + Parameters[2], + Parameters[3]); + + if (Message->Status == STATUS_UNHANDLED_EXCEPTION) + { + /* FIXME: Use localized strings! */ + if (Message->ValidResponseOptions == OptionOk || + Message->ValidResponseOptions == OptionOkCancel) + { + // Tmp = FormatString + wcslen(FormatString); + // *++Tmp = L'\n'; + // *++Tmp = L'\n'; + RtlStringCbCatW(TextStringU->Buffer, + TextStringU->MaximumLength, + L"\n\n"); + RtlStringCbCatW(TextStringU->Buffer, + TextStringU->MaximumLength, + L"Click on OK to terminate the program."); + } + if (Message->ValidResponseOptions == OptionOkCancel) + { + RtlStringCbCatW(TextStringU->Buffer, + TextStringU->MaximumLength, + L"Click on CANCEL to debug the program."); + } + } + Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* An exception occurred, use a default string */ + RtlStringCbPrintfW(TextStringU->Buffer, + TextStringU->MaximumLength, + L"Exception processing message 0x%lx\n" + L"Parameters 0x%lx 0x%lx 0x%lx 0x%lx", + Message->Status, + Parameters[0], Parameters[1], + Parameters[2], Parameters[3]); + /* Set error and free buffers */ Status = _SEH2_GetExceptionCode(); RtlFreeHeap(RtlGetProcessHeap(), 0, TextStringU->Buffer); RtlFreeHeap(RtlGetProcessHeap(), 0, CaptionStringU->Buffer); } - _SEH2_END + _SEH2_END; if (NT_SUCCESS(Status)) { TextStringU->Length = wcslen(TextStringU->Buffer) * sizeof(WCHAR); } + /* Free converted Unicode strings if the original format strings were Ansi */ + if (Format2A.Buffer) RtlFreeUnicodeString(&Format2U); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); return Status; } static BOOL -UserpShowInformationBalloon(PWSTR Text, +UserpShowInformationBalloon(PWSTR Text, PWSTR Caption, PHARDERROR_MSG Message) { + ULONG ShellErrorMode; HWND hwnd; COPYDATASTRUCT CopyData; PBALLOON_HARD_ERROR_DATA pdata; - DWORD dwSize, cchText, cchCaption; + DWORD dwSize, cbTextLen, cbTitleLen; PWCHAR pText, pCaption; DWORD ret, dwResult; + /* Query the shell error mode value */ + ShellErrorMode = GetRegInt(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Windows", + L"ShellErrorMode", 0); + + /* Make the shell display the hard error message in balloon only if necessary */ + if (ShellErrorMode != 1) + return FALSE; + hwnd = GetTaskmanWindow(); if (!hwnd) { - DPRINT1("Failed to find Shell_TrayWnd\n"); + DPRINT1("Failed to find shell task window (last error %lu)\n", GetLastError()); return FALSE; } - cchText = wcslen(Text); - cchCaption = wcslen(Caption); + cbTextLen = ((Text ? wcslen(Text) : 0) + 1) * sizeof(WCHAR); + cbTitleLen = ((Caption ? wcslen(Caption) : 0) + 1) * sizeof(WCHAR); dwSize = sizeof(BALLOON_HARD_ERROR_DATA); - dwSize += (cchText + 1) * sizeof(WCHAR); - dwSize += (cchCaption + 1) * sizeof(WCHAR); + dwSize += cbTextLen + cbTitleLen; pdata = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); if (!pdata) { - DPRINT1("Failed to allocate balloon package\n"); + DPRINT1("Failed to allocate balloon data\n"); return FALSE; } pdata->cbHeaderSize = sizeof(BALLOON_HARD_ERROR_DATA); pdata->Status = Message->Status; + if (NT_SUCCESS(Message->Status)) pdata->dwType = MB_OK; else if (Message->Status == STATUS_SERVICE_NOTIFICATION) pdata->dwType = Message->Parameters[2]; else pdata->dwType = MB_ICONINFORMATION; + pdata->TitleOffset = pdata->cbHeaderSize; pdata->MessageOffset = pdata->TitleOffset; - pdata->MessageOffset += (cchCaption + 1) * sizeof(WCHAR); + pdata->MessageOffset += cbTitleLen; pCaption = (PWCHAR)((ULONG_PTR)pdata + pdata->TitleOffset); pText = (PWCHAR)((ULONG_PTR)pdata + pdata->MessageOffset); wcscpy(pCaption, Caption); @@ -502,13 +596,63 @@ UserpShowInformationBalloon(PWSTR Text, return (ret && dwResult) ? TRUE : FALSE; } + +static ULONG +GetRegInt( + IN PCWSTR KeyName, + IN PCWSTR ValueName, + IN ULONG DefaultValue) +{ + NTSTATUS Status; + ULONG Value = DefaultValue; + UNICODE_STRING String; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + ULONG ResultLength; + UCHAR ValueBuffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + + RtlInitUnicodeString(&String, KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &String, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the registry key */ + Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Query the value */ + RtlInitUnicodeString(&String, ValueName); + Status = NtQueryValueKey(KeyHandle, + &String, + KeyValuePartialInformation, + ValueInfo, + sizeof(ValueBuffer), + &ResultLength); + + /* Close the registry key */ + NtClose(KeyHandle); + + if (NT_SUCCESS(Status) && (ValueInfo->Type == REG_DWORD)) + { + /* Directly retrieve the data */ + Value = *(PULONG)ValueInfo->Data; + } + } + + return Value; +} + static ULONG UserpMessageBox( - PWSTR Text, - PWSTR Caption, - ULONG ValidResponseOptions, - ULONG Severity) + IN PCWSTR Text, + IN PCWSTR Caption, + IN ULONG ValidResponseOptions, + IN ULONG Severity, + IN ULONG Timeout) { ULONG Type, MessageBoxResponse; @@ -555,9 +699,10 @@ UserpMessageBox( } /* Set severity */ - if (Severity == STATUS_SEVERITY_INFORMATIONAL) Type |= MB_ICONINFORMATION; - else if (Severity == STATUS_SEVERITY_WARNING) Type |= MB_ICONWARNING; - else if (Severity == STATUS_SEVERITY_ERROR) Type |= MB_ICONERROR; + // STATUS_SEVERITY_SUCCESS + if (Severity == STATUS_SEVERITY_INFORMATIONAL) Type |= MB_ICONINFORMATION; + else if (Severity == STATUS_SEVERITY_WARNING) Type |= MB_ICONWARNING; + else if (Severity == STATUS_SEVERITY_ERROR) Type |= MB_ICONERROR; Type |= MB_SYSTEMMODAL | MB_SETFOREGROUND; @@ -565,7 +710,7 @@ UserpMessageBox( Text, Caption, Severity, Type); /* Display a message box */ - MessageBoxResponse = MessageBoxW(NULL, Text, Caption, Type); + MessageBoxResponse = MessageBoxTimeoutW(NULL, Text, Caption, Type, 0, Timeout); /* Return response value */ switch (MessageBoxResponse) @@ -584,18 +729,56 @@ UserpMessageBox( return ResponseNotHandled; } +static +VOID +UserpLogHardError( + IN PUNICODE_STRING TextStringU, + IN PUNICODE_STRING CaptionStringU) +{ + NTSTATUS Status; + HANDLE hEventLog; + UNICODE_STRING UNCServerNameU = {0, 0, NULL}; + UNICODE_STRING SourceNameU = RTL_CONSTANT_STRING(L"Application Popup"); + PUNICODE_STRING Strings[] = {CaptionStringU, TextStringU}; + + Status = ElfRegisterEventSourceW(&UNCServerNameU, &SourceNameU, &hEventLog); + if (!NT_SUCCESS(Status) || !hEventLog) + { + DPRINT1("ElfRegisterEventSourceW failed with Status 0x%08lx\n", Status); + return; + } + + Status = ElfReportEventW(hEventLog, + EVENTLOG_INFORMATION_TYPE, + 0, + STATUS_LOG_HARD_ERROR, + NULL, // lpUserSid + ARRAYSIZE(Strings), + 0, // dwDataSize + Strings, + NULL, // lpRawData + 0, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + DPRINT1("ElfReportEventW failed with Status 0x%08lx\n", Status); + + ElfDeregisterEventSource(hEventLog); +} + VOID NTAPI UserServerHardError( IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { - ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; + ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS] = {0}; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING TextU, CaptionU; NTSTATUS Status; HANDLE hProcess; ULONG Size; + ULONG ErrorMode; ASSERT(ThreadData->Process != NULL); @@ -604,7 +787,17 @@ UserServerHardError( /* Make sure we don't have too many parameters */ if (Message->NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) + { + // FIXME: Windows just fails (STATUS_INVALID_PARAMETER) & returns ResponseNotHandled. Message->NumberOfParameters = MAXIMUM_HARDERROR_PARAMETERS; + } + if (Message->ValidResponseOptions > OptionCancelTryContinue) + { + // STATUS_INVALID_PARAMETER; + Message->Response = ResponseNotHandled; + return; + } + // TODO: More message validation: check NumberOfParameters wrt. Message Status code. /* Initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); @@ -616,7 +809,7 @@ UserServerHardError( &Message->h.ClientId); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenProcess failed with code: %lx\n", Status); + DPRINT1("NtOpenProcess failed with status 0x%08lx\n", Status); return; } @@ -640,22 +833,36 @@ UserServerHardError( UserpFreeStringParameters(Parameters, Message); NtClose(hProcess); + /* If we failed, bail out */ if (!NT_SUCCESS(Status)) - { return; + + /* Log the hard error message */ + UserpLogHardError(&TextU, &CaptionU); + + /* Display a hard error popup depending on the current ErrorMode */ + + /* Query the error mode value */ + ErrorMode = GetRegInt(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Windows", + L"ErrorMode", 0); + + if (ErrorMode != 0) + { + /* Returns OK for the hard error */ + Message->Response = ResponseOk; + goto Quit; } if (Message->ValidResponseOptions == OptionOkNoWait) { /* Display the balloon */ - if (UserpShowInformationBalloon(TextU.Buffer, - CaptionU.Buffer, + Message->Response = ResponseOk; + if (UserpShowInformationBalloon(TextU.Buffer, + CaptionU.Buffer, Message)) { Message->Response = ResponseOk; - RtlFreeUnicodeString(&TextU); - RtlFreeUnicodeString(&CaptionU); - return; + goto Quit; } } @@ -663,10 +870,13 @@ UserServerHardError( Message->Response = UserpMessageBox(TextU.Buffer, CaptionU.Buffer, Message->ValidResponseOptions, - (ULONG)Message->Status >> 30); + (ULONG)(Message->Status) >> 30, + (ULONG)-1); +Quit: RtlFreeUnicodeString(&TextU); RtlFreeUnicodeString(&CaptionU); + return; }

1 0

01/08: [NDK] Increase MAXIMUM_HARDERROR_PARAMETERS for Win2k3 compatibility.
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6d7ed7080db38dad9e5d… commit e6d7ed7080db38dad9e5d968e90a005fa2b774af Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 17 16:25:44 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 18:48:00 2018 +0200 [NDK] Increase MAXIMUM_HARDERROR_PARAMETERS for Win2k3 compatibility. --- sdk/include/ndk/extypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index feaf7b95df..adf1371500 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -142,7 +142,7 @@ extern ULONG NTSYSAPI NtBuildNumber; // // NtRaiseHardError-related parameters // -#define MAXIMUM_HARDERROR_PARAMETERS 4 +#define MAXIMUM_HARDERROR_PARAMETERS 5 #define HARDERROR_OVERRIDE_ERRORMODE 0x10000000 //

1 0

01/01: [RAPPS] Introduce 'SizeBytes' DB entry and use it for display
by Alexander Shaposhnikov 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=627739aed9b355e7e51e7… commit 627739aed9b355e7e51e7adca93867071c70ce17 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sat Apr 7 19:17:22 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Sat Apr 7 19:25:12 2018 +0300 [RAPPS] Introduce 'SizeBytes' DB entry and use it for display This will allow us to reduce the DB size a little by avoiding duplication for each and every entry. Original patch by JIRA user "swyter" CORE-10310 --- base/applications/rapps/available.cpp | 24 +++++++++++++++++++++--- base/applications/rapps/include/available.h | 1 + base/applications/rapps/include/misc.h | 4 ++-- base/applications/rapps/include/resource.h | 3 +++ base/applications/rapps/installed.cpp | 2 +- base/applications/rapps/misc.cpp | 11 +++++++---- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 5ed7119853..61c5a16e5e 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -38,7 +38,7 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo() { m_Parser = new CConfigParser(m_sFileName); - m_Category = m_Parser->GetInt(L"Category"); + m_Parser->GetInt(L"Category", m_Category); if (!GetString(L"Name", m_szName) || !GetString(L"URLDownload", m_szUrlDownload)) @@ -51,15 +51,16 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo() GetString(L"Version", m_szVersion); GetString(L"License", m_szLicense); GetString(L"Description", m_szDesc); - GetString(L"Size", m_szSize); GetString(L"URLSite", m_szUrlSite); GetString(L"CDPath", m_szCDPath); GetString(L"Language", m_szRegName); GetString(L"SHA1", m_szSHA1); + RetrieveSize(); RetrieveLicenseType(); RetrieveLanguages(); RetrieveInstalledStatus(); + if (m_IsInstalled) { RetrieveInstalledVersion(); @@ -128,7 +129,9 @@ VOID CAvailableApplicationInfo::RetrieveLanguages() VOID CAvailableApplicationInfo::RetrieveLicenseType() { - INT IntBuffer = m_Parser->GetInt(L"LicenseType"); + INT IntBuffer; + + m_Parser->GetInt(L"LicenseType", IntBuffer); if (IsLicenseType(IntBuffer)) { @@ -140,6 +143,21 @@ VOID CAvailableApplicationInfo::RetrieveLicenseType() } } +VOID CAvailableApplicationInfo::RetrieveSize() +{ + INT iSizeBytes; + + if (!m_Parser->GetInt(L"SizeBytes", iSizeBytes)) + { + // fall back to "Size" string + GetString(L"Size", m_szSize); + return; + } + + StrFormatByteSizeW(iSizeBytes, m_szSize.GetBuffer(MAX_PATH), MAX_PATH); + m_szSize.ReleaseBuffer(); +} + BOOL CAvailableApplicationInfo::FindInLanguages(LCID what) const { if (!m_HasLanguageInfo) diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 876465fd09..c0b0f2017f 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -75,6 +75,7 @@ private: VOID RetrieveInstalledVersion(); VOID RetrieveLanguages(); VOID RetrieveLicenseType(); + VOID RetrieveSize(); inline BOOL FindInLanguages(LCID what) const; }; diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 738f6746cb..143d9769b7 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -41,6 +41,6 @@ class CConfigParser public: CConfigParser(const ATL::CStringW& FileName = ""); - UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); - UINT GetInt(const ATL::CStringW& KeyName); + BOOL GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); + BOOL GetInt(const ATL::CStringW& KeyName, INT& iResult); }; diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 9f4c4b15de..7d5a9b9ebf 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -154,6 +154,9 @@ #define IDS_AINFO_URLDOWNLOAD 355 #define IDS_AINFO_AVAILABLEVERSION 356 #define IDS_AINFO_LANGUAGES 357 +#define IDS_AINFO_KILOBYTE_EXT 358 +#define IDS_AINFO_MEGABYTE_EXT 359 +#define IDS_AINFO_GIGABYTE_EXT 360 /* Names of categories */ diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index e1325770da..c8418dca93 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -129,7 +129,7 @@ BOOL ShowInstalledAppInfo(INT Index) GET_INFO(L"UninstallString", IDS_INFO_UNINSTALLSTR, CFE_BOLD, 0); GET_INFO(L"InstallSource", IDS_INFO_INSTALLSRC, CFE_BOLD, 0); GET_INFO(L"ModifyPath", IDS_INFO_MODIFYPATH, CFE_BOLD, 0); - + return TRUE; } diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index db0ae0bf1b..cc1dc6541f 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -354,7 +354,7 @@ VOID CConfigParser::CacheINILocale() m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocaleID.Right(2); } -UINT CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) { DWORD dwResult; @@ -392,10 +392,12 @@ UINT CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& Resul return (dwResult != 0 ? TRUE : FALSE); } -UINT CConfigParser::GetInt(const ATL::CStringW& KeyName) +BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) { ATL::CStringW Buffer; + iResult = 0; + // grab the text version of our entry if (!GetString(KeyName, Buffer)) return FALSE; @@ -404,8 +406,9 @@ UINT CConfigParser::GetInt(const ATL::CStringW& KeyName) return FALSE; // convert it to an actual integer - INT result = StrToIntW(Buffer.GetString()); + iResult = StrToIntW(Buffer.GetString()); - return (UINT) (result <= 0) ? 0 : result; + // we only care about values > 0 + return (iResult > 0); } // CConfigParser

1 0

06/06: [ZIPFLDR] Register the shell extension. CORE-7684
by Mark Jansen 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da6a46c6ac52cda4191fb… commit da6a46c6ac52cda4191fb09955fa791f13039fb7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 29 23:45:47 2017 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 7 15:29:59 2018 +0200 [ZIPFLDR] Register the shell extension. CORE-7684 --- media/inf/syssetup.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index e1545dadf2..3d12be6bfd 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -118,6 +118,7 @@ AddReg=Classes 11,wbem,wbemdisp.dll,1 11,wbem,wbemprox.dll,1 11,,shellbtrfs.dll,1 +11,,zipfldr.dll,1 [TypeLibraries] stdole2.tlb

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs