wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : cryptnet: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 0db20c448ab0993285d0231db42d05597264aec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db20c448ab0993285d0231d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:02 2022 +0100 cryptnet: 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/cryptnet/Makefile.in | 1 - dlls/cryptnet/cryptnet_main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index f394b0c1f79..8b13861da1e 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cryptnet.dll IMPORTLIB = cryptnet IMPORTS = crypt32 shell32 ole32 diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e1b32216353..8aec76e9b81 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -145,7 +145,7 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, } } else - FIXME("unsupported alt name type %d\n", + FIXME("unsupported alt name type %ld\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); } if (!pcbUrlArray) @@ -358,7 +358,7 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, HCRYPTOIDFUNCADDR hFunc = NULL; BOOL ret = FALSE; - TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), + TRACE("(%s, %p, %08lx, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved); if (IS_INTOID(pszUrlOid)) @@ -404,7 +404,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid, BOOL ret = FALSE; int len; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo); @@ -842,7 +842,7 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL, void **ppvFreeContext, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { - FIXME("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + FIXME("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -861,7 +861,7 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, { BOOL ret = FALSE; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -971,7 +971,7 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, URL_COMPONENTSW components = { sizeof(components), 0 }; BOOL ret; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -1477,7 +1477,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, ContextDllCreateObjectContext create; HCRYPTOIDFUNCADDR hRetrieve = 0, hCreate = 0; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo); @@ -1546,7 +1546,7 @@ static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) { - ERR("Failed to get LocalAppDataLow path, hr %#x.\n", hr); + ERR("Failed to get LocalAppDataLow path, hr %#lx.\n", hr); return INVALID_HANDLE_VALUE; } @@ -1617,7 +1617,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, return FALSE; } - TRACE("Using cached status %#x, reason %#x.\n", status->dwError, status->dwReason); + TRACE("Using cached status %#lx, reason %#lx.\n", status->dwError, status->dwReason); return TRUE; } @@ -1742,7 +1742,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c FIXME("OCSP URL = %s\n", debugstr_w(aia->rgAccDescr[i].AccessLocation.u.pwszURL)); else - FIXME("unsupported AccessLocation type %d\n", + FIXME("unsupported AccessLocation type %ld\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); } LocalFree(aia); @@ -1902,7 +1902,7 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, FILETIME now; LPFILETIME pTime = NULL; - TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, + TRACE("(%08lx, %ld, %ld, %p, %08lx, %p, %p)\n", dwEncodingType, dwRevType, cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) && @@ -1943,6 +1943,6 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, SetLastError(error); pRevStatus->dwError = error; } - TRACE("returning %d (%08x)\n", !error, error); + TRACE("returning %d (%08lx)\n", !error, error); return !error; }

1 0

Eric Pouech : cryptdlg: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 7bd5f72a34f11b39abfe7bd48b4edc0210ac7ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bd5f72a34f11b39abfe7bd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:56 2022 +0100 cryptdlg: 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/cryptdlg/Makefile.in | 1 - dlls/cryptdlg/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 7aaf4b90ff4..b9fccf2e31e 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cryptdlg.dll IMPORTS = cryptui crypt32 wintrust user32 advapi32 diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 0cc408b741a..1597dc2704c 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -39,7 +39,7 @@ static HINSTANCE hInstance; 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) { @@ -83,7 +83,7 @@ HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData) if (pProvData->padwTrustStepErrors && !pProvData->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT]) ret = S_OK; - TRACE("returning %08x\n", ret); + TRACE("returning %08lx\n", ret); return ret; } @@ -92,7 +92,7 @@ HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData) */ BOOL WINAPI CertTrustCertPolicy(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner) { - FIXME("(%p, %d, %s, %d)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner); + FIXME("(%p, %ld, %s, %ld)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner); return FALSE; } @@ -295,7 +295,7 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *data) TRACE("(%p)\n", data); if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) - FIXME("unimplemented for UI choice %d\n", + FIXME("unimplemented for UI choice %ld\n", data->pWintrustData->dwUIChoice); if (pCert) { @@ -354,7 +354,7 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *data) */ if (!ret) data->dwFinalError = err; - TRACE("returning %d (%08x)\n", S_OK, data->dwFinalError); + TRACE("returning %ld (%08lx)\n", S_OK, data->dwFinalError); return S_OK; }

