July 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : ws2_32/tests: Test listen() after a failed connect().
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: dded35aeb3c7ed7711aeb2a29e2502e9fdd668ce URL: https://gitlab.winehq.org/wine/wine/-/commit/dded35aeb3c7ed7711aeb2a29e2502… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 19 22:11:01 2022 -0500 ws2_32/tests: Test listen() after a failed connect(). --- dlls/ws2_32/tests/sock.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5ed0f286c55..c89f48879aa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3983,6 +3983,7 @@ static void test_select(void) .sin_addr.s_addr = htonl(INADDR_LOOPBACK), .sin_port = 255, }; + SOCKET client2, server2; fdWrite = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); set_blocking(fdWrite, FALSE); @@ -4082,6 +4083,65 @@ static void test_select(void) closesocket(fdWrite); + /* Test listening after a failed connection. */ + + fdWrite = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + set_blocking(fdWrite, FALSE); + + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + address.sin_port = 0; + ret = bind(fdWrite, (struct sockaddr *)&address, sizeof(address)); + ok(!ret, "got %d\n", ret); + + ret = connect(fdWrite, (struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + FD_ZERO(&exceptfds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, NULL, NULL, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + + len = sizeof(address); + ret = getsockname(fdWrite, (struct sockaddr *)&address, &len); + ok(!ret, "got error %lu\n", GetLastError()); + + /* Linux seems to forbid this. We'd need to replace the underlying fd. */ + ret = listen(fdWrite, 1); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + + if (!ret) + { + client2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client2, (struct sockaddr *)&address, sizeof(address)); + ok(!ret, "got error %lu\n", GetLastError()); + + server2 = accept(fdWrite, NULL, NULL); + ok(server2 != INVALID_SOCKET, "got %d\n", ret); + + closesocket(server2); + closesocket(client2); + } + + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "got error %lu\n", id); + + FD_ZERO_ALL(); + FD_SET(fdWrite, &readfds); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 0; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + + closesocket(fdWrite); + /* test polling after a (synchronous) failure */ fdWrite = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -4090,6 +4150,12 @@ static void test_select(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAECONNREFUSED, "got error %u\n", WSAGetLastError()); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + todo_wine ok(!id, "got error %lu\n", id); + FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); FD_SET(fdWrite, &writefds);

1 0

