wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : twain_32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f2eac52cd632c28b3c5a57a3da4a240de820adce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2eac52cd632c28b3c5a57a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:40 2022 +0100 twain_32: 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/twain_32/Makefile.in | 1 - dlls/twain_32/dsm_ctrl.c | 2 +- dlls/twain_32/twain32_main.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index 8919b82000a..c82b5a74453 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = twain_32.dll IMPORTS = user32 diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index f8ec539ba85..6854093017a 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) userselect_data param = {pOrigin, pData}; HWND parent = DSM_parent; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%lx ProductName=%s\n", pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); twain_autodetect(); diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 0f8ee144306..a8b11a9bbfe 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { - TRACE("%p,%x,%p\n", hinstance, reason, reserved); + TRACE("%p,%lx,%p\n", hinstance, reason, reserved); switch (reason) { @@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); if (DG == DG_CONTROL && DAT == DAT_NULL) { @@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, } DSM_twCC = TWCC_SUCCESS; - TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); + TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData); TRACE("return value is %d\n", twRC); return twRC; @@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData); break; default: - FIXME("The DSM does not handle DG %d\n", DG); + FIXME("The DSM does not handle DG %ld\n", DG); DSM_twCC = TWCC_BADPROTOCOL; twRC = TWRC_FAILURE; }

1 0

