system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 00:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ole2.dll16: Enable compilation with long types.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-16 08:12:10 +01:00 committed by Alexandre Julliard
parent 95df81e085
commit 438b379461
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/ole2.dll16/Makefile.in
View file

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = ole2.dll16 MODULE = ole2.dll16
IMPORTS = uuid ole32 user32 gdi32 IMPORTS = uuid ole32 user32 gdi32
EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll

6
dlls/ole2.dll16/memlockbytes.c
View file

@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt(
ULONG bytesReadBuffer = 0; ULONG bytesReadBuffer = 0;
ULONG bytesToReadFromBuffer; 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, * If the caller is not interested in the number of bytes read,
* we use another buffer to avoid "if" statements in the code. * 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); HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface);
HGLOBAL16 supportHandle; HGLOBAL16 supportHandle;
TRACE("(%p,%d)\n",This,libNewSize.u.LowPart); TRACE("(%p,%ld)\n",This,libNewSize.u.LowPart);
/* /*
* As documented. * As documented.
*/ */
@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt(
ULARGE_INTEGER newSize; ULARGE_INTEGER newSize;
ULONG bytesWritten = 0; 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, * If the caller is not interested in the number of bytes written,
* we use another buffer to avoid "if" statements in the code. * we use another buffer to avoid "if" statements in the code.

12
dlls/ole2.dll16/ole2.c
View file

@ -95,7 +95,7 @@ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*/ */
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{ {
FIXME("(%d,%p),stub!\n",reserved,pprot); FIXME("(%ld,%p),stub!\n",reserved,pprot);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -232,7 +232,7 @@ HRESULT WINAPI OleLoad16(
SEGPTR pClientSite, SEGPTR pClientSite,
LPVOID* ppvObj) 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; return E_NOTIMPL;
} }
@ -305,7 +305,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
HRESULT hres; HRESULT hres;
DWORD args[3]; DWORD args[3];
TRACE("(%x, %p)\n", pstg, pclsid); TRACE("(%lx, %p)\n", pstg, pclsid);
if (!pclsid) if (!pclsid)
return E_INVALIDARG16; return E_INVALIDARG16;
@ -330,7 +330,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
(LPDWORD)&hres (LPDWORD)&hres
)) { )) {
WOWGlobalUnlockFree16(args[1]); WOWGlobalUnlockFree16(args[1]);
ERR("CallTo16 IStorage16::Stat() failed, hres %x\n",hres); ERR("CallTo16 IStorage16::Stat() failed, hres %lx\n",hres);
return hres; return hres;
} }
memcpy(&statstg, MapSL(args[1]), sizeof(STATSTG16)); memcpy(&statstg, MapSL(args[1]), sizeof(STATSTG16));
@ -352,7 +352,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
HRESULT hres; HRESULT hres;
DWORD args[4]; DWORD args[4];
TRACE("(0x%x, %p)\n", stream, clsid); TRACE("(0x%lx, %p)\n", stream, clsid);
if (!clsid) if (!clsid)
return E_INVALIDARG16; return E_INVALIDARG16;
@ -386,7 +386,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
} }
else else
{ {
ERR("CallTo16 IStream16::Read() failed, hres %x\n", hres); ERR("CallTo16 IStream16::Read() failed, hres %lx\n", hres);
hres = E_FAIL; hres = E_FAIL;
} }
WOWGlobalUnlockFree16(args[1]); WOWGlobalUnlockFree16(args[1]);