Zhiyi Zhang : dsdmo/tests: Add IMediaParamInfo tests.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 208a8aaa295404b143550ddcc824fccdc06b2242 URL: https://gitlab.winehq.org/wine/wine/-/commit/208a8aaa295404b143550ddcc824fc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 20 11:35:09 2022 +0800 dsdmo/tests: Add IMediaParamInfo tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dsdmo/tests/dsdmo.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 44e4f88af8f..4947b67c751 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -24,6 +24,7 @@ #include "mmsystem.h" #include "dmo.h" #include "initguid.h" +#include "medparam.h" #include "dsound.h" #include "uuids.h" #include "wine/test.h" @@ -131,28 +132,41 @@ static void test_aggregation(const GUID *clsid) static void test_interfaces(const GUID *clsid, const GUID *iid) { + static const GUID *guids[] = + { + &IID_IMediaObject, + &IID_IMediaObjectInPlace, + &IID_IMediaParamInfo, + }; IUnknown *unk, *unk2, *unk3; + unsigned int i; HRESULT hr; ULONG ref; hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, (void **)&unk); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&unk2); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IUnknown_QueryInterface(unk2, iid, (void **)&unk3); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(unk3 == unk, "Interface pointers didn't match.\n"); - IUnknown_Release(unk3); - IUnknown_Release(unk2); + for (i = 0; i < ARRAY_SIZE(guids); ++i) + { + winetest_push_context("GUID %s", debugstr_guid(guids[i])); - hr = IUnknown_QueryInterface(unk, &IID_IMediaObjectInPlace, (void **)&unk2); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IUnknown_QueryInterface(unk2, iid, (void **)&unk3); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(unk3 == unk, "Interface pointers didn't match.\n"); - IUnknown_Release(unk3); - IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, guids[i], (void **)&unk2); + todo_wine_if(guids[i] == &IID_IMediaParamInfo) + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr != S_OK) + { + winetest_pop_context(); + continue; + } + + hr = IUnknown_QueryInterface(unk2, iid, (void **)&unk3); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(unk3 == unk, "Interface pointers didn't match.\n"); + IUnknown_Release(unk3); + IUnknown_Release(unk2); + + winetest_pop_context(); + } ref = IUnknown_Release(unk); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Jinoh Kang : advapi32/tests: Test that the token default DACL uses token owner instead of token user.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: b735ded8c2b76c7839836b02b6b7c2e9efaff38a URL: https://gitlab.winehq.org/wine/wine/-/commit/b735ded8c2b76c7839836b02b6b7c2… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 23:58:21 2022 +0900 advapi32/tests: Test that the token default DACL uses token owner instead of token user. --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3fe84083587..99e68c9a1e5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1765,6 +1765,24 @@ static void test_AccessCheck(void) HeapFree(GetProcessHeap(), 0, PrivSet); } +static TOKEN_USER *get_alloc_token_user( HANDLE token ) +{ + TOKEN_USER *token_user; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenUser, NULL, 0, &size ); + ok(!ret, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + + token_user = HeapAlloc( GetProcessHeap(), 0, size ); + ret = GetTokenInformation( token, TokenUser, token_user, size, &size ); + ok(ret, "GetTokenInformation failed with error %ld\n", GetLastError()); + + return token_user; +} + static TOKEN_OWNER *get_alloc_token_owner( HANDLE token ) { TOKEN_OWNER *token_owner; @@ -6357,6 +6375,7 @@ static void test_TokenIntegrityLevel(void) static void test_default_dacl_owner_group_sid(void) { + TOKEN_USER *token_user; TOKEN_OWNER *token_owner; TOKEN_PRIMARY_GROUP *token_primary_group; HANDLE handle, token; @@ -6371,6 +6390,7 @@ static void test_default_dacl_owner_group_sid(void) ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); ok(ret, "OpenProcessToken failed with error %ld\n", GetLastError()); + token_user = get_alloc_token_user( token ); token_owner = get_alloc_token_owner( token ); token_primary_group = get_alloc_token_primary_group( token ); @@ -6430,12 +6450,27 @@ static void test_default_dacl_owner_group_sid(void) } ok( found, "owner sid not found in dacl\n" ); + if (!EqualSid( token_user->User.Sid, token_owner->Owner )) + { + index = 0; + found = FALSE; + while (GetAce( dacl, index++, (void **)&ace )) + { + ok( ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, + "expected ACCESS_ALLOWED_ACE_TYPE, got %d\n", ace->Header.AceType ); + if (EqualSid( &ace->SidStart, token_user->User.Sid )) found = TRUE; + } + todo_wine + ok( !found, "DACL shall not reference token user if it is different from token owner\n" ); + } + HeapFree( GetProcessHeap(), 0, sa.lpSecurityDescriptor ); HeapFree( GetProcessHeap(), 0, sd ); CloseHandle( handle ); HeapFree( GetProcessHeap(), 0, token_primary_group ); HeapFree( GetProcessHeap(), 0, token_owner ); + HeapFree( GetProcessHeap(), 0, token_user ); } static void test_AdjustTokenPrivileges(void)

1 0

