Fix win32k to use new EPROCESS defintion

svn path=/trunk/; revision=15066

diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c
index c139b87..c5ee385 100644 (file)
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@@ -93,7 +93,7 @@ Win32kProcessCallback (struct _EPROCESS *Process,
 {
   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());

diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index b59b703..eb83f3b 100644 (file)
--- a/reactos/subsys/win32k/ntuser/menu.c
+++ b/reactos/subsys/win32k/ntuser/menu.c
@@ -234,9 +234,9 @@ IntDestroyMenuObject(PMENU_OBJECT MenuObject,
     
     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,

diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index 27c68e4..80be3b8 100644 (file)
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -71,12 +71,12 @@ IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register)
       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 @@ NtUserGetGuiResources(
     return 0;
   }
   
-  W32Process = Process->Win32Process;
+  W32Process = (PW32PROCESS)Process->Win32Process;
   if(!W32Process)
   {
     ObDereferenceObject(Process);

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index e04c0cf..93b995b 100644 (file)
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -566,7 +566,7 @@ DestroyThreadWindows(struct _ETHREAD *Thread)
   ULONG Cnt = 0;
 
   Win32Thread = Thread->Tcb.Win32Thread;
-  Win32Process = Thread->ThreadsProcess->Win32Process;
+  Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process;
   
   IntLockThreadWindows(Win32Thread);
   Current = Win32Thread->WindowListHead.Flink;

diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index bfb7816..036d8ba 100644 (file)
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -660,7 +660,7 @@ GDI_CleanupForProcess (struct _EPROCESS *Process)
     {
       KeAttachProcess(Process);
     }
-  W32Process = Process->Win32Process;
+  W32Process = (PW32PROCESS)Process->Win32Process;
   ASSERT(W32Process);
 
   if(W32Process->GDIObjects > 0)
@@ -1110,7 +1110,7 @@ LockHandle:
             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 @@ LockHandle:
             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 @@ LockHandle:
             ProcessId = PsGetProcessId(NewOwner);
 
             /* Increase the new process' object counter */
-            W32Process = NewOwner->Win32Process;
+            W32Process = (PW32PROCESS)NewOwner->Win32Process;
             if(W32Process != NULL)
             {
               InterlockedIncrement(&W32Process->GDIObjects);