September 2022 - Wine-commits

Zebediah Figura : libwine: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: d17fe0a7920c09a16e75b74213ae0e8bbbd1cba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d17fe0a7920c09a16e75b74213ae0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:15:30 2022 -0500 libwine: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/libs/wine/mmap.c: In function ‘wine_mmap_add_reserved_area_obsolete’: ../wine/libs/wine/mmap.c:504:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 504 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- libs/wine/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index ad51153d039..1f8ae3c7720 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -501,7 +501,7 @@ void wine_mmap_add_reserved_area_obsolete( void *addr, size_t size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -560,7 +560,7 @@ void wine_mmap_remove_reserved_area_obsolete( void *addr, size_t size, int unmap struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Zebediah Figura : ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: f66b49a4968a383bccab03dc200d5448a3ab15f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f66b49a4968a383bccab03dc200d54… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:21:48 2022 -0500 ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation. This works around a spurious gcc warning: ../wine/dlls/ntdll/unix/system.c: In function ‘NtQuerySystemInformation’: ../wine/dlls/ntdll/unix/system.c:3176:36: error: ‘%s’ directive output between 0 and 2147483644 bytes may cause result to exceed ‘INT_MAX’ [-Werror=format-truncation=] 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~ ~~~~~~~~~~ ../wine/dlls/ntdll/unix/system.c:3176:9: note: ‘snprintf’ output between 8 and 2147483780 bytes into a destination of size 4294967295 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 83e0521a3c9..136fc80adf1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3172,8 +3172,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, struct utsname buf; uname( &buf ); - len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); + len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; if (size < len) ret = STATUS_INFO_LENGTH_MISMATCH; break; }

1 0

Zebediah Figura : win32u: Copy directly into the union pointer in unpack_message().
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: c73999f169d54aea56796c1ebd71667b5ebf3b8d URL: https://gitlab.winehq.org/wine/wine/-/commit/c73999f169d54aea56796c1ebd7166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:19:15 2022 -0500 win32u: Copy directly into the union pointer in unpack_message(). This works around a spurious gcc warning: ../wine/dlls/win32u/message.c: In function ‘unpack_message.constprop’: ../wine/dlls/win32u/message.c:359:9: error: writing 28 bytes into a region of size 4 [-Werror=stringop-overflow=] 359 | memcpy( &ps->wp, &wp, sizeof(wp) ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ../wine/dlls/win32u/win32u_private.h:29, from ../wine/dlls/win32u/message.c:30: ../wine/include/ntuser.h:549:15: note: destination object ‘hwnd’ of size 4 549 | UINT hwnd; | ^~~~ --- dlls/win32u/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index f4f134e213b..57e9b26b33d 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -356,7 +356,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa wp.cx = ps->wp.cx; wp.cy = ps->wp.cy; wp.flags = ps->wp.flags; - memcpy( &ps->wp, &wp, sizeof(wp) ); + memcpy( ps, &wp, sizeof(wp) ); break; } case WM_WINE_KEYBOARD_LL_HOOK:

1 0

