[ros-diffs] [tfaber] 69536: [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve

Author: tfaber
Date: Thu Oct 15 09:44:20 2015
New Revision: 69536

URL: http://svn.reactos.org/svn/reactos?rev=69536&view=rev
Log:
[WIN32K:NTUSER]
- Don't perform thread initialization twice in csrss's UserInitialize thread
CORE-10339 #resolve

Modified:
    trunk/reactos/win32ss/user/ntuser/main.c
    trunk/reactos/win32ss/user/ntuser/ntuser.c

Modified: trunk/reactos/win32ss/user/ntuser/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c?...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/main.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/main.c	[iso-8859-1] Thu Oct 15 09:44:20 2015
@@ -379,11 +379,7 @@

/* 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,

Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser....
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/ntuser.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/ntuser.c	[iso-8859-1] Thu Oct 15 09:44:20 2015
@@ -113,7 +113,9 @@
     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 @@
 //     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.