Jinoh Kang : advapi32/tests: Test that default object owner match the token owner.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 9e7e6d29f6cd0a34000e164bd3f54b937c9e2881 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e7e6d29f6cd0a34000e164bd3f54b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 23:58:21 2022 +0900 advapi32/tests: Test that default object owner match the token owner. --- dlls/advapi32/tests/security.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 26753c25959..0c3d696c4ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1765,6 +1765,24 @@ static void test_AccessCheck(void) HeapFree(GetProcessHeap(), 0, PrivSet); } +static TOKEN_OWNER *get_alloc_token_owner( HANDLE token ) +{ + TOKEN_OWNER *token_owner; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenOwner, NULL, 0, &size ); + ok(!ret, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + + token_owner = HeapAlloc( GetProcessHeap(), 0, size ); + ret = GetTokenInformation( token, TokenOwner, token_owner, size, &size ); + ok(ret, "GetTokenInformation failed with error %ld\n", GetLastError()); + + return token_owner; +} + /* test GetTokenInformation for the various attributes */ static void test_token_attr(void) { @@ -6321,7 +6339,8 @@ static void test_TokenIntegrityLevel(void) static void test_default_dacl_owner_sid(void) { - HANDLE handle; + TOKEN_OWNER *token_owner; + HANDLE handle, token; BOOL ret, defaulted, present, found; DWORD size, index; SECURITY_DESCRIPTOR *sd; @@ -6330,6 +6349,13 @@ static void test_default_dacl_owner_sid(void) ACL *dacl; ACCESS_ALLOWED_ACE *ace; + ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); + ok(ret, "OpenProcessToken failed with error %ld\n", GetLastError()); + + token_owner = get_alloc_token_owner( token ); + + CloseHandle( token ); + sd = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH ); ret = InitializeSecurityDescriptor( sd, SECURITY_DESCRIPTOR_REVISION ); ok( ret, "error %lu\n", GetLastError() ); @@ -6354,6 +6380,8 @@ static void test_default_dacl_owner_sid(void) ok( ret, "error %lu\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); ok( !defaulted, "owner defaulted\n" ); + todo_wine + ok( EqualSid( owner, token_owner->Owner ), "owner shall equal token owner\n" ); dacl = (void *)0xdeadbeef; present = FALSE; @@ -6377,6 +6405,8 @@ static void test_default_dacl_owner_sid(void) HeapFree( GetProcessHeap(), 0, sa.lpSecurityDescriptor ); HeapFree( GetProcessHeap(), 0, sd ); CloseHandle( handle ); + + HeapFree( GetProcessHeap(), 0, token_owner ); } static void test_AdjustTokenPrivileges(void)

1 0

Jinoh Kang : advapi32/tests: Check that each ACE is ACCESS_ALLOWED_ACE in the default DACL.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 67429f3ad6b6b677818855eae013736a0de04426 URL: https://gitlab.winehq.org/wine/wine/-/commit/67429f3ad6b6b677818855eae01373… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 23:58:21 2022 +0900 advapi32/tests: Check that each ACE is ACCESS_ALLOWED_ACE in the default DACL. To ensure type safety, without complicating the test. --- dlls/advapi32/tests/security.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 56b30ccc87a..26753c25959 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6368,6 +6368,8 @@ static void test_default_dacl_owner_sid(void) found = FALSE; while (GetAce( dacl, index++, (void **)&ace )) { + ok( ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, + "expected ACCESS_ALLOWED_ACE_TYPE, got %d\n", ace->Header.AceType ); if (EqualSid( &ace->SidStart, owner )) found = TRUE; } ok( found, "owner sid not found in dacl\n" );

1 0

Jinoh Kang : advapi32/tests: Test that default object group match the token primary group.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 2eb6a25f444de486e3031252bf61d09d02019e87 URL: https://gitlab.winehq.org/wine/wine/-/commit/2eb6a25f444de486e3031252bf61d0… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 23:58:21 2022 +0900 advapi32/tests: Test that default object group match the token primary group. --- dlls/advapi32/tests/security.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0c3d696c4ec..3fe84083587 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1783,6 +1783,24 @@ static TOKEN_OWNER *get_alloc_token_owner( HANDLE token ) return token_owner; } +static TOKEN_PRIMARY_GROUP *get_alloc_token_primary_group( HANDLE token ) +{ + TOKEN_PRIMARY_GROUP *token_primary_group; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size ); + ok(!ret, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + + token_primary_group = HeapAlloc( GetProcessHeap(), 0, size ); + ret = GetTokenInformation( token, TokenPrimaryGroup, token_primary_group, size, &size ); + ok(ret, "GetTokenInformation failed with error %ld\n", GetLastError()); + + return token_primary_group; +} + /* test GetTokenInformation for the various attributes */ static void test_token_attr(void) { @@ -6337,15 +6355,16 @@ static void test_TokenIntegrityLevel(void) CloseHandle(token); } -static void test_default_dacl_owner_sid(void) +static void test_default_dacl_owner_group_sid(void) { TOKEN_OWNER *token_owner; + TOKEN_PRIMARY_GROUP *token_primary_group; HANDLE handle, token; BOOL ret, defaulted, present, found; DWORD size, index; SECURITY_DESCRIPTOR *sd; SECURITY_ATTRIBUTES sa; - PSID owner; + PSID owner, group; ACL *dacl; ACCESS_ALLOWED_ACE *ace; @@ -6353,6 +6372,7 @@ static void test_default_dacl_owner_sid(void) ok(ret, "OpenProcessToken failed with error %ld\n", GetLastError()); token_owner = get_alloc_token_owner( token ); + token_primary_group = get_alloc_token_primary_group( token ); CloseHandle( token ); @@ -6367,11 +6387,11 @@ static void test_default_dacl_owner_sid(void) ok( handle != NULL, "error %lu\n", GetLastError() ); size = 0; - ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &size ); + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &size ); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "error %lu\n", GetLastError() ); sd = HeapAlloc( GetProcessHeap(), 0, size ); - ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, size, &size ); + ret = GetKernelObjectSecurity( handle, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, size, &size ); ok( ret, "error %lu\n", GetLastError() ); owner = (void *)0xdeadbeef; @@ -6383,6 +6403,14 @@ static void test_default_dacl_owner_sid(void) todo_wine ok( EqualSid( owner, token_owner->Owner ), "owner shall equal token owner\n" ); + group = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorGroup( sd, &group, &defaulted ); + ok( ret, "error %lu\n", GetLastError() ); + ok( group != (void *)0xdeadbeef, "group not set\n" ); + ok( !defaulted, "group defaulted\n" ); + ok( EqualSid( group, token_primary_group->PrimaryGroup ), "group shall equal token primary group\n" ); + dacl = (void *)0xdeadbeef; present = FALSE; defaulted = TRUE; @@ -6406,6 +6434,7 @@ static void test_default_dacl_owner_sid(void) HeapFree( GetProcessHeap(), 0, sd ); CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, token_primary_group ); HeapFree( GetProcessHeap(), 0, token_owner ); } @@ -8549,7 +8578,7 @@ START_TEST(security) test_GetUserNameW(); test_CreateRestrictedToken(); test_TokenIntegrityLevel(); - test_default_dacl_owner_sid(); + test_default_dacl_owner_group_sid(); test_AdjustTokenPrivileges(); test_AddAce(); test_AddMandatoryAce();

1 0

Alexandre Julliard : README: Mention Gitlab.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 3253cbd8691e924ea7f49053ee1af49c612b2111 URL: https://gitlab.winehq.org/wine/wine/-/commit/3253cbd8691e924ea7f49053ee1af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 19:51:42 2022 +0200 README: Mention Gitlab. --- README | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README b/README index afcbbd48220..2d754da4b82 100644 --- a/README +++ b/README @@ -151,6 +151,8 @@ FAQ: The Wine FAQ is located at https://www.winehq.org/FAQ Wiki: The Wine Wiki is located at https://wiki.winehq.org +Gitlab: Wine development is hosted at https://gitlab.winehq.org + Mailing lists: There are several mailing lists for Wine users and developers; see https://www.winehq.org/forums for more information. @@ -161,13 +163,6 @@ Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org IRC: Online help is available at channel #WineHQ on irc.libera.chat. -Git: The current Wine development tree is available through Git. - Go to https://www.winehq.org/git for more information. - -If you add something, or fix a bug, please send a patch (preferably -using git-format-patch) to the wine-devel(a)winehq.org list for -inclusion in the next release. - -- Alexandre Julliard julliard(a)winehq.org

1 0

Alexandre Julliard : winebuild: Add GNU stack note also to the undefined symbols file.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 31d2a87ba078483be0f8c1c3549692d187d14d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/31d2a87ba078483be0f8c1c3549692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 20:21:48 2022 +0200 winebuild: Add GNU stack note also to the undefined symbols file. Recent ld complains about this. --- tools/winebuild/import.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c876d51f8e6..b1c14db9cab 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -631,6 +631,8 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) } for (j = 0; j < extra_ld_symbols.count; j++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(extra_ld_symbols.str[j]) ); + + output_gnu_stack_note(); fclose( output_file ); obj_file = get_temp_file_name( output_file_name, ".o" );