1 0

Eric Pouech : crypt32: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5fc99b35baefd49502f3625fa3a457ee477db98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc99b35baefd49502f3625f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:50 2022 +0100 crypt32: 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/crypt32/Makefile.in | 2 +- dlls/crypt32/base64.c | 16 +-- dlls/crypt32/cert.c | 94 ++++++++-------- dlls/crypt32/chain.c | 76 ++++++------- dlls/crypt32/collectionstore.c | 14 +-- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 30 +++--- dlls/crypt32/ctl.c | 24 ++--- dlls/crypt32/decode.c | 240 ++++++++++++++++++++--------------------- dlls/crypt32/encode.c | 42 ++++---- dlls/crypt32/filestore.c | 26 ++--- dlls/crypt32/main.c | 28 ++--- dlls/crypt32/message.c | 18 ++-- dlls/crypt32/msg.c | 52 ++++----- dlls/crypt32/object.c | 22 ++-- dlls/crypt32/oid.c | 42 ++++---- dlls/crypt32/pfx.c | 20 ++-- dlls/crypt32/proplist.c | 2 +- dlls/crypt32/protectdata.c | 14 +-- dlls/crypt32/provstore.c | 8 +- dlls/crypt32/regstore.c | 22 ++-- dlls/crypt32/rootstore.c | 6 +- dlls/crypt32/serialize.c | 20 ++-- dlls/crypt32/sip.c | 10 +- dlls/crypt32/store.c | 66 ++++++------ dlls/crypt32/str.c | 48 ++++----- 26 files changed, 473 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc99b35baefd49502f3…

1 0

Eric Pouech : comsvcs: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: c7c44c593a881f7f7aa22f3242584a365872d0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c44c593a881f7f7aa22f32… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:44 2022 +0100 comsvcs: 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/comsvcs/Makefile.in | 1 - dlls/comsvcs/main.c | 32 ++++++++++++++++---------------- dlls/comsvcs/property.c | 10 +++++----- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 5eede59d5b6..22090938b52 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 797e2db97db..b34c7d21309 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -97,7 +97,7 @@ static ULONG WINAPI holder_AddRef(IHolder *iface) { holder *This = impl_from_IHolder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -105,7 +105,7 @@ static ULONG WINAPI holder_Release(IHolder *iface) { holder *This = impl_from_IHolder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (!ref) { @@ -121,11 +121,11 @@ static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid HRESULT hr; TIMEINSECS secs; - TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08Ix, %p) stub\n", This, typeid, resid); hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); - TRACE("<- 0x%08x\n", hr); + TRACE("<- 0x%08lx\n", hr); return hr; } @@ -134,11 +134,11 @@ static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) holder *This = impl_from_IHolder(iface); HRESULT hr; - TRACE("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08Ix) stub\n", This, resid); hr = IDispenserDriver_DestroyResource(This->driver, resid); - TRACE("<- 0x%08x\n", hr); + TRACE("<- 0x%08lx\n", hr); return hr; } @@ -147,7 +147,7 @@ static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx) stub\n", This, resid); + FIXME("(%p)->(%08Ix) stub\n", This, resid); return E_NOTIMPL; } @@ -165,7 +165,7 @@ static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + FIXME("(%p)->(%08Ix, %d) stub\n", This, resid, value); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx) stub\n", This, resid); + FIXME("(%p)->(%08Ix) stub\n", This, resid); return E_NOTIMPL; } @@ -263,7 +263,7 @@ static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface) { dispensermanager *This = impl_from_IDispenserManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) { dispensermanager *This = impl_from_IDispenserManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (!ref) { @@ -299,7 +299,7 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi if (!This->mta_cookie) CoIncrementMTAUsage(&This->mta_cookie); - TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + TRACE("<-- 0x%08lx, %p\n", hr, *dispenser); return hr; } @@ -429,7 +429,7 @@ static ULONG WINAPI new_moniker_AddRef(IMoniker* iface) struct new_moniker *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -439,7 +439,7 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) struct new_moniker *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -600,7 +600,7 @@ static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD flags, IMoniker **ppmkToLeft, IMoniker **ret) { - TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); if (!ret) return E_POINTER; @@ -758,7 +758,7 @@ static ULONG WINAPI new_moniker_rotdata_Release(IROTData *iface) static HRESULT WINAPI new_moniker_rotdata_GetComparisonData(IROTData *iface, byte *data, ULONG data_len, ULONG *length) { - FIXME("%p, %p, %u, %p.\n", iface, data, data_len, length); + FIXME("%p, %p, %lu, %p.\n", iface, data, data_len, length); return E_NOTIMPL; } diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 4dc6e1d9a46..7a47135769e 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -59,7 +59,7 @@ static ULONG WINAPI group_manager_AddRef(ISharedPropertyGroupManager *iface) struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -69,7 +69,7 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -83,14 +83,14 @@ static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); + FIXME("iface %p, index %u, lcid %lu, info %p: stub.\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + FIXME("iface %p, riid %s, names %p, count %u, lcid %lu, dispid %p: stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; @@ -99,7 +99,7 @@ static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *i static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + FIXME("iface %p, member %lu, riid %s, lcid %lu, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); return E_NOTIMPL; }

