11 modified files
reactos/ntoskrnl/include/internal
diff -u -r1.39.2.2.2.3 -r1.39.2.2.2.4
--- ex.h 12 Sep 2004 19:21:06 -0000 1.39.2.2.2.3
+++ ex.h 29 Sep 2004 10:27:02 -0000 1.39.2.2.2.4
@@ -100,11 +100,13 @@
/* OTHER FUNCTIONS **********************************************************/
+#ifdef _ENABLE_THRDEVTPAIR
VOID
ExpSwapThreadEventPair(
IN struct _ETHREAD* Thread,
IN struct _KEVENT_PAIR* EventPair
);
+#endif /* _ENABLE_THRDEVTPAIR */
LONGLONG
FASTCALL
reactos/subsys/win32k/include
diff -u -r1.1.4.13 -r1.1.4.14
--- internal.h 27 Sep 2004 03:37:53 -0000 1.1.4.13
+++ internal.h 29 Sep 2004 10:27:03 -0000 1.1.4.14
@@ -798,7 +798,7 @@
(hWnd == HWND_BROADCAST || hWnd == HWND_TOPMOST)
#define IntWndBelongsToThread(WndObj, W32Thread) \
- ((WndObj)->MessageQueue->Thread->Win32Thread == W32Thread)
+ ((WndObj)->MessageQueue->Thread->Tcb.Win32Thread == W32Thread)
#define IntGetWndThreadId(WndObj) \
((WndObj)->MessageQueue->Thread->Cid.UniqueThread)
reactos/subsys/win32k/main
diff -u -r1.76.12.4 -r1.76.12.5
--- dllmain.c 14 Sep 2004 01:00:43 -0000 1.76.12.4
+++ dllmain.c 29 Sep 2004 10:27:03 -0000 1.76.12.5
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dllmain.c,v 1.76.12.4 2004/09/14 01:00:43 weiden Exp $
+/* $Id: dllmain.c,v 1.76.12.5 2004/09/29 10:27:03 weiden Exp $
*
* Entry Point for win32k.sys
*/
@@ -120,7 +120,7 @@
DPRINT("Win32kThreadCallback() called\n");
Process = Thread->ThreadsProcess;
- Win32Thread = Thread->Win32Thread;
+ Win32Thread = Thread->Tcb.Win32Thread;
if (Create)
{
DPRINT("W32k: Create thread\n");
@@ -302,7 +302,7 @@
/* FIXME - do this atomic!!! */
- if(Thread->Win32Thread != NULL)
+ if(Thread->Tcb.Win32Thread != NULL)
{
return STATUS_SUCCESS;
}
reactos/subsys/win32k/ntuser
diff -u -r1.17.2.6 -r1.17.2.7
--- desktop.c 14 Sep 2004 01:00:44 -0000 1.17.2.6
+++ desktop.c 29 Sep 2004 10:27:03 -0000 1.17.2.7
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: desktop.c,v 1.17.2.6 2004/09/14 01:00:44 weiden Exp $
+ * $Id: desktop.c,v 1.17.2.7 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -833,14 +833,14 @@
{
/* just return the handle, we queried the desktop handle of a thread running
in the same context */
- Ret = Thread->Win32Thread->hDesktop;
+ Ret = Thread->Tcb.Win32Thread->hDesktop;
ObDereferenceObject(Thread);
return Ret;
}
/* get the desktop handle and the desktop of the thread */
- if(!(hThreadDesktop = Thread->Win32Thread->hDesktop) ||
- !(DesktopObject = Thread->Win32Thread->Desktop))
+ if(!(hThreadDesktop = Thread->Tcb.Win32Thread->hDesktop) ||
+ !(DesktopObject = Thread->Tcb.Win32Thread->Desktop))
{
ObDereferenceObject(Thread);
DPRINT1("Desktop information of thread 0x%x broken!?\n", dwThreadId);
reactos/subsys/win32k/ntuser
diff -u -r1.36.4.7 -r1.36.4.8
--- input.c 14 Sep 2004 01:00:44 -0000 1.36.4.7
+++ input.c 29 Sep 2004 10:27:03 -0000 1.36.4.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: input.c,v 1.36.4.7 2004/09/14 01:00:44 weiden Exp $
+/* $Id: input.c,v 1.36.4.8 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -379,11 +379,11 @@
FocusThread = FocusQueue->Thread;
- if (FocusThread && FocusThread->Win32Thread &&
- FocusThread->Win32Thread->KeyboardLayout)
+ if (FocusThread && FocusThread->Tcb.Win32Thread &&
+ FocusThread->Tcb.Win32Thread->KeyboardLayout)
{
W32kKeyProcessMessage(&msg,
- FocusThread->Win32Thread->KeyboardLayout);
+ FocusThread->Tcb.Win32Thread->KeyboardLayout);
}
else
continue;
reactos/subsys/win32k/ntuser
diff -u -r1.71.4.7 -r1.71.4.8
--- message.c 23 Sep 2004 19:42:30 -0000 1.71.4.7
+++ message.c 29 Sep 2004 10:27:03 -0000 1.71.4.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: message.c,v 1.71.4.7 2004/09/23 19:42:30 weiden Exp $
+/* $Id: message.c,v 1.71.4.8 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -835,7 +835,7 @@
ASSERT(Window);
if(!IntIsWindow(Window) ||
- Window->MessageQueue->Thread->Win32Thread->IsExiting)
+ Window->MessageQueue->Thread->Tcb.Win32Thread->IsExiting)
{
/* Never send messages to exiting threads */
return FALSE;
@@ -1016,18 +1016,18 @@
BOOL INTERNAL_CALL
IntInitMessagePumpHook()
{
- PsGetCurrentThread()->Win32Thread->MessagePumpHookValue++;
+ PsGetWin32Thread()->MessagePumpHookValue++;
return TRUE;
}
BOOL INTERNAL_CALL
IntUninitMessagePumpHook()
{
- if (PsGetCurrentThread()->Win32Thread->MessagePumpHookValue <= 0)
+ if (PsGetWin32Thread()->MessagePumpHookValue <= 0)
{
return FALSE;
}
- PsGetCurrentThread()->Win32Thread->MessagePumpHookValue--;
+ PsGetWin32Thread()->MessagePumpHookValue--;
return TRUE;
}
reactos/subsys/win32k/ntuser
diff -u -r1.100.12.6 -r1.100.12.7
--- msgqueue.c 27 Sep 2004 13:17:12 -0000 1.100.12.6
+++ msgqueue.c 29 Sep 2004 10:27:03 -0000 1.100.12.7
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: msgqueue.c,v 1.100.12.6 2004/09/27 13:17:12 weiden Exp $
+/* $Id: msgqueue.c,v 1.100.12.7 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -574,7 +574,7 @@
if (!NT_SUCCESS(Status))
return;
- Win32Thread = ((PETHREAD)Thread)->Win32Thread;
+ Win32Thread = ((PETHREAD)Thread)->Tcb.Win32Thread;
if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL)
{
ObDereferenceObject ((PETHREAD)Thread);
reactos/subsys/win32k/ntuser
diff -u -r1.1.4.16 -r1.1.4.17
--- ntuser.c 27 Sep 2004 12:48:48 -0000 1.1.4.16
+++ ntuser.c 29 Sep 2004 10:27:03 -0000 1.1.4.17
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: ntuser.c,v 1.1.4.16 2004/09/27 12:48:48 weiden Exp $
+/* $Id: ntuser.c,v 1.1.4.17 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -392,7 +392,7 @@
ENTER_CRITICAL();
VALIDATE_USER_OBJECT(WINDOW, (HWND)Param2, Window);
- MsgQueue = PsGetCurrentThread()->Win32Thread->MessageQueue;
+ MsgQueue = PsGetCurrentThread()->Tcb.Win32Thread->MessageQueue;
if(Window->MessageQueue != MsgQueue)
{
NTUSER_FAIL_ERROR(ERROR_ACCESS_DENIED);
@@ -747,15 +747,15 @@
VALIDATE_USER_OBJECT(WINDOW, hWnd, Window);
/* Check for owner thread and desktop window */
- if(!IntWndBelongsToThread(Window, Thread->Win32Thread) || IntIsDesktopWindow(Window))
+ if(!IntWndBelongsToThread(Window, Thread->Tcb.Win32Thread) || IntIsDesktopWindow(Window))
{
LEAVE_CRITICAL();
NTUSER_FAIL_ERROR(ERROR_ACCESS_DENIED);
}
ASSERT(W32Process);
- ASSERT(Thread->Win32Thread);
+ ASSERT(Thread->Tcb.Win32Thread);
/* FIXME - send messages if the thread is already terminating? */
- Result = IntDestroyWindow(Window, W32Process, Thread->Win32Thread, TRUE);
+ Result = IntDestroyWindow(Window, W32Process, Thread->Tcb.Win32Thread, TRUE);
LEAVE_CRITICAL();
@@ -1742,7 +1742,7 @@
NTUSER_FAIL_NTERROR(Status);
}
- if(peThread->Win32Thread == NULL)
+ if(peThread->Tcb.Win32Thread == NULL)
{
/* we try to send a message to a non-win32 thread... */
ObDereferenceObject(peThread);
@@ -1755,7 +1755,7 @@
calling process. set the last error code to ERROR_INVALID_THREAD_ID */
ENTER_CRITICAL_SHARED();
- Result = IntPostThreadMessage(peThread->Win32Thread,
+ Result = IntPostThreadMessage(peThread->Tcb.Win32Thread,
Msg,
wParam,
lParam);
reactos/subsys/win32k/ntuser
diff -u -r1.33.4.3 -r1.33.4.4
--- timer.c 14 Sep 2004 01:00:44 -0000 1.33.4.3
+++ timer.c 29 Sep 2004 10:27:03 -0000 1.33.4.4
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: timer.c,v 1.33.4.3 2004/09/14 01:00:44 weiden Exp $
+/* $Id: timer.c,v 1.33.4.4 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -397,7 +397,7 @@
continue;
}
- MsqPostMessage(((PW32THREAD)Thread->Win32Thread)->MessageQueue, &MsgTimer->Msg, FALSE);
+ MsqPostMessage(((PW32THREAD)Thread->Tcb.Win32Thread)->MessageQueue, &MsgTimer->Msg, FALSE);
ThreadsToDereference[ThreadsToDereferencePos] = Thread;
++ThreadsToDereferencePos;
reactos/subsys/win32k/ntuser
diff -u -r1.244.2.13 -r1.244.2.14
--- window.c 27 Sep 2004 12:53:18 -0000 1.244.2.13
+++ window.c 29 Sep 2004 10:27:03 -0000 1.244.2.14
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: window.c,v 1.244.2.13 2004/09/27 12:53:18 weiden Exp $
+/* $Id: window.c,v 1.244.2.14 2004/09/29 10:27:03 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -344,7 +344,7 @@
ASSERT(Thread);
- Win32Thread = Thread->Win32Thread;
+ Win32Thread = Thread->Tcb.Win32Thread;
Win32Process = Thread->ThreadsProcess->Win32Process;
/* FIXME - acquire lock */
@@ -972,7 +972,7 @@
PRTL_USER_PROCESS_PARAMETERS ProcessParams;
BOOL CalculatedDefPosSize = FALSE;
- IntGetDesktopWorkArea(WindowObject->MessageQueue->Thread->Win32Thread->Desktop, &WorkArea);
+ IntGetDesktopWorkArea(WindowObject->MessageQueue->Thread->Tcb.Win32Thread->Desktop, &WorkArea);
rc = WorkArea;
ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters;
reactos/subsys/win32k/objects
diff -u -r1.71.4.4 -r1.71.4.5
--- gdiobj.c 26 Sep 2004 22:52:43 -0000 1.71.4.4
+++ gdiobj.c 29 Sep 2004 10:27:04 -0000 1.71.4.5
@@ -19,7 +19,7 @@
/*
* GDIOBJ.C - GDI object manipulation routines
*
- * $Id: gdiobj.c,v 1.71.4.4 2004/09/26 22:52:43 weiden Exp $
+ * $Id: gdiobj.c,v 1.71.4.5 2004/09/29 10:27:04 weiden Exp $
*/
#include <w32k.h>
@@ -125,7 +125,7 @@
UINT ObjType;
ULONG MemSize = sizeof(GDI_HANDLE_TABLE) + (sizeof(GDI_TABLE_ENTRY) * (Entries - 1));
- handleTable = ExAllocatePoolWithTag(PagedPool, MemSize, TAG_GDIHNDTBLE);
+ handleTable = ExAllocatePoolWithTag(NonPagedPool, MemSize, TAG_GDIHNDTBLE);
ASSERT( handleTable );
RtlZeroMemory(handleTable, MemSize);
@@ -134,7 +134,7 @@
handleTable->EntriesEnd = &handleTable->Entries[Entries];
- handleTable->LookasideLists = ExAllocatePoolWithTag(PagedPool,
+ handleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool,
OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST),
TAG_GDIHNDTBLE);
if(handleTable->LookasideLists == NULL)
@@ -149,7 +149,7 @@
ObjInfo[ObjType].Size + sizeof(GDIOBJHDR), TAG_GDIOBJ, 0);
}
- ShortDelay.QuadPart = -100;
+ ShortDelay.QuadPart = -100LL;
return handleTable;
}
CVSspam 0.2.8