1 0

Conor McCarthy : vkd3d: Delay unlocking the fence until after the blocked command queue op is written.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: vkd3d Branch: master Commit: 3b579f6fe7baa7c3f7e5e857458da7d1fae853bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3b579f6fe7baa7c3f7e5e857458da… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 18 13:08:01 2022 +1000 vkd3d: Delay unlocking the fence until after the blocked command queue op is written. An unblocking Signal() on the CPU must be handled after the blocked op is written, or the op will not be flushed until the next signal. The device is locked while the fence is already locked, so the fence must never be locked after locking the device. Currently this never occurs. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index eb163848..e0201d5d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6804,8 +6804,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if goto done; } - vkd3d_mutex_unlock(&fence->mutex); - /* This is the critical part required to support out-of-order signal. * Normally we would be able to submit waits and signals out of order, but * we don't have virtualized queues in Vulkan, so we need to handle the case @@ -6814,6 +6812,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if if (!(op = d3d12_command_queue_require_space_locked(command_queue))) { + vkd3d_mutex_unlock(&fence->mutex); hr = E_OUTOFMEMORY; goto done; } @@ -6828,6 +6827,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if if (command_queue->ops_count == 1) hr = d3d12_device_add_blocked_command_queues(command_queue->device, &command_queue, 1); + /* The fence must remain locked until the op is created and the queue is added to the blocked list, + * because if an unblocking d3d12_fence_Signal() call occurs on another thread before the above + * work is done, flushing will be delayed until the next signal, if one occurs at all. */ + vkd3d_mutex_unlock(&fence->mutex); + done: vkd3d_mutex_unlock(&command_queue->op_mutex); return hr;

