November 2023 - Wine-commits

Alex Henrie : dplayx: Use CRT allocation functions.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: 76205649de5dc03f1a27a3a9b90e6ee05d4d3003 URL: https://gitlab.winehq.org/wine/wine/-/commit/76205649de5dc03f1a27a3a9b90e6e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:57:24 2023 -0600 dplayx: Use CRT allocation functions. --- dlls/dplayx/dplay.c | 161 ++++++++++++++++++------------------------ dlls/dplayx/dplaysp.c | 19 +++-- dlls/dplayx/dplayx_messages.c | 18 +++-- dlls/dplayx/dplobby.c | 45 ++++++------ dlls/dplayx/lobbysp.c | 4 +- dlls/dplayx/name_server.c | 27 ++++--- 6 files changed, 118 insertions(+), 156 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader: Expose the whole profile when dumping an HLSL shader.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: ab09c0b45b29eb3c20caa4bba90ac4e43db2bd25 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab09c0b45b29eb3c20caa4bba90ac… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Oct 21 20:44:07 2023 +0200 vkd3d-shader: Expose the whole profile when dumping an HLSL shader. The profile cannot be reliably devised by analyzing the HLSL code, so it's useful to have it included in the file name. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 17 +++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f56ecc90..b6b77a86 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3633,7 +3633,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_NOT_IMPLEMENTED; } - vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, profile->name, &compile_info->source); if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) { diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index dcd40137..89ff96de 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -391,7 +391,10 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, id = InterlockedIncrement(&shader_id) - 1; - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.%s", path, prefix, id, suffix); + if (prefix) + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.%s", path, prefix, id, suffix); + else + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%u.%s", path, id, suffix); if ((f = fopen(filename, "wb"))) { if (fwrite(data, 1, size, f) != size) @@ -424,7 +427,7 @@ static const char *shader_get_source_type_suffix(enum vkd3d_shader_source_type t } void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, - enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader) + const char *prefix, const struct vkd3d_shader_code *shader) { static bool enabled = true; const char *path; @@ -438,8 +441,8 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, return; } - vkd3d_shader_dump_blob(path, shader_get_type_prefix(shader_type), - shader_get_source_type_suffix(source_type), shader->code, shader->size); + vkd3d_shader_dump_blob(path, prefix, shader_get_source_type_suffix(source_type), + shader->code, shader->size); } static void init_scan_signature_info(const struct vkd3d_shader_compile_info *info) @@ -1348,7 +1351,8 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, struct vkd3d_shader_compile_info scan_info; int ret; - vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, shader_get_type_prefix(parser->shader_version.type), + &compile_info->source); scan_info = *compile_info; @@ -1433,7 +1437,8 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_ return ret; } - vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, shader_get_type_prefix(parser->shader_version.type), + &compile_info->source); if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f6421cc8..7297e0d1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1325,7 +1325,7 @@ void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const s enum vkd3d_shader_error error, const char *format, va_list args); void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, - enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader); + const char *prefix, const struct vkd3d_shader_code *shader); void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function); #define vkd3d_shader_trace_text(text, size) \ vkd3d_shader_trace_text_(text, size, __FUNCTION__)

1 0

