September 2023 - Wine-commits

Zebediah Figura : wined3d: Remove WINED3D_TEXTURE_NORMALIZED_COORDS.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 0c4bb266399938654f5e8de5e1ee9a502c63b0a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4bb266399938654f5e8de5e1ee9a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 10 17:14:00 2022 -0600 wined3d: Remove WINED3D_TEXTURE_NORMALIZED_COORDS. This is no longer used. It was previously used in two places to perform an open-coded wined3d_context_gl_draw_textured_quad(), but the latter checks wined3d_texture_gl.target instead, which is set to GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE_ARB under the exact same conditions, making this flag redundant even at the time. The two uses were removed in 012f9b03f8 [which changed the relevant code to use wined3d_context_gl_draw_textured_quad() instead], and cdacbd985 [which removed the relevant code entirely.] --- dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7ec5c4f4f3b..bc7b1b63b9a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3955,8 +3955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->layer_count = layer_count; texture->level_count = level_count; texture->lod = 0; - texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS - | WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_DOWNLOADABLE; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) { texture->flags |= WINED3D_TEXTURE_GET_DC_LENIENT; @@ -3991,7 +3990,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; - texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d9fc796343..09f078344c8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3311,7 +3311,6 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DISCARD 0x00002000

1 0

Zebediah Figura : wined3d: Remove the unused "current_fprogram_id" field from struct shader_arb_priv.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 95197f62a0762bdbb18453b69ce1497e7c15927d URL: https://gitlab.winehq.org/wine/wine/-/commit/95197f62a0762bdbb18453b69ce149… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 11:02:17 2023 -0600 wined3d: Remove the unused "current_fprogram_id" field from struct shader_arb_priv. This has been unused since 1bd56b6ca5638cdf026938eb89fac0ccfd24874b. --- dlls/wined3d/arb_program_shader.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c535fe7d3ff..26e46432a17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -270,7 +270,6 @@ struct arb_vshader_private { struct shader_arb_priv { GLuint current_vprogram_id; - GLuint current_fprogram_id; const struct arb_ps_compiled_shader *compiled_fprog; const struct arb_vs_compiled_shader *compiled_vprog; BOOL use_arbfp_fixed_func; @@ -4581,12 +4580,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context_gl, ps, &compile_args); compiled = find_arb_pshader(context_gl, ps, &compile_args); - priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; /* Bind the fragment program */ - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);"); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId)); + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId);"); if (!priv->use_arbfp_fixed_func) priv->fragment_pipe->fp_enable(context, FALSE); @@ -4595,7 +4593,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - TRACE("Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", priv->current_fprogram_id); + TRACE("Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB.\n", compiled->prgId); /* Pixel Shader 1.x constants are clamped to [-1;1], Pixel Shader 2.0 constants are not. If switching between * a 1.x and newer shader, reload the first 8 constants @@ -4634,7 +4632,6 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context * function replacement shader. */ gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - priv->current_fprogram_id = 0; } priv->fragment_pipe->fp_enable(context, TRUE); } @@ -4718,7 +4715,6 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - priv->current_fprogram_id = 0; } priv->fragment_pipe->fp_enable(context, FALSE); @@ -6634,7 +6630,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); - priv->current_fprogram_id = desc->shader; if (device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) {

1 0

Zebediah Figura : wined3d: Remove the unused "current_vprogram_id" field from struct shader_arb_priv.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: dc2f353884a487e37dfabe86662129898013ef7b URL: https://gitlab.winehq.org/wine/wine/-/commit/dc2f353884a487e37dfabe86662129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 11:03:09 2023 -0600 wined3d: Remove the unused "current_vprogram_id" field from struct shader_arb_priv. This has been unused since 1bd56b6ca5638cdf026938eb89fac0ccfd24874b. --- dlls/wined3d/arb_program_shader.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 26e46432a17..ea15294262a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -269,7 +269,6 @@ struct arb_vshader_private { struct shader_arb_priv { - GLuint current_vprogram_id; const struct arb_ps_compiled_shader *compiled_fprog; const struct arb_vs_compiled_shader *compiled_vprog; BOOL use_arbfp_fixed_func; @@ -4656,19 +4655,18 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context compiled = find_arb_vshader(vs, gl_info, context->stream_info.use_map, &compile_args, ps_input_sig); - priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled; /* Bind the vertex program */ - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); - checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id);"); + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, compiled->prgId)); + checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, compiled->prgId);"); priv->vertex_pipe->vp_enable(context, FALSE); /* Enable OpenGL vertex programs */ gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); - TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", priv->current_vprogram_id); + TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", compiled->prgId); shader_arb_vs_local_constants(compiled, context_gl, state); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { @@ -4690,7 +4688,6 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context { if (gl_info->supported[ARB_VERTEX_PROGRAM]) { - priv->current_vprogram_id = 0; gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } @@ -4720,7 +4717,6 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex if (gl_info->supported[ARB_VERTEX_PROGRAM]) { - priv->current_vprogram_id = 0; gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); }

1 0

Zebediah Figura : wined3d: Do not set last_was_pshader from the GLSL fragment pipe.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: b3212327c705c3d957a63a1b2770af6957b9e9f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3212327c705c3d957a63a1b2770af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 11:33:01 2023 -0600 wined3d: Do not set last_was_pshader from the GLSL fragment pipe. It's only used by the arbfp, nvts, and ffp pipes. --- dlls/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 552d1bd75bd..7ed45da29f5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12140,8 +12140,6 @@ static void glsl_fragment_pipe_free(struct wined3d_device *device, struct wined3 static void glsl_fragment_pipe_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->last_was_pshader = use_ps(state); - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; }

1 0

Zhiyi Zhang : user32/tests: Test IsDialogMessageA() converting ASCII WM_CHAR messages.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: fe594a83d4a87fccaced20372a83ecb2ef28de6c URL: https://gitlab.winehq.org/wine/wine/-/commit/fe594a83d4a87fccaced20372a83ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 18 11:39:19 2023 +0800 user32/tests: Test IsDialogMessageA() converting ASCII WM_CHAR messages. --- dlls/user32/tests/dialog.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index a24bfafd0b9..bac4524cecb 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -567,8 +567,38 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L return DefWindowProcA(hwnd, msg, wparam, lparam); } +static int wm_char_count; + +static LRESULT CALLBACK test_IsDialogMessageA_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CHAR: + if (GetSystemMetrics(SM_DBCSENABLED)) + { + todo_wine + ok(wparam == 0x5b57, "Got unexpected wparam %#Ix.\n", wparam); + } + else + ok(wparam == 0x3f, "Got unexpected wparam %#Ix.\n", wparam); + wm_char_count++; + return 0; + case WM_CLOSE: + DestroyWindow(hwnd); + return 0; + case WM_DESTROY: + PostQuitMessage(0); + return 0; + case WM_GETDLGCODE: + return DLGC_WANTCHARS; + default: + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + static BOOL RegisterWindowClasses (void) { + WNDCLASSW cls_w; WNDCLASSA cls; cls.style = 0; @@ -597,6 +627,11 @@ static BOOL RegisterWindowClasses (void) cls.lpszClassName = "WM_NEXTDLGCTLWndClass"; if (!RegisterClassA (&cls)) return FALSE; + memset (&cls_w, 0, sizeof(cls_w)); + cls_w.lpfnWndProc = test_IsDialogMessageA_proc; + cls_w.hInstance = g_hinst; + cls_w.lpszClassName = L"TestIsDialogMessageAClass"; + if (!RegisterClassW (&cls_w)) return FALSE; return TRUE; } @@ -729,6 +764,8 @@ static LRESULT CALLBACK hook_proc2(INT code, WPARAM wParam, LPARAM lParam) static void test_IsDialogMessage(void) { HHOOK hook; + HWND child; + BOOL ret; MSG msg; g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", @@ -816,6 +853,34 @@ static void test_IsDialogMessage(void) ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + /* Test IsDialogMessageA converting a WM_CHAR wparam in ASCII to Unicode */ + child = CreateWindowW(L"TestIsDialogMessageAClass", L"test", WS_CHILD | WS_VISIBLE, 0, 0, 10, + 10, g_hwndMain, 0, g_hinst, 0); + ok(!!child, "Failed to create a window, error %#lx.\n", GetLastError()); + + /* \u5b57 is a '字' in Chinese */ + PostMessageW(child, WM_CHAR, 0x5b57, 0x1); + PostMessageW(child, WM_CLOSE, 0, 0); + + while (GetMessageA(&msg, child, 0, 0) > 0) + { + if (msg.message == WM_CHAR) + { + if (GetSystemMetrics(SM_DBCSENABLED)) + ok(msg.wParam != 0x3f && msg.wParam != 0x5b57, "Got unexpected wparam %#Ix.\n", msg.wParam); + else + ok(msg.wParam == 0x3f, "Got unexpected wparam %#Ix.\n", msg.wParam); + ret = IsDialogMessageA(g_hwndMain, &msg); + ok(ret, "IsDialogMessageA failed.\n"); + } + else + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + todo_wine_if(GetSystemMetrics(SM_DBCSENABLED)) + ok(wm_char_count == 1, "Got unexpected WM_CHAR count %d.\n", wm_char_count); DestroyWindow(g_hwndMain); }

1 0

Zhiyi Zhang : user32: Map WM_CHAR wparam in ASCII to Unicode in IsDialogMessageA() for CJK locales.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 109d15ab352fcec17479e3caf8e2aad586e57531 URL: https://gitlab.winehq.org/wine/wine/-/commit/109d15ab352fcec17479e3caf8e2aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 17 16:33:52 2023 +0800 user32: Map WM_CHAR wparam in ASCII to Unicode in IsDialogMessageA() for CJK locales. Fix displaying Chinese characters as "??" in some applications with Chinese locale. --- dlls/user32/message.c | 6 +++++- dlls/user32/tests/dialog.c | 4 ---- include/ntuser.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index acab4117cf2..4016c95539a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -814,8 +814,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT */ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) { + enum wm_char_mapping mapping; MSG msg = *pmsg; - map_wparam_AtoW( msg.message, &msg.wParam, WMCHAR_MAP_NOMAPPING ); + + mapping = GetSystemMetrics( SM_DBCSENABLED ) ? WMCHAR_MAP_ISDIALOGMESSAGE : WMCHAR_MAP_NOMAPPING; + if (!map_wparam_AtoW( msg.message, &msg.wParam, mapping )) + return TRUE; return IsDialogMessageW( hwndDlg, &msg ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index bac4524cecb..18a9685b230 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -575,10 +575,7 @@ static LRESULT CALLBACK test_IsDialogMessageA_proc(HWND hwnd, UINT msg, WPARAM w { case WM_CHAR: if (GetSystemMetrics(SM_DBCSENABLED)) - { - todo_wine ok(wparam == 0x5b57, "Got unexpected wparam %#Ix.\n", wparam); - } else ok(wparam == 0x3f, "Got unexpected wparam %#Ix.\n", wparam); wm_char_count++; @@ -879,7 +876,6 @@ static void test_IsDialogMessage(void) DispatchMessageA(&msg); } } - todo_wine_if(GetSystemMetrics(SM_DBCSENABLED)) ok(wm_char_count == 1, "Got unexpected WM_CHAR count %d.\n", wm_char_count); DestroyWindow(g_hwndMain); } diff --git a/include/ntuser.h b/include/ntuser.h index b873512dbd1..a8e8f4d6da0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -135,6 +135,7 @@ enum wm_char_mapping WMCHAR_MAP_RECVMESSAGE, WMCHAR_MAP_DISPATCHMESSAGE, WMCHAR_MAP_CALLWINDOWPROC, + WMCHAR_MAP_ISDIALOGMESSAGE, WMCHAR_MAP_COUNT, WMCHAR_MAP_NOMAPPING = WMCHAR_MAP_COUNT };

1 0

Zebediah Figura : wined3d: Enable shaderDrawParameters on Vulkan 1.1 if supported.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: f959068788771ace5d765b6825f997d308621c65 URL: https://gitlab.winehq.org/wine/wine/-/commit/f959068788771ace5d765b6825f997… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 15:38:29 2023 -0600 wined3d: Enable shaderDrawParameters on Vulkan 1.1 if supported. This fixes a validation error: [ VUID-VkShaderModuleCreateInfo-pCode-01091 ] Object 0: handle = 0x7fbdb300, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0xa7bb8db6 | vkCreateShaderModule(): The SPIR-V Capability (DrawParameters) was declared, but none of the requirements were met to use it. The Vulkan spec states: If pCode declares any of the capabilities listed in the SPIR-V Environment appendix, one of the corresponding requirements must be satisfied (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.ht…) --- dlls/wined3d/adapter_vk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21a53db6d1d..a728b840d07 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -244,6 +244,7 @@ struct wined3d_physical_device_info VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; VkPhysicalDeviceHostQueryResetFeatures host_query_reset_features; + VkPhysicalDeviceShaderDrawParametersFeatures draw_parameters_features; VkPhysicalDeviceFeatures2 features2; }; @@ -336,6 +337,7 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk, struct wined3d_physical_device_info *info) { VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; + VkPhysicalDeviceShaderDrawParametersFeatures *draw_parameters_features = &info->draw_parameters_features; VkPhysicalDeviceHostQueryResetFeatures *host_query_reset_features = &info->host_query_reset_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features = &info->xfb_features; VkPhysicalDevice physical_device = adapter_vk->physical_device; @@ -344,6 +346,11 @@ static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk memset(info, 0, sizeof(*info)); + draw_parameters_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES; + + if (vk_info->api_version >= VK_API_VERSION_1_1) + xfb_features->pNext = draw_parameters_features; + xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink AnchorElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 36d923e20ee9d99f3b15fdf574749a15a2f15794 URL: https://gitlab.winehq.org/wine/wine/-/commit/36d923e20ee9d99f3b15fdf574749a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink AnchorElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 30 ++++++++++++++++++++++-------- dlls/mshtml/htmlelem.c | 38 +++++++++++++------------------------- dlls/mshtml/htmlevent.h | 23 +++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 ++++ 4 files changed, 62 insertions(+), 33 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink AreaElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 20d8e72c65034d36772277eb41644fdaef003a4c URL: https://gitlab.winehq.org/wine/wine/-/commit/20d8e72c65034d36772277eb41644f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink AreaElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlarea.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 0a3a7efee2e..fd810a0baa1 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -454,17 +454,24 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static void HTMLAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); +} + +static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsarea) note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); } -static void HTMLAreaElement_unlink(HTMLDOMNode *iface) +static void HTMLAreaElement_unlink(DispatchEx *dispex) { - HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsarea); } @@ -476,8 +483,15 @@ static const NodeImplVtbl HTMLAreaElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLAreaElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLAreaElement_traverse, - .unlink = HTMLAreaElement_unlink +}; + +static const event_target_vtbl_t HTMLAreaElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLAreaElement_traverse, + .unlink = HTMLAreaElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLAreaElement_iface_tids[] = { @@ -487,7 +501,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = { }; static dispex_static_data_t HTMLAreaElement_dispex = { "HTMLAreaElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLAreaElement_event_target_vtbl.dispex_vtbl, DispHTMLAreaElement_tid, HTMLAreaElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink BodyElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 87a06268fc59e218f4332a45a0d53b6e02905f2a URL: https://gitlab.winehq.org/wine/wine/-/commit/87a06268fc59e218f4332a45a0d53b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink BodyElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlbody.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 19875915efe..46f3ddef0dd 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -906,20 +906,6 @@ static void *HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLBodyElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) -{ - HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsbody) - note_cc_edge((nsISupports*)This->nsbody, "This->nsbody", cb); -} - -static void HTMLBodyElement_unlink(HTMLDOMNode *iface) -{ - HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - unlink_ref(&This->nsbody); -} - static EventTarget *HTMLBodyElement_get_event_prop_target(HTMLDOMNode *iface, int event_id) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); @@ -953,6 +939,27 @@ static BOOL HTMLBodyElement_is_settable(HTMLDOMNode *iface, DISPID dispid) } } +static inline HTMLBodyElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLBodyElement, element.node.event_target.dispex); +} + +static void HTMLBodyElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLBodyElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsbody) + note_cc_edge((nsISupports*)This->nsbody, "nsbody", cb); +} + +static void HTMLBodyElement_unlink(DispatchEx *dispex) +{ + HTMLBodyElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsbody); +} + static const cpc_entry_t HTMLBodyElement_cpc[] = { {&DIID_HTMLTextContainerEvents}, {&IID_IPropertyNotifySink}, @@ -969,12 +976,19 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_event_prop_target = HTMLBodyElement_get_event_prop_target, - .traverse = HTMLBodyElement_traverse, - .unlink = HTMLBodyElement_unlink, .is_text_edit = HTMLBodyElement_is_text_edit, .is_settable = HTMLBodyElement_is_settable }; +static const event_target_vtbl_t HTMLBodyElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLBodyElement_traverse, + .unlink = HTMLBodyElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, @@ -985,7 +999,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = { static dispex_static_data_t HTMLBodyElement_dispex = { "HTMLBodyElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLBodyElement_event_target_vtbl.dispex_vtbl, DispHTMLBody_tid, HTMLBodyElement_iface_tids, HTMLElement_init_dispex_info

1 0