1 0

Conor McCarthy : vkd3d: Delay adding a command queue to the blocked list until after the op is written.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: vkd3d Branch: master Commit: c1071fda524741682057b7c7992fe81c3f427bef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1071fda524741682057b7c7992fe… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 18 13:08:00 2022 +1000 vkd3d: Delay adding a command queue to the blocked list until after the op is written. Otherwise the following sequence can occur: 1. A command queue is added to the blocked list during a Wait() call. 2. An unblocking Signal() occurs on the CPU in another thread, flushing the blocked ops, but as no op has been written, the queue is removed from the blocked list. 3. The blocked op is written. 3. Another op is queued and the queue is not re-added to the blocked list because this only happens for the first op. World of Warcraft triggers this issue. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d0782e5a..eb163848 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6812,12 +6812,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if * where multiple queues alias over the same physical queue, so effectively, * we need to manage out-of-order submits ourselves. */ - if (!command_queue->ops_count) - hr = d3d12_device_add_blocked_command_queues(command_queue->device, &command_queue, 1); - - if (FAILED(hr)) - goto done; - if (!(op = d3d12_command_queue_require_space_locked(command_queue))) { hr = E_OUTOFMEMORY; @@ -6829,6 +6823,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if d3d12_fence_incref(fence); + /* Add the queue to the blocked list after writing the op to ensure the queue isn't + * removed again in another thread because it has no ops. */ + if (command_queue->ops_count == 1) + hr = d3d12_device_add_blocked_command_queues(command_queue->device, &command_queue, 1); + done: vkd3d_mutex_unlock(&command_queue->op_mutex); return hr;

1 0