February 2022 - Wine-Commits

Eric Pouech : rtutils: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 6714a290deeeca205c502e29a0aafe0f20aa3b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6714a290deeeca205c502e29… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:09 2022 +0100 rtutils: 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/rtutils/Makefile.in | 1 - dlls/rtutils/tracing.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index ac39ee054aa..d55efc11cfb 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtutils.dll IMPORTLIB = rtutils diff --git a/dlls/rtutils/tracing.c b/dlls/rtutils/tracing.c index 96d1dfb4a02..576acbd7647 100644 --- a/dlls/rtutils/tracing.c +++ b/dlls/rtutils/tracing.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rtutils); */ DWORD WINAPI TraceRegisterExW(LPCWSTR name, DWORD flags) { - FIXME("(%s, %x): stub\n", debugstr_w(name), flags); + FIXME("(%s, %lx): stub\n", debugstr_w(name), flags); return INVALID_TRACEID; }

1 0

Eric Pouech : rsaenh: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 8a12a30503951fa002dc57126944235d81371d08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a12a30503951fa002dc5712… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:56 2022 +0100 rsaenh: 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/rsaenh/Makefile.in | 1 - dlls/rsaenh/handle.c | 10 +++---- dlls/rsaenh/rsaenh.c | 72 ++++++++++++++++++++++++------------------------- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a12a30503951fa002dc…

1 0

