February 2022 - Wine-commits

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

11 Feb '22

Module: wine Branch: master Commit: 0b2fd91596081fb1ce679d2a960bf5aebb434157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2fd91596081fb1ce679d2a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:05 2022 +0100 joy.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/joy.cpl/Makefile.in | 1 - dlls/joy.cpl/main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index 265f9e6add8..d9b2aff3724 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 8ea3892b750..3ecef2d9aa8 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -43,7 +43,7 @@ DECLSPEC_HIDDEN HMODULE hcpl; */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", hdll, reason, reserved); + TRACE("(%p, %ld, %p)\n", hdll, reason, reserved); switch (reason) { @@ -297,7 +297,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM static struct JoystickData *data; int sel; - TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); + TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); switch (msg) { case WM_INITDIALOG: @@ -417,10 +417,10 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM static void dump_joy_state(DIJOYSTATE* st) { int i; - TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ); - TRACE("RAx (% 5d,% 5d,% 5d)\n", st->lRx, st->lRy, st->lRz); - TRACE("Slider (% 5d,% 5d)\n", st->rglSlider[0], st->rglSlider[1]); - TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); + TRACE("Ax (% 5ld,% 5ld,% 5ld)\n", st->lX,st->lY, st->lZ); + TRACE("RAx (% 5ld,% 5ld,% 5ld)\n", st->lRx, st->lRy, st->lRz); + TRACE("Slider (% 5ld,% 5ld)\n", st->rglSlider[0], st->rglSlider[1]); + TRACE("Pov (% 5ld,% 5ld,% 5ld,% 5ld)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); TRACE("Buttons "); for(i=0; i < TEST_MAX_BUTTONS; i++) @@ -616,7 +616,7 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { static HANDLE thread; static struct JoystickData *data; - TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); + TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); switch (msg) { @@ -876,7 +876,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) if (FAILED(hr)) { - FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr); + FIXME("Failed to create effect with type %s, hr %#lx\n", debugstr_guid(&pdei->guid), hr); return DIENUM_CONTINUE; } @@ -903,7 +903,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp { static HANDLE thread; static struct JoystickData *data; - TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); + TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); switch (msg) { @@ -973,7 +973,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp */ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { - TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); + TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); switch (msg) { case PSCB_INITIALIZED: @@ -1060,7 +1060,7 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { static struct JoystickData data; - TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hwnd, command, lParam1, lParam2); + TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hwnd, command, lParam1, lParam2); switch (command) { @@ -1073,7 +1073,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) if (FAILED(hr)) { - ERR("Failed to initialize DirectInput: 0x%08x\n", hr); + ERR("Failed to initialize DirectInput: 0x%08lx\n", hr); return FALSE; }

1 0

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

11 Feb '22

Module: wine Branch: master Commit: e8e0917a9c3153b98a8f7a3b29c3989335300404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8e0917a9c3153b98a8f7a3b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:11 2022 +0100 jscript: 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/jscript/Makefile.in | 1 - dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 56 ++++++++++++++++++++++----------------------- dlls/jscript/engine.c | 20 ++++++++-------- dlls/jscript/error.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 38 +++++++++++++++--------------- dlls/jscript/jscript_main.c | 4 ++-- dlls/jscript/jsregexp.c | 2 +- dlls/jscript/jsutils.c | 4 ++-- dlls/jscript/regexp.c | 6 ++--- dlls/jscript/string.c | 6 ++--- 13 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8e0917a9c3153b98a8f…

1 0

Michael Stefaniuc : dmloader/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 7a2bead0263e1ef9123bafd0102d4a2a248edeab URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a2bead0263e1ef9123bafd0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 10 22:32:18 2022 +0100 dmloader/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/Makefile.in | 1 - dlls/dmloader/tests/loader.c | 176 ++++++++++++++++++++-------------------- 2 files changed, 88 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2bead0263e1ef9123b…

1 0