August 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : wow64: Also send notifications for failed memory management calls.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: 1942cc30171c9f98abde65f3a0d8857c9ccd892a URL: https://gitlab.winehq.org/wine/wine/-/commit/1942cc30171c9f98abde65f3a0d885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 13:54:59 2023 +0200 wow64: Also send notifications for failed memory management calls. --- dlls/ntdll/tests/wow64.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.c | 1 + dlls/wow64/virtual.c | 38 ++++++++++++++++++-------------------- 3 files changed, 66 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 6ca5ebd9b74..485b9006b14 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -392,6 +392,21 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) } ok( !entry, "not at end of list\n" ); + addr = (void *)0x123; + size = 0x321; + status = NtAllocateVirtualMemory( process, &addr, 0, &size, MEM_COMMIT, PAGE_EXECUTE_READ ); + ok( status == STATUS_CONFLICTING_ADDRESSES || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory failed %lx\n", status ); + entry = pop_from_work_list( &list->work_list ); + if (current_machine != IMAGE_FILE_MACHINE_ARM64) + { + entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualAlloc, addr, 0x321, + MEM_COMMIT, PAGE_EXECUTE_READ, 0, 0xcccccccc ); + entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualAlloc, addr, 0x321, + MEM_COMMIT, PAGE_EXECUTE_READ, status, 0xcccccccc ); + } + ok( !entry, "not at end of list\n" ); + addr = NULL; size = 0x4321; status = NtAllocateVirtualMemory( process, &addr, 0, &size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); @@ -433,6 +448,23 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) } ok( !entry, "not at end of list\n" ); + addr2 = (char *)addr + 0x222; + size = 34; + status = NtProtectVirtualMemory( process, &addr2, &size, PAGE_EXECUTE_WRITECOPY, &old_prot ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PAGE_PROTECTION, + "NtProtectVirtualMemory failed %lx\n", status ); + entry = pop_from_work_list( &list->work_list ); + if (current_machine != IMAGE_FILE_MACHINE_ARM64) + { + entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualProtect, + (char *)addr + 0x222, 34, + PAGE_EXECUTE_WRITECOPY, 0, 0xcccccccc, 0xcccccccc ); + entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualProtect, + (char *)addr + 0x222, 34, + PAGE_EXECUTE_WRITECOPY, status, 0xcccccccc, 0xcccccccc ); + } + ok( !entry, "not at end of list\n" ); + status = NtWriteVirtualMemory( process, (char *)addr + 0x1111, data, sizeof(data), &size ); ok( !status, "NtWriteVirtualMemory failed %lx\n", status ); entry = pop_from_work_list( &list->work_list ); @@ -465,6 +497,21 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) } ok( !entry, "not at end of list\n" ); + addr = (void *)0x123; + size = 0; + status = NtFreeVirtualMemory( process, &addr, &size, MEM_RELEASE ); + ok( status == STATUS_MEMORY_NOT_ALLOCATED || status == STATUS_INVALID_PARAMETER, + "NtFreeVirtualMemory failed %lx\n", status ); + entry = pop_from_work_list( &list->work_list ); + if (current_machine != IMAGE_FILE_MACHINE_ARM64) + { + entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualFree, addr, 0, + MEM_RELEASE, 0, 0xcccccccc, 0xcccccccc ); + entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualFree, addr, 0, + MEM_RELEASE, status, 0xcccccccc, 0xcccccccc ); + } + ok( !entry, "not at end of list\n" ); + file = CreateFileA( "c:\\windows\\syswow64\\version.dll", GENERIC_READ | GENERIC_EXECUTE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n" ); mapping = CreateFileMappingA( file, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL ); diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 4b13fd9d3cd..3b8e479bcb2 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1296,6 +1296,7 @@ void WINAPI Wow64ProcessPendingCrossProcessItems(void) break; case CrossProcessPostVirtualAlloc: if (!pBTCpuNotifyMemoryAlloc) break; + if (entry->args[2]) break; pBTCpuNotifyMemoryAlloc( (void *)entry->addr, entry->size, entry->args[0], entry->args[1] ); break; case CrossProcessPreVirtualFree: diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 79b4e9c2288..e497f60210e 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -160,15 +160,14 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemory( UINT *args ) addr, size, 3, type, protect, 0 ); status = NtAllocateVirtualMemory( process, &addr, get_zero_bits( zero_bits ), &size, type, protect ); + + if (!is_current) + send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + addr, size, 3, type, protect, status ); + if (!status) { - if (is_current) - { - if (pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); - } - else send_cross_process_notification( process, CrossProcessPostVirtualAlloc, - addr, size, 3, type, protect, 0 ); - + if (is_current && pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -204,15 +203,13 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) addr, size, 3, type, protect, 0 ); status = NtAllocateVirtualMemoryEx( process, &addr, &size, type, protect, params64, count ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + addr, size, 3, type, protect, status ); + if (!status) { - if (is_current) - { - if (pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); - } - else send_cross_process_notification( process, CrossProcessPostVirtualAlloc, - addr, size, 3, type, protect, 0 ); - + if (is_current && pBTCpuNotifyMemoryAlloc) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -299,11 +296,11 @@ NTSTATUS WINAPI wow64_NtFreeVirtualMemory( UINT *args ) addr, size, 2, type, 0 ); status = NtFreeVirtualMemory( process, &addr, &size, type ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualFree, + addr, size, 2, type, status ); if (!status) { - if (!is_current) - send_cross_process_notification( process, CrossProcessPostVirtualFree, - addr, size, 2, type, 0 ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -517,11 +514,12 @@ NTSTATUS WINAPI wow64_NtProtectVirtualMemory( UINT *args ) addr, size, 2, new_prot, 0 ); status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, + addr, size, 2, new_prot, status ); + if (!status) { - if (!is_current) - send_cross_process_notification( process, CrossProcessPostVirtualProtect, - addr, size, 2, new_prot, 0 ); put_addr( addr32, addr ); put_size( size32, size ); }

