From 28bfb7820f57e00ad1af2e536841830220de2a66 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Thu, 15 Oct 2015 09:44:20 +0000 Subject: [PATCH] [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve svn path=/trunk/; revision=69536 --- reactos/win32ss/user/ntuser/main.c | 6 +----- reactos/win32ss/user/ntuser/ntuser.c | 11 +++-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/reactos/win32ss/user/ntuser/main.c b/reactos/win32ss/user/ntuser/main.c index 9dd8cfe2f54..05fc831f03f 100644 --- a/reactos/win32ss/user/ntuser/main.c +++ b/reactos/win32ss/user/ntuser/main.c @@ -379,11 +379,7 @@ AllocW32Thread(IN PETHREAD Thread, /* Check that we were not called with an already existing Win32 thread info */ ptiCurrent = PsGetThreadWin32Thread(Thread); - if (ptiCurrent) - { - ERR_CH(UserThread, "PsGetThreadWin32Thread returned non-NULL thread info!!\n"); - // return STATUS_SUCCESS; - } + NT_ASSERT(ptiCurrent == NULL); /* Allocate a new Win32 thread info */ ptiCurrent = ExAllocatePoolWithTag(NonPagedPool, diff --git a/reactos/win32ss/user/ntuser/ntuser.c b/reactos/win32ss/user/ntuser/ntuser.c index 3982e78ae1c..87a285aaa9e 100644 --- a/reactos/win32ss/user/ntuser/ntuser.c +++ b/reactos/win32ss/user/ntuser/ntuser.c @@ -113,7 +113,9 @@ UserInitialize(VOID) HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; -// Create Event for Diconnect Desktop. + NT_ASSERT(PsGetCurrentThreadWin32Thread() != NULL); + +// Create Event for Disconnect Desktop. Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; @@ -128,14 +130,7 @@ UserInitialize(VOID) // Update Shared Device Caps. // Initialize User Screen. // } -// Create ThreadInfo for this Thread! -// { - /* Initialize the current thread */ - Status = InitThreadCallback(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) return Status; - -// } // Set Global SERVERINFO Error flags. // Load Resources. -- 2.17.1