September 2023 - Wine-Commits

Zebediah Figura : wined3d: Remove the unused "current_fprogram_id" field from struct shader_arb_priv.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

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: Do not use EXT_transform_feedback if transformFeedback is not actually supported.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 85c89bd864dec24cf2b38116b1ac8c2c9803c474 URL: https://gitlab.winehq.org/wine/wine/-/commit/85c89bd864dec24cf2b38116b1ac8c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 7 17:24:17 2023 -0500 wined3d: Do not use EXT_transform_feedback if transformFeedback is not actually supported. --- dlls/wined3d/adapter_vk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index c3161906387..fffe33a76d4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2303,6 +2303,9 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ if (!device_info.host_query_reset_features.hostQueryReset) adapter_vk->vk_info.supported[WINED3D_VK_EXT_HOST_QUERY_RESET] = FALSE; + if (!device_info.xfb_features.transformFeedback) + adapter_vk->vk_info.supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK] = FALSE; + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps);

1 0

Zebediah Figura : wined3d: Remove WINED3D_TEXTURE_NORMALIZED_COORDS.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

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 "sampler" local variable from wined3d_context_vk_load_shader_resources().
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 37a60f580c30d5b388f21b4a6984820993c7030b URL: https://gitlab.winehq.org/wine/wine/-/commit/37a60f580c30d5b388f21b4a698482… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 22 17:53:39 2023 -0500 wined3d: Remove the unused "sampler" local variable from wined3d_context_vk_load_shader_resources(). This was made unused by a42808b54ae28ab5a38d523e987dcbc619697609. --- dlls/wined3d/context_vk.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f9ac0a59707..75f0e68395c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3456,7 +3456,6 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; - struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -3551,11 +3550,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: - break; - case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: - if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) - sampler = context_vk->c.device->null_sampler; break; default:

1 0

Zebediah Figura : wined3d: Do not use EXT_host_query_reset if hostQueryReset is not actually supported.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 067c8acd95f1d594a64a672f2803cbae13d6089f URL: https://gitlab.winehq.org/wine/wine/-/commit/067c8acd95f1d594a64a672f2803cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 7 17:23:22 2023 -0500 wined3d: Do not use EXT_host_query_reset if hostQueryReset is not actually supported. --- dlls/wined3d/adapter_vk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3bedce4d0b4..c3161906387 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2300,6 +2300,9 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ get_physical_device_info(adapter_vk, &device_info); + if (!device_info.host_query_reset_features.hostQueryReset) + adapter_vk->vk_info.supported[WINED3D_VK_EXT_HOST_QUERY_RESET] = FALSE; + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps);

1 0

Zebediah Figura : wined3d: Allow creating a feature level < 10 device if KHR_shader_draw_parameters is missing.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: c87786b30ed538a4f1c1410faccbffe79b769613 URL: https://gitlab.winehq.org/wine/wine/-/commit/c87786b30ed538a4f1c1410faccbff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 15:36:48 2023 -0600 wined3d: Allow creating a feature level < 10 device if KHR_shader_draw_parameters is missing. vkd3d-shader only needs it for SV_VertexID and SV_InstanceID, which are specific to shader model 4 and higher. --- dlls/wined3d/adapter_vk.c | 6 +++++- dlls/wined3d/wined3d_vk.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a728b840d07..3bedce4d0b4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -350,6 +350,8 @@ static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk if (vk_info->api_version >= VK_API_VERSION_1_1) xfb_features->pNext = draw_parameters_features; + else + draw_parameters_features->shaderDrawParameters = vk_info->supported[WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS]; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -2224,6 +2226,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.pipelineStatisticsQuery && info->features2.features.shaderClipDistance && info->features2.features.shaderCullDistance + && info->draw_parameters_features.shaderDrawParameters && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } @@ -2389,7 +2392,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_API_VERSION_1_2}, }; @@ -2403,6 +2406,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk { {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, WINED3D_VK_EXT_HOST_QUERY_RESET}, }; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 74bab95be2a..963328a215f 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -217,6 +217,7 @@ enum wined3d_vk_extension WINED3D_VK_EXT_TRANSFORM_FEEDBACK, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS, WINED3D_VK_EXT_HOST_QUERY_RESET, WINED3D_VK_EXT_COUNT,

1 0

