- Wine-Commits - list.winehq.org

Tim Clem : winemac.drv: Return success from query_ime_char_rect.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 8e9c6e29d01f744d85a96023e9b574f64b4039b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9c6e29d01f744d85a96023e9b574… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Nov 20 14:46:50 2023 -0800 winemac.drv: Return success from query_ime_char_rect. Fixes misplaced IME windows. --- dlls/winemac.drv/event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 9241a7a3326..2fc699e3f77 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -414,6 +414,7 @@ BOOL query_ime_char_rect(macdrv_query* query) NtUserMapWindowPoints(info.hwndCaret, 0, (POINT*)&info.rcCaret, 2); if (range->length && info.rcCaret.left == info.rcCaret.right) info.rcCaret.right++; query->ime_char_rect.rect = cgrect_from_rect(info.rcCaret); + ret = TRUE; } TRACE_(imm)(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location,

1 0

Alexandre Julliard : ntdll: Add syscall entries for ARM64EC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 9c85c8591c59ebfb5a188aec3c2d9a126d78d40f URL: https://gitlab.winehq.org/wine/wine/-/commit/9c85c8591c59ebfb5a188aec3c2d9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:13:54 2023 +0100 ntdll: Add syscall entries for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 1371 ++++++++++++++++++++++++++++++++++++++++++- include/wine/asm.h | 8 + 2 files changed, 1378 insertions(+), 1 deletion(-)

1 0

Fabian Maurer : winex11: Free correct pointer when using xf86vm.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 18522a0594b1dc63880063520ae48707738ed346 URL: https://gitlab.winehq.org/wine/wine/-/commit/18522a0594b1dc63880063520ae487… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 19 22:26:55 2023 +0100 winex11: Free correct pointer when using xf86vm. After allocation the pointer gets shifted by sizeof(xf86vm_modes), so we have to undo that before calling free. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55909 --- dlls/winex11.drv/xvidmode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 399d5e90e1e..fd9b1e7e8b1 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -159,11 +159,12 @@ static void xf86vm_free_modes(DEVMODEW *modes) if (modes) { + BYTE *ptr = (BYTE *)modes - sizeof(xf86vm_modes); assert(modes[0].dmDriverExtra == sizeof(XF86VidModeModeInfo *)); - memcpy(&xf86vm_modes, (BYTE *)modes - sizeof(xf86vm_modes), sizeof(xf86vm_modes)); + memcpy(&xf86vm_modes, ptr, sizeof(xf86vm_modes)); XFree(xf86vm_modes); + free(ptr); } - free(modes); } static BOOL xf86vm_get_current_mode(x11drv_settings_id id, DEVMODEW *mode)

1 0

Nikolay Sivov : d3dcompiler/tests: Do not crash on device creation.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: f341a693f4caa6804e068142d8850a943beda6a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f341a693f4caa6804e068142d8850a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 18 23:55:33 2023 +0100 d3dcompiler/tests: Do not crash on device creation. Fixes crashes running with a null driver. --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index eed96db7248..a6ecb6a37ee 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -134,7 +134,11 @@ static IDirect3DDevice9 *create_device(HWND window) HRESULT hr; d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D object.\n"); + return NULL; + } hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device);

1 0

Alexandre Julliard : win32u: Add syscall entries for ARM64EC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 97ebd9f1ac9b246046054ec68a9707dab0382be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/97ebd9f1ac9b246046054ec68a9707… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:14:21 2023 +0100 win32u: Add syscall entries for ARM64EC. --- dlls/win32u/main.c | 2124 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2124 insertions(+)

1 0

Louis Lenders : wbemprox: Add StandardCimv2 namespace.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 1e1d18a44484a595b7a519f26d9189ef1866ea37 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e1d18a44484a595b7a519f26d9189… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 21 09:19:34 2023 +0100 wbemprox: Add StandardCimv2 namespace. --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/tests/services.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fe496bdde41..e751299e4e6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4369,6 +4369,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"StandardCimv2", NULL, 0}, {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index e7fbc90cf61..4881cee745d 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -256,6 +256,7 @@ static void test_namespaces(void) { {L"ROOT\\CIMV2"}, {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + {L"ROOT\\StandardCimv2", TRUE /* Before Win8. */}, {L"ROOT\\WMI"}, }; IWbemLocator *locator; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2701c725c89..3c8fa403c57 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -23,6 +23,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_STANDARDCIMV2, WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, };

1 0

Henri Verbeet : vkd3d-shader/ir: Use location information from the instruction in vkd3d_shader_scan_instruction().
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: ae4341b565553fe35fa8e94fdf19176cbd576339 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae4341b565553fe35fa8e94fdf191… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 15:22:01 2023 +0100 vkd3d-shader/ir: Use location information from the instruction in vkd3d_shader_scan_instruction(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1517f970..770e385a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1065,6 +1065,8 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte struct vkd3d_shader_cf_info *cf_info; unsigned int i; + context->location = instruction->location; + switch (instruction->handler_idx) { case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1292,7 +1294,6 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte } } - ++context->location.line; return VKD3D_OK; }

