Fix win32k to use new EPROCESS defintion Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____
Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -93,7 +93,7 @@
{ PW32PROCESS Win32Process;
- Win32Process = Process->Win32Process; + Win32Process = (PW32PROCESS)Process->Win32Process; if (Create) { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); _____
Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -234,9 +234,9 @@
if(RemoveFromProcess) { - IntLockProcessMenus(MenuObject->Process->Win32Process); + IntLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); RemoveEntryList(&MenuObject->ListEntry); - IntUnLockProcessMenus(MenuObject->Process->Win32Process); + IntUnLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); }
Status = ObReferenceObjectByHandle(MenuObject->Process->Win32WindowStation, _____
Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -71,12 +71,12 @@
return FALSE; }
- LogonProcess = Process->Win32Process; + LogonProcess = (PW32PROCESS)Process->Win32Process; } else { /* Deregister the logon process */ - if (LogonProcess != Process->Win32Process) + if (LogonProcess != (PW32PROCESS)Process->Win32Process) { ObDereferenceObject(Process); return FALSE; @@ -1277,7 +1277,7 @@ return 0; }
- W32Process = Process->Win32Process; + W32Process = (PW32PROCESS)Process->Win32Process; if(!W32Process) { ObDereferenceObject(Process); _____
Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -566,7 +566,7 @@
ULONG Cnt = 0;
Win32Thread = Thread->Tcb.Win32Thread; - Win32Process = Thread->ThreadsProcess->Win32Process; + Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process;
IntLockThreadWindows(Win32Thread); Current = Win32Thread->WindowListHead.Flink; _____
Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -660,7 +660,7 @@
{ KeAttachProcess(Process); } - W32Process = Process->Win32Process; + W32Process = (PW32PROCESS)Process->Win32Process; ASSERT(W32Process);
if(W32Process->GDIObjects > 0) @@ -1110,7 +1110,7 @@ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { - W32Process = OldProcess->Win32Process; + W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { InterlockedDecrement(&W32Process->GDIObjects); @@ -1221,7 +1221,7 @@ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { - W32Process = OldProcess->Win32Process; + W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { InterlockedDecrement(&W32Process->GDIObjects); @@ -1235,7 +1235,7 @@ ProcessId = PsGetProcessId(NewOwner);
/* Increase the new process' object counter */ - W32Process = NewOwner->Win32Process; + W32Process = (PW32PROCESS)NewOwner->Win32Process; if(W32Process != NULL) { InterlockedIncrement(&W32Process->GDIObjects);