1 0

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

09 Feb '22

Module: wine Branch: master Commit: 3f0469131ecf4afbeeb7ae289d64a0f9babf671f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f0469131ecf4afbeeb7ae28… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:38 2022 +0100 compobj.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/compobj.dll16/Makefile.in | 1 - dlls/compobj.dll16/compobj.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in index 8ab9d824683..5b11e840c7f 100644 --- a/dlls/compobj.dll16/Makefile.in +++ b/dlls/compobj.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = compobj.dll16 IMPORTS = uuid ole32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 831d62d25ee..12a41775333 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -143,7 +143,7 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface) { IMalloc16Impl *malloc = impl_from_IMalloc16(iface); ULONG refcount = InterlockedIncrement(&malloc->refcount); - TRACE("%p increasing refcount to %u.\n", malloc, refcount); + TRACE("%p increasing refcount to %lu.\n", malloc, refcount); return refcount; } @@ -154,7 +154,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface) { IMalloc16Impl *malloc = impl_from_IMalloc16(MapSL(iface)); ULONG refcount = InterlockedDecrement(&malloc->refcount); - TRACE("%p decreasing refcount to %u.\n", malloc, refcount); + TRACE("%p decreasing refcount to %lu.\n", malloc, refcount); if (!refcount) { UnMapLS(iface); @@ -169,7 +169,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface) SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Alloc(%d)\n",This,cb); + TRACE("(%p)->Alloc(%ld)\n",This,cb); return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) ); } @@ -180,7 +180,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) { void *ptr = MapSL(pv); IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Free(%08x)\n",This,pv); + TRACE("(%p)->Free(%08lx)\n",This,pv); UnMapLS(pv); HeapFree( GetProcessHeap(), 0, ptr ); } @@ -193,7 +193,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) SEGPTR ret; IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Realloc(%08x,%d)\n",This,pv,cb); + TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb); if (!pv) ret = IMalloc16_fnAlloc(iface, cb); else if (cb) { @@ -213,7 +213,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->GetSize(%08x)\n",This,pv); + TRACE("(%p)->GetSize(%08lx)\n",This,pv); return HeapSize( GetProcessHeap(), 0, MapSL(pv) ); } @@ -301,11 +301,11 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc) */ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) { - TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown); + TRACE("size %lu, context %d, unknown %#lx.\n", size, context, unknown); if (context != MEMCTX_TASK) FIXME("Ignoring context %d.\n", context); if (unknown) - FIXME("Ignoring unknown parameter %#x.\n", unknown); + FIXME("Ignoring unknown parameter %#lx.\n", unknown); return call_IMalloc_Alloc(compobj_malloc, size); } @@ -504,7 +504,7 @@ HRESULT WINAPI CoRegisterClassObject16( DWORD flags, /* [in] REGCLS flags indicating how connections are made */ LPDWORD lpdwRegister ) { - FIXME("(%s,%p,0x%08x,0x%08x,%p),stub\n", + FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n", debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister ); return 0; @@ -516,7 +516,7 @@ HRESULT WINAPI CoRegisterClassObject16( */ HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */ { - FIXME("(0x%08x),stub!\n", dwRegister); + FIXME("(0x%08lx),stub!\n", dwRegister); return 0; } @@ -613,7 +613,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state) */ BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2) { - TRACE("(%08x, %04x, %04x, %04x, %08x, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2); + TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2); return TRUE; } @@ -738,7 +738,7 @@ HRESULT WINAPI CoGetClassObject16( WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet); if (dwRet != S_OK) { - ERR("DllGetClassObject returned error 0x%08x\n", dwRet); + ERR("DllGetClassObject returned error 0x%08lx\n", dwRet); FreeLibrary16(dll); return dwRet; } @@ -768,7 +768,7 @@ HRESULT WINAPI CoCreateInstance16( REFIID iid, LPVOID *ppv) { - FIXME("(%s, %p, %x, %s, %p), stub!\n", + FIXME("(%s, %p, %lx, %s, %p), stub!\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv ); @@ -780,6 +780,6 @@ HRESULT WINAPI CoCreateInstance16( */ HRESULT WINAPI CoDisconnectObject16( LPUNKNOWN lpUnk, DWORD reserved ) { - FIXME("(%p, 0x%08x): stub!\n", lpUnk, reserved); + FIXME("(%p, 0x%08lx): stub!\n", lpUnk, reserved); return E_NOTIMPL; }

1 0

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

09 Feb '22

Module: wine Branch: master Commit: 1216170b00211b0c24710041e90467b441e853e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1216170b00211b0c24710041… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:32 2022 +0100 commdlg.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/commdlg.dll16/Makefile.in | 1 - dlls/commdlg.dll16/filedlg.c | 2 +- dlls/commdlg.dll16/fontdlg.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in index 1b2e19d09e3..69731147d07 100644 --- a/dlls/commdlg.dll16/Makefile.in +++ b/dlls/commdlg.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = commdlg.dll16 IMPORTS = comdlg32 user32 gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 0a4dad4a37a..5ad67a4a91f 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -218,7 +218,7 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR CONTEXT context; WORD params[5]; - TRACE( "%p: %p %08x %lx %lx: stub\n", hook, hwnd, msg, wp, lp ); + TRACE( "%p: %p %08x %x %lx: stub\n", hook, hwnd, msg, wp, lp ); memset( &context, 0, sizeof(context) ); context.SegDs = context.SegEs = CURRENT_SS; diff --git a/dlls/commdlg.dll16/fontdlg.c b/dlls/commdlg.dll16/fontdlg.c index b7c87fd7361..79efb3a292f 100644 --- a/dlls/commdlg.dll16/fontdlg.c +++ b/dlls/commdlg.dll16/fontdlg.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); return 0; } @@ -53,7 +53,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); return 0; }

