February 2022 - Wine-commits

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 : 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 : 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 : 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

Alexandre Julliard : configure: Build demos with -municode on Mingw.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: vkd3d Branch: master Commit: 59d918fd50e6a4fad4052b563bfd248d8ff87013 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=59d918fd50e6a4fad4052b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 17:28:11 2022 +0100 configure: Build demos with -municode on Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index bd58000..265dccc 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,7 @@ dnl Makefiles case $host_os in mingw32*) AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) - AC_SUBST([DEMO_CFLAGS],[""]) + AC_SUBST([DEMO_CFLAGS],["-municode"]) ;; *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])])

1 0

Alexandre Julliard : configure: Don't require libxcb to build demos on Mingw.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: vkd3d Branch: master Commit: 02fe9f5bdf5f9268d06da8bbe95f7157cd2be617 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02fe9f5bdf5f9268d06da8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 17:27:30 2022 +0100 configure: Don't require libxcb to build demos on Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 4 ++-- configure.ac | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8617a09..2425706 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,8 +339,8 @@ XFAIL_TESTS = \ endif if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ -DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) demos_vkd3d_gears_SOURCES = demos/gears.c diff --git a/configure.ac b/configure.ac index 45220f8..bd58000 100644 --- a/configure.ac +++ b/configure.ac @@ -139,8 +139,17 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) dnl Makefiles -AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], +case $host_os in + mingw32*) + AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) + AC_SUBST([DEMO_CFLAGS],[""]) + ;; + *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) + AC_SUBST([DEMO_LIBS],[$XCB_LIBS]) + AC_SUBST([DEMO_CFLAGS],[$XCB_CFLAGS]) + ;; +esac AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([BUILD_DOC], [test $DX_FLAG_doc = 1]) AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])

1 0

Francois Gouget : testbot/WineRunReconfig: Avoid variable redefinitions.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: 8e21d4317e0141ba606654c9e148295990bd2b47 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8e21d4317e0141ba606654c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:54:51 2022 +0100 testbot/WineRunReconfig: Avoid variable redefinitions. Luckily these instances were harmless but somewhat confusing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 12 ++++++------ testbot/bin/WineRunWineTest.pl | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 50696b7..1bddc04 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -432,8 +432,8 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) # that explains why. $NewStatus = "badbuild"; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 04308f3..9f71ff4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -435,8 +435,8 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 72faf10..017e8c4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -401,8 +401,8 @@ if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -(my $ErrMessage, $ReportNames, my $TaskMissions) = $Task->GetReportNames(); -FatalError "$ErrMessage\n" if (defined $ErrMessage); +(my $ReportErr, $ReportNames, my $TaskMissions) = $Task->GetReportNames(); +FatalError "$ReportErr\n" if (defined $ReportErr); FatalError "Cannot specify multiple missions\n" if (@{$TaskMissions->{Missions}} > 1); my $Mission = $TaskMissions->{Missions}->[0]; my $RptFileName = $ReportNames->[0]; @@ -534,8 +534,8 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); $TaskFailures ||= $LogInfo->{ErrCount}; - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { @@ -564,8 +564,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) # $LogInfo->{Failures} can legitimately be undefined in case of a timeout $TaskFailures += $LogInfo->{Failures} || 0; - my $ErrMessage = CreateLogErrorsCache($LogInfo, $Task); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } } elsif (!defined $TAError) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c1a37ae..3526719 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -399,8 +399,8 @@ if (($Step->Type eq "suite" and $Step->FileType ne "none") or FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -(my $ErrMessage, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); -FatalError "$ErrMessage\n" if (defined $ErrMessage); +(my $ReportErr, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); +FatalError "$ReportErr\n" if (defined $ReportErr); # @@ -482,7 +482,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); +my ($ErrMessage, $TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -543,8 +543,8 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TaskFailures = undef; $PossibleCrash = 1; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { @@ -580,8 +580,8 @@ foreach my $RptFileName (@$ReportNames) # $LogInfo->{Failures} can legitimately be undefined in case of a timeout $TaskFailures += $LogInfo->{Failures} || 0; - my $ErrMessage = CreateLogErrorsCache($LogInfo, $Task); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } } elsif (!defined $TAError and

1 0

Francois Gouget : testbot/web: Rename and fix a loop variable declaration.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: da44a1907e8c1e03742ce5e064d252d1bf480861 URL: https://source.winehq.org/git/tools.git/?a=commit;h=da44a1907e8c1e03742ce5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:54:59 2022 +0100 testbot/web: Rename and fix a loop variable declaration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d4270a..eef7a17 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -423,8 +423,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - my $i = 0; - for my $i (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..@{$Group->{Errors}} - 1) { if ($IsEmpty) { @@ -432,8 +431,8 @@ sub GenerateFullLog($$$$) $IsEmpty = 0; } - my $Line = $Group->{Errors}->[$i]; - my $Category = $Group->{IsNew}->[$i] ? "new" : "error"; + my $Line = $Group->{Errors}->[$ErrIndex]; + my $Category = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; my $Html = $self->escapeHTML($Line); print "<span class='log-$Category'>$Html</span>\n"; }

1 0

