wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : advpack/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 488505360e7d5d536526667bdfa158e80cf93e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=488505360e7d5d536526667b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:58 2022 +0100 advpack/tests: 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/advpack/tests/Makefile.in | 1 - dlls/advpack/tests/advpack.c | 88 +++++++++++++++++++++--------------------- dlls/advpack/tests/files.c | 48 +++++++++++------------ dlls/advpack/tests/install.c | 50 ++++++++++++------------ 4 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=488505360e7d5d536526…

1 0

Eric Pouech : advapi32/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 339f4a3a70b0df6a17b07cc73fe8aecc64b7d3ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=339f4a3a70b0df6a17b07cc7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:51 2022 +0100 advapi32/tests: 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/advapi32/tests/Makefile.in | 1 - dlls/advapi32/tests/cred.c | 152 +-- dlls/advapi32/tests/crypt.c | 304 +++--- dlls/advapi32/tests/eventlog.c | 234 ++--- dlls/advapi32/tests/lsa.c | 108 +- dlls/advapi32/tests/perf.c | 52 +- dlls/advapi32/tests/registry.c | 1610 +++++++++++++++--------------- dlls/advapi32/tests/security.c | 2060 +++++++++++++++++++-------------------- dlls/advapi32/tests/service.c | 658 ++++++------- 9 files changed, 2589 insertions(+), 2590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=339f4a3a70b0df6a17b0…

1 0

Eric Pouech : adsldp/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 63bcb0f6098905f239864d3c0865daaa22ed440c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bcb0f6098905f239864d3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:45 2022 +0100 adsldp/tests: 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/adsldp/tests/Makefile.in | 1 - dlls/adsldp/tests/ldap.c | 120 +++++++++++++++++++++--------------------- dlls/adsldp/tests/sysinfo.c | 50 +++++++++--------- 3 files changed, 85 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63bcb0f6098905f23986…

1 0

Eric Pouech : activeds/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 45399c9c3853bb9b50eb29b5ccafe12d20c4d3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45399c9c3853bb9b50eb29b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:39 2022 +0100 activeds/tests: 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/activeds/tests/Makefile.in | 1 - dlls/activeds/tests/activeds.c | 62 ++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in index 340336d4c0a..25ae2a9bfd2 100644 --- a/dlls/activeds/tests/Makefile.in +++ b/dlls/activeds/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = activeds.dll IMPORTS = ole32 oleaut32 activeds diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index c2dc3d58c4b..bc6a6bfc568 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -41,46 +41,46 @@ static void test_ADsBuildVarArrayStr(void) LONG start, end, idx; hr = ADsBuildVarArrayStr(NULL, 0, NULL); - ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#x\n", hr); + ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#lx\n", hr); hr = ADsBuildVarArrayStr(NULL, 0, &var); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); start = 0xdeadbeef; hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); - ok(hr == S_OK, "got %#x\n", hr); - ok(start == 0, "got %d\n", start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); end = 0xdeadbeef; hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); - ok(hr == S_OK, "got %#x\n", hr); - ok(end == -1, "got %d\n", end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == -1, "got %ld\n", end); VariantClear(&var); hr = ADsBuildVarArrayStr((LPWSTR *)props, ARRAY_SIZE(props), &var); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); start = 0xdeadbeef; hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); - ok(hr == S_OK, "got %#x\n", hr); - ok(start == 0, "got %d\n", start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); end = 0xdeadbeef; hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); - ok(hr == S_OK, "got %#x\n", hr); - ok(end == 1, "got %d\n", end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == 1, "got %ld\n", end); idx = 0; hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); ok(!lstrcmpW(V_BSTR(&item), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&item))); VariantClear(&item); hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); ok(!lstrcmpW(V_BSTR(&data[0]), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[0]))); ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); ok(!lstrcmpW(V_BSTR(&data[1]), L"prop2"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[1]))); hr = SafeArrayUnaccessData(V_ARRAY(&var)); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantClear(&var); } @@ -93,68 +93,68 @@ static void test_Pathname(void) LONG count, i; hr = CoCreateInstance(&CLSID_Pathname, 0, CLSCTX_INPROC_SERVER, &IID_IADsPathname, (void **)&path); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 0, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 0, "got %ld\n", count); bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = SysAllocString(L"LDAP://sample"); hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(bstr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 0, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 0, "got %ld\n", count); hr = IADsPathname_GetElement(path, 0, &bstr); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#lx\n", hr); SysFreeString(bstr); bstr = SysAllocString(L"LDAP://sample:123/a=b,c=d,e=f"); hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(bstr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 3, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 3, "got %ld\n", count); for (i = 0; i < count; i++) { hr = IADsPathname_GetElement(path, i, &bstr); - ok(hr == S_OK, "got %#x\n", hr); - ok(!wcscmp(bstr, elem[i]), "%u: %s\n", i, wine_dbgstr_w(bstr)); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!wcscmp(bstr, elem[i]), "%lu: %s\n", i, wine_dbgstr_w(bstr)); SysFreeString(bstr); } hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_SERVER, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"sample:123"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_LEAF, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"a=b"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);