Giovanni Mascellani : vkd3d-shader: Dump shaders as soon as possible.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: dd96fe50e2c446990667bcaba76d5bb21569dfe2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd96fe50e2c446990667bcaba76d5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Oct 21 21:35:08 2023 +0200 vkd3d-shader: Dump shaders as soon as possible. So that they are dumped even if parsing fails, which is a circumstance in which one likely wants to see the problematic shader. The downside of that is that for shader types other than HLSL the profile is not written any more in the filename. This should not be a big problem, because in those cases the shader describes its own type. When dumping an HLSL shader, the id is brought in front of the profile in the file name, in order to make it more tab-friendly: when dealing with a directory full of shaders it's likely that the id determines the profile, but the other way around. --- libs/vkd3d-shader/hlsl.c | 6 ++---- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 37 +++++++++++++++++++++----------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b6b77a86..c8677f41 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3260,7 +3260,7 @@ unsigned int hlsl_combine_swizzles(unsigned int first, unsigned int second, unsi return ret; } -static const struct hlsl_profile_info *get_target_info(const char *target) +const struct hlsl_profile_info *hlsl_get_target_info(const char *target) { unsigned int i; @@ -3627,14 +3627,12 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d } entry_point = hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"; - if (!(profile = get_target_info(hlsl_source_info->profile))) + if (!(profile = hlsl_get_target_info(hlsl_source_info->profile))) { FIXME("Unknown compilation target %s.\n", debugstr_a(hlsl_source_info->profile)); return VKD3D_ERROR_NOT_IMPLEMENTED; } - vkd3d_shader_dump_shader(compile_info->source_type, profile->name, &compile_info->source); - if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) { vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0655bb8e..309d7080 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1169,6 +1169,7 @@ void hlsl_free_var(struct hlsl_ir_var *decl); struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *name); struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); +const struct hlsl_profile_info *hlsl_get_target_info(const char *target); struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive, bool case_insensitive); struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 89ff96de..28d647b3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,6 +18,7 @@ #include "vkd3d_shader_private.h" #include "vkd3d_version.h" +#include "hlsl.h" #include <stdio.h> #include <math.h> @@ -381,7 +382,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value memcpy(buffer->data + offset, &value, sizeof(value)); } -static void vkd3d_shader_dump_blob(const char *path, const char *prefix, +static void vkd3d_shader_dump_blob(const char *path, const char *profile, const char *suffix, const void *data, size_t size) { static LONG shader_id = 0; @@ -391,8 +392,8 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, id = InterlockedIncrement(&shader_id) - 1; - if (prefix) - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.%s", path, prefix, id, suffix); + if (profile) + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%u-%s.%s", path, id, profile, suffix); else snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%u.%s", path, id, suffix); if ((f = fopen(filename, "wb"))) @@ -426,9 +427,12 @@ static const char *shader_get_source_type_suffix(enum vkd3d_shader_source_type t } } -void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, - const char *prefix, const struct vkd3d_shader_code *shader) +void vkd3d_shader_dump_shader(const struct vkd3d_shader_compile_info *compile_info) { + const struct vkd3d_shader_code *shader = &compile_info->source; + const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + const struct hlsl_profile_info *profile; + const char *profile_name = NULL; static bool enabled = true; const char *path; @@ -441,7 +445,18 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, return; } - vkd3d_shader_dump_blob(path, prefix, shader_get_source_type_suffix(source_type), + if (compile_info->source_type == VKD3D_SHADER_SOURCE_HLSL) + { + if (!(hlsl_source_info = vkd3d_find_struct(compile_info->next, HLSL_SOURCE_INFO))) + return; + + if (!(profile = hlsl_get_target_info(hlsl_source_info->profile))) + return; + + profile_name = profile->name; + } + + vkd3d_shader_dump_blob(path, profile_name, shader_get_source_type_suffix(compile_info->source_type), shader->code, shader->size); } @@ -1310,6 +1325,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char vkd3d_shader_message_context_init(&message_context, compile_info->log_level); + vkd3d_shader_dump_shader(compile_info); + switch (compile_info->source_type) { case VKD3D_SHADER_SOURCE_DXBC_TPF: @@ -1351,9 +1368,6 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, struct vkd3d_shader_compile_info scan_info; int ret; - vkd3d_shader_dump_shader(compile_info->source_type, shader_get_type_prefix(parser->shader_version.type), - &compile_info->source); - scan_info = *compile_info; if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) @@ -1437,9 +1451,6 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_ return ret; } - vkd3d_shader_dump_shader(compile_info->source_type, shader_get_type_prefix(parser->shader_version.type), - &compile_info->source); - if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); @@ -1486,6 +1497,8 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_message_context_init(&message_context, compile_info->log_level); + vkd3d_shader_dump_shader(compile_info); + switch (compile_info->source_type) { case VKD3D_SHADER_SOURCE_DXBC_TPF: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7297e0d1..0146a976 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1324,8 +1324,7 @@ void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const stru void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args); -void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, - const char *prefix, const struct vkd3d_shader_code *shader); +void vkd3d_shader_dump_shader(const struct vkd3d_shader_compile_info *compile_info); void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function); #define vkd3d_shader_trace_text(text, size) \ vkd3d_shader_trace_text_(text, size, __FUNCTION__)

