Michael Stefaniuc : vwin32.vxd: Win64 printf format warning fixes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8c66e6d80ab5f47dfd129c274c419eaee6ba0a74
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c66e6d80ab5f47dfd129c274c...

Author: Michael Stefaniuc 
Date:   Fri Oct  6 23:01:41 2006 +0200

vwin32.vxd: Win64 printf format warning fixes.

---

dlls/vwin32.vxd/Makefile.in |    1 -
 dlls/vwin32.vxd/vwin32.c    |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in
index 53fdc47..b7236a0 100644
--- a/dlls/vwin32.vxd/Makefile.in
+++ b/dlls/vwin32.vxd/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vwin32.vxd
 IMPORTS   = winedos kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT

C_SRCS = \
    vwin32.c
diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c
index 3374d81..fdd5998 100644
--- a/dlls/vwin32.vxd/vwin32.c
+++ b/dlls/vwin32.vxd/vwin32.c
@@ -111,8 +111,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD
             BYTE intnum = 0;

TRACE( "Control '%s': "
-                   "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, "
-                   "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\n",
+                   "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, "
+                   "edx=0x%08x, esi=0x%08x, edi=0x%08x\n",
                    (dwIoControlCode == VWIN32_DIOC_DOS_IOCTL)? "VWIN32_DIOC_DOS_IOCTL" :
                    (dwIoControlCode == VWIN32_DIOC_DOS_INT25)? "VWIN32_DIOC_DOS_INT25" :
                    (dwIoControlCode == VWIN32_DIOC_DOS_INT26)? "VWIN32_DIOC_DOS_INT26" :
@@ -153,7 +153,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD
         return FALSE;

default:
-        FIXME( "Unknown Control %ld\n", dwIoControlCode);
+        FIXME( "Unknown Control %d\n", dwIoControlCode);
         return FALSE;
     }
 }
@@ -179,7 +179,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi
         {
             DWORD parm = stack32_pop(context);

-            FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm);
+            FIXME("Get VMCPD Version(%08x): partial stub!\n", parm);

/* FIXME: This is what Win98 returns, it may
              *        not be correct in all situations.
@@ -192,7 +192,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi
             DWORD callnum = stack32_pop(context);
             DWORD parm    = stack32_pop(context);

-            TRACE("Int31/DPMI dispatch(%08lx)\n", callnum);
+            TRACE("Int31/DPMI dispatch(%08x)\n", callnum);

context->Eax = callnum;
             context->Ecx = parm;
@@ -205,7 +205,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi
             return callnum; /* FIXME: should really call INT_Int41Handler() */
         }
     default:
-        FIXME("Unknown service %08lx\n", service);
+        FIXME("Unknown service %08x\n", service);
         return 0xffffffff;
     }
 }