Eric Pouech : vmm.vxd: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6d376641f5ba26d654d7cd4c44642c9bba69126a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6d376641f5ba26d654d7cd4c4...

Author: Eric Pouech 
Date:   Mon Feb 21 07:58:49 2022 +0100

vmm.vxd: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

dlls/vmm.vxd/Makefile.in |  1 -
 dlls/vmm.vxd/vmm.c       | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in
index 9d4818c1926..28a5302f532 100644
--- a/dlls/vmm.vxd/Makefile.in
+++ b/dlls/vmm.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vmm.vxd

C_SRCS = \
diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c
index 373e826efe8..699f1444206 100644
--- a/dlls/vmm.vxd/vmm.c
+++ b/dlls/vmm.vxd/vmm.c
@@ -144,7 +144,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG npages = stack32_pop( context );
         ULONG flags  = stack32_pop( context );

-        TRACE("PageReserve: page: %08x, npages: %08x, flags: %08x partial stub!\n",
+        TRACE("PageReserve: page: %08lx, npages: %08lx, flags: %08lx partial stub!\n",
               page, npages, flags );

if ( page == PR_SYSTEM ) {
@@ -175,8 +175,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG pagerdata   = stack32_pop( context );
         ULONG flags  = stack32_pop( context );

-        TRACE("PageCommit: page: %08x, npages: %08x, hpd: %08x pagerdata: "
-              "%08x, flags: %08x partial stub\n",
+        TRACE("PageCommit: page: %08lx, npages: %08lx, hpd: %08lx pagerdata: "
+              "%08lx, flags: %08lx partial stub\n",
               page, npages, hpd, pagerdata, flags );

if ( flags & PC_USER )
@@ -202,7 +202,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG npages = stack32_pop( context );
         ULONG flags = stack32_pop( context );

-        TRACE("PageDecommit: page: %08x, npages: %08x, flags: %08x partial stub\n",
+        TRACE("PageDecommit: page: %08lx, npages: %08lx, flags: %08lx partial stub\n",
               page, npages, flags );
         address = (LPVOID )( page * page_size );
         ret = VirtualFree ( address, npages * page_size, MEM_DECOMMIT );
@@ -223,7 +223,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG permand = stack32_pop ( context );
         ULONG permor = stack32_pop ( context );

-        TRACE("PageModifyPermissions %08x %08x %08x %08x partial stub\n",
+        TRACE("PageModifyPermissions %08lx %08lx %08lx %08lx partial stub\n",
               page, npages, permand, permor );
         address = (LPVOID )( page * page_size );

@@ -264,7 +264,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
           ERR("Can't change page permissions for %p\n", address );
           return 0xffffffff;
         }
-        TRACE("Returning: %08x\n", pg_old_perm );
+        TRACE("Returning: %08lx\n", pg_old_perm );
         return pg_old_perm;
     }

@@ -274,7 +274,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         LPVOID hmem = (LPVOID) stack32_pop( context );
         DWORD flags = stack32_pop( context );

-        TRACE("PageFree: hmem: %p, flags: %08x partial stub\n",
+        TRACE("PageFree: hmem: %p, flags: %08lx partial stub\n",
               hmem, flags );

ret = VirtualFree ( hmem, 0, MEM_RELEASE );
@@ -413,7 +413,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
           * implementation of this.
           */

-         FIXME("GetDemandPageInfo(%08x %08x): stub!\n", dinfo, flags);
+         FIXME("GetDemandPageInfo(%08lx %08lx): stub!\n", dinfo, flags);

return 0;
     }
@@ -462,10 +462,10 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )

default:
         if (LOWORD(service) < N_VMM_SERVICE)
-            FIXME( "Unimplemented service %s (%08x)\n",
+            FIXME( "Unimplemented service %s (%08lx)\n",
                    VMM_Service_Name[LOWORD(service)], service);
         else
-            FIXME( "Unknown service %08x\n", service);
+            FIXME( "Unknown service %08lx\n", service);
         return 0xffffffff;  /* FIXME */
     }
 }