1 0

Alfred Agrell : quartz/tests: Add tests for CLSID_CMpegVideoCodec.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: 012de8b265d4ee1b76e8bc65425a3aa081345e7f URL: https://gitlab.winehq.org/wine/wine/-/commit/012de8b265d4ee1b76e8bc65425a3a… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:53:55 2023 +0200 quartz/tests: Add tests for CLSID_CMpegVideoCodec. --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/mpegvideo.c | 1620 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1621 insertions(+)

1 0

Louis Lenders : uxtheme: Add stub for AllowDarkModeForWindow.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: 29d5ce6b7a40635e2c4904ece9b8381a8132f248 URL: https://gitlab.winehq.org/wine/wine/-/commit/29d5ce6b7a40635e2c4904ece9b838… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 31 07:59:03 2023 +0100 uxtheme: Add stub for AllowDarkModeForWindow. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55742 --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 6b202bb48a7..2c041356930 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1291,6 +1291,16 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) return !light_theme; } +/********************************************************************** + * AllowDarkModeForWindow (UXTHEME.133) + * + */ +BOOL WINAPI AllowDarkModeForWindow(HWND hwnd, BOOL allow) +{ + FIXME("%p %d: stub\n", hwnd, allow); + return FALSE; +} + /********************************************************************** * SetPreferredAppMode (UXTHEME.135) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 6bcebffe0a5..1cf8ae7e418 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -43,6 +43,7 @@ 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection 132 stdcall -noname ShouldAppsUseDarkMode() +133 stdcall -noname AllowDarkModeForWindow(ptr long) 135 stdcall -noname SetPreferredAppMode(long) 138 stdcall -noname ShouldSystemUseDarkMode()

1 0

Gabriel Ivăncescu : mshtml: Keep ref from the document node to the inner window.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: ce9ef35b92ffc0b67674db03ea323cdddb352cd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce9ef35b92ffc0b67674db03ea323c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml: Keep ref from the document node to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9750ad19765..f1da5eaad07 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5700,6 +5700,12 @@ void detach_document_node(HTMLDocumentNode *doc) { unsigned i; + if(doc->window) { + HTMLInnerWindow *window = doc->window; + doc->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } + while(!list_empty(&doc->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); @@ -5855,6 +5861,15 @@ static void *HTMLDocumentNode_query_interface(DispatchEx *dispex, REFIID riid) return HTMLDOMNode_query_interface(&This->node.event_target.dispex, riid); } +static void HTMLDocumentNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->window) + note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); +} + static void HTMLDocumentNode_unlink(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -5865,13 +5880,8 @@ static void HTMLDocumentNode_unlink(DispatchEx *dispex) detach_document_node(This); This->dom_document = NULL; This->html_document = NULL; - This->window = NULL; }else if(This->window) { detach_document_node(This); - - /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); - This->window = NULL; } } @@ -6057,7 +6067,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { .query_interface = HTMLDocumentNode_query_interface, .destructor = HTMLDocumentNode_destructor, - .traverse = HTMLDOMNode_traverse, + .traverse = HTMLDocumentNode_traverse, .unlink = HTMLDocumentNode_unlink, .get_name = HTMLDocumentNode_get_name, .invoke = HTMLDocumentNode_invoke, @@ -6166,6 +6176,9 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo doc->outer_window = window ? window->base.outer_window : NULL; doc->window = window; + if(window) + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocumentNode_cpc); HTMLDocumentNode_Persist_Init(doc); HTMLDocumentNode_Service_Init(doc); @@ -6241,8 +6254,6 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do if(!doc_frag) return E_OUTOFMEMORY; - IHTMLWindow2_AddRef(&doc_frag->window->base.IHTMLWindow2_iface); - HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode, &HTMLDocumentNode_dispex); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->document_mode = lock_document_mode(doc_node);

