From 1699c3a5345cc52fba3d6caabe652ed2ee16cc39 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 21 Feb 2022 07:59:19 +0100 Subject: [PATCH] vwin32.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- 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 81282166549..6157900448c 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vwin32.vxd IMPORTS = kernel diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 5a33f2ba665..63c440fdbe4 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -123,8 +123,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, BYTE intnum = 0; TRACE( "Control '%s': " - "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, " - "edx=0x%08x, esi=0x%08x, edi=0x%08x\n", + "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, " + "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\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" : @@ -165,7 +165,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, return FALSE; default: - FIXME( "Unknown Control %d\n", dwIoControlCode); + FIXME( "Unknown Control %ld\n", dwIoControlCode); return FALSE; } } @@ -191,7 +191,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) { DWORD parm = stack32_pop(context); - FIXME("Get VMCPD Version(%08x): partial stub!\n", parm); + FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm); /* FIXME: This is what Win98 returns, it may * not be correct in all situations. @@ -204,7 +204,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) DWORD callnum = stack32_pop(context); DWORD parm = stack32_pop(context); - TRACE("Int31/DPMI dispatch(%08x)\n", callnum); + TRACE("Int31/DPMI dispatch(%08lx)\n", callnum); context->Eax = callnum; context->Ecx = parm; @@ -217,7 +217,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) return callnum; /* FIXME: should really call INT_Int41Handler() */ } default: - FIXME("Unknown service %08x\n", service); + FIXME("Unknown service %08lx\n", service); return 0xffffffff; } }