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

Alexandre Julliard : ntdll/tests: Add tests for cross-process notifications.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: b892d12c8c12719fb377de9cc34ed4e8d319e1ae URL: https://gitlab.winehq.org/wine/wine/-/commit/b892d12c8c12719fb377de9cc34ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:53:20 2023 +0200 ntdll/tests: Add tests for cross-process notifications. --- dlls/ntdll/tests/wow64.c | 254 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 252 insertions(+), 2 deletions(-)

1 0

Alexandre Julliard : winebuild: Ignore syscalls that point to an alias.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: afb8d94e2f5e79ddeef4f9d63966787557a3d0ac URL: https://gitlab.winehq.org/wine/wine/-/commit/afb8d94e2f5e79ddeef4f9d6396678… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 18:38:51 2023 +0200 winebuild: Ignore syscalls that point to an alias. --- tools/winebuild/import.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 99258a94527..de4bc26f60d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1402,6 +1402,7 @@ void output_syscalls( DLLSPEC *spec ) { ORDDEF *odp = &spec->entry_points[i]; if (!(odp->flags & FLAG_SYSCALL)) continue; + if (strcmp( odp->name, odp->link_name )) continue; /* ignore syscall aliases */ if (!syscalls) syscalls = xmalloc( (spec->nb_entry_points - i) * sizeof(*syscalls) ); syscalls[count++] = odp; }

1 0

Lorenzo Ferrillo : secur32: Increment iteration index after load_package error.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 3957f937fcb4c70079e0b09a4ac457937c3cf65f URL: https://gitlab.winehq.org/wine/wine/-/commit/3957f937fcb4c70079e0b09a4ac457… Author: Lorenzo Ferrillo <lorenzofersteam(a)live.it> Date: Fri Aug 25 23:45:39 2023 +0200 secur32: Increment iteration index after load_package error. Otherwise if a package fail to load the routine is stuck in a continuous loop trying to load the package, resulting in a loader deadlock. Restore the behaviour before commit 021547cabcb811c38060a2f7e675c25d26f16d3d. Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/secur32/lsa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a9ca8b60283..9bcf0bf7152 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -967,10 +967,9 @@ void load_auth_packages(void) if (err != ERROR_SUCCESS) continue; - if (!load_package(name, &package, i + 1)) - continue; + if (load_package(name, &package, i + 1)) + add_package(&package); - add_package(&package); i++; }

1 0

Marcus Meissner : cryptui: LoadStringW gets characters as size, not bytes.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 7d72397a0821120605944721c1e47895e6cf10db URL: https://gitlab.winehq.org/wine/wine/-/commit/7d72397a0821120605944721c1e478… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 27 13:47:21 2023 +0200 cryptui: LoadStringW gets characters as size, not bytes. --- dlls/cryptui/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 357eec02460..ee5d7037366 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -923,7 +923,7 @@ static void get_cert_usages(PCCERT_CONTEXT cert, LPWSTR *str) size = MAX_STRING_LEN * sizeof(WCHAR); *str = malloc(size); if (*str) - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, *str, size); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, *str, MAX_STRING_LEN); } } else @@ -931,7 +931,7 @@ static void get_cert_usages(PCCERT_CONTEXT cert, LPWSTR *str) size = MAX_STRING_LEN * sizeof(WCHAR); *str = malloc(size); if (*str) - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, *str, size); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, *str, MAX_STRING_LEN); } }

1 0

