From 289211cc3b10b50840892139e4fd49eb2393cf30 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@psn.net>
Date: Wed, 17 Feb 1999 16:15:11 +0000
Subject: [PATCH] Fixed a number of warnings concerning the matching of the
 printf format string and the associated parameters (actually it's mostly
 TRACE and FIXMEs).

---
 controls/scroll.c          | 2 +-
 dlls/advapi32/crypt.c      | 2 +-
 dlls/ntdll/nt.c            | 2 +-
 graphics/x11drv/graphics.c | 4 ++--
 scheduler/synchro.c        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/controls/scroll.c b/controls/scroll.c
index 5ae8a518355..4a89de12c8c 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -697,7 +697,7 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
           return;  /* Should never happen */
     }
 
-    TRACE(scroll, "Event: hwnd=%04x bar=%d msg=%x pt=%d,%d hit=%d\n",
+    TRACE(scroll, "Event: hwnd=%04x bar=%d msg=%x pt=%ld,%ld hit=%d\n",
 		 hwnd, nBar, msg, pt.x, pt.y, hittest );
 
     switch(SCROLL_trackHitTest)
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 0112ed4f4f8..b1cd7a8e01f 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -24,7 +24,7 @@ BOOL32 WINAPI
 CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
 		      LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags)
 {
-    FIXME(advapi,"(%08lx, %s, %s, %d, %08lx): stub!\n", phProv, pszContainer,
+    FIXME(advapi,"(%p, %s, %s, %ld, %08lx): stub!\n", phProv, pszContainer,
 	  pszProvider, dwProvType, dwFlags);
     return FALSE;
 }
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index af150305244..259048063e6 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -399,7 +399,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken(
 	OUT PTOKEN_PRIVILEGES PreviousState,
 	OUT PDWORD ReturnLength)
 {
-	FIXME(ntdll,"(0x%08x,0x%08lx,%p,0x%08lx,%p,%p),stub!\n",
+	FIXME(ntdll,"(0x%08x,0x%08x,%p,0x%08lx,%p,%p),stub!\n",
 	TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength);
 	return 0;
 }
diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c
index 3a7a2942e44..1a2388661ea 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -1373,8 +1373,8 @@ X11DRV_PolyBezier(DC *dc, POINT32 start, const POINT32* BezierPoints, DWORD coun
     XPoint* xpoints;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    TRACE(graphics, "dc=%04x count=%ld %d,%d - %d,%d - %d,%d -%d,%d \n", 
-            (int)dc, count,
+    TRACE(graphics, "dc=%p count=%ld %ld,%ld - %ld,%ld - %ld,%ld - %ld,%ld\n", 
+            dc, count,
             start.x, start.y,
             (Points+0)->x, (Points+0)->y, 
             (Points+1)->x, (Points+1)->y, 
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index 238e4e49116..589bf51e426 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -31,7 +31,7 @@ static BOOL32 SYNC_BuildWaitStruct( DWORD count, const HANDLE32 *handles,
     wait->wait_all = wait_all;
     for (i = 0, ptr = wait->objs; i < count; i++, ptr++)
     {
-    	TRACE(win32,"handle %i is %08x\n",i,handles[i]);
+    	TRACE(win32,"handle %ld is %08x\n",i,handles[i]);
         if (!(*ptr = HANDLE_GetObjPtr( PROCESS_Current(), handles[i],
                                        K32OBJ_UNKNOWN, SYNCHRONIZE,
                                        &wait->server[i] )))