February 2022 - Wine-Commits

Eric Pouech : olesvr.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 91b19177c791ae62e2378638ee0b3ea033993df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b19177c791ae62e2378638… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:46 2022 +0100 olesvr.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr.dll16/Makefile.in | 1 - dlls/olesvr.dll16/olesvr.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index 49c07bdcc76..d894b588007 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 44e68228f4c..aee28df4340 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct, */ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) { - FIXME("%d - stub\n",hServer); + FIXME("%ld - stub\n",hServer); return OLE_OK; } @@ -157,7 +157,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); return OLE_OK; } @@ -166,7 +166,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -179,7 +179,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%d,%s): stub\n",hServer, docname); + FIXME("(%ld,%s): stub\n",hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -189,7 +189,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, */ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) { - FIXME("%d - stub\n",hServerDoc); + FIXME("%ld - stub\n",hServerDoc); return OLE_OK; } @@ -199,7 +199,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) */ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s): stub.\n", hDoc, newName); + FIXME("(%ld,%s): stub.\n", hDoc, newName); return OLE_OK; } @@ -209,7 +209,7 @@ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -219,6 +219,6 @@ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; }

1 0

Eric Pouech : ole2disp.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 95df81e085897f2fe3eaa8f981ff54df19b6c662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95df81e085897f2fe3eaa8f9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:04 2022 +0100 ole2disp.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/Makefile.in | 1 - dlls/ole2disp.dll16/ole2disp.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in index c1dbbea0df7..86100fe146a 100644 --- a/dlls/ole2disp.dll16/Makefile.in +++ b/dlls/ole2disp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ole2disp.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 53239598418..8318ae863e5 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -253,7 +253,7 @@ HRESULT WINAPI SafeArrayAllocData16(SAFEARRAY16 *sa) */ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) { - TRACE("0x%08x\n", s); + TRACE("0x%08lx\n", s); if (s) { @@ -479,7 +479,7 @@ HRESULT WINAPI CreateDispTypeInfo16( LCID lcid, ITypeInfo **pptinfo) { - FIXME("(%p,%d,%p),stub\n",pidata,lcid,pptinfo); + FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo); return E_NOTIMPL; } @@ -503,7 +503,7 @@ HRESULT WINAPI CreateStdDispatch16( HRESULT WINAPI RegisterActiveObject16( IUnknown *punk, REFCLSID rclsid, DWORD dwFlags, unsigned long *pdwRegister ) { - FIXME("(%p,%s,0x%08x,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); + FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); return E_NOTIMPL; } @@ -512,7 +512,7 @@ HRESULT WINAPI RegisterActiveObject16( */ HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LCID lcid, USHORT flags, VARTYPE vt) { - FIXME("stub: %p %p %d %d %d\n", dest, src, lcid, flags, vt); + FIXME("stub: %p %p %ld %d %d\n", dest, src, lcid, flags, vt); return E_INVALIDARG; } @@ -521,7 +521,7 @@ HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LC */ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) { - FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); + FIXME("stub: (%ld, %p)\n", dwReserved, perrinfo); return E_INVALIDARG; }

1 0

Eric Pouech : newdev: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 6a213b1c67cc9f668bd65c0540225d37bd42771d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a213b1c67cc9f668bd65c05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:28 2022 +0100 newdev: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/Makefile.in | 1 - dlls/newdev/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index 25f2fea0518..c447a388614 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 72e7cbc690d..54f572c3d08 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -101,11 +101,11 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar DIF_NEWDEVICEWIZARD_FINISHINSTALL, }; - TRACE("parent %p, hardware_id %s, inf_path %s, flags %#x, reboot %p.\n", + TRACE("parent %p, hardware_id %s, inf_path %s, flags %#lx, reboot %p.\n", parent, debugstr_w(hardware_id), debugstr_w(inf_path), flags, reboot); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (reboot) *reboot = FALSE; @@ -154,7 +154,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar */ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); return TRUE; } @@ -163,6 +163,6 @@ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOO */ BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); return TRUE; }

1 0

Eric Pouech : mfplat: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: d9ade7461ed3398723319f452edb31533c03b7c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ade7461ed3398723319f45… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:26 2022 +0100 mfplat: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 - dlls/mfplat/buffer.c | 28 ++++----- dlls/mfplat/main.c | 144 +++++++++++++++++++++---------------------- dlls/mfplat/mediatype.c | 36 +++++------ dlls/mfplat/mfplat_private.h | 4 +- dlls/mfplat/queue.c | 8 +-- dlls/mfplat/sample.c | 26 ++++---- 7 files changed, 123 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9ade7461ed339872331…

1 0

Eric Pouech : oledb32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 8bbe1e45eeb363278a2f284694ec5cb112c21dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbe1e45eeb363278a2f2846… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:28 2022 +0100 oledb32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/Makefile.in | 1 - dlls/oledb32/convert.c | 10 +++++----- dlls/oledb32/datainit.c | 22 +++++++++++----------- dlls/oledb32/dslocator.c | 30 +++++++++++++++--------------- dlls/oledb32/errorinfo.c | 16 ++++++++-------- dlls/oledb32/rowpos.c | 8 ++++---- 6 files changed, 43 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bbe1e45eeb363278a2f…

1 0

