February 2022 - Wine-commits

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

16 Feb '22

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 : ntprint: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 06111f34d8fc096beca5e8b610c1acf8fc57004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=06111f34d8fc096beca5e8b6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:46 2022 +0100 ntprint: 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/ntprint/Makefile.in | 1 - dlls/ntprint/ntprint.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index bdfe69a69e6..2ca355140d9 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntprint.dll IMPORTS = winspool diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 6a4cb57c7f6..e89929a0ba1 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -51,7 +51,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) DWORD needed; DWORD res; - TRACE("(%d, %s)\n", unknown1, debugstr_w(server)); + TRACE("(%ld, %s)\n", unknown1, debugstr_w(server)); mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); if (!mi) { @@ -71,7 +71,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) return NULL; } - TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + TRACE("=> %p (%lu monitors installed)\n", mi, mi->installed); return mi; } @@ -118,14 +118,14 @@ BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LP LPWSTR nameW; DWORD len; - TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + TRACE("(%p, %lu, %p, %p) => %ld\n", mi, index, buffer, psize, psize ? *psize : 0); if (index < mi->installed) { nameW = mi->mi2[index].pName; len = lstrlenW(nameW) + 1; if (len <= *psize) { memcpy(buffer, nameW, len * sizeof(WCHAR)); - TRACE("#%u: %s\n", index, debugstr_w(buffer)); + TRACE("#%lu: %s\n", index, debugstr_w(buffer)); return TRUE; } *psize = len;

1 0

Eric Pouech : odbc32: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

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 : odbccp32: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: c54cad850bcced6ad8abd11fbabbdbd487770253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c54cad850bcced6ad8abd11f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:58 2022 +0100 odbccp32: 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/odbccp32/Makefile.in | 1 - dlls/odbccp32/odbccp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index ec36870b114..77308270728 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1c46584cd29..131cb158ed6 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -108,7 +108,7 @@ static inline WCHAR *heap_strdupAtoW(const char *str) BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { clear_errors(); - FIXME( "( %d %d %p %p) : stub!\n", i, j, p1, p2); + FIXME( "( %ld %ld %p %p) : stub!\n", i, j, p1, p2); return FALSE; } @@ -977,7 +977,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons /* Store Usage */ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); for (; *p; p += lstrlenW(p) + 1) { @@ -1399,14 +1399,14 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd) SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_w(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_w(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_a(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_a(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1460,7 +1460,7 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) { @@ -1584,7 +1584,7 @@ BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) {

1 0

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

16 Feb '22

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 : ole2.dll16: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

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 : olecli32: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 430c875481b913a0740c9e9eedddf1ccbebbbfe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=430c875481b913a0740c9e9e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:16 2022 +0100 olecli32: 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/olecli32/Makefile.in | 1 - dlls/olecli32/olecli_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 54dc54d02ac..0eca46ff269 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index ebffc0fda6a..38ffd48b0f0 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -88,7 +88,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc) { - FIXME("(%d: stub\n", hDoc); + FIXME("(%ld: stub\n", hDoc); return OLE_OK; } @@ -108,7 +108,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname, */ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s,...): stub\n",hDoc, newName); + FIXME("(%ld,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -117,7 +117,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -128,7 +128,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); return OLE_OK; } @@ -137,7 +137,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( * OleQueryLinkFromClip [OLECLI32.9] */ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -145,7 +145,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO * OleQueryCreateFromClip [OLECLI32.10] */ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -185,7 +185,7 @@ OLESTATUS WINAPI OleCreateFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); /* clipb type, object kreieren entsprechend etc. */ return OLE_OK;

1 0

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

16 Feb '22

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 : oledb32: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

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 : oledlg: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 189b62723b3457e46bfc51c9ca55ff06edcfa1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189b62723b3457e46bfc51c9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:34 2022 +0100 oledlg: 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/oledlg/Makefile.in | 1 - dlls/oledlg/oledlg_main.c | 2 +- dlls/oledlg/pastespl.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 1d1113a7876..4a16469a456 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index df53ad709ad..33e62f64935 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -84,7 +84,7 @@ static void register_messages(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 2593fd559d2..b716036f15f 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -78,7 +78,7 @@ static void dump_ps_flags(DWORD flags) strcat(flagstr, "|"); } } - TRACE("flags %08x %s\n", flags, flagstr); + TRACE("flags %08lx %s\n", flags, flagstr); } static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) @@ -87,7 +87,7 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) UINT j; dump_ps_flags(ps->dwFlags); - TRACE("hwnd %p caption %s hook %p custdata %lx\n", + TRACE("hwnd %p caption %s hook %p custdata %Ix\n", ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); if(IS_INTRESOURCE(ps->lpszTemplate)) TRACE("hinst %p template %04x hresource %p\n", ps->hInstance, (WORD)(ULONG_PTR)ps->lpszTemplate, ps->hResource); @@ -96,16 +96,16 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) TRACE("dataobj %p arrpasteent %p cpasteent %d arrlinktype %p clinktype %d\n", ps->lpSrcDataObj, ps->arrPasteEntries, ps->cPasteEntries, ps->arrLinkTypes, ps->cLinkTypes); - TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%d,%d)\n", + TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%ld,%ld)\n", ps->cClsidExclude, ps->lpClsidExclude, ps->nSelectedIndex, ps->fLink, ps->hMetaPict, ps->sizel.cx, ps->sizel.cy); for(i = 0; i < ps->cPasteEntries; i++) { - TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %d lindex %d tymed %d\n", + TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %ld lindex %ld tymed %ld\n", i, ps->arrPasteEntries[i].fmtetc.cfFormat, ps->arrPasteEntries[i].fmtetc.ptd, ps->arrPasteEntries[i].fmtetc.dwAspect, ps->arrPasteEntries[i].fmtetc.lindex, ps->arrPasteEntries[i].fmtetc.tymed); - TRACE("\tformat name %s result text %s flags %04x\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), + TRACE("\tformat name %s result text %s flags %04lx\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), debugstr_w(ps->arrPasteEntries[i].lpstrResultText), ps->arrPasteEntries[i].dwFlags); } for(i = 0; i < ps->cLinkTypes; i++) @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) /* The native version grabs only the first 20 fmts and we do the same */ hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); - TRACE("got %d formats hr %08x\n", fetched, hr); + TRACE("got %ld formats hr %08lx\n", fetched, hr); if(SUCCEEDED(hr)) { @@ -271,7 +271,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) if(hr == S_OK) supported_mask |= 1 << link; } - TRACE("supported_mask %02x\n", supported_mask); + TRACE("supported_mask %02lx\n", supported_mask); for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) { DWORD linktypes; @@ -515,7 +515,7 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0}; ps_struct_t *ps_struct; - TRACE("(%p, %04x, %08lx, %08lx)\n", hdlg, msg, wp, lp); + TRACE("(%p, %04x, %08Ix, %08Ix)\n", hdlg, msg, wp, lp); ps_struct = GetPropW(hdlg, prop_name);

1 0