Francois Gouget : testbot/LibvirtTool: Separate ShutDown() from ShutDownIfOffSnapshot().
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: d342cd997cb100a124baa776d046a3f1653d9ff0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d342cd997cb100a124baa77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:55:37 2022 +0100 testbot/LibvirtTool: Separate ShutDown() from ShutDownIfOffSnapshot(). ShutDown() unconditionally performs a clean shutdown while ShutDownIfOffSnapshot() only does so if the VM is currently running a snapshot that requests them (contains '-off' in its name). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 50 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 6364b30..759d8ec 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -311,6 +311,35 @@ sub Halt($$) =pod =over 12 +=item C<ShutDown()> + +Attempt a clean shutdown of the VM (regardless of its current snapshot). + +Returns 0 if the shutdown failed, 1 otherwise. +=back +=cut + +sub ShutDown($$) +{ + my ($Domain, $TA) = @_; + + if (Halt($TA, 0)) + { + Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); + my $Deadline = time() + $WaitForShutdown; + while (time() <= $Deadline) + { + return 1 if (!$Domain->IsPoweredOn()); + sleep(1); + } + Error "Timed out waiting for $VMKey to perform a clean shutdown\n"; + } + return 0; +} + +=pod +=over 12 + =item C<ShutDownIfOffSnapshot()> Attempt a clean shutdown of the VM if it is running a snapshot that requests @@ -320,6 +349,8 @@ Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was already powered off or a shutdown was not needed. =back =cut +=back +=cut sub ShutDownIfOffSnapshot() { @@ -333,22 +364,15 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - return 0 if (!Halt($VM->GetAgent(), 0)); - - Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); - my $Deadline = time() + $WaitForShutdown; - while (time() <= $Deadline) + if (ShutDown($Domain, $VM->GetAgent())) { - if (!$Domain->IsPoweredOn()) - { - Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); - LogMsg "Successfully shut down $VMKey\n"; - return 2; - } - sleep(1); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return 2; } - Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + # In fact the caller will do so + Error "Forcefully shutting down $VMKey/$CurrentSnapshot now...\n"; return 0; }

1 0

Francois Gouget : testbot/LibvirtTool: Allow taking powered off snapshots.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: 00a592969c037ef88c6a7865d3f86dc629a8a4aa URL: https://source.winehq.org/git/tools.git/?a=commit;h=00a592969c037ef88c6a786… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:55:40 2022 +0100 testbot/LibvirtTool: Allow taking powered off snapshots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 67 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 759d8ec..5e3e7af 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -610,7 +610,7 @@ sub GetSnapshotConfig($) { $Config->{locale} ||= $1; # take only the last match } - elsif ($Config->{base} =~ s/-(live|tsign|u8)$//) + elsif ($Config->{base} =~ s/-(live|off|tsign|u8)$//) { $Config->{$1} = 1; } @@ -722,33 +722,58 @@ sub CreateSnapshot($$$$) } } - if ($Reboot) + if ($Config->{live}) { - # A reboot is still required for some changes to take effect - ResetBootCount($TA); - Halt($TA, "reboot"); - WaitForBoot($TA); - $Booting = 1; - } - if ($Booting) - { - WaitForSession($TA); - if ($SleepAfterBoot) + if ($Reboot) + { + # A reboot is still required for some changes to take effect + ResetBootCount($TA); + Halt($TA, "reboot"); + WaitForBoot($TA); + $Booting = 1; + } + if ($Booting) { - Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); - LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; - sleep($SleepAfterBoot); + WaitForSession($TA); + if ($SleepAfterBoot) + { + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); + LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; + sleep($SleepAfterBoot); + } } + CheckBootCount($TA); + $TA->Disconnect(); # disconnect before taking the snapshot + } + else + { + # Power off the VM for the snapshot + Debug(Elapsed($Start), " Shutting down $VMKey to take the $Config->{snapshot} snapshot\n"); + ResetBootCount($TA); + ShutDown($Domain, $TA); } - CheckBootCount($TA); - $TA->Disconnect(); # disconnect before taking the snapshot Debug(Elapsed($Start), " Creating the $Config->{snapshot} snapshot\n"); my $ErrMessage = $Domain->CreateSnapshot($Config->{snapshot}); if (defined $ErrMessage) { FatalError("Could not create the $Config->{snapshot} snapshot on $VMKey: $ErrMessage\n"); } + return 0 if ($Config->{live}); + + # Without this small pause Libvirt/QEmu sometimes forgets to power on the VM! + sleep(1); + + # The VM was powered off for the snapshot but we need it to be running for + # Revert(). So (revert &) power it on again. + Debug(Elapsed($Start), " Starting $VMKey from the new $Config->{snapshot} snapshot\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{snapshot}); + if (defined $ErrMessage) + { + FatalError("Could not revert $VMKey to $Config->{snapshot}: $ErrMessage\n"); + } + WaitForBoot($TA); + return 1; } sub Revert() @@ -774,9 +799,10 @@ sub Revert() { FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); } - if (!$Config->{live}) + if ($Config->{locale} and !$Config->{live}) { - FatalError("Only live snapshots can be created ($VMKey)\n"); + # The --locale and --country changes don't persist across reboots :-( + FatalError("Creating non-live locale snapshots is not supported ($VMKey)\n"); } if (!$Domain->HasSnapshot($Config->{base})) { @@ -836,8 +862,7 @@ sub Revert() if ($Config->{create}) { - CreateSnapshot($Domain, $TA, $Config, $Booting); - $Booting = 0; + $Booting = CreateSnapshot($Domain, $TA, $Config, $Booting); if ($VM->Type eq "build" or $VM->Type eq "wine") {

1 0