Eric Pouech : olecli.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: c2fae439442e32ac25329bb613685d2d4f8f1157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2fae439442e32ac25329bb6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:22 2022 +0100 olecli.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olecli.dll16/Makefile.in | 1 - dlls/olecli.dll16/olecli.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in index deb080b7282..40a2446b61e 100644 --- a/dlls/olecli.dll16/Makefile.in +++ b/dlls/olecli.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index 599312e5491..805d9ecee4b 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -89,7 +89,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc) { - FIXME("(%d: stub\n", hDoc); + FIXME("(%ld: stub\n", hDoc); return OLE_OK; } @@ -109,7 +109,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, */ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s,...): stub\n",hDoc, newName); + FIXME("(%ld,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -118,7 +118,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -127,7 +127,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) */ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n", hServerDoc); + FIXME("(%ld): stub\n", hServerDoc); return OLE_OK; } @@ -136,7 +136,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) */ OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data) { - FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data), + FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data), LOWORD(data)); return OLE_OK; } @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDO LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK; @@ -195,7 +195,7 @@ OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hc LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK;

1 0

Eric Pouech : ole2.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 438b37946113c0267c818a9041f9ee9da0f8ce3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=438b37946113c0267c818a90… Author: Eric Pouech <eric.pouech(a)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(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)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]);

1 0

Eric Pouech : odbc32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 773bdcf7decd0bbbafa9b117535917def5732d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773bdcf7decd0bbbafa9b117… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:52 2022 +0100 odbc32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/Makefile.in | 1 - dlls/odbc32/proxyodbc.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 75ac6d1f309..def7b4b5d67 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbc32.dll UNIXLIB = odbc32.so IMPORTLIB = odbc32 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..c1cb44c29fc 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -107,14 +107,14 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating driver %s\n", + TRACE ("Error %ld replicating driver %s\n", reg_ret, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for %s in drivers\n", + TRACE ("Error %ld checking for %s in drivers\n", reg_ret, desc); success = FALSE; } @@ -131,12 +131,12 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) */ if ((reg_ret = RegCloseKey (hThis)) != ERROR_SUCCESS) - TRACE ("Error %d closing %s key\n", reg_ret, + TRACE ("Error %ld closing %s key\n", reg_ret, desc); } else { - TRACE ("Error %d ensuring driver key %s\n", + TRACE ("Error %ld ensuring driver key %s\n", reg_ret, desc); success = FALSE; } @@ -155,21 +155,21 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { - TRACE ("Error %d closing hDrivers\n", reg_ret); + TRACE ("Error %ld closing hDrivers\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); } if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) { - TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } if (!success) { @@ -242,26 +242,26 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating description of " + TRACE ("Error %ld replicating description of " "%s(%s)\n", reg_ret, dsn, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for description of %s\n", + TRACE ("Error %ld checking for description of %s\n", reg_ret, dsn); success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s DSN key %s\n", + TRACE ("Error %ld closing %s DSN key %s\n", reg_ret, which, dsn); } } else { - TRACE ("Error %d opening %s DSN key %s\n", + TRACE ("Error %ld opening %s DSN key %s\n", reg_ret, which, dsn); success = FALSE; } @@ -281,13 +281,13 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, + TRACE ("Error %ld closing %s ODBC.INI registry key\n", reg_ret, which); } } else { - TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", + TRACE ("Error %ld creating/opening %s ODBC.INI registry key\n", reg_ret, which); } if (!success) @@ -421,7 +421,7 @@ SQLRETURN WINAPI SQLAllocHandleStd(SQLSMALLINT HandleType, SQLHANDLE InputHandle static const char *debugstr_sqllen( SQLLEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%ld", len ); + return wine_dbg_sprintf( "%Id", len ); #else return wine_dbg_sprintf( "%d", len ); #endif @@ -448,7 +448,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, static const char *debugstr_sqlulen( SQLULEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%lu", len ); + return wine_dbg_sprintf( "%Iu", len ); #else return wine_dbg_sprintf( "%u", len ); #endif @@ -2648,7 +2648,7 @@ SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); + TRACE("proxy ODBC: %p,%lx,%p\n", hinstDLL, reason, reserved); switch (reason) {

1 0

Eric Pouech : ntoskrnl.exe: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: c23de9794600a2c4683024d209f7c22e213723d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c23de9794600a2c4683024d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:40 2022 +0100 ntoskrnl.exe: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 1 - dlls/ntoskrnl.exe/instr.c | 30 +++++----- dlls/ntoskrnl.exe/ntoskrnl.c | 132 +++++++++++++++++++++--------------------- dlls/ntoskrnl.exe/pnp.c | 62 ++++++++++---------- dlls/ntoskrnl.exe/sync.c | 26 ++++----- 5 files changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c23de9794600a2c46830…

1 0

Eric Pouech : ntdsapi: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 23bd3bc237cc90498af8282f5d40dd40d1e367cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bd3bc237cc90498af8282f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:34 2022 +0100 ntdsapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 1 - dlls/ntdsapi/ntdsapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 350a1e2aa5b..263b0d45333 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 2438197a7a3..a6b6c90c9d7 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -218,7 +218,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const CHAR **names, PDS_NAME_RESULTA *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -228,6 +228,6 @@ DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT of DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const WCHAR **names, PDS_NAME_RESULTW *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0