Alistair Leslie-Hughes : ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 493db3b1f799c9af1e3bad5fcf974aa0f3861cca URL: https://gitlab.winehq.org/wine/wine/-/commit/493db3b1f799c9af1e3bad5fcf974a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 15 19:44:38 2020 +1000 ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d51fef1adb..2f115f02e48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2327,6 +2327,45 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_IDEAL_SEND_BACKLOG_QUERY: + { + DWORD ret; + WSAPROTOCOL_INFOA proto_info; + int proto_len, len; + struct sockaddr addr; + + if (!out_buff || out_size < sizeof(DWORD)) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + proto_len = sizeof(WSAPROTOCOL_INFOA); + ret = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&proto_info, &proto_len); + if (ret == SOCKET_ERROR) + return SOCKET_ERROR; + + if (proto_info.iSocketType != SOCK_STREAM) + { + SetLastError( WSAEOPNOTSUPP ); + return SOCKET_ERROR; + } + + len = sizeof(addr); + if (getpeername( s, &addr, &len ) == SOCKET_ERROR) + { + return SOCKET_ERROR; + } + + *(DWORD*)out_buff = 0x10000; /* 64k */ + + WARN("SIO_IDEAL_SEND_BACKLOG_QUERY Always returning 64k\n"); + + SetLastError( ret ); + *ret_size = sizeof(DWORD); + return 0; + } + case SIOCATMARK: { DWORD ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e6faaffa4c..d4f430a29d2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5273,6 +5273,55 @@ static void test_get_extension_func(void) closesocket(s); } +static void test_backlog_query(void) +{ + const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + GUID acceptex_guid = WSAID_ACCEPTEX; + LPFN_ACCEPTEX pAcceptEx; + struct sockaddr_in destaddr; + DWORD size; + SOCKET s, listener; + int len, ret; + ULONG backlog = 0; + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTCONN, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + + ret = connect(s, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(!ret, "WSAIoctl() failed: %d\n", WSAGetLastError()); + ok(backlog == 0x10000, "got %08lx\n", backlog); + + closesocket(listener); + closesocket(s); + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + backlog = 0; + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEOPNOTSUPP, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + closesocket(s); +} + static void test_base_handle(void) { OVERLAPPED overlapped = {0}, *overlapped_ptr; @@ -13242,6 +13291,7 @@ START_TEST( sock ) test_fionbio(); test_fionread_siocatmark(); test_get_extension_func(); + test_backlog_query(); test_get_interface_list(); test_keepalive_vals(); test_sioRoutingInterfaceQuery();

1 0

Alexandre Julliard : user32/tests: Only report the first todo of a failed message sequence.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: a72bffe768c9fe462010d7e40e20226322fb82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72bffe768c9fe462010d7e40e2022… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:18:29 2022 +0200 user32/tests: Only report the first todo of a failed message sequence. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8bed81b6faf..2c46d24a98f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2713,6 +2713,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex const struct recvd_message *actual; int failcount = 0, dump = 0; unsigned int count = 0; + BOOL is_wine = !strcmp(winetest_platform, "wine"); add_message(&end_of_sequence); @@ -2729,11 +2730,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting wParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->wParam, actual->wParam); } + if (is_wine) goto done; } else { @@ -2750,11 +2752,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting lParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->lParam, actual->lParam); } + if (is_wine) goto done; } else { @@ -2776,11 +2779,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); } + if (is_wine) goto done; } else { @@ -2831,23 +2835,25 @@ static void ok_sequence_(const struct message *expected_list, const char *contex ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || ((expected->flags & kbd_hook) && !hKBD_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) + ((expected->flags & winevent_hook_todo) && is_wine)) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { - todo_wine { + static int reported; + if (!reported++) todo_wine { ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } } expected++; + goto done; } else if (todo) { failcount++; todo_wine { - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } @@ -2868,7 +2874,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex while (expected->message && ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine")))) + ((expected->flags & winevent_hook_todo) && is_wine))) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { @@ -2878,6 +2884,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } } expected++; + goto done; } if (todo) @@ -2885,11 +2892,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex todo_wine { if (expected->message || actual->message) { failcount++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", context, count, expected->message, actual->message); } } + if (is_wine) goto done; } else { @@ -2902,12 +2910,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { - if (!strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); } done: - if (dump) dump_sequence(expected_list, context, file, line); + if (dump && (!is_wine || winetest_debug > 1)) dump_sequence(expected_list, context, file, line); flush_sequence(); }

1 0

Alexandre Julliard : user32/tests: Don't print debug traces by default.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 46164f40ab50ba7d4135d8c2226b4488269262a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/46164f40ab50ba7d4135d8c2226b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:22:45 2022 +0200 user32/tests: Don't print debug traces by default. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 310 ++++++++++++++++++++++++------------------------ 1 file changed, 156 insertions(+), 154 deletions(-)

1 0