1 0

Alexis Murzeau : wpcap: Handle negative count for pcap_dispatch and pcap_loop.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: 2cc573aef98c082ce1c934750b4e448cd1070d9c URL: https://gitlab.winehq.org/wine/wine/-/commit/2cc573aef98c082ce1c934750b4e44… Author: Alexis Murzeau <amubtdx(a)gmail.com> Date: Wed Aug 30 09:51:29 2023 +0000 wpcap: Handle negative count for pcap_dispatch and pcap_loop. According to WinPcap documentation of `pcap_dispatch` (https://www.winpcap.org/docs/docs_41b5/html/group__wpcapfunc.html#g60ce104c…) > A cnt of -1 processes all the packets received in one buffer when > reading a live capture, or all the packets in the file when reading a > ``savefile'' Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55487 Signed-off-by: Alexis Murzeau <amubtdx(a)gmail.com> --- dlls/wpcap/wpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 8c304ce66a4..f96e7098ae5 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -967,7 +967,7 @@ int CDECL pcap_dispatch( struct pcap *pcap, int count, TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); - while (processed < count) + while (count <= 0 || processed < count) { struct pcap_pkthdr_win32 *hdr = NULL; const unsigned char *data = NULL; @@ -1000,7 +1000,7 @@ int CDECL pcap_loop( struct pcap *pcap, int count, TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); - while (processed < count) + while (count <= 0 || processed < count) { struct pcap_pkthdr_win32 *hdr = NULL; const unsigned char *data = NULL;

1 0