1 0

Gabriel Ivăncescu : mshtml: Properly traverse document nodes.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: bcf89639e70063eb222ced3dab52301d2e227f36 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcf89639e70063eb222ced3dab5230… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml: Properly traverse document nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f1da5eaad07..4daf5ccc58d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5868,6 +5868,10 @@ static void HTMLDocumentNode_traverse(DispatchEx *dispex, nsCycleCollectionTrave if(This->window) note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); + if(This->dom_implementation) + note_cc_edge((nsISupports*)This->dom_implementation, "dom_implementation", cb); + if(This->namespaces) + note_cc_edge((nsISupports*)This->namespaces, "namespaces", cb); } static void HTMLDocumentNode_unlink(DispatchEx *dispex)

1 0

Gabriel Ivăncescu : mshtml/tests: Test parent window links after navigation.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: bc8c1b5696aeb02ee34df31d47fb631c8db769c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc8c1b5696aeb02ee34df31d47fb63… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml/tests: Test parent window links after navigation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7d139ccafe1..a55ebd8d26e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3234,6 +3234,48 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IHTMLDocument2_Release(iframes_doc); } +static void test_window_refs(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *self, *parent, *child; + IHTMLFrameBase2 *iframe; + IHTMLDocument6 *doc6; + IHTMLElement2 *elem; + HRESULT hres; + BSTR bstr; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6); + ok(hres == S_OK, "Could not get IHTMLDocument6 iface: %08lx\n", hres); + bstr = SysAllocString(L"ifr"); + hres = IHTMLDocument6_getElementById(doc6, bstr, &elem); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); + IHTMLDocument6_Release(doc6); + SysFreeString(bstr); + + hres = IHTMLElement2_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&iframe); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08lx\n", hres); + IHTMLElement2_Release(elem); + hres = IHTMLFrameBase2_get_contentWindow(iframe, &child); + ok(hres == S_OK, "get_contentWindow failed: %08lx\n", hres); + IHTMLFrameBase2_Release(iframe); + + hres = IHTMLWindow2_get_self(window, &self); + ok(hres == S_OK, "get_self failed: %08lx\n", hres); + hres = IHTMLWindow2_get_parent(child, &parent); + ok(hres == S_OK, "get_parent failed: %08lx\n", hres); + ok(parent == self, "parent != self\n"); + IHTMLWindow2_Release(parent); + IHTMLWindow2_Release(self); + + navigate(doc, L"blank.html"); + + hres = IHTMLWindow2_get_parent(child, &parent); + ok(hres == S_OK, "get_parent failed: %08lx\n", hres); + ok(parent == child, "parent != child\n"); + + IHTMLWindow2_Release(parent); + IHTMLWindow2_Release(child); +} + static void test_doc_obj(IHTMLDocument2 *doc) { static DISPID propput_dispid = DISPID_PROPERTYPUT; @@ -6523,6 +6565,7 @@ START_TEST(events) run_test_from_res(L"doc_with_prop_ie9.html", test_visibilitychange); run_test_from_res(L"blank_ie10.html", test_visibilitychange); run_test_from_res(L"iframe.html", test_unload_event); + run_test_from_res(L"iframe.html", test_window_refs); run_test(empty_doc_ie9_str, test_create_event); run_test(img_doc_ie9_str, test_imgload); run_test(input_image_doc_ie9_str, test_inputload);

1 0