Alexandre Julliard : advapi32/tests: Mark some failing tests as todo.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 5965771a9c8213eb85079dc3efa02609dfe75855 URL: https://gitlab.winehq.org/wine/wine/-/commit/5965771a9c8213eb85079dc3efa026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 14:07:13 2022 +0200 advapi32/tests: Mark some failing tests as todo. --- dlls/advapi32/tests/lsa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 5c00298d41e..c43f313d77e 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -402,9 +402,11 @@ static void test_LsaLookupSids(void) /* English and Japanese */ check_unicode_string(&names[0].Name, L"Everyone"); else if (wcscmp(langW, L"0407") == 0) /* German */ - check_unicode_string(&names[0].Name, L"Jeder"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Jeder"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else if (wcscmp(langW, L"040C") == 0) /* French */ - check_unicode_string(&names[0].Name, L"Tout le monde"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Tout le monde"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer));

1 0

Henri Verbeet : wined3d: Destroy the Vulkan command pool after cleaning up resources.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 51466755ad52d80164f969fffcf1f7ba4699a4d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/51466755ad52d80164f969fffcf1f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 15:14:44 2022 +0200 wined3d: Destroy the Vulkan command pool after cleaning up resources. This fixes an issue exposed (but not caused) by commit e553be7e776282fea77b8b60304298d9de90bd8b. Calling vkFreeCommandBuffers() after the corresponding command pool was destroyed causes invalid memory accesses. Thanks to Jacek for pointing this out. --- dlls/wined3d/context_vk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index db1840d29e2..d47f7cf5d1a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1684,10 +1684,13 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) heap_free(context_vk->vk_descriptor_pools); if (context_vk->vk_framebuffer) VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, context_vk->vk_framebuffer, NULL)); - VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); if (context_vk->vk_so_counter_bo.vk_buffer) wined3d_context_vk_destroy_bo(context_vk, &context_vk->vk_so_counter_bo); wined3d_context_vk_cleanup_resources(context_vk, VK_NULL_HANDLE); + /* Destroy the command pool after cleaning up resources. In particular, + * this needs to happen after all command buffers are freed, because + * vkFreeCommandBuffers() requires a valid pool handle. */ + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools);

1 0

Henri Verbeet : d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: bba63771eb742470046801ca4123613b32288624 URL: https://gitlab.winehq.org/wine/wine/-/commit/bba63771eb742470046801ca412361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 14:35:52 2022 +0200 d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions. This appears to have gotten lost in commit 7623d0a6f585505302044beace53fb8ff81ae120. --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 119ab0b3b34..dbdce1e5871 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3644,6 +3644,7 @@ static void test_scissor_size(void) hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); ok(hr == S_OK, "Got hr %#lx.\n", hr); + SetRect(&expect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); ok(EqualRect(&scissorrect, &expect), "Expected rect %s, got %s.\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&scissorrect));

1 0

