From ad5dceff98139dea7d196ca656e5f7ae9d12a191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 15 May 2016 22:32:17 +0000 Subject: [PATCH] [NTOS][USERSRV]: Both hard-error message box options "OptionOkNoWait" and "OptionCancelTryContinue" are valid! svn path=/trunk/; revision=71338 --- reactos/ntoskrnl/ex/harderr.c | 2 ++ reactos/win32ss/user/winsrv/usersrv/harderror.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/reactos/ntoskrnl/ex/harderr.c b/reactos/ntoskrnl/ex/harderr.c index a9ab8cb2197..c5073a30b8d 100644 --- a/reactos/ntoskrnl/ex/harderr.c +++ b/reactos/ntoskrnl/ex/harderr.c @@ -552,6 +552,8 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, case OptionYesNo: case OptionYesNoCancel: case OptionShutdownSystem: + case OptionOkNoWait: + case OptionCancelTryContinue: break; /* Anything else is invalid */ diff --git a/reactos/win32ss/user/winsrv/usersrv/harderror.c b/reactos/win32ss/user/winsrv/usersrv/harderror.c index 27b1dd4e3c3..52e22a89d4b 100644 --- a/reactos/win32ss/user/winsrv/usersrv/harderror.c +++ b/reactos/win32ss/user/winsrv/usersrv/harderror.c @@ -473,10 +473,23 @@ UserpMessageBox( case OptionShutdownSystem: Type = MB_RETRYCANCEL; // FIXME??? break; + case OptionOkNoWait: + /* + * This gives a balloon notification. + * See rostests/kmtests/ntos_ex/ExHardError.c + */ + Type = MB_YESNO; // FIXME! + break; + case OptionCancelTryContinue: + Type = MB_CANCELTRYCONTINUE; + break; /* Anything else is invalid */ default: + { + DPRINT1("Unknown ValidResponseOptions = %d\n", ValidResponseOptions); return ResponseNotHandled; + } } /* Set severity */