Eric Pouech : ole2.dll16: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb 16 08:12:10 2022 +0100

ole2.dll16: 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/ole2.dll16/Makefile.in    |  1 -
 dlls/ole2.dll16/memlockbytes.c |  6 +++---
 dlls/ole2.dll16/ole2.c         | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in
index 1003f29c589..bb9fa89fd69 100644
--- a/dlls/ole2.dll16/Makefile.in
+++ b/dlls/ole2.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ole2.dll16
 IMPORTS   = uuid ole32 user32 gdi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c
index 9a246efdd15..d5ae041d6a2 100644
--- a/dlls/ole2.dll16/memlockbytes.c
+++ b/dlls/ole2.dll16/memlockbytes.c
@@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt(
   ULONG bytesReadBuffer = 0;
   ULONG bytesToReadFromBuffer;
 
-  TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead);
+  TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead);
   /*
    * If the caller is not interested in the number of bytes read,
    * we use another buffer to avoid "if" statements in the code.
@@ -339,7 +339,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize(
   HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface);
   HGLOBAL16 supportHandle;
 
-  TRACE("(%p,%d)\n",This,libNewSize.u.LowPart);
+  TRACE("(%p,%ld)\n",This,libNewSize.u.LowPart);
   /*
    * As documented.
    */
@@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt(
   ULARGE_INTEGER newSize;
   ULONG          bytesWritten = 0;
 
-  TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten);
+  TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten);
   /*
    * If the caller is not interested in the number of bytes written,
    * we use another buffer to avoid "if" statements in the code.
diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c
index 04b40b08635..8812bd21f0a 100644
--- a/dlls/ole2.dll16/ole2.c
+++ b/dlls/ole2.dll16/ole2.c
@@ -95,7 +95,7 @@ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
  */
 HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
-    FIXME("(%d,%p),stub!\n",reserved,pprot);
+    FIXME("(%ld,%p),stub!\n",reserved,pprot);
     return E_NOTIMPL;
 }
 
@@ -232,7 +232,7 @@ HRESULT WINAPI OleLoad16(
     SEGPTR		pClientSite,
     LPVOID*		ppvObj)
 {
-  FIXME("(%x,%s,%x,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
+  FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
   return E_NOTIMPL;
 }
 
@@ -305,7 +305,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
 	HRESULT	hres;
 	DWORD args[3];
 
-	TRACE("(%x, %p)\n", pstg, pclsid);
+	TRACE("(%lx, %p)\n", pstg, pclsid);
 
 	if (!pclsid)
 	    return E_INVALIDARG16;
@@ -330,7 +330,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
 	    (LPDWORD)&hres
 	)) {
 	    WOWGlobalUnlockFree16(args[1]);
-            ERR("CallTo16 IStorage16::Stat() failed, hres %x\n",hres);
+            ERR("CallTo16 IStorage16::Stat() failed, hres %lx\n",hres);
 	    return hres;
 	}
 	memcpy(&statstg, MapSL(args[1]), sizeof(STATSTG16));
@@ -352,7 +352,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
     HRESULT hres;
     DWORD args[4];
 
-    TRACE("(0x%x, %p)\n", stream, clsid);
+    TRACE("(0x%lx, %p)\n", stream, clsid);
 
     if (!clsid)
         return E_INVALIDARG16;
@@ -386,7 +386,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
     }
     else
     {
-        ERR("CallTo16 IStream16::Read() failed, hres %x\n", hres);
+        ERR("CallTo16 IStream16::Read() failed, hres %lx\n", hres);
         hres = E_FAIL;
     }
     WOWGlobalUnlockFree16(args[1]);