Biswapriyo Nath : uiautomationcore: Fix typo with TreeScope_Subtree name.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 096377be4219e2bebe3ed8535a0ae7965536a489 URL: https://gitlab.winehq.org/wine/wine/-/commit/096377be4219e2bebe3ed8535a0ae7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Aug 27 18:41:52 2023 +0530 uiautomationcore: Fix typo with TreeScope_Subtree name. --- dlls/uiautomationcore/tests/uiautomation.c | 20 ++++++++++---------- dlls/uiautomationcore/uia_com_client.c | 6 +++--- include/uiautomationclient.idl | 2 +- include/uiautomationcoreapi.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index af640dbe00f..a733e183312 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11544,7 +11544,7 @@ static void test_CUIAutomation_cache_request_iface(IUIAutomation *uia_iface) hr = IUIAutomationCacheRequest_put_TreeScope(cache_req, TreeScope_Ancestors | TreeScope_Element); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IUIAutomationCacheRequest_put_TreeScope(cache_req, ~(TreeScope_SubTree | TreeScope_Parent | TreeScope_Ancestors)); + hr = IUIAutomationCacheRequest_put_TreeScope(cache_req, ~(TreeScope_Subtree | TreeScope_Parent | TreeScope_Ancestors)); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Invalid values don't change anything. */ @@ -12133,7 +12133,7 @@ static void test_Element_Find(IUIAutomation *uia_iface) * Equivalent to: Maximum find depth of -1, find first is FALSE, exclude * root is FALSE. */ - hr = IUIAutomationElement_FindAllBuildCache(element, TreeScope_SubTree, condition, cache_req, &element_arr); + hr = IUIAutomationElement_FindAllBuildCache(element, TreeScope_Subtree, condition, cache_req, &element_arr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_elem_desc(&exp_elems[0], &Provider, NULL, GetCurrentProcessId(), 2, 2); @@ -12378,7 +12378,7 @@ static void test_Element_Find(IUIAutomation *uia_iface) * root is FALSE. Provider_child_child2 is the only element in the tree * to match our condition. */ - hr = IUIAutomationElement_FindFirstBuildCache(element, TreeScope_SubTree, condition, cache_req, &element2); + hr = IUIAutomationElement_FindFirstBuildCache(element, TreeScope_Subtree, condition, cache_req, &element2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider_child_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child_child2.ref); @@ -12443,7 +12443,7 @@ static void test_Element_Find(IUIAutomation *uia_iface) set_provider_prop_override(&Provider_child, &prop_override, 1); set_provider_prop_override(&Provider_child_child, &prop_override, 1); - hr = IUIAutomationElement_FindFirst(element, TreeScope_SubTree, condition, &element2); + hr = IUIAutomationElement_FindFirst(element, TreeScope_Subtree, condition, &element2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider_child_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child_child2.ref); @@ -13231,11 +13231,11 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati /* * Invalid input argument tests. */ - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, NULL, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, NULL, TreeScope_Subtree, NULL, &AutomationEventHandler.IUIAutomationEventHandler_iface); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem, TreeScope_Subtree, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); @@ -13260,14 +13260,14 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati * AddFocusChangedEventHandler. Trying to register it on a regular event * handler returns E_INVALIDARG. */ - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_AutomationFocusChangedEventId, elem, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_AutomationFocusChangedEventId, elem, TreeScope_Subtree, NULL, &AutomationEventHandler.IUIAutomationEventHandler_iface); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Windows 11 queries the HWND for the element when adding a new handler. */ set_uia_hwnd_expects(3, 2, 2, 3, 0); /* All other event IDs are fine, only focus events are blocked. */ - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, 1, elem, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, 1, elem, TreeScope_Subtree, NULL, &AutomationEventHandler.IUIAutomationEventHandler_iface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(AutomationEventHandler.ref > 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); @@ -13282,7 +13282,7 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati * Test event raising behavior. */ set_uia_hwnd_expects(3, 2, 2, 3, 0); - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem, TreeScope_Subtree, NULL, &AutomationEventHandler.IUIAutomationEventHandler_iface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(AutomationEventHandler.ref > 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); @@ -13349,7 +13349,7 @@ static void test_IUIAutomationEventHandler(IUIAutomation *uia_iface, IUIAutomati * runtime-id, the only way to unregister the event handler is to call * RemoveAllEventHandlers(). */ - hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem2, TreeScope_SubTree, NULL, + hr = IUIAutomation_AddAutomationEventHandler(uia_iface, UIA_LiveRegionChangedEventId, elem2, TreeScope_Subtree, NULL, &AutomationEventHandler.IUIAutomationEventHandler_iface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(AutomationEventHandler.ref > 1, "Unexpected refcnt %ld\n", AutomationEventHandler.ref); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 9242a279faa..c2b723660b1 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -743,7 +743,7 @@ static HRESULT WINAPI uia_cache_request_put_TreeScope(IUIAutomationCacheRequest TRACE("%p, %#x\n", iface, scope); - if (!scope || (scope & ~TreeScope_SubTree)) + if (!scope || (scope & ~TreeScope_Subtree)) return E_INVALIDARG; if ((scope & TreeScope_Children) || (scope & TreeScope_Descendants)) @@ -1366,7 +1366,7 @@ static HRESULT set_find_params_struct(struct UiaFindParams *params, IUIAutomatio if (FAILED(hr)) return hr; - if (!scope || (scope & (~TreeScope_SubTree))) + if (!scope || (scope & (~TreeScope_Subtree))) return E_INVALIDARG; params->FindFirst = find_first; @@ -3447,7 +3447,7 @@ static HRESULT WINAPI uia_iface_AddFocusChangedEventHandler(IUIAutomation6 *ifac return hr; } - hr = uia_add_com_event_handler(iface, UIA_AutomationFocusChangedEventId, elem, TreeScope_SubTree, cache_req, + hr = uia_add_com_event_handler(iface, UIA_AutomationFocusChangedEventId, elem, TreeScope_Subtree, cache_req, &IID_IUIAutomationFocusChangedEventHandler, handler_unk); IUIAutomationElement_Release(elem); IUnknown_Release(handler_unk); diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index 7a0b50288d4..1026230f1c2 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -27,7 +27,7 @@ enum TreeScope { TreeScope_Descendants = 0x04, TreeScope_Parent = 0x08, TreeScope_Ancestors = 0x10, - TreeScope_SubTree = TreeScope_Element | TreeScope_Children | TreeScope_Descendants, + TreeScope_Subtree = TreeScope_Element | TreeScope_Children | TreeScope_Descendants, }; enum PropertyConditionFlags { diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0c2ad7b742d..a9a3c75c13c 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -371,7 +371,7 @@ enum TreeScope { TreeScope_Descendants = 0x04, TreeScope_Parent = 0x08, TreeScope_Ancestors = 0x10, - TreeScope_SubTree = TreeScope_Element | TreeScope_Children | TreeScope_Descendants, + TreeScope_Subtree = TreeScope_Element | TreeScope_Children | TreeScope_Descendants, }; enum PropertyConditionFlags {