Eric Pouech : rasapi32: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: df977dd3bb7eb90bf2eabbca8550e905a7965bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df977dd3bb7eb90bf2eabbca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:37 2022 +0100 rasapi32: 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/rasapi32/Makefile.in | 1 - dlls/rasapi32/rasapi.c | 52 +++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index e1d31e8c405..ff7e71042f9 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rasapi32.dll IMPORTLIB = rasapi32 diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index f70f73caa2c..a7f3baf4953 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ras); DWORD WINAPI RasConnectionNotificationA(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } DWORD WINAPI RasConnectionNotificationW(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } @@ -54,14 +54,14 @@ DWORD WINAPI RasCreatePhonebookEntryW(HWND hwnd, LPCWSTR lpszPhonebook) DWORD WINAPI RasDeleteSubEntryA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_a(lpszPhonebook), debugstr_a(lpszEntry),dwSubEntryId); return 0; } DWORD WINAPI RasDeleteSubEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_w(lpszPhonebook), debugstr_w(lpszEntry),dwSubEntryId); return 0; } @@ -70,7 +70,7 @@ DWORD WINAPI RasDialA(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCSTR lpszPhoneb LPRASDIALPARAMSA lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -79,7 +79,7 @@ DWORD WINAPI RasDialW(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCWSTR lpszPhone LPRASDIALPARAMSW lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -300,7 +300,7 @@ DWORD WINAPI RasGetAutodialAddressW(LPCWSTR a, LPDWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -309,7 +309,7 @@ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -318,7 +318,7 @@ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -327,7 +327,7 @@ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa */ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -337,7 +337,7 @@ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_a(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_a(a),b,c,d,e); return 0; } @@ -347,7 +347,7 @@ DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_w(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_w(a),b,c,d,e); return 0; } @@ -356,7 +356,7 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -365,7 +365,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -374,7 +374,7 @@ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -383,7 +383,7 @@ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) */ DWORD WINAPI RasSetAutodialParamW(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -394,12 +394,12 @@ DWORD WINAPI RasSetEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, LPRASENTRYA lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_a(lpszPhonebook),debugstr_a(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); FIXME("Rasentry:\n"); - FIXME("\tdwfOptions %x\n",lpRasEntry->dwfOptions); + FIXME("\tdwfOptions %lx\n",lpRasEntry->dwfOptions); FIXME("\tszLocalPhoneNumber %s\n",debugstr_a(lpRasEntry->szLocalPhoneNumber)); return 0; } @@ -411,7 +411,7 @@ DWORD WINAPI RasSetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASENTRYW lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_w(lpszPhonebook),debugstr_w(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); @@ -458,13 +458,13 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } @@ -510,13 +510,13 @@ DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASC DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); return 0; } DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); return 0; } @@ -538,7 +538,7 @@ DWORD WINAPI RasSetSubEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, D LPRASSUBENTRYA lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_a(lpszPhonebook), debugstr_a(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -548,7 +548,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASSUBENTRYW lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_w(lpszPhonebook), debugstr_w(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -556,7 +556,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) { - FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + FIXME("(%p,%lu,%p), stub!\n", connection, entry, statistics); return 0; }

1 0

Eric Pouech : qwave: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 67d35e0342e4b5e93292f23f8b80c958de1c8b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d35e0342e4b5e93292f23f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:31 2022 +0100 qwave: 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/qwave/Makefile.in | 1 - dlls/qwave/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index b75cbb05423..fee5602d7ba 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qwave.dll IMPORTLIB = qwave diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index fceb5c79503..a8755d993d1 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -39,7 +39,7 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) { - FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + FIXME("%p, %Ix, %p, %d, 0x%08lx, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; }

1 0

Zebediah Figura : kernelbase: Prepend the scheme even if the requested URL part is empty.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 439600d5ce276d8d42c6ea2b2cd69d5117938b63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=439600d5ce276d8d42c6ea2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:43 2022 -0600 kernelbase: Prepend the scheme even if the requested URL part is empty. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 47 ++++++----------------------------------------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0dba2098391..f83c68e14f5 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4277,12 +4277,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p { case URL_PART_SCHEME: flags &= ~URL_PARTFLAG_KEEPSCHEME; - if (!pl.scheme_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.scheme; size = pl.scheme_len; break; @@ -4290,30 +4284,19 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_HOSTNAME: if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { - *out = '\0'; - *out_len = 0; - return S_FALSE; + addr = NULL; + size = 0; } - - if (!pl.hostname_len) + else { - *out = '\0'; - *out_len = 0; - return S_FALSE; + addr = pl.hostname; + size = pl.hostname_len; } - addr = pl.hostname; - size = pl.hostname_len; break; case URL_PART_USERNAME: if (!pl.username) return E_INVALIDARG; - if (!pl.username_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.username; size = pl.username_len; break; @@ -4321,12 +4304,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PASSWORD: if (!pl.password) return E_INVALIDARG; - if (!pl.password_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.password; size = pl.password_len; break; @@ -4334,24 +4311,12 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PORT: if (!pl.port) return E_INVALIDARG; - if (!pl.port_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.port; size = pl.port_len; break; case URL_PART_QUERY: flags &= ~URL_PARTFLAG_KEEPSCHEME; - if (!pl.query_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.query; size = pl.query_len; break; @@ -4401,7 +4366,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return S_OK; + return *out_len ? S_OK : S_FALSE; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 5c28142bc42..c6c7e26cec6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -681,7 +681,7 @@ static void test_UrlGetPart(void) {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, - {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE}, + {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE},

1 0

Eric Pouech : propsys: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: a9c797e4538a37716e62bb81c3fed3de39561b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c797e4538a37716e62bb81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:06 2022 +0100 propsys: 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/propsys/Makefile.in | 1 - dlls/propsys/propstore.c | 8 ++++---- dlls/propsys/propsys_main.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 71fd29a0dfe..166b7751d6e 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6e0d49057d9..9906df83f6f 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, propstore_value *value; HRESULT hr; - TRACE("%p,%d,%p\n", iface, iProp, pkey); + TRACE("%p,%ld,%p\n", iface, iProp, pkey); if (!pkey) return E_POINTER; @@ -478,7 +478,7 @@ HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFI { HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret); if (!obj || !ret) return E_POINTER; diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 06150dfad12..6e87b3d3579 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -157,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, LPWSTR dest, DWORD destlen) { - FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen); return E_NOTIMPL; }

1 0

Eric Pouech : qmgr: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 13de3b2ea6357ef64840fa184e9ad9d3dd0dc4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13de3b2ea6357ef64840fa18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:19 2022 +0100 qmgr: 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/qmgr/Makefile.in | 1 - dlls/qmgr/enum_files.c | 8 ++++---- dlls/qmgr/enum_jobs.c | 8 ++++---- dlls/qmgr/file.c | 14 +++++++------- dlls/qmgr/job.c | 34 +++++++++++++++++----------------- dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/service.c | 6 +++--- 7 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13de3b2ea6357ef64840…

1 0

Eric Pouech : query: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 5a30d6791826ce4f3d1490cf3e745e561df94b3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a30d6791826ce4f3d1490cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:25 2022 +0100 query: 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/query/Makefile.in | 1 - dlls/query/query_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 71352a5ff0f..8cdeb9c9765 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = query.dll IMPORTS = uuid diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index cc1eac596c7..9e27986e022 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -57,7 +57,7 @@ HRESULT WINAPI LocateCatalogsA(CHAR const *pwszScope, ULONG iBm, CHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_a(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } @@ -67,7 +67,7 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, WCHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_w(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; }

1 0

Rémi Bernon : winegstreamer: Move format helpers to a dedicated source.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: a288b94831bcd9ef65c23475d8499e53fea69c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a288b94831bcd9ef65c23475… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:06 2022 +0100 winegstreamer: Move format helpers to a dedicated source. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/unix_private.h | 32 +++ dlls/winegstreamer/wg_format.c | 436 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 397 +--------------------------------- 4 files changed, 471 insertions(+), 395 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a288b94831bcd9ef65c2…

1 0

Eric Pouech : pdh: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 7ad38e3b809d94e846bf23488c6a36451c66ea5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad38e3b809d94e846bf2348… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:43 2022 +0100 pdh: 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/pdh/Makefile.in | 1 - dlls/pdh/pdh_main.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index f98fb916646..a56b9d6e4fc 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pdh.dll IMPORTLIB = pdh diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 3840b9d0288..3fc3f7bc6b8 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -213,7 +213,7 @@ PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS ret; WCHAR *pathW; - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!path) return PDH_INVALID_ARGUMENT; @@ -236,7 +236,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, struct counter *counter; unsigned int i; - TRACE("%p %s %lx %p\n", hquery, debugstr_w(path), userdata, hcounter); + TRACE("%p %s %Ix %p\n", hquery, debugstr_w(path), userdata, hcounter); if (!path || !hcounter) return PDH_INVALID_ARGUMENT; @@ -282,7 +282,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -295,7 +295,7 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_w(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -326,7 +326,7 @@ static PDH_STATUS format_value( struct counter *counter, DWORD format, union val } else { - WARN("unknown format %x\n", format); + WARN("unknown format %lx\n", format); return PDH_INVALID_ARGUMENT; } return ERROR_SUCCESS; @@ -342,7 +342,7 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p 0x%08x %p %p %p\n", handle, format, raw1, raw2, value); + TRACE("%p 0x%08lx %p %p %p\n", handle, format, raw1, raw2, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -492,7 +492,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND PDH_STATUS ret; struct query *query = handle; - TRACE("%p %d %p\n", handle, interval, event); + TRACE("%p %ld %p\n", handle, interval, event); EnterCriticalSection( &pdh_handle_cs ); if (!query || query->magic != PDH_MAGIC_QUERY) @@ -584,7 +584,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *time */ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -593,7 +593,7 @@ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCard */ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -745,7 +745,7 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p %x %p %p\n", handle, format, type, value); + TRACE("%p %lx %p %p\n", handle, format, type, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -864,7 +864,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR WCHAR bufferW[PDH_MAX_COUNTER_NAME]; DWORD sizeW = ARRAY_SIZE(bufferW); - TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_a(machine), index, buffer, size); if (!buffer || !size) return PDH_INVALID_ARGUMENT; @@ -890,7 +890,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST PDH_STATUS ret; unsigned int i; - TRACE("%s %d %p %p\n", debugstr_w(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_w(machine), index, buffer, size); if (machine) { @@ -929,7 +929,7 @@ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY * PDH_STATUS ret; WCHAR *sourceW = NULL; - TRACE("%s %lx %p\n", debugstr_a(source), userdata, query); + TRACE("%s %Ix %p\n", debugstr_a(source), userdata, query); if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; @@ -946,7 +946,7 @@ PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY { struct query *query; - TRACE("%s %lx %p\n", debugstr_w(source), userdata, handle); + TRACE("%s %Ix %p\n", debugstr_w(source), userdata, handle); if (!handle) return PDH_INVALID_ARGUMENT; @@ -1112,7 +1112,7 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf WCHAR *bufferW; DWORD buflenW; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); if (!e || !buflen) return PDH_INVALID_ARGUMENT; @@ -1162,9 +1162,9 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu PDH_STATUS ret = ERROR_SUCCESS; DWORD len; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); - if (flags) FIXME("unimplemented flags 0x%08x\n", flags); + if (flags) FIXME("unimplemented flags 0x%08lx\n", flags); if (!e || !e->szCounterName || !e->szObjectName || !buflen) return PDH_INVALID_ARGUMENT; @@ -1207,7 +1207,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1221,7 +1221,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1233,7 +1233,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam */ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) { - FIXME("%u\n", source); + FIXME("%lu\n", source); return ERROR_SUCCESS; }

1 0