1 0

Eric Pouech : winemapi: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: fb3b849321f86cd6c26cd62fc99d62c834838fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3b849321f86cd6c26cd62f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:33 2022 +0100 winemapi: 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/winemapi/Makefile.in | 1 - dlls/winemapi/main.c | 6 +++--- dlls/winemapi/sendmail.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 5408ee834b7..813ee42b349 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemapi.dll IMPORTS = shlwapi shell32 mapi32 diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index b627d49a6b1..e8407f8879b 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -64,7 +64,7 @@ ULONG WINAPI MAPIFindNext(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_type, ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08lx %s %p 0x%08x 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx 0x%08lx %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (session) @@ -76,7 +76,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved) { - TRACE("(0x%08lx 0x%08lx 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session, uiparam, flags, reserved); return SUCCESS_SUCCESS; @@ -97,7 +97,7 @@ ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, SCODE scode; char *p; - TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, + TRACE("(0x%08Ix 0x%08Ix %s 0x%08lx 0x%08lx %p)\n", session, uiparam, debugstr_a(name), flags, reserved, recip); if (!name || !name[0]) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index ca1b6c59df1..1bd3908ef6d 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -101,7 +101,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, HRESULT res; DWORD size; - TRACE("(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, + TRACE("(0x%08Ix 0x%08Ix %p 0x%08lx 0x%08lx)\n", session, uiparam, message, flags, reserved); if (!message) @@ -144,7 +144,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, break; default: - TRACE("Unknown recipient class: %d\n", + TRACE("Unknown recipient class: %ld\n", message->lpRecips[i].ulRecipClass); } } @@ -154,7 +154,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount) { - FIXME("Ignoring %u attachments:\n", message->nFileCount); + FIXME("Ignoring %lu attachments:\n", message->nFileCount); for (i = 0; i < message->nFileCount; i++) FIXME("\t%s (%s)\n", debugstr_a(message->lpFiles[i].lpszPathName), debugstr_a(message->lpFiles[i].lpszFileName));

1 0

Eric Pouech : wtsapi32: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 5595b2c490c7819a9f1e2275107313ed5bbddc36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5595b2c490c7819a9f1e2275… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:27 2022 +0100 wtsapi32: 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/wtsapi32/Makefile.in | 1 - dlls/wtsapi32/wtsapi32.c | 74 +++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5595b2c490c7819a9f1e…

1 0

Eric Pouech : wsock32: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 6c2b2c37327d66a08337cb486a2f26ef2ce1ab0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2b2c37327d66a08337cb48… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:21 2022 +0100 wsock32: 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/wsock32/Makefile.in | 1 - dlls/wsock32/service.c | 12 ++++++------ dlls/wsock32/socket.c | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index 5307150bfef..b5a9c437825 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wsock32.dll IMPORTLIB = wsock32 IMPORTS = mswsock ws2_32 iphlpapi diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index f2a45c983b5..c10951110b5 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -36,7 +36,7 @@ INT WINAPI GetAddressByNameA(DWORD dwNameSpace, LPGUID lpServiceType, LPSTR lpSe LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer, LPDWORD lpdwAliasBufferLength) { - FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace, + FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace, debugstr_guid(lpServiceType), debugstr_a(lpServiceName), lpiProtocols, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, lpAliasBuffer, lpdwAliasBufferLength); @@ -50,7 +50,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer, LPDWORD lpdwAliasBufferLength) { - FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace, + FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace, debugstr_guid(lpServiceType), debugstr_w(lpServiceName), lpiProtocols, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, lpAliasBuffer, lpdwAliasBufferLength); @@ -133,7 +133,7 @@ INT WINAPI SetServiceA(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags) { /* tell the user they've got a substandard implementation */ - FIXME("wsock32: SetServiceA(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, + FIXME("wsock32: SetServiceA(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags); /* some programs may be able to compensate if they know what happened */ @@ -150,7 +150,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags) { /* tell the user they've got a substandard implementation */ - FIXME("wsock32: SetServiceW(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, + FIXME("wsock32: SetServiceW(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags); /* some programs may be able to compensate if they know what happened */ @@ -192,7 +192,7 @@ INT WINAPI GetServiceA(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) { - FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace, + FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); /* some programs may be able to compensate if they know what happened */ @@ -209,7 +209,7 @@ INT WINAPI GetServiceW(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) { - FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace, + FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); /* some programs may be able to compensate if they know what happened */ diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 88ddf5b8eeb..2df54b2280a 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -250,7 +250,7 @@ DWORD WINAPI WsControl(DWORD protocol, */ if (index == 1) return NO_ERROR; - ERR ("Error retrieving data for interface index %u\n", + ERR ("Error retrieving data for interface index %lu\n", index); return ret; } @@ -405,8 +405,8 @@ DWORD WINAPI WsControl(DWORD protocol, { if (table->table[i].dwIndex == index) { - TRACE("Found IP info for tei_instance 0x%x:\n", index); - TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr, + TRACE("Found IP info for tei_instance 0x%lx:\n", index); + TRACE("IP 0x%08lx, mask 0x%08lx\n", table->table[i].dwAddr, table->table[i].dwMask); *baseIPInfo = table->table[i]; break; @@ -615,7 +615,7 @@ DWORD WINAPI WsControl(DWORD protocol, } default: - FIXME("Protocol Not Supported -> protocol=0x%x, action=0x%x, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n", + FIXME("Protocol Not Supported -> protocol=0x%lx, action=0x%lx, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n", protocol, action, pRequestInfo, pcbRequestInfoLen, pResponseInfo, pcbResponseInfoLen); return (WSAEOPNOTSUPP);

1 0

Eric Pouech : wsdapi: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 39f732c8c1549ad579107bc73800d3d6d05efeb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f732c8c1549ad579107bc7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:15 2022 +0100 wsdapi: 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/wsdapi/Makefile.in | 1 - dlls/wsdapi/address.c | 8 ++++---- dlls/wsdapi/discovery.c | 6 +++--- dlls/wsdapi/memory.c | 2 +- dlls/wsdapi/msgparams.c | 4 ++-- dlls/wsdapi/network.c | 12 ++++++------ dlls/wsdapi/xml.c | 6 +++--- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index cb477fd5f44..dd7b350d80b 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 7f11f48ce7c..bb8f54ef93c 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -78,7 +78,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface) IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -87,7 +87,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -99,7 +99,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe) { - FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe); + FIXME("(%p, %p, %ld, %d)\n", This, pszBuffer, cchLength, fSafe); return E_NOTIMPL; } @@ -294,7 +294,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WS static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) { - FIXME("(%p, %d)\n", This, dwTTL); + FIXME("(%p, %ld)\n", This, dwTTL); return E_NOTIMPL; } diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 708cb803d03..9341eec7b78 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -69,7 +69,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_AddRef(IWSDiscoveryPublisher *ifac IWSDiscoveryPublisherImpl *This = impl_from_IWSDiscoveryPublisher(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa struct notificationSink *sink, *cursor; struct message_id *msg_id, *msg_id_cursor; - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -118,7 +118,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_SetAddressFamily(IWSDiscoveryPub { IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); - TRACE("(%p, %d)\n", This, dwAddressFamily); + TRACE("(%p, %ld)\n", This, dwAddressFamily); /* Has the address family already been set? */ if (impl->addressFamily != 0) diff --git a/dlls/wsdapi/memory.c b/dlls/wsdapi/memory.c index 89a6d2dc47d..83261623aee 100644 --- a/dlls/wsdapi/memory.c +++ b/dlls/wsdapi/memory.c @@ -82,7 +82,7 @@ void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize) struct memory_allocation *allocation, *parent; void *ptr; - TRACE("(%p, %lu)\n", pParent, cbSize); + TRACE("(%p, %Iu)\n", pParent, cbSize); ptr = HeapAlloc(GetProcessHeap(), 0, MEMORY_ALLOCATION_SIZE + cbSize); diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index dd07a5bf652..139fc734a2e 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -58,7 +58,7 @@ static ULONG IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -67,7 +67,7 @@ static ULONG IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index ab290845834..4a9a706b747 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -116,7 +116,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (retval != ERROR_BUFFER_OVERFLOW) { - WARN("GetAdaptorsAddresses failed with error %08x\n", retval); + WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); goto cleanup; } @@ -133,7 +133,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (retval != ERROR_SUCCESS) { - WARN("GetAdaptorsAddresses failed with error %08x\n", retval); + WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); goto cleanup; } @@ -200,7 +200,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (thread_handle == NULL) { - WARN("CreateThread failed (error %d)\n", GetLastError()); + WARN("CreateThread failed (error %ld)\n", GetLastError()); closesocket(s); heap_free(send_params->data); @@ -487,7 +487,7 @@ static int start_listening(IWSDiscoveryPublisherImpl *impl, SOCKADDR_STORAGE *bi if (thread_handle == NULL) { - WARN("CreateThread failed (error %d)\n", GetLastError()); + WARN("CreateThread failed (error %ld)\n", GetLastError()); goto cleanup; } @@ -514,7 +514,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL if (ret != ERROR_BUFFER_OVERFLOW) { - WARN("GetAdaptorsAddresses failed with error %08x\n", ret); + WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); return FALSE; } @@ -532,7 +532,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL if (ret != ERROR_SUCCESS) { - WARN("GetAdaptorsAddresses failed with error %08x\n", ret); + WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); goto cleanup; } diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index ca47583da64..d92582718dd 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -466,7 +466,7 @@ static ULONG WINAPI IWSDXMLContextImpl_AddRef(IWSDXMLContext *iface) IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -475,7 +475,7 @@ static ULONG WINAPI IWSDXMLContextImpl_Release(IWSDXMLContext *iface) IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -617,7 +617,7 @@ static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, co static HRESULT WINAPI IWSDXMLContextImpl_SetTypes(IWSDXMLContext *iface, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber) { - FIXME("(%p, %p, %d, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); + FIXME("(%p, %p, %ld, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); return E_NOTIMPL; }

1 0

Eric Pouech : oleacc: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 24bb3b690dc59945cb9ea9c1c2f33d4049eadd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=24bb3b690dc59945cb9ea9c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:09 2022 +0100 oleacc: 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/oleacc/Makefile.in | 1 - dlls/oleacc/client.c | 20 ++++++++++---------- dlls/oleacc/main.c | 32 ++++++++++++++++---------------- dlls/oleacc/propservice.c | 30 +++++++++++++++--------------- dlls/oleacc/window.c | 20 ++++++++++---------- 5 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24bb3b690dc59945cb9e…

1 0

Nikolay Sivov : msxml3/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: aebd8cd514c3bd386a98e4ecc8d1aa1de7a9df4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebd8cd514c3bd386a98e4ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 09:46:35 2022 +0300 msxml3/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/Makefile.in | 1 - dlls/msxml3/tests/domdoc.c | 4870 +++++++++++++++++++++-------------------- dlls/msxml3/tests/httpreq.c | 173 +- dlls/msxml3/tests/saxreader.c | 1181 +++++----- dlls/msxml3/tests/schema.c | 718 +++--- dlls/msxml3/tests/xmldoc.c | 408 ++-- dlls/msxml3/tests/xmlparser.c | 24 +- dlls/msxml3/tests/xmlview.c | 36 +- 8 files changed, 3845 insertions(+), 3566 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aebd8cd514c3bd386a98…

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