1 0

Eric Pouech : comdlg32: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 05fef74867799ff57dcd1c7f248c37ac804ddaf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fef74867799ff57dcd1c7f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:26 2022 +0100 comdlg32: 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/comdlg32/Makefile.in | 1 - dlls/comdlg32/cdlg32.c | 4 +- dlls/comdlg32/colordlg.c | 4 +- dlls/comdlg32/filedlg.c | 36 ++++++++-------- dlls/comdlg32/filedlg31.c | 16 +++---- dlls/comdlg32/filedlgbrowser.c | 14 +++--- dlls/comdlg32/finddlg.c | 2 +- dlls/comdlg32/fontdlg.c | 12 +++--- dlls/comdlg32/itemdlg.c | 98 +++++++++++++++++++++--------------------- dlls/comdlg32/printdlg.c | 30 ++++++------- 10 files changed, 108 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05fef74867799ff57dcd…

1 0

Eric Pouech : clusapi: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 8a3bc321745a6174ce9b83af575e2fde04a16cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3bc321745a6174ce9b83af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:20 2022 +0100 clusapi: 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/clusapi/Makefile.in | 1 - dlls/clusapi/clusapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index 9514378e663..01451a1d743 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = clusapi.dll IMPORTLIB = clusapi diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index b1dde6f0290..28c5f63d4ca 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -89,7 +89,7 @@ BOOL WINAPI CloseCluster(HCLUSTER hCluster) */ HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType) { - FIXME("(%p, %u) stub!\n", hCluster,dwType); + FIXME("(%p, %lu) stub!\n", hCluster,dwType); return (HCLUSENUM)0xdeadbeef; } @@ -111,7 +111,7 @@ DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum) */ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) { - FIXME("(%p, %u, %p, %p, %u) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName); + FIXME("(%p, %lu, %p, %p, %lu) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName); return ERROR_NO_MORE_ITEMS; }

