* Sync to trunk HEAD (r53473).

[reactos.git] / subsystems / win32 / win32k / ntuser / ntuser.c

diff --git a/subsystems/win32/win32k/ntuser/ntuser.c b/subsystems/win32/win32k/ntuser/ntuser.c
index b28c24a..832c4a3 100644 (file)
--- a/subsystems/win32/win32k/ntuser/ntuser.c
+++ b/subsystems/win32/win32k/ntuser/ntuser.c
@@ -11,16 +11,18 @@
 
 #include <win32k.h>
 
-#define NDEBUG
-#include <debug.h>
+DBG_DEFAULT_CHANNEL(UserMisc);
 
 BOOL InitSysParams();
 
 /* GLOBALS *******************************************************************/
 
+PTHREADINFO gptiCurrent = NULL;
 ERESOURCE UserLock;
 ATOM AtomMessage; // Window Message atom.
 ATOM AtomWndObj;  // Window Object atom.
+ATOM AtomLayer;   // Window Layer atom.
+ATOM AtomFlashWndState; // Window Flash State atom.
 BOOL gbInitialized;
 HINSTANCE hModClient = NULL;
 BOOL ClientPfnInit = FALSE;
@@ -47,6 +49,8 @@ InitUserAtoms(VOID)
   gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE);
 
   AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE);
+  AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE);
+  AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE);
 
   return STATUS_SUCCESS;
 }
@@ -64,14 +68,14 @@ InitUserImpl(VOID)
 
    if (!UserCreateHandleTable())
    {
-      DPRINT1("Failed creating handle table\n");
+      ERR("Failed creating handle table\n");
       return STATUS_INSUFFICIENT_RESOURCES;
    }
 
    Status = InitSessionImpl();
    if (!NT_SUCCESS(Status))
    {
-      DPRINT1("Error init session impl.\n");
+      ERR("Error init session impl.\n");
       return Status;
    }
 
@@ -152,7 +156,7 @@ NtUserInitialize(
 {
     NTSTATUS Status;
 
-    DPRINT1("Enter NtUserInitialize(%lx, %p, %p)\n",
+    ERR("Enter NtUserInitialize(%lx, %p, %p)\n",
             dwWinVersion, hPowerRequestEvent, hMediaRequestEvent);
 
     /* Check the Windows version */
@@ -223,6 +227,7 @@ VOID FASTCALL UserEnterExclusive(VOID)
    ASSERT_NOGDILOCKS();
    KeEnterCriticalRegion();
    ExAcquireResourceExclusiveLite(&UserLock, TRUE);
+   gptiCurrent = PsGetCurrentThreadWin32Thread();
 }
 
 VOID FASTCALL UserLeave(VOID)