1 0

Alex Henrie : dmusic: Use CRT allocation functions.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 4ef31ae987b80ae7794c0a72a99e9999efda8a50 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ef31ae987b80ae7794c0a72a99e99… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 22 22:28:38 2023 -0600 dmusic: Use CRT allocation functions. --- dlls/dmusic/buffer.c | 10 +++++----- dlls/dmusic/clock.c | 4 ++-- dlls/dmusic/collection.c | 14 +++++++------- dlls/dmusic/dmobject.c | 7 +++---- dlls/dmusic/dmusic.c | 29 +++++++++++------------------ dlls/dmusic/download.c | 4 ++-- dlls/dmusic/instrument.c | 23 ++++++++++------------- dlls/dmusic/port.c | 29 ++++++++++++++--------------- 8 files changed, 54 insertions(+), 66 deletions(-)

1 0

Alex Henrie : mpr: Fix double free in WNetGetResourceInformationA.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: afdd2191944337414f0e311adfaadfab615369ca URL: https://gitlab.winehq.org/wine/wine/-/commit/afdd2191944337414f0e311adfaadf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Aug 26 20:07:34 2023 -0600 mpr: Fix double free in WNetGetResourceInformationA. --- dlls/mpr/wnet.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 999a2a0e80c..e9c5321cee1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1684,7 +1684,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, if (ret == WN_SUCCESS) { LPWSTR lpSystemW = NULL; - LPVOID lpBufferW; + NETRESOURCEW *lpBufferW; size = 1024; lpBufferW = HeapAlloc(GetProcessHeap(), 0, size); if (lpBufferW) @@ -1705,12 +1705,10 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, { ret = _thunkNetResourceArrayWToA(lpBufferW, &count, lpBuffer, cbBuffer); - HeapFree(GetProcessHeap(), 0, lpNetResourceW); - lpNetResourceW = lpBufferW; size = sizeof(NETRESOURCEA); - size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpRemoteName, + size += WideCharToMultiByte(CP_ACP, 0, lpBufferW->lpRemoteName, -1, NULL, 0, NULL, NULL); - size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpProvider, + size += WideCharToMultiByte(CP_ACP, 0, lpBufferW->lpProvider, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_ACP, 0, lpSystemW,

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate the src register of case conditions.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 5c706152fa805eb5ef88d5f397e32654d29a5cab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c706152fa805eb5ef88d5f397e32… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Aug 28 12:55:47 2023 +1000 vkd3d-shader/tpf: Validate the src register of case conditions. Case values are constants in TPF. --- libs/vkd3d-shader/tpf.c | 16 +++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index cf2cc0d1..461a110a 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -707,6 +707,19 @@ static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, VKD3D_SHADER_CONDITIONAL_OP_NZ : VKD3D_SHADER_CONDITIONAL_OP_Z; } +static void shader_sm4_read_case_condition(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) +{ + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, + (struct vkd3d_shader_src_param *)&ins->src[0]); + if (ins->src[0].reg.type != VKD3DSPR_IMMCONST) + { + FIXME("Switch case value is not a 32-bit constant.\n"); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_CASE_VALUE, + "Switch case value is not a 32-bit immediate constant register."); + } +} + static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { @@ -1215,7 +1228,8 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_BREAK, VKD3DSIH_BREAK, "", ""}, {VKD3D_SM4_OP_BREAKC, VKD3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, - {VKD3D_SM4_OP_CASE, VKD3DSIH_CASE, "", "u"}, + {VKD3D_SM4_OP_CASE, VKD3DSIH_CASE, "", "u", + shader_sm4_read_case_condition}, {VKD3D_SM4_OP_CONTINUE, VKD3DSIH_CONTINUE, "", ""}, {VKD3D_SM4_OP_CONTINUEC, VKD3DSIH_CONTINUEP, "", "u", shader_sm4_read_conditional_op}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7cfaba56..df0273cb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -78,6 +78,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER = 1005, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL = 1006, + VKD3D_SHADER_ERROR_TPF_INVALID_CASE_VALUE = 1007, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300, VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK = 1301,

1 0

Conor McCarthy : vkd3d-shader/tpf: Handle the dimension bitfield in src param tokens.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 7e5d9e3b6fc5c4646a48ee306c26ebb57a19740c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e5d9e3b6fc5c4646a48ee306c26e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 8 11:38:26 2023 +1000 vkd3d-shader/tpf: Handle the dimension bitfield in src param tokens. --- libs/vkd3d-shader/spirv.c | 18 +++++++++- libs/vkd3d-shader/tpf.c | 62 +++++++++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +++ 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa605f18..f1644587 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2643,6 +2643,16 @@ static void VKD3D_PRINTF_FUNC(3, 4) spirv_compiler_error(struct spirv_compiler * compiler->failed = true; } +static void VKD3D_PRINTF_FUNC(3, 4) spirv_compiler_warning(struct spirv_compiler *compiler, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(compiler->message_context, &compiler->location, error, format, args); + va_end(args); +} + static struct vkd3d_string_buffer *vkd3d_shader_register_range_string(struct spirv_compiler *compiler, const struct vkd3d_shader_register_range *range) { @@ -7466,7 +7476,13 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c assert(compiler->control_flow_depth); assert(cf_info->current_block == VKD3D_BLOCK_SWITCH); - assert(src->swizzle == VKD3D_SHADER_NO_SWIZZLE && src->reg.type == VKD3DSPR_IMMCONST); + if (src->swizzle != VKD3D_SHADER_SWIZZLE(X, X, X, X)) + { + WARN("Unexpected src swizzle %#x.\n", src->swizzle); + spirv_compiler_warning(compiler, VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE, + "The swizzle for a switch case value is not scalar."); + } + assert(src->reg.type == VKD3DSPR_IMMCONST); value = *src->reg.u.immconst_uint; if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 461a110a..e00dfd5e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2026,6 +2026,7 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { + unsigned int dimension; DWORD token; if (*ptr >= end) @@ -2041,37 +2042,50 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons return false; } - if (src_param->reg.type == VKD3DSPR_IMMCONST || src_param->reg.type == VKD3DSPR_IMMCONST64) + switch ((dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT)) { - src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; - } - else - { - enum vkd3d_sm4_swizzle_type swizzle_type = - (token & VKD3D_SM4_SWIZZLE_TYPE_MASK) >> VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + case VKD3D_SM4_DIMENSION_NONE: + case VKD3D_SM4_DIMENSION_SCALAR: + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); + break; - switch (swizzle_type) + case VKD3D_SM4_DIMENSION_VEC4: { - case VKD3D_SM4_SWIZZLE_NONE: - if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); - else - src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; - break; + enum vkd3d_sm4_swizzle_type swizzle_type = + (token & VKD3D_SM4_SWIZZLE_TYPE_MASK) >> VKD3D_SM4_SWIZZLE_TYPE_SHIFT; - case VKD3D_SM4_SWIZZLE_SCALAR: - src_param->swizzle = (token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT; - src_param->swizzle = (src_param->swizzle & 0x3) * 0x01010101; - break; + switch (swizzle_type) + { + case VKD3D_SM4_SWIZZLE_NONE: + if (shader_sm4_is_scalar_register(&src_param->reg)) + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); + else + src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + break; - case VKD3D_SM4_SWIZZLE_VEC4: - src_param->swizzle = swizzle_from_sm4((token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT); - break; + case VKD3D_SM4_SWIZZLE_SCALAR: + src_param->swizzle = (token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT; + src_param->swizzle = (src_param->swizzle & 0x3) * 0x01010101; + break; - default: - FIXME("Unhandled swizzle type %#x.\n", swizzle_type); - break; + case VKD3D_SM4_SWIZZLE_VEC4: + src_param->swizzle = swizzle_from_sm4((token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT); + break; + + default: + FIXME("Unhandled swizzle type %#x.\n", swizzle_type); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_SWIZZLE, + "Source register swizzle type %#x is invalid.", swizzle_type); + break; + } + break; } + + default: + FIXME("Unhandled dimension %#x.\n", dimension); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_DIMENSION, + "Source register dimension %#x is invalid.", dimension); + break; } if (register_is_input_output(&src_param->reg) && !shader_sm4_validate_input_output_register(priv, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index df0273cb..c6be6f22 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER = 1005, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL = 1006, VKD3D_SHADER_ERROR_TPF_INVALID_CASE_VALUE = 1007, + VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_DIMENSION = 1008, + VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_SWIZZLE = 1009, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300, VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK = 1301, @@ -89,6 +91,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED = 2003, VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED = 2004, + VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE = 2300, + VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002,

1 0

Conor McCarthy : vkd3d-shader/tpf: Use the default vec4 swizzle if a src param contains a mask.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 92021b7a3c13143165144cfe045b10030597ab1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/92021b7a3c13143165144cfe045b1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 8 12:09:10 2023 +1000 vkd3d-shader/tpf: Use the default vec4 swizzle if a src param contains a mask. --- libs/vkd3d-shader/spirv.c | 5 ----- libs/vkd3d-shader/tpf.c | 25 +++++++++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++++++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f1644587..d79796bc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -204,11 +204,6 @@ static inline bool register_is_undef(const struct vkd3d_shader_register *reg) return reg->type == VKD3DSPR_UNDEF; } -static inline bool register_is_constant(const struct vkd3d_shader_register *reg) -{ - return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64); -} - static inline bool register_is_constant_or_undef(const struct vkd3d_shader_register *reg) { return register_is_constant(reg) || register_is_undef(reg); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e00dfd5e..084b0bfd 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -507,7 +507,7 @@ enum vkd3d_sm4_input_primitive_type enum vkd3d_sm4_swizzle_type { - VKD3D_SM4_SWIZZLE_NONE = 0x0, + VKD3D_SM4_SWIZZLE_NONE = 0x0, /* swizzle bitfield contains a mask */ VKD3D_SM4_SWIZZLE_VEC4 = 0x1, VKD3D_SM4_SWIZZLE_SCALAR = 0x2, }; @@ -2026,7 +2026,7 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { - unsigned int dimension; + unsigned int dimension, mask; DWORD token; if (*ptr >= end) @@ -2057,10 +2057,23 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons switch (swizzle_type) { case VKD3D_SM4_SWIZZLE_NONE: - if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); - else - src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + + mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; + /* Mask seems only to be used for vec4 constants and is always zero. */ + if (!register_is_constant(&src_param->reg)) + { + FIXME("Source mask %#x is not for a constant.\n", mask); + vkd3d_shader_parser_warning(&priv->p, VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK, + "Unhandled mask %#x for a non-constant source register.", mask); + } + else if (mask) + { + FIXME("Unhandled mask %#x.\n", mask); + vkd3d_shader_parser_warning(&priv->p, VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK, + "Unhandled source register mask %#x.", mask); + } + break; case VKD3D_SM4_SWIZZLE_SCALAR: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c6be6f22..3ea6e5b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -84,6 +84,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300, VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK = 1301, + VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK = 1302, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, @@ -1018,6 +1019,11 @@ static inline bool vkd3d_shader_register_is_patch_constant(const struct vkd3d_sh return reg->type == VKD3DSPR_PATCHCONST; } +static inline bool register_is_constant(const struct vkd3d_shader_register *reg) +{ + return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64); +} + struct vkd3d_shader_location { const char *source_name;

1 0