Paul Gofman : user32/tests: Test more flags for MessageBox.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: adf77c1abe6af1dfa746a5299c772947c575070a URL: https://gitlab.winehq.org/wine/wine/-/commit/adf77c1abe6af1dfa746a5299c7729… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 29 19:13:56 2023 -0600 user32/tests: Test more flags for MessageBox. --- dlls/user32/tests/dialog.c | 72 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 21958ddb193..99f52769e73 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2123,15 +2123,36 @@ static void test_timer_message(void) DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); } +static unsigned int msgbox_hook_proc_called; +static UINT msgbox_type; + static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) { + static const LONG considered_ex_styles = WS_EX_CONTROLPARENT | WS_EX_WINDOWEDGE | WS_EX_DLGMODALFRAME | WS_EX_TOPMOST; + if (code == HCBT_ACTIVATE) { HWND msgbox = (HWND)wParam, msghwnd; + LONG exstyles, expected_exstyles; + BOOL system_modal; char text[64]; if (msgbox) { + exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE) & considered_ex_styles; + + ++msgbox_hook_proc_called; + system_modal = msgbox_type & MB_SYSTEMMODAL && !(msgbox_type & MB_TASKMODAL); + expected_exstyles = WS_EX_CONTROLPARENT | WS_EX_WINDOWEDGE; + if ((msgbox_type & MB_TOPMOST) || system_modal) + expected_exstyles |= WS_EX_TOPMOST; + if (!system_modal) + expected_exstyles |= WS_EX_DLGMODALFRAME; + + todo_wine_if((system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) + || (!system_modal && msgbox_type & MB_TOPMOST)) + ok(exstyles == expected_exstyles, "got %#lx, expected %#lx\n", exstyles, expected_exstyles); + text[0] = 0; GetWindowTextA(msgbox, text, sizeof(text)); ok(!strcmp(text, "MSGBOX caption"), "Unexpected window text \"%s\"\n", text); @@ -2141,26 +2162,9 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) text[0] = 0; GetWindowTextA(msghwnd, text, sizeof(text)); - ok(!strcmp(text, "Text"), "Unexpected window text \"%s\"\n", text); - - SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); - SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); - } - } - - return CallNextHookEx(NULL, code, wParam, lParam); -} - -static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARAM lParam) -{ - if (code == HCBT_ACTIVATE) - { - HWND msgbox = (HWND)wParam; - LONG exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE); - if (msgbox) - { - ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + todo_wine_if(msgbox_type != MB_OKCANCEL && !*text) + ok(!strcmp(text, "Text"), "Unexpected window text \"%s\"\n", text); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); @@ -2172,20 +2176,32 @@ static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARA static void test_MessageBox(void) { + static const UINT tests[] = + { + MB_OKCANCEL, + MB_OKCANCEL | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TASKMODAL | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TOPMOST, + MB_OKCANCEL | MB_TOPMOST | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TASKMODAL | MB_TOPMOST, + MB_OKCANCEL | MB_TASKMODAL | MB_SYSTEMMODAL | MB_TOPMOST, + }; + unsigned int i; HHOOK hook; int ret; hook = SetWindowsHookExA(WH_CBT, msgbox_hook_proc, NULL, GetCurrentThreadId()); - ret = MessageBoxA(NULL, "Text", "MSGBOX caption", MB_OKCANCEL); - ok(ret == IDCANCEL, "got %d\n", ret); - - UnhookWindowsHookEx(hook); - - /* Test for MB_SYSTEMMODAL */ - hook = SetWindowsHookExA(WH_CBT, msgbox_sysmodal_hook_proc, NULL, GetCurrentThreadId()); - - MessageBoxA(NULL, NULL, "system modal", MB_OKCANCEL | MB_SYSTEMMODAL); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + msgbox_type = tests[i]; + winetest_push_context("type %#x", msgbox_type); + msgbox_hook_proc_called = 0; + ret = MessageBoxA(NULL, "Text", "MSGBOX caption", msgbox_type); + ok(ret == IDCANCEL, "got %d\n", ret); + ok(msgbox_hook_proc_called, "got %u.\n", msgbox_hook_proc_called); + winetest_pop_context(); + } UnhookWindowsHookEx(hook); }

1 0

Paul Gofman : user32/msgbox: Implement MB_TOPMOST.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: b34c21637682673ca9c822e13e915df52232db35 URL: https://gitlab.winehq.org/wine/wine/-/commit/b34c21637682673ca9c822e13e915d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 29 18:19:44 2023 -0600 user32/msgbox: Implement MB_TOPMOST. --- dlls/user32/msgbox.c | 6 ++++-- dlls/user32/tests/dialog.c | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 4a14a868c73..4d345777a10 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -110,10 +110,12 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } /* handle modal message boxes */ - if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL))) - NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); + if (lpmb->dwStyle & MB_TASKMODAL && lpmb->hwndOwner == NULL) + NtUserSetWindowPos( hwnd, lpmb->dwStyle & MB_TOPMOST ? HWND_TOPMOST : HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); else if (lpmb->dwStyle & MB_SYSTEMMODAL) NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED ); + else if (lpmb->dwStyle & MB_TOPMOST) + NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 99f52769e73..a24bfafd0b9 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2149,8 +2149,7 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) if (!system_modal) expected_exstyles |= WS_EX_DLGMODALFRAME; - todo_wine_if((system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) - || (!system_modal && msgbox_type & MB_TOPMOST)) + todo_wine_if(system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) ok(exstyles == expected_exstyles, "got %#lx, expected %#lx\n", exstyles, expected_exstyles); text[0] = 0;

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle signature element mask left shift in calculate_clip_or_cull_distance_mask().
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: ebc461f795842ede8ff4976acf2f9acaec40de14 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebc461f795842ede8ff4976acf2f9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 13:57:53 2023 +1000 vkd3d-shader/spirv: Handle signature element mask left shift in calculate_clip_or_cull_distance_mask(). In DXIL these masks can have a left shift. --- libs/vkd3d-shader/spirv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9b308453..7232219f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4792,13 +4792,16 @@ static bool is_dual_source_blending(const struct spirv_compiler *compiler) static void calculate_clip_or_cull_distance_mask(const struct signature_element *e, uint32_t *mask) { + unsigned int write_mask; + if (e->semantic_index >= sizeof(*mask) * CHAR_BIT / VKD3D_VEC4_SIZE) { FIXME("Invalid semantic index %u for clip/cull distance.\n", e->semantic_index); return; } - *mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); + write_mask = e->mask >> vkd3d_write_mask_get_component_idx(e->mask); + *mask |= (write_mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); } /* Emits arrayed SPIR-V built-in variables. */

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle signature element mask left shift in spirv_compiler_emit_output().
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: 61a550017f7d86f6b72306ff5f76b9cdef20deb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61a550017f7d86f6b72306ff5f76b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:02:34 2023 +1000 vkd3d-shader/spirv: Handle signature element mask left shift in spirv_compiler_emit_output(). Element masks can have a left shift in DXIL, but these must start at bit 0 in the register info. The SPIR-V declaration will either be a builtin or have SpvDecorationComponent. --- libs/vkd3d-shader/spirv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7232219f..f93960d6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4965,7 +4965,6 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; - component_idx = 0; } else { @@ -4979,14 +4978,9 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, || needs_private_io_variable(builtin)) { use_private_variable = true; - reg_write_mask = write_mask; - } - else - { - component_idx = vkd3d_write_mask_get_component_idx(write_mask); - reg_write_mask = write_mask >> component_idx; } + reg_write_mask = write_mask >> component_idx; vkd3d_symbol_make_register(&reg_symbol, reg); if (rb_get(&compiler->symbol_table, &reg_symbol))