Henri Verbeet : d3d11: Implement d3d11_input_layout_to_wined3d_declaration() on top of vkd3d_shader_parse_input_signature().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 7d20333faf8e93a3a16680cf1beadc9cdcb50c45 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d20333faf8e93a3a16680cf1beadc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 11:33:48 2022 +0200 d3d11: Implement d3d11_input_layout_to_wined3d_declaration() on top of vkd3d_shader_parse_input_signature(). This was originally prompted by the fact that wined3d_extract_shader_input_signature_from_dxbc() allocates elements with HeapAlloc(), but d3d11_input_layout_to_wined3d_declaration() attempts to free them with free(). That's a regression introduced by commit b951c37b8791ceb052c9e159ad7927f75a72d667. Since we're touching the code though, we may as well use vkd3d_shader_parse_input_signature(), and get rid of wined3d_extract_shader_input_signature_from_dxbc(). --- dlls/d3d11/Makefile.in | 1 + dlls/d3d11/inputlayout.c | 30 ++++++++++++++------------ dlls/wined3d/shader_sm4.c | 23 -------------------- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 46 +++++++++++++++++++++++++++++++++++++++ include/wine/wined3d.h | 49 ------------------------------------------ 6 files changed, 63 insertions(+), 88 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5a56faec523..5197f9ef9d7 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3d11.dll IMPORTLIB = d3d11 IMPORTS = dxguid uuid dxgi wined3d +EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ async.c \ diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index cfdd0e980ed..9f26ef4032b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -19,27 +19,28 @@ #include "d3d11_private.h" #include "winternl.h" +#include <vkd3d_shader.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static BOOL is_vs_sysval_semantic(const struct wined3d_shader_signature_element *e) +static BOOL is_vs_sysval_semantic(const struct vkd3d_shader_signature_element *e) { return !stricmp(e->semantic_name, "sv_instanceid") || !stricmp(e->semantic_name, "sv_vertexid"); } static unsigned int find_input_element(const D3D11_INPUT_ELEMENT_DESC *element_descs, unsigned int element_count, - struct wined3d_shader_signature_element *ise) + const struct vkd3d_shader_signature_element *ise) { const D3D11_INPUT_ELEMENT_DESC *f; unsigned int i; - if (ise->stream_idx) + if (ise->stream_index) return element_count; for (i = 0; i < element_count; ++i) { f = &element_descs[i]; - if (!stricmp(ise->semantic_name, f->SemanticName) && ise->semantic_idx == f->SemanticIndex) + if (!stricmp(ise->semantic_name, f->SemanticName) && ise->semantic_index == f->SemanticIndex) return i; } return element_count; @@ -54,22 +55,23 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct wined3d_vertex_element **wined3d_elements) { - struct wined3d_shader_signature_element *ise; - struct wined3d_shader_signature is; + const struct vkd3d_shader_code dxbc = {shader_byte_code, shader_byte_code_length}; + struct vkd3d_shader_signature_element *ise; const D3D11_INPUT_ELEMENT_DESC *f; + struct vkd3d_shader_signature is; unsigned int i, index; - HRESULT hr; + int ret; - if (FAILED(hr = wined3d_extract_shader_input_signature_from_dxbc(&is, shader_byte_code, shader_byte_code_length))) + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &is, NULL)) < 0) { - ERR("Failed to extract input signature.\n"); + ERR("Failed to extract input signature, ret %d.\n", ret); return E_FAIL; } if (!(*wined3d_elements = calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return E_OUTOFMEMORY; } @@ -96,18 +98,18 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME { if ((index = find_input_element(element_descs, element_count, &ise[i])) < element_count) { - (*wined3d_elements)[index].output_slot = ise[i].register_idx; + (*wined3d_elements)[index].output_slot = ise[i].register_index; } else if (!is_vs_sysval_semantic(&ise[i])) { - WARN("Input element %s%u not found in shader signature.\n", ise[i].semantic_name, ise[i].semantic_idx); + WARN("Input element %s%u not found in shader signature.\n", ise[i].semantic_name, ise[i].semantic_index); free(*wined3d_elements); - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return E_INVALIDARG; } } - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return S_OK; } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e60eb9b2fc4..73001d90833 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2159,26 +2159,3 @@ HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, return hr; } - -static HRESULT shader_isgn_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) -{ - struct wined3d_shader_signature *is = ctx; - - if (tag != TAG_ISGN) - return S_OK; - - if (is->elements) - { - FIXME("Multiple shader signatures.\n"); - return S_OK; - } - - return shader_parse_signature(tag, data, data_size, is); -} - -HRESULT CDECL wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, - const void *code, SIZE_T code_size) -{ - memset(signature, 0, sizeof(*signature)); - return parse_dxbc(code, code_size, shader_isgn_chunk_handler, signature); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a5cf7eca22c..e6126faf838 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -319,8 +319,6 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long) - @ cdecl vkd3d_create_instance(ptr ptr) @ cdecl vkd3d_instance_decref(ptr) @ cdecl vkd3d_instance_get_vk_instance(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a87471fd5d1..5217ee7d221 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -778,6 +778,52 @@ enum wined3d_shader_conditional_op WINED3D_SHADER_CONDITIONAL_OP_Z = 1 }; +enum wined3d_sysval_semantic +{ + WINED3D_SV_POSITION = 0x01, + WINED3D_SV_CLIP_DISTANCE = 0x02, + WINED3D_SV_CULL_DISTANCE = 0x03, + WINED3D_SV_RENDER_TARGET_ARRAY_INDEX = 0x04, + WINED3D_SV_VIEWPORT_ARRAY_INDEX = 0x05, + WINED3D_SV_VERTEX_ID = 0x06, + WINED3D_SV_PRIMITIVE_ID = 0x07, + WINED3D_SV_INSTANCE_ID = 0x08, + WINED3D_SV_IS_FRONT_FACE = 0x09, + WINED3D_SV_SAMPLE_INDEX = 0x0a, + WINED3D_SV_TESS_FACTOR_QUADEDGE = 0x0b, + WINED3D_SV_TESS_FACTOR_QUADINT = 0x0c, + WINED3D_SV_TESS_FACTOR_TRIEDGE = 0x0d, + WINED3D_SV_TESS_FACTOR_TRIINT = 0x0e, + WINED3D_SV_TESS_FACTOR_LINEDET = 0x0f, + WINED3D_SV_TESS_FACTOR_LINEDEN = 0x10, +}; + +enum wined3d_component_type +{ + WINED3D_TYPE_UNKNOWN = 0x0, + WINED3D_TYPE_UINT = 0x1, + WINED3D_TYPE_INT = 0x2, + WINED3D_TYPE_FLOAT = 0x3, +}; + +struct wined3d_shader_signature_element +{ + const char *semantic_name; + unsigned int semantic_idx; + unsigned int stream_idx; + enum wined3d_sysval_semantic sysval_semantic; + enum wined3d_component_type component_type; + unsigned int register_idx; + uint32_t mask; + unsigned int min_precision; +}; + +struct wined3d_shader_signature +{ + unsigned int element_count; + struct wined3d_shader_signature_element *elements; +}; + #define WINED3D_SM1_VS 0xfffeu #define WINED3D_SM1_PS 0xffffu #define WINED3D_SM4_PS 0x0000u diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1348b6fe368..d1147e03f66 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -811,34 +811,6 @@ enum wined3d_decl_usage WINED3D_DECL_USAGE_SAMPLE = 13 }; -enum wined3d_sysval_semantic -{ - WINED3D_SV_POSITION = 1, - WINED3D_SV_CLIP_DISTANCE = 2, - WINED3D_SV_CULL_DISTANCE = 3, - WINED3D_SV_RENDER_TARGET_ARRAY_INDEX = 4, - WINED3D_SV_VIEWPORT_ARRAY_INDEX = 5, - WINED3D_SV_VERTEX_ID = 6, - WINED3D_SV_PRIMITIVE_ID = 7, - WINED3D_SV_INSTANCE_ID = 8, - WINED3D_SV_IS_FRONT_FACE = 9, - WINED3D_SV_SAMPLE_INDEX = 10, - WINED3D_SV_TESS_FACTOR_QUADEDGE = 11, - WINED3D_SV_TESS_FACTOR_QUADINT = 12, - WINED3D_SV_TESS_FACTOR_TRIEDGE = 13, - WINED3D_SV_TESS_FACTOR_TRIINT = 14, - WINED3D_SV_TESS_FACTOR_LINEDET = 15, - WINED3D_SV_TESS_FACTOR_LINEDEN = 16, -}; - -enum wined3d_component_type -{ - WINED3D_TYPE_UNKNOWN = 0, - WINED3D_TYPE_UINT = 1, - WINED3D_TYPE_INT = 2, - WINED3D_TYPE_FLOAT = 3, -}; - enum wined3d_scanline_ordering { WINED3D_SCANLINE_ORDERING_UNKNOWN = 0, @@ -2113,24 +2085,6 @@ struct wined3d_sampler_desc BOOL srgb_decode; }; -struct wined3d_shader_signature_element -{ - const char *semantic_name; - unsigned int semantic_idx; - unsigned int stream_idx; - enum wined3d_sysval_semantic sysval_semantic; - enum wined3d_component_type component_type; - unsigned int register_idx; - DWORD mask; - unsigned int min_precision; -}; - -struct wined3d_shader_signature -{ - UINT element_count; - struct wined3d_shader_signature_element *elements; -}; - struct wined3d_shader_desc { const DWORD *byte_code; @@ -2930,9 +2884,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, - const void *byte_code, SIZE_T byte_code_size); - static inline void wined3d_streaming_buffer_init(struct wined3d_streaming_buffer *buffer, unsigned int bind_flags) { memset(buffer, 0, sizeof(*buffer));

1 0