wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : itss: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 097fc377e2885a9f3512b513eea4d6dbcb86734a URL: https://source.winehq.org/git/wine.git/?a=commit;h=097fc377e2885a9f3512b513… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:59 2022 +0100 itss: 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/itss/Makefile.in | 1 - dlls/itss/itss.c | 6 +++--- dlls/itss/protocol.c | 30 +++++++++++++++--------------- dlls/itss/storage.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index c12ead3faec..2d34b74ed78 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = itss.dll IMPORTS = uuid urlmon shlwapi ole32 diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 6d41ef38c38..010c01dd586 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -231,7 +231,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfile( { ITStorageImpl *This = impl_from_IITStorage(iface); - TRACE("%p %s %u %u %p\n", This, + TRACE("%p %s %lu %lu %p\n", This, debugstr_w(pwcsName), grfMode, reserved, ppstgOpen ); return ITSS_StgOpenStorage( pwcsName, NULL, grfMode, @@ -279,7 +279,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorage( { ITStorageImpl *This = impl_from_IITStorage(iface); - TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ), + TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ), pstgPriority, grfMode, snbExclude ); return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode, @@ -379,6 +379,6 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj) HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %u\n", dll_count); + TRACE("dll_count = %lu\n", dll_count); return dll_count ? S_FALSE : S_OK; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 6d40ddf738f..cb1df3c2e1a 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -101,7 +101,7 @@ static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface) { ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -110,7 +110,7 @@ static ULONG WINAPI ITSProtocol_Release(IUnknown *iface) ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { release_chm(This); @@ -231,7 +231,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, int res; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); ptr = skip_schema(szUrl); @@ -242,7 +242,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, bindinfo.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); return hres; } @@ -253,7 +253,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, memcpy(file_name, ptr, len*sizeof(WCHAR)); hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE); if(FAILED(hres)) { - WARN("UrlUnescape failed: %08x\n", hres); + WARN("UrlUnescape failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, file_name); return hres; } @@ -322,7 +322,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, chm_object.length, chm_object.length); if(FAILED(hres)) { - WARN("ReportData failed: %08x\n", hres); + WARN("ReportData failed: %08lx\n", hres); release_chm(This); return report_result(pOIProtSink, hres); } @@ -343,7 +343,7 @@ static HRESULT WINAPI ITSProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas DWORD dwOptions) { ITSProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return E_NOTIMPL; } @@ -351,7 +351,7 @@ static HRESULT WINAPI ITSProtocol_Terminate(IInternetProtocol *iface, DWORD dwOp { ITSProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -375,7 +375,7 @@ static HRESULT WINAPI ITSProtocol_Read(IInternetProtocol *iface, void *pv, { ITSProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); if(!This->chm_file) return INET_E_DATA_NOT_AVAILABLE; @@ -390,7 +390,7 @@ static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ITSProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -398,7 +398,7 @@ static HRESULT WINAPI ITSProtocol_LockRequest(IInternetProtocol *iface, DWORD dw { ITSProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -453,7 +453,7 @@ static HRESULT WINAPI ITSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface); - TRACE("(%p)->(%s %x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction, + TRACE("(%p)->(%s %x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction, dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); switch(ParseAction) { @@ -478,7 +478,7 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR base_end, ptr; DWORD rel_len; - TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), + TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); @@ -520,7 +520,7 @@ static HRESULT WINAPI ITSProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, L LPCWSTR pwzUrl2, DWORD dwCompareFlags) { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface); - FIXME("%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + FIXME("%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); return E_NOTIMPL; } @@ -529,7 +529,7 @@ static HRESULT WINAPI ITSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP DWORD dwReserved) { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface); - FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, + FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, cbBuffer, pcbBuf, dwReserved); return E_NOTIMPL; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index ee5432d4d61..82c6b5442d9 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -151,7 +151,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Next( DWORD len, n; struct enum_info *cur; - TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched ); + TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched ); cur = This->current; n = 0; @@ -203,7 +203,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip( DWORD n; struct enum_info *cur; - TRACE("%p %u\n", This, celt ); + TRACE("%p %lu\n", This, celt ); cur = This->current; n = 0; @@ -340,7 +340,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( int r; WCHAR *path, *p; - TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %lu %lu %p\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm ); len = lstrlenW( This->dir ) + lstrlenW( pwcsName ) + 1; @@ -408,7 +408,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( WCHAR *path, *p; DWORD len; - TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %lu %p %lu %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); chmfile = chm_dup( This->chmfile ); @@ -515,7 +515,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements( ITSS_IStorageImpl *This = impl_from_IStorage(iface); IEnumSTATSTG_Impl* stgenum; - TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum ); + TRACE("%p %ld %p %ld %p\n", This, reserved1, reserved2, reserved3, ppenum ); stgenum = ITSS_create_enum(); if( !stgenum ) @@ -704,7 +704,7 @@ static HRESULT WINAPI ITSS_IStream_Read( IStream_Impl *This = impl_from_IStream(iface); ULONG count; - TRACE("%p %p %u %p\n", This, pv, cb, pcbRead); + TRACE("%p %p %lu %p\n", This, pv, cb, pcbRead); count = chm_retrieve_object(This->stg->chmfile, &This->ui, pv, This->addr, cb); @@ -734,7 +734,7 @@ static HRESULT WINAPI ITSS_IStream_Seek( IStream_Impl *This = impl_from_IStream(iface); LONGLONG newpos; - TRACE("%p %s %u %p\n", This, + TRACE("%p %s %lu %p\n", This, wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition ); newpos = This->addr; @@ -822,7 +822,7 @@ static HRESULT WINAPI ITSS_IStream_Stat( { IStream_Impl *This = impl_from_IStream(iface); - TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); + TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); memset( pstatstg, 0, sizeof *pstatstg ); if( !( grfStatFlag & STATFLAG_NONAME ) )