Zebediah Figura : wined3d: Enable shaderDrawParameters on Vulkan 1.1 if supported.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

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 LinkElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: e6c2395fd455261b09a61290b2a89d4bd587cc2b URL: https://gitlab.winehq.org/wine/wine/-/commit/e6c2395fd455261b09a61290b2a89d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink LinkElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllink.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 3edc36ed96b..ef756494b76 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -396,17 +396,24 @@ static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p); } -static void HTMLLinkElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLLinkElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLLinkElement, element.node.event_target.dispex); +} + +static void HTMLLinkElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLLinkElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nslink) - note_cc_edge((nsISupports*)This->nslink, "This->nslink", cb); + note_cc_edge((nsISupports*)This->nslink, "nslink", cb); } -static void HTMLLinkElement_unlink(HTMLDOMNode *iface) +static void HTMLLinkElement_unlink(DispatchEx *dispex) { - HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + HTMLLinkElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nslink); } static const NodeImplVtbl HTMLLinkElementImplVtbl = { @@ -419,8 +426,15 @@ static const NodeImplVtbl HTMLLinkElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLLinkElementImpl_put_disabled, .get_disabled = HTMLLinkElementImpl_get_disabled, - .traverse = HTMLLinkElement_traverse, - .unlink = HTMLLinkElement_unlink +}; + +static const event_target_vtbl_t HTMLLinkElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLLinkElement_traverse, + .unlink = HTMLLinkElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLLinkElement_iface_tids[] = { @@ -430,7 +444,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = { }; static dispex_static_data_t HTMLLinkElement_dispex = { "HTMLLinkElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLLinkElement_event_target_vtbl.dispex_vtbl, DispHTMLLinkElement_tid, HTMLLinkElement_iface_tids, HTMLElement_init_dispex_info

1 0

Hans Leidekker : wpcap/tests: Accept another return value from pcap_can_set_rfmon().
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 417dc2b40ed7bb8f46882fa4b8050bdbe6ee4494 URL: https://gitlab.winehq.org/wine/wine/-/commit/417dc2b40ed7bb8f46882fa4b8050b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 13 19:00:14 2023 +0200 wpcap/tests: Accept another return value from pcap_can_set_rfmon(). --- dlls/wpcap/tests/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/tests/wpcap.c b/dlls/wpcap/tests/wpcap.c index 017d3b77a4e..ec0f05c368a 100644 --- a/dlls/wpcap/tests/wpcap.c +++ b/dlls/wpcap/tests/wpcap.c @@ -152,7 +152,7 @@ static void test_capture( void ) ok( !ret, "got %d\n", ret ); ret = ppcap_can_set_rfmon( pcap ); - ok( !ret, "got %d\n", ret ); + ok( ret == 0 || ret == 1, "got %d\n", ret ); ret = ppcap_getnonblock( pcap, errbuf ); ok( ret == -3, "got %d\n", ret );

1 0

Alistair Leslie-Hughes : d3drm: Correct D3DRMIMAGE validation.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: cfae1ceb04a7e492c344190a656595f1c60af41f URL: https://gitlab.winehq.org/wine/wine/-/commit/cfae1ceb04a7e492c344190a656595… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 10:44:49 2022 +1000 d3drm: Correct D3DRMIMAGE validation. --- dlls/d3drm/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/texture.c | 27 ++++++++++++++++++++------- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6922a70df24..5d478f24b1a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2724,6 +2724,12 @@ static void test_Texture(void) TRUE, 0, (void *)0xcafebabe, NULL, 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL }, + testimg_palette = + { + 2, 2, 1, 1, 32, + FALSE, 2 * sizeof(DWORD), (void *)0xcafebabe, NULL, + 0x00000000, 0x00000000, 0x00000000, 0, 2, (void *)0xcafebabe + }, *d3drm_img = NULL; DWORD pixel[4] = { 20000, 30000, 10000, 0 }; @@ -2785,6 +2791,17 @@ static void test_Texture(void) IDirect3DRMTexture2_Release(texture2); IDirect3DRMTexture3_Release(texture3); + /* Just palette set */ + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg_palette, &texture1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg_palette, &texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg_palette, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr); + IDirect3DRMTexture_Release(texture1); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + initimg.rgb = 0; texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index b9d84114995..f0983d53e24 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -52,14 +52,27 @@ static void d3drm_texture_destroy(struct d3drm_texture *texture) static BOOL d3drm_validate_image(D3DRMIMAGE *image) { - if (!image - || !image->red_mask - || !image->green_mask - || !image->blue_mask - || !image->buffer1 - || !(image->rgb || (image->palette && image->palette_size))) - { + if (!image) return FALSE; + + TRACE("size (%d, %d), aspect (%d, %d), depth %d, red %#lx, green %#lx, blue %#lx, " + "buffer1 %p, buffer2 %p, rgb %d, pal %p, size %d\n", + image->width, image->height, image->aspectx, image->aspecty, + image->depth, image->red_mask, image->green_mask, image->blue_mask, image->buffer1, + image->buffer2, image->rgb, image->palette, image->palette_size ); + + if (!image->buffer1) + return FALSE; + + if (image->rgb) + { + if (!image->red_mask || !image->green_mask || !image->blue_mask) + return FALSE; + } + else + { + if (!image->palette || !image->palette_size) + return FALSE; } return TRUE;

1 0