[ros-diffs] [jimtabor] 40892: - Remove client thread information from w32 thread information.

Author: jimtabor
Date: Tue May 12 05:56:39 2009
New Revision: 40892

URL: http://svn.reactos.org/svn/reactos?rev=40892&view=rev
Log:
- Remove client thread information from w32 thread information.

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/win32.h
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 12 05:56:39 2009
@@ -366,11 +366,7 @@
 {
     PPROCESSINFO ppi; /* [KERNEL] */
     PDESKTOPINFO pDeskInfo;
-//    PVOID DesktopHeapBase;
-//    ULONG_PTR DesktopHeapLimit;
-    /* A mask of what hooks are currently active */
     ULONG fsHooks;
-    CLIENTTHREADINFO ClientThreadInfo;
 } W32THREADINFO, *PW32THREADINFO;
 
 /* Window Client Information structure */

Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue May 12 05:56:39
2009
@@ -44,6 +44,8 @@
     UINT                cTimersReady; /* Count of timers pending. */
     ULONG               fsHooks;
     LIST_ENTRY          PtiLink;
+
+    CLIENTTHREADINFO    cti;  // Used only when no Desktop or pcti NULL.
 
   LIST_ENTRY WindowListHead;
   LIST_ENTRY W32CallbackListHead;

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue May 12 05:56:39
2009
@@ -280,11 +280,6 @@
       }
       Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread);
       Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout();
-      if (Win32Thread->ThreadInfo)
-      {
-          Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0;
-//          Win32Thread->pClientInfo->pClientThreadInfo =
&Win32Thread->ThreadInfo->ClientThreadInfo;
-      }
     }
   else
     {

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue May 12
05:56:39 2009
@@ -1998,7 +1998,7 @@
 {
    if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo)
    {
-    
((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook++;
+     ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++;
      return TRUE;
    }
    return FALSE;
@@ -2009,11 +2009,11 @@
 {
    if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo)
    {
-      if
(((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook
<= 0)
+      if
(((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <=
0)
       {
          return FALSE;
       }
-     
((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook--;
+     
((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--;
       return TRUE;
    }
    return FALSE;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 12 05:56:39
2009
@@ -525,8 +525,7 @@
             /* initialize it */
             ti->ppi = GetW32ProcessInfo();
             ti->fsHooks = W32Thread->fsHooks;
-//            W32Thread->pcti = &ti->ClientThreadInfo;
-            W32Thread->pcti = NULL; // FIXME
+            W32Thread->pcti = &W32Thread->cti; // FIXME
             if (W32Thread->Desktop != NULL)
             {
                 ti->pDeskInfo = W32Thread->Desktop->DesktopInfo;