Eric Pouech : dispex: Enable compilation with long types.

Alexandre Julliard julliard at winehq.org
Wed Feb 9 16:03:48 CST 2022


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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb  9 09:27:10 2022 +0100

dispex: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dispex/Makefile.in  | 1 -
 dlls/dispex/usrmarshal.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in
index a40e2b49215..98a05926727 100644
--- a/dlls/dispex/Makefile.in
+++ b/dlls/dispex/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dispex.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 
diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c
index 6e3c7239f16..4c837b53397 100644
--- a/dlls/dispex/usrmarshal.c
+++ b/dlls/dispex/usrmarshal.c
@@ -50,7 +50,7 @@ HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID l
     UINT *ref_idx = &dummy_idx;
     DWORD dword_flags = wFlags & 0xf;
 
-    TRACE("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,
+    TRACE("(%p)->(%08lx, %04lx, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,
           pdp, pvarRes, pei, pspCaller);
 
     if(!pvarRes)
@@ -118,7 +118,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID
     UINT arg;
     VARTYPE *vt_list = NULL;
 
-    TRACE("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags,
+    TRACE("(%p)->(%08lx, %04lx, %08lx, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags,
           pdp, result, pei, pspCaller, byref_args, ref_idx, ref_arg);
 
     VariantInit(result);




More information about the wine-cvs mailing list