From 7bbf8ae688a59f6512cfcb03966da408623bf644 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 5 Jan 2019 16:50:32 +0100 Subject: [PATCH] [WIN32SS:NTUSER] Bugcheck in case two mandatory initialization steps are not fulfilled. - Bugcheck VIDEO_DRIVER_INIT_FAILURE in case initializing video fails. - Bugcheck WIN32K_INIT_OR_RIT_FAILURE (Windows-compatible) in case the USER subsystem version does not match. --- win32ss/user/ntuser/ntuser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index e44feb8db05..d433855ae8e 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -132,9 +132,13 @@ UserInitialize(VOID) Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; - /* Initialize Video */ + /* Initialize the Video */ Status = InitVideo(); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* We failed, bugcheck */ + KeBugCheckEx(VIDEO_DRIVER_INIT_FAILURE, Status, 0, 0, USER_VERSION); + } // { // DrvInitConsole. @@ -185,8 +189,8 @@ NtUserInitialize( /* Check Windows USER subsystem version */ if (dwWinVersion != USER_VERSION) { - // FIXME: Should bugcheck! - return STATUS_UNSUCCESSFUL; + /* No match, bugcheck */ + KeBugCheckEx(WIN32K_INIT_OR_RIT_FAILURE, 0, 0, dwWinVersion, USER_VERSION); } /* Acquire exclusive lock */ -- 2.17.1