1 0

Conor McCarthy : vkd3d-shader/dxil: Validate the function block count.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: 58d6e445014ba88010ef2b083414799d1eb83349 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58d6e445014ba88010ef2b0834147… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 31 16:23:08 2023 +1000 vkd3d-shader/dxil: Validate the function block count. --- libs/vkd3d-shader/dxil.c | 8 ++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f9efe47f..e1cef5dc 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1911,6 +1911,14 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const { sm6->p.location.column = i; + if (!code_block) + { + WARN("Invalid block count %zu.\n", function->block_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid block count %zu.", function->block_count); + return VKD3D_ERROR_INVALID_SHADER; + } + /* block->record_count - 1 is the instruction count, but some instructions * can emit >1 IR instruction, so extra may be used. */ if (!vkd3d_array_reserve((void **)&code_block->instructions, &code_block->instruction_capacity, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 84614a4e..35f9acd9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -173,6 +173,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_FUNCTION_DCL = 8009, VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_ID = 8010, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE = 8011, + VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND = 8012, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,

1 0

Conor McCarthy : vkd3d-shader/dxil: Replace the result type enum with a bool.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: 720a087c2846f0f8ec458a01c85cfd6e7cdbf3dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/720a087c2846f0f8ec458a01c85cf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 30 11:45:59 2023 +1000 vkd3d-shader/dxil: Replace the result type enum with a bool. Changes to failure handling make the enum unnecessary. --- libs/vkd3d-shader/dxil.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e1cef5dc..96e593b8 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1855,15 +1855,10 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const { struct vkd3d_shader_instruction *ins; const struct dxil_record *record; + bool ret_found, is_terminator; struct sm6_block *code_block; struct sm6_value *dst; size_t i, block_idx; - bool ret_found; - enum - { - RESULT_VALUE, - RESULT_TERMINATE, - } result_type; if (sm6->function_count) { @@ -1934,14 +1929,14 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const dst = sm6_parser_get_current_value(sm6); dst->type = NULL; dst->value_type = VALUE_TYPE_REG; - result_type = RESULT_VALUE; + is_terminator = false; record = block->records[i]; switch (record->code) { case FUNC_CODE_INST_RET: sm6_parser_emit_ret(sm6, record, code_block, ins); - result_type = RESULT_TERMINATE; + is_terminator = true; ret_found = true; break; default: @@ -1949,7 +1944,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_ERROR_INVALID_SHADER; } - if (result_type == RESULT_TERMINATE) + if (is_terminator) { ++block_idx; code_block = (block_idx < function->block_count) ? function->blocks[block_idx] : NULL;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL CALL instruction.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: e54f770669fb8ba8a8ebf7bd4c0a039be23e6279 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e54f770669fb8ba8a8ebf7bd4c0a0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 00:09:19 2023 +1000 vkd3d-shader/dxil: Implement the DXIL CALL instruction. --- libs/vkd3d-shader/dxil.c | 263 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++ 3 files changed, 270 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Declare shader outputs.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: bf49a1a95b50723ea41d12b23a79361f9d1eb915 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf49a1a95b50723ea41d12b23a793… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 21 15:41:43 2023 +1000 vkd3d-shader/dxil: Declare shader outputs. --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/dxil.c | 96 +++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 3 -- 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cfe54dbf..d329e205 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1463,6 +1463,8 @@ enum vkd3d_shader_sysval_semantic VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, + /** Render target; SV_Target in Direct3D shader model 6 shaders. */ + VKD3D_SHADER_SV_TARGET = 0x40, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fd5873dd..db03f0dd 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -290,6 +290,8 @@ struct sm6_parser struct sm6_symbol *global_symbols; size_t global_symbol_count; + struct vkd3d_shader_dst_param *output_params; + struct sm6_function *functions; size_t function_count; @@ -1951,6 +1953,81 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) return VKD3D_OK; } +static void dst_param_io_init(struct vkd3d_shader_dst_param *param, + const struct signature_element *e, enum vkd3d_shader_register_type reg_type) +{ + enum vkd3d_shader_component_type component_type; + + param->write_mask = e->mask; + param->modifiers = 0; + param->shift = 0; + /* DXIL types do not have signedness. Load signed elements as unsigned. */ + component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type; + shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0); +} + +static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, + enum vkd3d_shader_register_type reg_type, struct vkd3d_shader_dst_param *params) +{ + struct vkd3d_shader_dst_param *param; + const struct signature_element *e; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + e = &s->elements[i]; + + param = &params[i]; + dst_param_io_init(param, e, reg_type); + param->reg.idx[0].offset = i; + param->reg.idx_count = 1; + } +} + +static void sm6_parser_emit_signature(struct sm6_parser *sm6, const struct shader_signature *s, + enum vkd3d_shader_opcode handler_idx, enum vkd3d_shader_opcode siv_handler_idx, + struct vkd3d_shader_dst_param *params) +{ + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_dst_param *param; + const struct signature_element *e; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + e = &s->elements[i]; + + /* Do not check e->used_mask because in some cases it is zero for used elements. + * TODO: scan ahead for used I/O elements. */ + + if (e->sysval_semantic != VKD3D_SHADER_SV_NONE && e->sysval_semantic != VKD3D_SHADER_SV_TARGET) + { + ins = sm6_parser_add_instruction(sm6, siv_handler_idx); + param = &ins->declaration.register_semantic.reg; + ins->declaration.register_semantic.sysval_semantic = vkd3d_siv_from_sysval(e->sysval_semantic); + } + else + { + ins = sm6_parser_add_instruction(sm6, handler_idx); + param = &ins->declaration.dst; + } + + *param = params[i]; + } +} + +static void sm6_parser_init_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) +{ + sm6_parser_init_signature(sm6, output_signature, + (sm6->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL) ? VKD3DSPR_COLOROUT : VKD3DSPR_OUTPUT, + sm6->output_params); +} + +static void sm6_parser_emit_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) +{ + sm6_parser_emit_signature(sm6, output_signature, VKD3DSIH_DCL_OUTPUT, VKD3DSIH_DCL_OUTPUT_SIV, sm6->output_params); +} + static const struct sm6_value *sm6_parser_next_function_definition(struct sm6_parser *sm6) { size_t i, count = sm6->function_count; @@ -2365,6 +2442,7 @@ static const struct vkd3d_shader_parser_ops sm6_parser_ops = static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t *byte_code, size_t byte_code_size, const char *source_name, struct vkd3d_shader_message_context *message_context) { + const struct shader_signature *output_signature = &sm6->p.shader_desc.output_signature; const struct vkd3d_shader_location location = {.source_name = source_name}; uint32_t version_token, dxil_version, token_count, magic; unsigned int chunk_offset, chunk_size; @@ -2520,6 +2598,14 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + if (!(sm6->output_params = shader_parser_get_dst_params(&sm6->p, output_signature->element_count))) + { + ERR("Failed to allocate output parameters.\n"); + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory allocating output parameters."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + function_count = dxil_block_compute_function_count(&sm6->root_block); if (!(sm6->functions = vkd3d_calloc(function_count, sizeof(*sm6->functions)))) { @@ -2550,6 +2636,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + sm6_parser_init_output_signature(sm6, output_signature); + if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) @@ -2561,6 +2649,14 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + if (!sm6_parser_require_space(sm6, output_signature->element_count)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader signature declarations."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + sm6_parser_emit_output_signature(sm6, output_signature); + for (i = 0; i < sm6->function_count; ++i) { if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 38f90966..273a543a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1771,9 +1771,6 @@ void *shader_param_allocator_get(struct vkd3d_shader_param_allocator *allocator, { void *params; - if (!count) - return NULL; - if (count > allocator->count - allocator->index) { struct vkd3d_shader_param_node *next = shader_param_allocator_node_create(allocator);

1 0