Module: wine Branch: master Commit: c51e7ed89f54b759cc96a7bd2367769292f0c687 URL: https://gitlab.winehq.org/wine/wine/-/commit/c51e7ed89f54b759cc96a7bd2367769...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Jul 10 23:08:11 2024 +0200
mshtml: Use host object script bindings for MediaQueryList class.
---
dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 8 ++++---- dlls/mshtml/tests/documentmode.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 86e0ca51a30..9b7e69a25df 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3170,7 +3170,7 @@ static HRESULT WINAPI window_private_matchMedia(IWineHTMLWindowPrivate *iface, B
TRACE("iface %p, media_query %s\n", iface, debugstr_w(media_query));
- return create_media_query_list(This, media_query, media_query_list); + return create_media_query_list(This->inner_window, media_query, media_query_list); }
static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, IDispatch **console) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f94f9b7ed6a..4fd94034bfe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1553,6 +1553,6 @@ IInternetSecurityManager *get_security_manager(void);
extern HINSTANCE hInst; void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret); -HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch **ret); +HRESULT create_media_query_list(HTMLInnerWindow *window, BSTR media_query, IDispatch **ret);
HRESULT create_mutation_observer_ctor(compat_mode_t compat_mode, IDispatch **ret); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 83dbf029c44..21383808c32 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2411,7 +2411,7 @@ static dispex_static_data_t media_query_list_dispex = { media_query_list_iface_tids };
-HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch **ret) +HRESULT create_media_query_list(HTMLInnerWindow *window, BSTR media_query, IDispatch **ret) { struct media_query_list *media_query_list; nsISupports *nsunk; @@ -2433,7 +2433,7 @@ HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch media_query_list->callback->ref = 1;
nsAString_InitDepend(&nsstr, media_query); - nsres = nsIDOMWindow_MatchMedia(window->outer_window->nswindow, &nsstr, &nsunk); + nsres = nsIDOMWindow_MatchMedia(window->dom_window, &nsstr, &nsunk); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { free(media_query_list->callback); @@ -2449,8 +2449,8 @@ HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch
media_query_list->IWineMSHTMLMediaQueryList_iface.lpVtbl = &media_query_list_vtbl; list_init(&media_query_list->listeners); - init_dispatch(&media_query_list->dispex, &media_query_list_dispex, NULL, - dispex_compat_mode(&window->inner_window->event_target.dispex)); + init_dispatch(&media_query_list->dispex, &media_query_list_dispex, window, + dispex_compat_mode(&window->event_target.dispex));
*ret = (IDispatch*)&media_query_list->IWineMSHTMLMediaQueryList_iface; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7362e0d16bf..3b2dca84c86 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -341,7 +341,7 @@ sync_test("builtin_toString", function() { if(v >= 10) { test("classList", e.classList, "DOMTokenList", "testclass another ", true); test("console", window.console, "Console", null, true); - test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList", null, true); + test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList"); } if(v >= 11) { test("MutationObserver", new window.MutationObserver(function() {}), "MutationObserver", null, true);