July 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Store script global object pointer in document object.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: c4b5b9a5261000c2dfec5b36b25eb68634319c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4b5b9a5261000c2dfec5b36b25eb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 22:47:32 2024 +0200 mshtml: Store script global object pointer in document object. And use it to create DOMImplementation. --- dlls/mshtml/htmldoc.c | 17 +++++++++++++---- dlls/mshtml/htmlwindow.c | 7 +++++-- dlls/mshtml/mshtml_private.h | 6 +++++- dlls/mshtml/omnavigator.c | 5 +++-- dlls/mshtml/tests/es5.js | 1 - 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e761356e05e..5eca382c3e0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5337,6 +5337,10 @@ static void HTMLDocumentNode_unlink(DispatchEx *dispex) HTMLInnerWindow *window = This->window; HTMLDOMNode_unlink(dispex); + if(This->script_global) { + list_remove(&This->script_global_entry); + This->script_global = NULL; + } if(window) { This->window = NULL; IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); @@ -5709,7 +5713,7 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HTMLDocumentNode_init_dispex_info }; -static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window) +static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLInnerWindow *script_global) { HTMLDocumentNode *doc; @@ -5738,6 +5742,11 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo if(window) IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + if(script_global) { + doc->script_global = script_global; + list_add_tail(&script_global->documents, &doc->script_global_entry); + } + ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocumentNode_cpc); HTMLDocumentNode_Persist_Init(doc); HTMLDocumentNode_Service_Init(doc); @@ -5753,12 +5762,12 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo } HRESULT create_document_node(nsIDOMDocument *nsdoc, GeckoBrowser *browser, HTMLInnerWindow *window, - compat_mode_t parent_mode, HTMLDocumentNode **ret) + HTMLInnerWindow *script_global, compat_mode_t parent_mode, HTMLDocumentNode **ret) { HTMLDocumentObj *doc_obj = browser->doc; HTMLDocumentNode *doc; - doc = alloc_doc_node(doc_obj, window); + doc = alloc_doc_node(doc_obj, window, script_global); if(!doc) return E_OUTOFMEMORY; @@ -5809,7 +5818,7 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do { HTMLDocumentNode *doc_frag; - doc_frag = alloc_doc_node(doc_node->doc_obj, doc_node->window); + doc_frag = alloc_doc_node(doc_node->doc_obj, doc_node->window, doc_node->script_global); if(!doc_frag) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7cf4bf9738b..86e0ca51a30 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -109,7 +109,7 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN static void detach_inner_window(HTMLInnerWindow *window) { HTMLOuterWindow *outer_window = window->base.outer_window; - HTMLDocumentNode *doc = window->doc; + HTMLDocumentNode *doc = window->doc, *doc_iter; while(!list_empty(&window->children)) { HTMLOuterWindow *child = LIST_ENTRY(list_tail(&window->children), HTMLOuterWindow, sibling_entry); @@ -126,6 +126,8 @@ static void detach_inner_window(HTMLInnerWindow *window) if(outer_window && is_main_content_window(outer_window)) window->doc->cp_container.forward_container = NULL; + LIST_FOR_EACH_ENTRY(doc_iter, &window->documents, HTMLDocumentNode, script_global_entry) + doc_iter->script_global = NULL; if(doc) detach_document_node(doc); @@ -4239,6 +4241,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, return E_OUTOFMEMORY; window->base.IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; + list_init(&window->documents); list_init(&window->children); list_init(&window->script_hosts); list_init(&window->bindings); @@ -4367,7 +4370,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) if(outer_window->parent) parent_mode = outer_window->parent->base.inner_window->doc->document_mode; - hres = create_document_node(nsdoc, outer_window->browser, window, parent_mode, &window->doc); + hres = create_document_node(nsdoc, outer_window->browser, window, window, parent_mode, &window->doc); nsIDOMDocument_Release(nsdoc); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a5e0f309ed9..f94f9b7ed6a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -632,6 +632,7 @@ struct HTMLInnerWindow { struct list children; struct list script_hosts; + struct list documents; IWineJScript *jscript; IHTMLEventObj *event; @@ -994,6 +995,9 @@ struct HTMLDocumentNode { GeckoBrowser *browser; struct list browser_entry; + HTMLInnerWindow *script_global; + struct list script_global_entry; + compat_mode_t document_mode; BOOL document_mode_locked; @@ -1027,7 +1031,7 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT MHTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); -HRESULT create_document_node(nsIDOMDocument*,GeckoBrowser*,HTMLInnerWindow*, +HRESULT create_document_node(nsIDOMDocument*,GeckoBrowser*,HTMLInnerWindow*,HTMLInnerWindow*, compat_mode_t,HTMLDocumentNode**); HRESULT create_doctype_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 04779b76a1e..83dbf029c44 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -130,7 +130,8 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen return E_FAIL; } - hres = create_document_node(doc, This->doc->browser, NULL, dispex_compat_mode(&This->dispex), &new_document_node); + hres = create_document_node(doc, This->doc->browser, NULL, This->doc->script_global, + dispex_compat_mode(&This->dispex), &new_document_node); nsIDOMDocument_Release(doc); if(FAILED(hres)) return hres; @@ -242,7 +243,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; dom_implementation->doc = doc_node; - init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, doc_node->window, doc_node->document_mode); + init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, doc_node->script_global, doc_node->document_mode); nsres = nsIDOMDocument_GetImplementation(doc_node->dom_document, &dom_implementation->implementation); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 3d00f39cbc3..f2e025ec864 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2665,7 +2665,6 @@ async_test("script_global", function() { var doc = document.implementation.createHTMLDocument("test"); todo_wine. ok(doc instanceof Object, "created doc is not an instance of Object"); - todo_wine. ok(doc.implementation instanceof Object, "created doc.implementation is not an instance of Object"); document.body.innerHTML = "";

1 0

Jacek Caban : mshtml: Use host object script bindings for MediaQueryList class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: c51e7ed89f54b759cc96a7bd2367769292f0c687 URL: https://gitlab.winehq.org/wine/wine/-/commit/c51e7ed89f54b759cc96a7bd236776… Author: Jacek Caban <jacek(a)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);

1 0

Jacek Caban : mshtml: Use host object script bindings for Navigator class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 69dba71619944e8a82927e751af9b21b8f97b1da URL: https://gitlab.winehq.org/wine/wine/-/commit/69dba71619944e8a82927e751af9b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:12:20 2024 +0200 mshtml: Use host object script bindings for Navigator class. --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- dlls/mshtml/tests/documentmode.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9b7e69a25df..40f738df8b3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -829,7 +829,7 @@ static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigato if(!window->navigator) { HRESULT hres; - hres = create_navigator(dispex_compat_mode(&window->event_target.dispex), &window->navigator); + hres = create_navigator(window, &window->navigator); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4fd94034bfe..e3296ff1b5c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1043,7 +1043,7 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactor HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**); HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**); HRESULT create_location(HTMLOuterWindow*,HTMLLocation**); -HRESULT create_navigator(compat_mode_t,IOmNavigator**); +HRESULT create_navigator(HTMLInnerWindow*,IOmNavigator**); HRESULT create_html_screen(HTMLInnerWindow*,IHTMLScreen**); HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**); HRESULT create_history(HTMLInnerWindow*,OmHistory**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 21383808c32..4eac4ffd7f8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1159,7 +1159,7 @@ static dispex_static_data_t OmNavigator_dispex = { OmNavigator_iface_tids }; -HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator) +HRESULT create_navigator(HTMLInnerWindow *script_global, IOmNavigator **navigator) { OmNavigator *ret; @@ -1169,7 +1169,8 @@ HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator) ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl; - init_dispatch(&ret->dispex, &OmNavigator_dispex, NULL, compat_mode); + init_dispatch(&ret->dispex, &OmNavigator_dispex, script_global, + dispex_compat_mode(&script_global->event_target.dispex)); *navigator = &ret->IOmNavigator_iface; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 3b2dca84c86..83559c07171 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -305,7 +305,7 @@ sync_test("builtin_toString", function() { if(localStorage) test("localStorage", localStorage, "Storage", null, true); test("location", window.location, "Object", window.location.href, null, true); if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray", null, true); - test("navigator", window.navigator, "Navigator", null, true); + test("navigator", window.navigator, "Navigator"); test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); test("performanceTiming", window.performance.timing, "PerformanceTiming");

1 0

Jacek Caban : mshtml: Use host object script bindings for Selection class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: d1ca5f0d19bd6e54e61016e8cf8d862ffd6c8ec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1ca5f0d19bd6e54e61016e8cf8d86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:18:50 2024 +0200 mshtml: Use host object script bindings for Selection class. --- dlls/mshtml/selection.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 8c457f1813f..c20c24dad5f 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -253,7 +253,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; - init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, NULL, + init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, doc->script_global, dispex_compat_mode(&doc->node.event_target.dispex)); selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 83559c07171..94b00a07e82 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -326,7 +326,7 @@ sync_test("builtin_toString", function() { } if(v < 11) { test("eventObject", document.createEventObject(), "MSEventObj", null, true); - test("selection", document.selection, "MSSelection", null, true); + test("selection", document.selection, "MSSelection"); } if(v >= 9) { test("computedStyle", window.getComputedStyle(e), "CSSStyleDeclaration", null, true);

1 0

Jacek Caban : mshtml: Use host object script bindings for TextRange class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: f2098da681554ed0e510a9d1fee17cc202a42137 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2098da681554ed0e510a9d1fee17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:20:22 2024 +0200 mshtml: Use host object script bindings for TextRange class. --- dlls/mshtml/range.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 10f9de09ca8..7ba95fa7251 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1699,7 +1699,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx if(!ret) return E_OUTOFMEMORY; - init_dispatch(&ret->dispex, &HTMLTxtRange_dispex, NULL, + init_dispatch(&ret->dispex, &HTMLTxtRange_dispex, doc->script_global, dispex_compat_mode(&doc->node.event_target.dispex)); ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 94b00a07e82..7ee5a94b785 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -318,7 +318,7 @@ sync_test("builtin_toString", function() { test("styleSheetRules", sheet.rules, "MSCSSRuleList", null, true); test("styleSheets", document.styleSheets, "StyleSheetList", null, true); test("textNode", document.createTextNode("testNode"), "Text", v < 9 ? "testNode" : null, true); - test("textRange", txtRange, "TextRange", null, true); + test("textRange", txtRange, "TextRange"); test("window", window, "Window", "[object Window]", true); test("xmlHttpRequest", new XMLHttpRequest(), "XMLHttpRequest", null, true); if(v < 10) {

1 0

Jacek Caban : mshtml: Use host object script bindings for Range class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: 8e62f9319b3fe4d48744315f201fdf16e4c83597 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e62f9319b3fe4d48744315f201fdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:30:24 2024 +0200 mshtml: Use host object script bindings for Range class. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/range.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5eca382c3e0..0ed6b1d6710 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5129,7 +5129,7 @@ static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMR if(NS_FAILED(nsIDOMDocument_CreateRange(This->dom_document, &nsrange))) return E_FAIL; - hres = create_dom_range(nsrange, dispex_compat_mode(&This->node.event_target.dispex), p); + hres = create_dom_range(nsrange, This, p); nsIDOMRange_Release(nsrange); return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e3296ff1b5c..d944c3b93fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1159,7 +1159,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**); HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**); HRESULT create_style_sheet_collection(nsIDOMStyleSheetList*,compat_mode_t, IHTMLStyleSheetsCollection**); -HRESULT create_dom_range(nsIDOMRange*,compat_mode_t,IHTMLDOMRange**); +HRESULT create_dom_range(nsIDOMRange*,HTMLDocumentNode*,IHTMLDOMRange**); HRESULT create_markup_pointer(IMarkupPointer**); void detach_document_node(HTMLDocumentNode*); diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 7ba95fa7251..4129834b9b7 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1997,7 +1997,7 @@ static dispex_static_data_t HTMLDOMRange_dispex = { HTMLDOMRange_iface_tids }; -HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLDOMRange **p) +HRESULT create_dom_range(nsIDOMRange *nsrange, HTMLDocumentNode *doc, IHTMLDOMRange **p) { HTMLDOMRange *ret; @@ -2005,7 +2005,8 @@ HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLD if(!ret) return E_OUTOFMEMORY; - init_dispatch(&ret->dispex, &HTMLDOMRange_dispex, NULL, compat_mode); + init_dispatch(&ret->dispex, &HTMLDOMRange_dispex, doc->script_global, + dispex_compat_mode(&doc->node.event_target.dispex)); ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl;

1 0

Jacek Caban : mshtml: Use host object script bindings for Console class.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: wine Branch: master Commit: a1d2c5d304cf55ba9f319f785b3c99776e818ff8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d2c5d304cf55ba9f319f785b3c99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:41:44 2024 +0200 mshtml: Use host object script bindings for Console class. --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 40f738df8b3..88c9879ac69 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3181,7 +3181,7 @@ static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, TRACE("iface %p, console %p.\n", iface, console); if (!window->console) - create_console(dispex_compat_mode(&window->event_target.dispex), &window->console); + create_console(window, &window->console); *console = (IDispatch *)window->console; if (window->console) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d944c3b93fc..e41b4fd592c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1552,7 +1552,7 @@ void set_statustext(HTMLDocumentObj*,INT,LPCWSTR); IInternetSecurityManager *get_security_manager(void); extern HINSTANCE hInst; -void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret); +void create_console(HTMLInnerWindow *window, IWineMSHTMLConsole **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 4eac4ffd7f8..6284858b763 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2122,7 +2122,7 @@ static dispex_static_data_t console_dispex = { console_iface_tids }; -void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret) +void create_console(HTMLInnerWindow *window, IWineMSHTMLConsole **ret) { struct console *obj; @@ -2134,7 +2134,7 @@ void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret) } obj->IWineMSHTMLConsole_iface.lpVtbl = &WineMSHTMLConsoleVtbl; - init_dispatch(&obj->dispex, &console_dispex, NULL, compat_mode); + init_dispatch(&obj->dispex, &console_dispex, window, dispex_compat_mode(&window->event_target.dispex)); *ret = &obj->IWineMSHTMLConsole_iface; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7ee5a94b785..3d592e9c47d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -340,7 +340,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("console", window.console, "Console"); test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList"); } if(v >= 11) {

1 0

Elizabeth Figura : include: Document shader parameters.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 3dff608bf857c8029ae7a2a7f4c58734ab7e8039 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3dff608bf857c8029ae7a2a7f4c58… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 7 18:20:49 2024 -0500 include: Document shader parameters. --- include/vkd3d_shader.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a754a3d0..d37b0f18 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -458,44 +458,96 @@ enum vkd3d_shader_binding_flag VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), }; +/** + * The manner in which a parameter value is provided to the shader, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_type { VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, + /** The parameter value is embedded directly in the shader. */ VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, + /** + * The parameter value is provided to the shader via a specialization + * constant. This value is only supported for the SPIR-V target type. + */ VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; +/** + * The format of data provided to the shader, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_data_type { VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, + /** The parameter is provided as a 32-bit unsigned integer. */ VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_DATA_TYPE), }; +/** + * Names a specific shader parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_name { VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, + /** + * The sample count of the framebuffer, as returned by the HLSL function + * GetRenderTargetSampleCount() or the GLSL builtin gl_NumSamples. + * + * This parameter should be specified when compiling to SPIR-V, which + * provides no builtin ability to query this information from the shader. + * + * The default value is 1. + */ VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_NAME), }; +/** + * The value of an immediate constant parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ struct vkd3d_shader_parameter_immediate_constant { union { + /** + * The value if the parameter's data type is + * VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32. + */ uint32_t u32; } u; }; +/** + * The linkage of a specialization constant parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ struct vkd3d_shader_parameter_specialization_constant { + /** The ID of the specialization constant. */ uint32_t id; }; +/** + * An individual shader parameter. + * + * This structure is an earlier version of struct vkd3d_shader_parameter1 + * which supports fewer parameter types; + * refer to that structure for usage information. + * + * Only the following types may be used with this structure: + * + * - VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT + * - VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT + */ struct vkd3d_shader_parameter { enum vkd3d_shader_parameter_name name; @@ -508,14 +560,45 @@ struct vkd3d_shader_parameter } u; }; +/** + * An individual shader parameter. + * + * This structure is used in struct vkd3d_shader_parameter_info; see there for + * explanation of shader parameters. + * + * For example, to specify the rasterizer sample count to the shader via an + * unsigned integer specialization constant with ID 3, + * set the following members: + * + * - \a name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT + * - \a type = VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT + * - \a data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32 + * - \a u.specialization_constant.id = 3 + * + * This structure is an extended version of struct vkd3d_shader_parameter. + */ struct vkd3d_shader_parameter1 { + /** The builtin parameter to be mapped. */ enum vkd3d_shader_parameter_name name; + /** How the parameter will be provided to the shader. */ enum vkd3d_shader_parameter_type type; + /** + * The data type of the supplied parameter, which determines how it is to + * be interpreted. + */ enum vkd3d_shader_parameter_data_type data_type; union { + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT. + */ struct vkd3d_shader_parameter_immediate_constant immediate_constant; + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT. + */ struct vkd3d_shader_parameter_specialization_constant specialization_constant; void *_pointer_pad; uint32_t _pad[4];

1 0

Elizabeth Figura : vkd3d-shader/spirv: Support passing shader parameters through uniform buffers.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: e8bdac814730fbcda582873ef3a1072fb59987c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e8bdac814730fbcda582873ef3a10… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 12:36:58 2024 -0500 vkd3d-shader/spirv: Support passing shader parameters through uniform buffers. --- include/vkd3d_shader.h | 29 ++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d37b0f18..ceee4b86 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -472,6 +472,13 @@ enum vkd3d_shader_parameter_type * constant. This value is only supported for the SPIR-V target type. */ VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, + /** + * The parameter value is provided to the shader as part of a uniform + * buffer. + * + * \since 1.13 + */ + VKD3D_SHADER_PARAMETER_TYPE_BUFFER, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; @@ -536,6 +543,23 @@ struct vkd3d_shader_parameter_specialization_constant uint32_t id; }; +/** + * The linkage of a parameter specified through a uniform buffer, used in + * struct vkd3d_shader_parameter1. + */ +struct vkd3d_shader_parameter_buffer +{ + /** + * The set of the uniform buffer descriptor. If the target environment does + * not support descriptor sets, this value must be set to 0. + */ + unsigned int set; + /** The binding index of the uniform buffer descriptor. */ + unsigned int binding; + /** The byte offset of the parameter within the buffer. */ + uint32_t offset; +}; + /** * An individual shader parameter. * @@ -600,6 +624,11 @@ struct vkd3d_shader_parameter1 * VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT. */ struct vkd3d_shader_parameter_specialization_constant specialization_constant; + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_BUFFER. + */ + struct vkd3d_shader_parameter_buffer buffer; void *_pointer_pad; uint32_t _pad[4]; } u; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d5a3bafd..92130ff3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2421,6 +2421,11 @@ struct spirv_compiler const struct vkd3d_shader_parameter1 *parameters; unsigned int parameter_count; + struct + { + uint32_t buffer_id; + } *spirv_parameter_info; + bool prolog_emitted; struct shader_signature input_signature; struct shader_signature output_signature; @@ -3394,6 +3399,21 @@ static uint32_t spirv_compiler_get_spec_constant(struct spirv_compiler *compiler return spirv_compiler_emit_spec_constant(compiler, name, spec_id); } +static uint32_t spirv_compiler_get_buffer_parameter(struct spirv_compiler *compiler, + const struct vkd3d_shader_parameter1 *parameter) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int index = parameter - compiler->parameters; + uint32_t type_id, ptr_id, ptr_type_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + compiler->spirv_parameter_info[index].buffer_id, + spirv_compiler_get_constant_uint(compiler, 0)); + return vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); +} + static uint32_t spirv_compiler_emit_uint_shader_parameter(struct spirv_compiler *compiler, enum vkd3d_shader_parameter_name name) { @@ -3409,6 +3429,8 @@ static uint32_t spirv_compiler_emit_uint_shader_parameter(struct spirv_compiler return spirv_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) return spirv_compiler_get_spec_constant(compiler, name, parameter->u.specialization_constant.id); + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_BUFFER) + return spirv_compiler_get_buffer_parameter(compiler, parameter); FIXME("Unhandled parameter type %#x.\n", parameter->type); @@ -10573,6 +10595,32 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct compiler->parameter_count = program->parameter_count; compiler->parameters = program->parameters; + compiler->spirv_parameter_info = vkd3d_calloc(compiler->parameter_count, sizeof(*compiler->spirv_parameter_info)); + for (i = 0; i < compiler->parameter_count; ++i) + { + const struct vkd3d_shader_parameter1 *parameter = &compiler->parameters[i]; + + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_BUFFER) + { + uint32_t type_id, struct_id, ptr_type_id, var_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + + struct_id = vkd3d_spirv_build_op_type_struct(builder, &type_id, 1); + vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBlock, NULL, 0); + vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, + SpvDecorationOffset, parameter->u.buffer.offset); + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, struct_id); + var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, + ptr_type_id, SpvStorageClassUniform, 0); + + vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationDescriptorSet, parameter->u.buffer.set); + vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationBinding, parameter->u.buffer.binding); + + compiler->spirv_parameter_info[i].buffer_id = var_id; + } + } if (program->block_count && !spirv_compiler_init_blocks(compiler, program->block_count)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Elizabeth Figura : tests: Add a test for the vkd3d_shader_parameter APIs.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 9e59e57cb33fe523c4f5015f7885d80cd1e12ef7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9e59e57cb33fe523c4f5015f7885d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 17:07:21 2024 -0500 tests: Add a test for the vkd3d_shader_parameter APIs. --- Makefile.am | 3 +- tests/vkd3d_shader_api.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 419 insertions(+), 1 deletion(-)

1 0