1 0

Henri Verbeet : vkd3d-shader/ir: Decorate vkd3d_shader_scan_error() with VKD3D_PRINTF_FUNC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: 5b82afb83f24b74d869aaabf63def832f30884e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b82afb83f24b74d869aaabf63def… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 14:51:05 2023 +0100 vkd3d-shader/ir: Decorate vkd3d_shader_scan_error() with VKD3D_PRINTF_FUNC. --- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 48af5d97..85210a8b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -645,6 +645,16 @@ struct vkd3d_shader_scan_context size_t combined_samplers_size; }; +static VKD3D_PRINTF_FUNC(3, 4) void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(context->message_context, &context->location, error, format, args); + va_end(args); +} + static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, @@ -1026,16 +1036,6 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca semantic->resource_type, resource_data_type, semantic->sample_count, 0, false); } -static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, - enum vkd3d_shader_error error, const char *format, ...) -{ - va_list args; - - va_start(args, format); - vkd3d_shader_verror(context->message_context, &context->location, error, format, args); - va_end(args); -} - static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) {

1 0

Henri Verbeet : vkd3d-shader/ir: Skip recording combined resource/sampler information for dynamically indexed descriptor arrays.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: 01dad41862c73e9cda7ecfa266839cc11ad316db URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/01dad41862c73e9cda7ecfa266839… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 14:58:40 2023 +0100 vkd3d-shader/ir: Skip recording combined resource/sampler information for dynamically indexed descriptor arrays. And output a warning instead. --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader_main.c | 22 ++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 28 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d42b6110..66a7de9b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1507,6 +1507,10 @@ struct vkd3d_shader_combined_resource_sampler_info * particularly useful when targeting environments without separate binding * points for samplers and resources, like OpenGL. * + * No resource-sampler pairs are returned for dynamic accesses to + * resource/sampler descriptor arrays, as can occur in Direct3D shader model + * 5.1 shaders. + * * Members of this structure are allocated by vkd3d-shader and should be freed * with vkd3d_shader_free_scan_combined_resource_sampler_info() when no longer * needed. diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 85210a8b..1517f970 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -655,6 +655,16 @@ static VKD3D_PRINTF_FUNC(3, 4) void vkd3d_shader_scan_error(struct vkd3d_shader_ va_end(args); } +static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_scan_warning(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(context->message_context, &context->location, error, format, args); + va_end(args); +} + static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, @@ -907,6 +917,18 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co { const struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; const struct vkd3d_shader_descriptor_info1 *d; + bool dynamic_resource, dynamic_sampler; + + if ((dynamic_resource = resource->idx[1].rel_addr)) + vkd3d_shader_scan_warning(context, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY, + "Resource descriptor array %u is being dynamically indexed, " + "not recording a combined resource-sampler pair.", resource->idx[0].offset); + if ((dynamic_sampler = sampler && sampler->idx[1].rel_addr)) + vkd3d_shader_scan_warning(context, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY, + "Sampler descriptor array %u is being dynamically indexed, " + "not recording a combined resource-sampler pair.", sampler->idx[0].offset); + if (dynamic_resource || dynamic_sampler) + return; for (i = 0; i < info->descriptor_count; ++i) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bff49453..41fcf577 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -213,6 +213,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS = 9014, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX = 9015, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING = 9016, + + VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300, }; enum vkd3d_shader_opcode

1 0

Jacek Caban : mshtml: Use Gecko inner window in get_ns_selection.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 5289cc85252b92d2a2e12ba91493a2d16cdab8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/5289cc85252b92d2a2e12ba91493a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 20 15:14:36 2023 +0100 mshtml: Use Gecko inner window in get_ns_selection. --- dlls/mshtml/editor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 478c30932c1..e4a16956e46 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -203,7 +203,10 @@ static nsISelection *get_ns_selection(HTMLDocumentNode *doc) nsISelection *nsselection = NULL; nsresult nsres; - nsres = nsIDOMWindow_GetSelection(doc->outer_window->nswindow, &nsselection); + if(!doc->window) + return NULL; + + nsres = nsIDOMWindow_GetSelection(doc->window->dom_window, &nsselection); if(NS_FAILED(nsres)) ERR("GetSelection failed %08lx\n", nsres);

1 0