1 0

Eric Pouech : iphlpapi: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 61becab48701da1fb58691e4b43a49163bfee463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61becab48701da1fb58691e4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:53 2022 +0100 iphlpapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/iphlpapi_main.c | 84 +++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61becab48701da1fb586…

1 0

Eric Pouech : inseng: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 8d006c1db7553e01f1ee53d4ecaed96b3e7a038b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d006c1db7553e01f1ee53d4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:47 2022 +0100 inseng: 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/inseng/Makefile.in | 1 - dlls/inseng/inseng_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index f4b1d4b915f..0217203791a 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 2c95a2e72bd..c72a12955b8 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -74,7 +74,7 @@ static ULONG WINAPI InstallEngine_AddRef(IInstallEngine2 *iface) InstallEngine *This = impl_from_IInstallEngine2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) InstallEngine *This = impl_from_IInstallEngine2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -109,14 +109,14 @@ static HRESULT WINAPI InstallEngine_SetCifFile(IInstallEngine2 *iface, const cha static HRESULT WINAPI InstallEngine_DownloadComponents(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } static HRESULT WINAPI InstallEngine_InstallComponents(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } @@ -158,7 +158,7 @@ static HRESULT WINAPI InstallEngine_UnregisterInstallEngineCallback(IInstallEngi static HRESULT WINAPI InstallEngine_SetAction(IInstallEngine2 *iface, const char *id, DWORD action, DWORD priority) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%s %d %d)\n", This, debugstr_a(id), action, priority); + FIXME("(%p)->(%s %ld %ld)\n", This, debugstr_a(id), action, priority); return E_NOTIMPL; } @@ -207,7 +207,7 @@ static HRESULT WINAPI InstallEngine_SetInstallDrive(IInstallEngine2 *iface, char static HRESULT WINAPI InstallEngine_SetInstallOptions(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } @@ -228,7 +228,7 @@ static HRESULT WINAPI InstallEngine_SetIStream(IInstallEngine2 *iface, IStream * static HRESULT WINAPI InstallEngine_Abort(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; }

1 0

Eric Pouech : infosoft: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 03598fa6f678c395e641c2097d0779b51fc48d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03598fa6f678c395e641c209… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:41 2022 +0100 infosoft: 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/infosoft/Makefile.in | 1 - dlls/infosoft/wordbreaker.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 2e7b3b4762d..d70e2fa52fe 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = infosoft.dll IMPORTS = uuid advapi32 diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index aa432eb6bc4..0b29a6eb2d1 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -84,7 +84,7 @@ static ULONG WINAPI wb_Release(IWordBreaker *iface) static HRESULT WINAPI wb_Init( IWordBreaker *iface, BOOL fQuery, ULONG ulMaxTokenSize, BOOL *pfLicense ) { - TRACE("%d %u\n", fQuery, ulMaxTokenSize); + TRACE("%d %lu\n", fQuery, ulMaxTokenSize); *pfLicense = FALSE; return S_OK; } @@ -158,7 +158,7 @@ static HRESULT WINAPI wb_ComposePhrase( IWordBreaker *iface, const WCHAR *pwcModifier, ULONG cwcModifier, ULONG ulAttachmentType, WCHAR *pwcPhrase, ULONG *pcwcPhrase) { - FIXME("%p %u %p %u %u %p %p\n", pwcNoun, cwcNoun, + FIXME("%p %lu %p %lu %lu %p %p\n", pwcNoun, cwcNoun, pwcModifier, cwcModifier, ulAttachmentType, pwcPhrase, pcwcPhrase); return S_OK; }

1 0

Eric Pouech : inetmib1: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: adf47c60e664397b9598bb9a099ec53faea742e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf47c60e664397b9598bb9a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:35 2022 +0100 inetmib1: 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/inetmib1/Makefile.in | 1 - dlls/inetmib1/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index 5bfdf5fe769..25391ff2624 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inetmib1.dll IMPORTS = snmpapi DELAYIMPORTS = iphlpapi diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 31dc4d5e8e2..90da277375e 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1318,7 +1318,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, AsnObjectIdentifier myOid = DEFINE_OID(mib2System); UINT i; - TRACE("(%d, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent, + TRACE("(%ld, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent, pFirstSupportedRegion); minSupportedIDLength = UINT_MAX; @@ -1447,7 +1447,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, */ 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); switch (fdwReason) {

1 0

Eric Pouech : inetcpl.cpl: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 0c4fdeee408e2124f162bd6dc1a4d0687c04869b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4fdeee408e2124f162bd6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:29 2022 +0100 inetcpl.cpl: 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/inetcpl.cpl/Makefile.in | 1 - dlls/inetcpl.cpl/connections.c | 6 +++--- dlls/inetcpl.cpl/content.c | 4 ++-- dlls/inetcpl.cpl/general.c | 8 ++++---- dlls/inetcpl.cpl/inetcpl.c | 6 +++--- dlls/inetcpl.cpl/security.c | 30 +++++++++++++++--------------- 6 files changed, 27 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c4fdeee408e2124f162…

1 0

Eric Pouech : inetcomm: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 2e38cb9efdc2b86a449b2be1060f64671da1e528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e38cb9efdc2b86a449b2be1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:23 2022 +0100 inetcomm: 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/inetcomm/Makefile.in | 1 - dlls/inetcomm/imaptransport.c | 44 ++++++------- dlls/inetcomm/inetcomm_main.c | 2 +- dlls/inetcomm/mimeintl.c | 8 +-- dlls/inetcomm/mimeole.c | 146 +++++++++++++++++++++--------------------- dlls/inetcomm/pop3transport.c | 34 +++++----- dlls/inetcomm/protocol.c | 38 +++++------ dlls/inetcomm/smtptransport.c | 8 +-- 8 files changed, 140 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e38cb9efdc2b86a449b…

1 0

Eric Pouech : imm32: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 427e16d0b3f9402487d9b49e865b3b145fc7f159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=427e16d0b3f9402487d9b49e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:17 2022 +0100 imm32: 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/imm32/Makefile.in | 1 - dlls/imm32/imm.c | 82 +++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=427e16d0b3f9402487d9…

1 0

Eric Pouech : imagehlp: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 8b7beee065f19dcf1dac0c343cee0bd59d13ef85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7beee065f19dcf1dac0c34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:11 2022 +0100 imagehlp: 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/imagehlp/Makefile.in | 2 +- dlls/imagehlp/access.c | 6 +++--- dlls/imagehlp/integrity.c | 18 +++++++++--------- dlls/imagehlp/modify.c | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index 555bc47f879..e8958d9fc62 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -D_IMAGEHLP_SOURCE_ MODULE = imagehlp.dll IMPORTLIB = imagehlp IMPORTS = dbghelp diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 29315f172ab..f0b5814dead 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -153,7 +153,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { - WARN("CreateFile: Error = %d\n", GetLastError()); + WARN("CreateFile: Error = %ld\n", GetLastError()); goto Error; } @@ -162,7 +162,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad 0, 0, NULL); if (!hFileMapping) { - WARN("CreateFileMapping: Error = %d\n", GetLastError()); + WARN("CreateFileMapping: Error = %ld\n", GetLastError()); goto Error; } @@ -170,7 +170,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad CloseHandle(hFileMapping); if (!mapping) { - WARN("MapViewOfFile: Error = %d\n", GetLastError()); + WARN("MapViewOfFile: Error = %ld\n", GetLastError()); goto Error; } diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index d86ec11bd59..c2759c027f4 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -160,7 +160,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, else return FALSE; - TRACE("ret = %d size = %x addr = %x\n", ret, sd->Size, sd->VirtualAddress); + TRACE("ret = %d size = %lx addr = %lx\n", ret, sd->Size, sd->VirtualAddress); *pdwSize = sd->Size; *pdwOfs = sd->VirtualAddress; @@ -208,7 +208,7 @@ static BOOL IMAGEHLP_SetSecurityDirOffset(HANDLE handle, sd->Size = dwSize; sd->VirtualAddress = dwOfs; - TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); + TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress); /* write the header back again */ count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN); @@ -282,7 +282,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, *pdwOfs = sd_VirtualAddr + offset; *pdwSize = len; - TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset); + TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset); return TRUE; } @@ -492,7 +492,7 @@ BOOL WINAPI ImageEnumerateCertificates( const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; BOOL r; - TRACE("%p %hd %p %p %d\n", + TRACE("%p %hd %p %p %ld\n", handle, TypeFilter, CertificateCount, Indices, IndexCount); r = IMAGEHLP_GetSecurityDirOffset( handle, &sd_VirtualAddr, &size ); @@ -515,7 +515,7 @@ BOOL WINAPI ImageEnumerateCertificates( if( count != cert_hdr_size ) return FALSE; - TRACE("Size = %08x id = %08hx\n", + TRACE("Size = %08lx id = %08hx\n", hdr.dwLength, hdr.wCertificateType ); /* check the certificate is not too big or too small */ @@ -556,7 +556,7 @@ BOOL WINAPI ImageGetCertificateData( { DWORD r, offset, ofs, size, count; - TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength); + TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength); if( !RequiredLength) { @@ -607,7 +607,7 @@ BOOL WINAPI ImageGetCertificateHeader( DWORD r, offset, ofs, size, count; const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate; - TRACE("%p %d %p\n", handle, index, pCert); + TRACE("%p %ld %p\n", handle, index, pCert); if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) ) return FALSE; @@ -792,7 +792,7 @@ BOOL WINAPI ImageGetDigestStream( IMAGE_NT_HEADERS *nt_hdr; IMAGE_SECTION_HEADER *section_headers; - TRACE("(%p, %d, %p, %p)\n", FileHandle, DigestLevel, DigestFunction, + TRACE("(%p, %ld, %p, %p)\n", FileHandle, DigestLevel, DigestFunction, DigestHandle); /* Get the file size */ @@ -891,7 +891,7 @@ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) LPVOID cert_data; BOOL r; - TRACE("(%p, %d)\n", FileHandle, Index); + TRACE("(%p, %ld)\n", FileHandle, Index); r = ImageEnumerateCertificates(FileHandle, CERT_SECTION_TYPE_ANY, &count, NULL, 0); diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index d740d221bfc..aa93ee63365 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -51,13 +51,13 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, LOADED_IMAGE image; ULONG size; - TRACE("flags %#x, module %s, dll_path %s, symbol_path %s, cb %p.\n", + TRACE("flags %#lx, module %s, dll_path %s, symbol_path %s, cb %p.\n", flags, debugstr_a(module), debugstr_a(dll_path), debugstr_a(symbol_path), cb); if (!(flags & BIND_NO_UPDATE)) FIXME("Image modification is not implemented.\n"); if (flags & ~BIND_NO_UPDATE) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!MapAndLoad(module, dll_path, &image, TRUE, TRUE)) return FALSE; @@ -84,7 +84,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, if (!(dll_name = ImageRvaToVa(image.FileHeader, image.MappedAddress, import->Name, 0))) { - ERR("Failed to get VA for import name RVA %#x.\n", import->Name); + ERR("Failed to get VA for import name RVA %#lx.\n", import->Name); continue; } @@ -99,7 +99,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, thunk_rva = import->OriginalFirstThunk ? import->OriginalFirstThunk : import->FirstThunk; if (!(thunk = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk_rva, 0))) { - ERR("Failed to get VA for import thunk RVA %#x.\n", thunk_rva); + ERR("Failed to get VA for import thunk RVA %#lx.\n", thunk_rva); continue; } @@ -117,7 +117,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0))) { - ERR("Failed to get VA for name RVA %#x.\n", thunk->u1.AddressOfData); + ERR("Failed to get VA for name RVA %#Ix.\n", thunk->u1.AddressOfData); continue; } @@ -168,7 +168,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( DWORD CalcSum; DWORD HdrSum; - TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); + TRACE("(%p, %ld, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); CalcSum = CalcCheckSum(0, BaseAddress, (FileLength + 1) / sizeof(WORD)); header = RtlImageNtHeader(BaseAddress); @@ -349,7 +349,7 @@ BOOL WINAPI ReBaseImage( ULONG_PTR *NewImageBase, ULONG TimeStamp) { FIXME( - "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n", + "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n", debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase, fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize, OldImageBase, NewImageSize, NewImageBase, TimeStamp @@ -387,7 +387,7 @@ BOOL WINAPI SplitSymbols( PSTR ImageName, PCSTR SymbolsPath, PSTR SymbolFilePath, ULONG Flags) { - FIXME("(%s, %s, %s, %d): stub\n", + FIXME("(%s, %s, %s, %ld): stub\n", debugstr_a(ImageName), debugstr_a(SymbolsPath), debugstr_a(SymbolFilePath), Flags ); @@ -417,7 +417,7 @@ BOOL WINAPI UpdateDebugInfoFileEx( PCSTR ImageFileName, PCSTR SymbolPath, PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum) { - FIXME("(%s, %s, %s, %p, %d): stub\n", + FIXME("(%s, %s, %s, %p, %ld): stub\n", debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(DebugFilePath), NtHeaders, OldChecksum );

1 0

Eric Pouech : imaadp32.acm: Enable compilation with long types.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: d0819c7e5b335a2633f2d130c93c319aca7e35aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0819c7e5b335a2633f2d130… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:05 2022 +0100 imaadp32.acm: 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/imaadp32.acm/Makefile.in | 1 - dlls/imaadp32.acm/imaadp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index e01f5494653..ff982fd138e 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = imaadp32.acm IMPORTS = winmm user32 diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index b6d70dcbe2f..0b5e6a83ae6 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -569,7 +569,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -628,12 +628,12 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -877,7 +877,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -898,7 +898,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -923,7 +923,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

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