Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 22:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove client thread information from w32 thread information.

Browse source 
svn path=/trunk/; revision=40892
This commit is contained in:
James Tabor 2009-05-12 01:56:39 +00:00
parent 85d4ab3b58
commit 3902e655f3
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/include/reactos/win32k/ntuser.h
View file

@ -366,11 +366,7 @@ typedef struct _W32THREADINFO
{
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 */

2
reactos/subsystems/win32/win32k/include/win32.h
View file

@ -45,6 +45,8 @@ typedef struct _THREADINFO
ULONG fsHooks;
LIST_ENTRY PtiLink;
CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL.
LIST_ENTRY WindowListHead;
LIST_ENTRY W32CallbackListHead;
BOOLEAN IsExiting;

5
reactos/subsystems/win32/win32k/main/dllmain.c
View file

@ -280,11 +280,6 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
}
Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread);
Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout();
if (Win32Thread->ThreadInfo)
{
Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0;
// Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo;
}
}
else
{

6
reactos/subsystems/win32/win32k/ntuser/message.c
View file

@ -1998,7 +1998,7 @@ IntInitMessagePumpHook()
{
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 @@ IntUninitMessagePumpHook()
{
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;

3
reactos/subsystems/win32/win32k/ntuser/misc.c
View file

@ -525,8 +525,7 @@ GetW32ThreadInfo(VOID)
/* 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;