1 0

Eric Pouech : cards: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5e441786d34b5f8a6e379a69cc8153ddeb753f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e441786d34b5f8a6e379a69… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:13 2022 +0100 cards: 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/cards/Makefile.in | 1 - dlls/cards/cards.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index 7a6f14dda06..395b15018ad 100644 --- a/dlls/cards/Makefile.in +++ b/dlls/cards/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cards.dll IMPORTLIB = cards IMPORTS = user32 gdi32 diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index dec25f3252c..e774d7df4a4 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -92,7 +92,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode BOOL eraseFlag = FALSE; BOOL drawFlag = TRUE; - TRACE("(%p, %d, %d, %d, %d, %d, %d, %d)\n", hdc, x, y, dx, dy, card, mode, color); + TRACE("(%p, %d, %d, %d, %d, %d, %d, %ld)\n", hdc, x, y, dx, dy, card, mode, color); roundCornersFlag = !(mode & MODEFLAG_DONT_ROUND_CORNERS) && (dx == cardWidth) && (dy == cardHeight); @@ -238,7 +238,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode */ BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int mode, DWORD color) { - TRACE("(%p, %d, %d, %d, %d, %d)\n", hdc, x, y, card, mode, color); + TRACE("(%p, %d, %d, %d, %d, %ld)\n", hdc, x, y, card, mode, color); return cdtDrawExt(hdc, x, y, cardWidth, cardHeight, card, mode, color); }

1 0

Eric Pouech : cabinet: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 0197a1c0cc76a15a6bae8dcdbcc6877b93d90016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0197a1c0cc76a15a6bae8dcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:07 2022 +0100 cabinet: 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/cabinet/Makefile.in | 1 - dlls/cabinet/fdi.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index eb45aae8df7..4ee406480ac 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cabinet.dll IMPORTLIB = cabinet IMPORTS = $(ZLIB_PE_LIBS) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 1f442917d56..7e2e6b8fdde 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -482,7 +482,7 @@ static char *FDI_read_string(FDI_Int *fdi, INT_PTR hf, long cabsize) unsigned int i; cab_UBYTE *buf = NULL; - TRACE("(fdi == %p, hf == %ld, cabsize == %ld)\n", fdi, hf, cabsize); + TRACE("(fdi == %p, hf == %Id, cabsize == %ld)\n", fdi, hf, cabsize); do { if (len > maxlen) len = maxlen; @@ -541,7 +541,7 @@ static BOOL FDI_read_entries( cab_UBYTE buf[64], block_resv; char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL; - TRACE("(fdi == ^%p, hf == %ld, pfdici == ^%p)\n", fdi, hf, pfdici); + TRACE("(fdi == ^%p, hf == %Id, pfdici == ^%p)\n", fdi, hf, pfdici); /* read in the CFHEADER */ if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) { @@ -698,7 +698,7 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) BOOL rv; FDI_Int *fdi = get_fdi_ptr( hfdi ); - TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici); + TRACE("(hfdi == ^%p, hf == ^%Id, pfdici == ^%p)\n", hfdi, hf, pfdici); if (!fdi) return FALSE;

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