From 29ca1c4689f00c83cf34274e058c4e0dbd049b92 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Mon, 10 Jan 2005 23:11:45 +0000
Subject: [PATCH] Fix compilation without NDEBUG.

svn path=/trunk/; revision=12922
---
 reactos/subsys/win32k/ntuser/cursoricon.c | 2 --
 reactos/subsys/win32k/ntuser/menu.c       | 2 +-
 reactos/subsys/win32k/ntuser/msgqueue.c   | 2 +-
 reactos/subsys/win32k/objects/gdiobj.c    | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/cursoricon.c b/reactos/subsys/win32k/ntuser/cursoricon.c
index dd283823be3..e7b05719685 100644
--- a/reactos/subsys/win32k/ntuser/cursoricon.c
+++ b/reactos/subsys/win32k/ntuser/cursoricon.c
@@ -961,8 +961,6 @@ NtUserGetClipCursor(
   WinStaObject = IntGetWinStaObj();
   if (WinStaObject == NULL)
   {
-    DPRINT("Validation of window station handle (0x%X) failed\n",
-      PROCESS_WINDOW_STATION());
     return FALSE;
   }
   
diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index 81d757c158b..b59b7032f3a 100644
--- a/reactos/subsys/win32k/ntuser/menu.c
+++ b/reactos/subsys/win32k/ntuser/menu.c
@@ -1353,7 +1353,7 @@ NtUserCreateMenu(BOOL PopupMenu)
   if (!NT_SUCCESS(Status))
   {
     DPRINT("Validation of window station handle (0x%X) failed\n",
-      PROCESS_WINDOW_STATION());
+      PsGetCurrentProcess()->Win32WindowStation);
     SetLastNtError(Status);
     return (HMENU)0;
   }
diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c
index 18a1637fbbc..900f3b9b6b3 100644
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.c
@@ -1679,7 +1679,7 @@ MsqGetTimerMessage(PUSER_MESSAGE_QUEUE MessageQueue,
     {
       Timer = CONTAINING_RECORD(MessageQueue->TimerListHead.Flink,
                                 TIMER_ENTRY, ListEntry);
-      DPRINT("Checking timer %p wnd %x expiry %I64d\n", Timer, Timer->wnd,
+      DPRINT("Checking timer %p wnd %x expiry %I64d\n", Timer, Timer->Wnd,
              Timer->ExpiryTime.QuadPart);
       EnumEntry = EnumEntry->Flink;
       if ((NULL == WndFilter || Timer->Wnd == WndFilter) &&
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index 4b30364d506..94ff539d2e4 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -715,7 +715,7 @@ GDI_CleanupForProcess (struct _EPROCESS *Process)
   LONG ProcId;
   ULONG Index = RESERVE_ENTRIES_COUNT;
 
-  DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Pid);
+  DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId);
   CurrentProcess = PsGetCurrentProcess();
   if (CurrentProcess != Process)
     {
@@ -761,7 +761,7 @@ GDI_CleanupForProcess (struct _EPROCESS *Process)
       KeDetachProcess();
     }
 
-  DPRINT("Completed cleanup for process %d\n", Pid);
+  DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId);
 
   return TRUE;
 }