Gabriel Ivăncescu : mshtml: Keep ref from the ImageElementFactory to the inner window.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: e0065c3affe52b36120143be620a5f8c7db5f611 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0065c3affe52b36120143be620a5f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml: Keep ref from the ImageElementFactory to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlimg.c | 31 +++++++++++++++++++++++-------- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/tests/events.c | 15 ++++++++++++++- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index cf69b62e744..07ce5643ad1 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -846,7 +846,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i VARIANT width, VARIANT height, IHTMLImgElement **img_elem) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - HTMLDocumentNode *doc; + HTMLDocumentNode *doc = This->window->doc; IHTMLImgElement *img; HTMLElement *elem; nsIDOMElement *nselem; @@ -856,13 +856,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), img_elem); - if(!This->window || !This->window->doc) { - WARN("NULL doc\n"); - return E_UNEXPECTED; - } - - doc = This->window->doc; - *img_elem = NULL; hres = create_nselem(doc, L"IMG", &nselem); @@ -921,6 +914,25 @@ static void *HTMLImageElementFactory_query_interface(DispatchEx *dispex, REFIID return NULL; } +static void HTMLImageElementFactory_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLImageElementFactory *This = impl_from_DispatchEx(dispex); + + if(This->window) + note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); +} + +static void HTMLImageElementFactory_unlink(DispatchEx *dispex) +{ + HTMLImageElementFactory *This = impl_from_DispatchEx(dispex); + + if(This->window) { + HTMLInnerWindow *window = This->window; + This->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } +} + static void HTMLImageElementFactory_destructor(DispatchEx *dispex) { HTMLImageElementFactory *This = impl_from_DispatchEx(dispex); @@ -963,6 +975,8 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { .query_interface = HTMLImageElementFactory_query_interface, .destructor = HTMLImageElementFactory_destructor, + .traverse = HTMLImageElementFactory_traverse, + .unlink = HTMLImageElementFactory_unlink, .value = HTMLImageElementFactory_value, }; @@ -983,6 +997,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElement ret->IHTMLImageElementFactory_iface.lpVtbl = &HTMLImageElementFactoryVtbl; ret->window = window; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); init_dispatch(&ret->dispex, &HTMLImageElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 47e65472c01..3e08a90d5fc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3977,7 +3977,6 @@ static void HTMLWindow_unlink(DispatchEx *dispex) if(This->image_factory) { HTMLImageElementFactory *image_factory = This->image_factory; - This->image_factory->window = NULL; This->image_factory = NULL; IHTMLImageElementFactory_Release(&image_factory->IHTMLImageElementFactory_iface); } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a55ebd8d26e..515a2cf443c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3236,13 +3236,18 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_window_refs(IHTMLDocument2 *doc) { + IHTMLImageElementFactory *image_factory; IHTMLWindow2 *self, *parent, *child; + IHTMLImgElement *img_elem; IHTMLFrameBase2 *iframe; IHTMLDocument6 *doc6; IHTMLElement2 *elem; + VARIANT vempty; HRESULT hres; BSTR bstr; + V_VT(&vempty) = VT_EMPTY; + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6); ok(hres == S_OK, "Could not get IHTMLDocument6 iface: %08lx\n", hres); bstr = SysAllocString(L"ifr"); @@ -3258,6 +3263,9 @@ static void test_window_refs(IHTMLDocument2 *doc) ok(hres == S_OK, "get_contentWindow failed: %08lx\n", hres); IHTMLFrameBase2_Release(iframe); + hres = IHTMLWindow2_get_Image(window, &image_factory); + ok(hres == S_OK, "get_Image failed: %08lx\n", hres); + hres = IHTMLWindow2_get_self(window, &self); ok(hres == S_OK, "get_self failed: %08lx\n", hres); hres = IHTMLWindow2_get_parent(child, &parent); @@ -3271,9 +3279,14 @@ static void test_window_refs(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_parent(child, &parent); ok(hres == S_OK, "get_parent failed: %08lx\n", hres); ok(parent == child, "parent != child\n"); - IHTMLWindow2_Release(parent); IHTMLWindow2_Release(child); + + hres = IHTMLImageElementFactory_create(image_factory, vempty, vempty, &img_elem); + ok(hres == S_OK, "create failed: %08lx\n", hres); + ok(img_elem != NULL, "img_elem == NULL\n"); + IHTMLImageElementFactory_Release(image_factory); + IHTMLImgElement_Release(img_elem); } static void test_doc_obj(IHTMLDocument2 *doc)

1 0

Gabriel Ivăncescu : mshtml: Keep ref from the OptionElementFactory to the inner window.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: wine Branch: master Commit: 7f85937158f82bc508aad60d4a27cf3780bb22a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f85937158f82bc508aad60d4a27cf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml: Keep ref from the OptionElementFactory to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 27 ++++++++++++++++++++++----- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/tests/events.c | 10 ++++++++++ 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 2daed7e8b2c..1b867195595 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -491,11 +491,6 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - if(!This->window || !This->window->doc) { - WARN("NULL doc\n"); - return E_UNEXPECTED; - } - *optelem = NULL; hres = create_nselem(This->window->doc, L"OPTION", &nselem); @@ -555,6 +550,25 @@ static void *HTMLOptionElementFactory_query_interface(DispatchEx *dispex, REFIID return NULL; } +static void HTMLOptionElementFactory_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + + if(This->window) + note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); +} + +static void HTMLOptionElementFactory_unlink(DispatchEx *dispex) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + + if(This->window) { + HTMLInnerWindow *window = This->window; + This->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } +} + static void HTMLOptionElementFactory_destructor(DispatchEx *dispex) { HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); @@ -601,6 +615,8 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { .query_interface = HTMLOptionElementFactory_query_interface, .destructor = HTMLOptionElementFactory_destructor, + .traverse = HTMLOptionElementFactory_traverse, + .unlink = HTMLOptionElementFactory_unlink, .value = HTMLOptionElementFactory_value, }; @@ -621,6 +637,7 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme ret->IHTMLOptionElementFactory_iface.lpVtbl = &HTMLOptionElementFactoryVtbl; ret->window = window; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); init_dispatch(&ret->dispex, &HTMLOptionElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3e08a90d5fc..85794b7fe85 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3982,7 +3982,6 @@ static void HTMLWindow_unlink(DispatchEx *dispex) } if(This->option_factory) { HTMLOptionElementFactory *option_factory = This->option_factory; - This->option_factory->window = NULL; This->option_factory = NULL; IHTMLOptionElementFactory_Release(&option_factory->IHTMLOptionElementFactory_iface); } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 515a2cf443c..0ccb892603a 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3236,8 +3236,10 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_window_refs(IHTMLDocument2 *doc) { + IHTMLOptionElementFactory *option_factory; IHTMLImageElementFactory *image_factory; IHTMLWindow2 *self, *parent, *child; + IHTMLOptionElement *option_elem; IHTMLImgElement *img_elem; IHTMLFrameBase2 *iframe; IHTMLDocument6 *doc6; @@ -3265,6 +3267,8 @@ static void test_window_refs(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_Image(window, &image_factory); ok(hres == S_OK, "get_Image failed: %08lx\n", hres); + hres = IHTMLWindow2_get_Option(window, &option_factory); + ok(hres == S_OK, "get_Option failed: %08lx\n", hres); hres = IHTMLWindow2_get_self(window, &self); ok(hres == S_OK, "get_self failed: %08lx\n", hres); @@ -3287,6 +3291,12 @@ static void test_window_refs(IHTMLDocument2 *doc) ok(img_elem != NULL, "img_elem == NULL\n"); IHTMLImageElementFactory_Release(image_factory); IHTMLImgElement_Release(img_elem); + + hres = IHTMLOptionElementFactory_create(option_factory, vempty, vempty, vempty, vempty, &option_elem); + ok(hres == S_OK, "create failed: %08lx\n", hres); + ok(option_elem != NULL, "option_elem == NULL\n"); + IHTMLOptionElementFactory_Release(option_factory); + IHTMLOptionElement_Release(option_elem); } static void test_doc_obj(IHTMLDocument2 *doc)

1 0