Eric Pouech : traffic: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 56f0485da75978d0287ab774d6deeb031c63f1d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f0485da75978d0287ab774… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:34 2022 +0100 traffic: 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/traffic/Makefile.in | 1 - dlls/traffic/traffic_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index bef639c0a98..633355f93ec 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = traffic.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 87646622346..c551d8bcc30 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, PTCI_CLIENT_FUNC_LIST list, PHANDLE buffer) { - FIXME("(%u %p %p %p) stub\n", version, context, list, buffer); + FIXME("(%lu %p %p %p) stub\n", version, context, list, buffer); if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

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

18 Feb '22

Module: wine Branch: master Commit: 66b171d2bc68bbe54edc67061514d24c90ac109e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b171d2bc68bbe54edc6706… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:28 2022 +0100 toolhelp.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/toolhelp.dll16/Makefile.in | 1 - dlls/toolhelp.dll16/toolhelp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 7e39aa9c7cb..64d0de31528 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = toolhelp.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 57a95fb8d8f..1bec37c505e 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -552,7 +552,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, { int i; - FIXME("(%x,%x,%x), semi-stub.\n", + FIXME("(%x,%lx,%x), semi-stub.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++)

1 0

Eric Pouech : taskschd: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f925d0d8c4d3c0c711d6642101d800b2197cb2e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f925d0d8c4d3c0c711d66421… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:22 2022 +0100 taskschd: 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/taskschd/Makefile.in | 1 - dlls/taskschd/folder.c | 28 ++++++------- dlls/taskschd/folder_collection.c | 10 ++--- dlls/taskschd/regtask.c | 22 +++++------ dlls/taskschd/task.c | 82 +++++++++++++++++++-------------------- 5 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f925d0d8c4d3c0c711d6…

1 0

Eric Pouech : tapi32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: e0c75af0f65cc830079cdd2271e148514ca1d876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c75af0f65cc830079cdd22… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:16 2022 +0100 tapi32: 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/tapi32/Makefile.in | 1 - dlls/tapi32/line.c | 148 ++++++++++++++++++++++++------------------------ dlls/tapi32/phone.c | 38 ++++++------- 3 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0c75af0f65cc830079c…

1 0

Eric Pouech : sxs: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 334b3f2b5c645340c4910b068c5e483e2e8c333b URL: https://source.winehq.org/git/wine.git/?a=commit;h=334b3f2b5c645340c4910b06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:10 2022 +0100 sxs: 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/sxs/Makefile.in | 1 - dlls/sxs/cache.c | 22 +++++++++++----------- dlls/sxs/name.c | 12 ++++++------ dlls/sxs/sxs.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 27a5c58bdd0..867ea270f3d 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e4fdda8c860..02403501231 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( unsigned int len; HRESULT hr; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); if (flags || (info && info->cbAssemblyInfo != sizeof(*info))) return E_INVALIDARG; @@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem( IAssemblyCacheItem **item, LPCWSTR name ) { - FIXME("%p, 0x%08x, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); + FIXME("%p, 0x%08lx, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); return E_NOTIMPL; } @@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) hr = IXMLDOMNodeList_get_length( list, &len ); if (hr != S_OK) goto done; - TRACE("found %d files\n", len); + TRACE("found %ld files\n", len); if (!len) { hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; @@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy policy manifest file 0x%08x\n", hr); + WARN("failed to copy policy manifest file 0x%08lx\n", hr); return hr; } return S_OK; @@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy manifest file 0x%08x\n", hr); + WARN("failed to copy manifest file 0x%08lx\n", hr); return hr; } @@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy file 0x%08x\n", hr); + WARN("failed to copy file 0x%08lx\n", hr); goto done; } } @@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly( IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(path), ref); cache_lock( cache ); init = CoInitialize( NULL ); @@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); - if (!DeleteFileW( filename )) WARN( "failed to delete file %u\n", GetLastError() ); + if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, filename ); } RemoveDirectoryW( dirname ); @@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly( const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL; - TRACE("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); + TRACE("%p, 0x%08lx, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); if (ref) { @@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly( if ((hr = load_manifest( doc, path )) != S_OK) goto done; if ((hr = parse_assembly( doc, &assembly )) != S_OK) goto done; - if (!DeleteFileW( path )) WARN( "unable to remove manifest file %u\n", GetLastError() ); + if (!DeleteFileW( path )) WARN( "unable to remove manifest file %lu\n", GetLastError() ); else if ((p = wcsrchr( path, '\\' ))) { *p = 0; @@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) { struct cache *cache; - TRACE("%p, %u\n", obj, reserved); + TRACE("%p, %lu\n", obj, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 0fab45c5018..29368b6d788 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty( LPVOID property, DWORD size ) { - FIXME("%p, %d, %p, %d\n", iface, id, property, size); + FIXME("%p, %ld, %p, %ld\n", iface, id, property, size); return E_NOTIMPL; } @@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty( LPVOID buffer, LPDWORD buflen ) { - FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + FIXME("%p, %ld, %p, %p\n", iface, id, buffer, buflen); return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName( struct name *name = impl_from_IAssemblyName( iface ); unsigned int len; - TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + TRACE("%p, %p, %p, 0x%08lx\n", iface, buffer, buflen, flags); if (!buflen || flags) return E_INVALIDARG; @@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved( DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %ld, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual( IAssemblyName *name2, DWORD flags ) { - FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + FIXME("%p, %p, 0x%08lx\n", name1, name2, flags); return E_NOTIMPL; } @@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject( struct name *name; HRESULT hr; - TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + TRACE("%p, %s, 0x%08lx, %p\n", obj, debugstr_w(assembly), flags, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 2fa4dc0262b..934aa9345c8 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff char *ret_strings; ULONG_PTR cookie; - TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#lx, %s, %p, %p, %Ix, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX)

1 0

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

18 Feb '22

Module: wine Branch: master Commit: bd575863f45cb449cb04d0d843c73d4f9c836d57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd575863f45cb449cb04d0d8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:04 2022 +0100 stress.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/stress.dll16/Makefile.in | 1 - dlls/stress.dll16/stress.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in index 76731e716d6..0c93384c33e 100644 --- a/dlls/stress.dll16/Makefile.in +++ b/dlls/stress.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = stress.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/stress.dll16/stress.c b/dlls/stress.dll16/stress.c index be292d9d58a..f3c845b988c 100644 --- a/dlls/stress.dll16/stress.c +++ b/dlls/stress.dll16/stress.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(stress); */ INT16 WINAPI AllocDiskSpace(LONG lLeft, UINT16 uDrive) { - FIXME("(%d, %d) - stub\n", + FIXME("(%d, %ld) - stub\n", uDrive, lLeft); return 1; @@ -62,7 +62,7 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) */ BOOL16 WINAPI AllocMem(DWORD dwLeft) { - FIXME("(%d) - stub\n", dwLeft); + FIXME("(%ld) - stub\n", dwLeft); return TRUE; }

1 0

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

18 Feb '22

Module: wine Branch: master Commit: fcfab4e5a902a4f8cac356778244feee4b310d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcfab4e5a902a4f8cac35677… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:57 2022 +0100 storage.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/storage.dll16/Makefile.in | 1 - dlls/storage.dll16/storage.c | 58 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in index 69a06475c55..f390aca7dd9 100644 --- a/dlls/storage.dll16/Makefile.in +++ b/dlls/storage.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = storage.dll16 IMPORTS = uuid ole32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 1bcc72065ce..d2f91a77b46 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -345,12 +345,12 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("(%p,%d,%p), seek failed (%d)\n",str->hf, n, block, GetLastError()); + WARN("(%p,%d,%p), seek failed (%ld)\n",str->hf, n, block, GetLastError()); return FALSE; } if (!ReadFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN("(hf=%p, block size %d): read didn't read (%d)\n",str->hf,n,GetLastError()); + WARN("(hf=%p, block size %d): read didn't read (%ld)\n",str->hf,n,GetLastError()); return FALSE; } } else { @@ -374,7 +374,7 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return FALSE; } memcpy(block, MapSL(args[3]), BIGSIZE); @@ -406,7 +406,7 @@ _ilockbytes16_writeat(SEGPTR lockbytes, DWORD offset, DWORD length, void *buffer (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %lx\n",hres); return FALSE; } UnMapLS(args[3]); @@ -426,12 +426,12 @@ STORAGE_put_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("seek failed (%d)\n",GetLastError()); + WARN("seek failed (%ld)\n",GetLastError()); return FALSE; } if (!WriteFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN(" write failed (%d)\n",GetLastError()); + WARN(" write failed (%ld)\n",GetLastError()); return FALSE; } return TRUE; @@ -710,9 +710,9 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { return; TRACE("name: %s\n",name); TRACE("type: %d\n",stde->pps_type); - TRACE("prev pps: %d\n",stde->pps_prev); - TRACE("next pps: %d\n",stde->pps_next); - TRACE("dir pps: %d\n",stde->pps_dir); + TRACE("prev pps: %ld\n",stde->pps_prev); + TRACE("next pps: %ld\n",stde->pps_next); + TRACE("dir pps: %ld\n",stde->pps_dir); TRACE("guid: %s\n",debugstr_guid(&(stde->pps_guid))); if (stde->pps_type !=2) { time_t t; @@ -724,8 +724,8 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { t = dw; TRACE("ts2: %s\n",ctime(&t)); } - TRACE("startblock: %d\n",stde->pps_sb); - TRACE("size: %d\n",stde->pps_size); + TRACE("startblock: %ld\n",stde->pps_sb); + TRACE("size: %ld\n",stde->pps_size); } /****************************************************************************** @@ -1102,7 +1102,7 @@ _ilockbytes16_addref(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::AddRef() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::AddRef() failed, hres %lx\n",hres); } static void @@ -1120,7 +1120,7 @@ _ilockbytes16_release(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Release() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Release() failed, hres %lx\n",hres); } static void @@ -1138,7 +1138,7 @@ _ilockbytes16_flush(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Flush() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Flush() failed, hres %lx\n",hres); } /****************************************************************************** @@ -1176,7 +1176,7 @@ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whe ULARGE_INTEGER *newpos) { IStream16Impl *This = impl_from_IStream16(iface); - TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); + TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); switch (whence) { case STREAM_SEEK_SET: @@ -1213,7 +1213,7 @@ HRESULT CDECL IStream16_fnRead(IStream16 *iface, void *pv, ULONG cb, ULONG *pcbR int blocknr; LPBYTE pbv = pv; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbRead); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbRead); if (!pcbRead) bytesread=&xxread; *bytesread = 0; @@ -1277,7 +1277,7 @@ HRESULT CDECL IStream16_fnWrite(IStream16 *iface, const void *pv, ULONG cb, ULON if (!pcbWrite) byteswritten=&xxwritten; *byteswritten = 0; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbWrite); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbWrite); /* do we need to junk some blocks? */ newsize = This->offset.u.LowPart+cb; oldsize = This->stde.pps_size; @@ -1647,7 +1647,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr DWORD len = WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, NULL, 0, NULL, NULL ); LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, len ); - TRACE("(%p)->(%p,0x%08x)\n", + TRACE("(%p)->(%p,0x%08lx)\n", This,pstatstg,grfStatFlag ); WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, nameA, len, NULL, NULL ); @@ -1671,7 +1671,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr HRESULT CDECL IStorage16_fnCommit(IStorage16 *iface, DWORD commitflags) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("(%p)->(0x%08x),STUB!\n", + FIXME("(%p)->(0x%08lx),STUB!\n", This,commitflags ); return S_OK; @@ -1684,7 +1684,7 @@ HRESULT CDECL IStorage16_fnCopyTo(IStorage16 *iface, DWORD ciidExclude, const II SNB16 SNB16Exclude, IStorage16 *pstgDest) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("IStorage16(%p)->(0x%08x,%s,%p,%p),stub!\n", + FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n", This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest ); return S_OK; @@ -1706,7 +1706,7 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName int nPPSEntries; READ_HEADER(&This->str); - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,dwStgFormat,reserved2,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1773,7 +1773,7 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, BOOL ret; int nPPSEntries; - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,reserved1,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1835,7 +1835,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,%p,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,%p,0x%08lx,%p)\n", This,pwcsName,pstgPrio,grfMode,snbExclude,reserved,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1877,7 +1877,7 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,0x%08lx,%p)\n", This,pwcsName,reserved1,grfMode,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1990,13 +1990,13 @@ HRESULT WINAPI StgCreateDocFile16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,0x%08x,0x%08x,%p)\n", + TRACE("(%s,0x%08lx,0x%08lx,%p)\n", pwcsName,grfMode,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0); if (hf==INVALID_HANDLE_VALUE) { - WARN("couldn't open file for storage:%d\n",GetLastError()); + WARN("couldn't open file for storage:%ld\n",GetLastError()); return E_FAIL; } lpstg = MapSL((SEGPTR)*ppstgOpen); @@ -2051,7 +2051,7 @@ HRESULT WINAPI StgOpenStorage16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,%p,0x%08x,%p,%d,%p)\n", + TRACE("(%s,%p,0x%08lx,%p,%ld,%p)\n", pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); @@ -2106,7 +2106,7 @@ HRESULT WINAPI StgIsStorageILockBytes16(SEGPTR plkbyt) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return hres; } if (memcmp(MapSL(args[3]), STORAGE_magic, sizeof(STORAGE_magic)) == 0) { @@ -2135,7 +2135,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16( int i,ret; struct storage_pps_entry stde; - FIXME("(%x, %p, 0x%08x, %d, %x, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); + FIXME("(%lx, %p, 0x%08lx, %d, %lx, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); if ((plkbyt == 0) || (ppstgOpen == 0)) return STG_E_INVALIDPOINTER;

1 0

Eric Pouech : sti: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 125760501f8392f1818901add53aa46ab1fffdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=125760501f8392f1818901ad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:51 2022 +0100 sti: 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/sti/Makefile.in | 1 - dlls/sti/sti.c | 14 +++++++------- dlls/sti/sti_main.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 162205a5bf6..f6e542c64d5 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 0bb60382979..e079b9f2bb8 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -70,7 +70,7 @@ static ULONG WINAPI stillimagew_Release(IStillImageW *iface) static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) { stillimage *This = impl_from_IStillImageW(iface); - TRACE("(%p, %p, 0x%X)\n", This, hinst, dwVersion); + TRACE("(%p, %p, 0x%lX)\n", This, hinst, dwVersion); return S_OK; } @@ -78,7 +78,7 @@ static HRESULT WINAPI stillimagew_GetDeviceList(IStillImageW *iface, DWORD dwTyp DWORD *pdwItemsReturned, LPVOID *ppBuffer) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, 0x%X, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); + FIXME("(%p, %lu, 0x%lX, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); return E_NOTIMPL; } @@ -94,7 +94,7 @@ static HRESULT WINAPI stillimagew_CreateDevice(IStillImageW *iface, LPWSTR pwszD PSTIDEVICEW *pDevice, LPUNKNOWN pUnkOuter) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %u, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); + FIXME("(%p, %s, %lu, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); return E_NOTIMPL; } @@ -111,7 +111,7 @@ static HRESULT WINAPI stillimagew_SetDeviceValue(IStillImageW *iface, LPWSTR pws DWORD type, LPBYTE pData, DWORD cbData) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %s, %u, %p, %u): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), + FIXME("(%p, %s, %s, %lu, %p, %lu): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), type, pData, cbData); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI stillimagew_SetupDeviceParameters(IStillImageW *iface, PST static HRESULT WINAPI stillimagew_WriteToErrorLog(IStillImageW *iface, DWORD dwMessageType, LPCWSTR pszMessage) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); + FIXME("(%p, %lu, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); return E_NOTIMPL; } @@ -307,7 +307,7 @@ static const struct IUnknownVtbl internal_unk_vtbl = */ HRESULT WINAPI StiCreateInstanceA(HINSTANCE hinst, DWORD dwVer, PSTIA *ppSti, LPUNKNOWN pUnkOuter) { - FIXME("(%p, %u, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); + FIXME("(%p, %lu, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); return STG_E_UNIMPLEMENTEDFUNCTION; } @@ -319,7 +319,7 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP stillimage *This; HRESULT hr; - TRACE("(%p, %u, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); + TRACE("(%p, %lu, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(stillimage)); if (This) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 61118e910b6..4ae8a337f8a 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -135,7 +135,7 @@ static sti_cf the_sti_cf = { { &sti_cf_vtbl }, sti_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %ld, %p)\n",hInstDLL,fdwReason,lpvReserved); return STI_DllMain(hInstDLL, fdwReason, lpvReserved); }

1 0

Eric Pouech : sppc: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 5beaca8e23fc76384d9458ad894df4fe9b1ff5e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beaca8e23fc76384d9458ad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:45 2022 +0100 sppc: 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/sppc/Makefile.in | 1 - dlls/sppc/sppc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 4d31f9dc923..1cd222f6175 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index ce3183f39bd..8819961d7c6 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -60,7 +60,7 @@ HRESULT WINAPI SLClose(HSLC handle) HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { - FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + FIXME("(%s,%s,%lx) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); if (!app) return E_INVALIDARG;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022