March 2021 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use single navigator instance per inner window.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 000321b234291fee3a00e14a4c5d0a045b85d838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000321b234291fee3a00e14a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:45 2021 +0100 mshtml: Use single navigator instance per inner window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 14 ++++++++++++-- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/omnavigator.c | 9 +++++---- dlls/mshtml/tests/dom.c | 4 +++- dlls/mshtml/tests/dom.js | 10 ++++++++++ 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a373bbe1916..5d9a603e686 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -294,6 +294,8 @@ static void release_inner_window(HTMLInnerWindow *This) IOmHistory_Release(&This->history->IOmHistory_iface); } + if(This->navigator) + IOmNavigator_Release(This->navigator); if(This->session_storage) IHTMLStorage_Release(This->session_storage); if(This->local_storage) @@ -918,11 +920,19 @@ static HRESULT WINAPI HTMLWindow2_get_opener(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigator **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); - *p = OmNavigator_Create(); - return *p ? S_OK : E_OUTOFMEMORY; + if(!window->navigator) { + HRESULT hres; + hres = create_navigator(dispex_compat_mode(&window->event_target.dispex), &window->navigator); + if(FAILED(hres)) + return hres; + } + + IOmNavigator_AddRef(*p = window->navigator); + return S_OK; } static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 784432b30b2..f870c05f2cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -535,6 +535,7 @@ struct HTMLInnerWindow { HTMLXMLHttpRequestFactory *xhr_factory; IHTMLScreen *screen; OmHistory *history; + IOmNavigator *navigator; IHTMLStorage *session_storage; IHTMLStorage *local_storage; @@ -910,7 +911,7 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactor HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; -IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; +HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index f3a3ec54924..624e66b4c95 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1453,20 +1453,21 @@ static dispex_static_data_t OmNavigator_dispex = { OmNavigator_iface_tids }; -IOmNavigator *OmNavigator_Create(void) +HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator) { OmNavigator *ret; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) - return NULL; + return E_OUTOFMEMORY; ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl; ret->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)&ret->IOmNavigator_iface, &OmNavigator_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IOmNavigator_iface, &OmNavigator_dispex, compat_mode); - return &ret->IOmNavigator_iface; + *navigator = &ret->IOmNavigator_iface; + return S_OK; } typedef struct { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ebed27b48e8..3c9deec7d0b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6296,12 +6296,13 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + todo_wine ok(navigator != navigator2, "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); hres = IHTMLWindow2_get_clientInformation(window, &navigator2); ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres); - todo_wine ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); + ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); IHTMLWindow2_Release(window); @@ -6416,6 +6417,7 @@ static void test_navigator(IHTMLDocument2 *doc) test_mime_types_col(navigator); ref = IOmNavigator_Release(navigator); + todo_wine ok(!ref, "navigator should be destroyed here\n"); } diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 7fc6b87882c..e1c60d6ea53 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -415,3 +415,13 @@ async_test("animation", function() { document.body.appendChild(div); div.className = "testAnimation"; }); + +sync_test("navigator", function() { + ok(typeof(window.navigator) === "object", + "typeof(window.navigator) = " + typeof(window.navigator)); + + var v = window.navigator; + ok(v === window.navigator, "v != window.navigator"); + v.testProp = true; + ok(window.navigator.testProp, "window.navigator.testProp = " + window.navigator.testProp); +});

1 0

Jacek Caban : mshtml: Initialize HTMLPerformance object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 19992377b01111fd9b92f03db2d4ae44b4abcc5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19992377b01111fd9b92f03d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:52 2021 +0100 mshtml: Initialize HTMLPerformance object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5d9a603e686..bc12d0decbc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * if(!This->performance_initialized) { IHTMLPerformance *performance; - hres = create_performance(&performance); + hres = create_performance(dispex_compat_mode(&This->event_target.dispex), &performance); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f870c05f2cb..03aa7e33b16 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -913,7 +913,7 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFact HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; -HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; +HRESULT create_performance(compat_mode_t,IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_namespace_collection(IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 624e66b4c95..ed65f18caaf 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2172,7 +2172,7 @@ static dispex_static_data_t HTMLPerformance_dispex = { HTMLPerformance_iface_tids }; -HRESULT create_performance(IHTMLPerformance **ret) +HRESULT create_performance(compat_mode_t compat_mode, IHTMLPerformance **ret) { HTMLPerformance *performance; @@ -2183,8 +2183,8 @@ HRESULT create_performance(IHTMLPerformance **ret) performance->IHTMLPerformance_iface.lpVtbl = &HTMLPerformanceVtbl; performance->ref = 1; - init_dispex(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, - &HTMLPerformance_dispex); + init_dispex_with_compat_mode(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, + &HTMLPerformance_dispex, compat_mode); *ret = &performance->IHTMLPerformance_iface; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLPerformanceNavigation and HTMLPerformanceTiming objects with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 974a215d486df91f23e113c5a2c4da8e6286c54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=974a215d486df91f23e113c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:58 2021 +0100 mshtml: Initialize HTMLPerformanceNavigation and HTMLPerformanceTiming objects with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index ed65f18caaf..e43328bf5b2 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2099,8 +2099,8 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, navigation->IHTMLPerformanceNavigation_iface.lpVtbl = &HTMLPerformanceNavigationVtbl; navigation->ref = 1; - init_dispex(&navigation->dispex, (IUnknown*)&navigation->IHTMLPerformanceNavigation_iface, - &HTMLPerformanceNavigation_dispex); + init_dispex_with_compat_mode(&navigation->dispex, (IUnknown*)&navigation->IHTMLPerformanceNavigation_iface, + &HTMLPerformanceNavigation_dispex, dispex_compat_mode(&This->dispex)); This->navigation = &navigation->IHTMLPerformanceNavigation_iface; } @@ -2124,8 +2124,8 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP timing->IHTMLPerformanceTiming_iface.lpVtbl = &HTMLPerformanceTimingVtbl; timing->ref = 1; - init_dispex(&timing->dispex, (IUnknown*)&timing->IHTMLPerformanceTiming_iface, - &HTMLPerformanceTiming_dispex); + init_dispex_with_compat_mode(&timing->dispex, (IUnknown*)&timing->IHTMLPerformanceTiming_iface, + &HTMLPerformanceTiming_dispex, dispex_compat_mode(&This->dispex)); This->timing = &timing->IHTMLPerformanceTiming_iface; }

1 0

Jacek Caban : mshtml: Initialize HTMLNamespaceCollection object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 51e348e919b63a9ebfefcfd0d9d80374e86444ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e348e919b63a9ebfefcfd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:04 2021 +0100 mshtml: Initialize HTMLNamespaceCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4e56d548f47..54273f5a6e0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2637,7 +2637,8 @@ static HRESULT WINAPI HTMLDocument4_get_namespaces(IHTMLDocument4 *iface, IDispa if(!This->doc_node->namespaces) { HRESULT hres; - hres = create_namespace_collection(&This->doc_node->namespaces); + hres = create_namespace_collection(dispex_compat_mode(&This->doc_node->node.event_target.dispex), + &This->doc_node->namespaces); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 03aa7e33b16..be19d98637f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -915,7 +915,7 @@ HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(compat_mode_t,IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; -HRESULT create_namespace_collection(IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; +HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e43328bf5b2..e55753a83d9 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2330,7 +2330,7 @@ static dispex_static_data_t HTMLNamespaceCollection_dispex = { HTMLNamespaceCollection_iface_tids }; -HRESULT create_namespace_collection(IHTMLNamespaceCollection **ret) +HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCollection **ret) { HTMLNamespaceCollection *namespaces; @@ -2339,7 +2339,8 @@ HRESULT create_namespace_collection(IHTMLNamespaceCollection **ret) namespaces->IHTMLNamespaceCollection_iface.lpVtbl = &HTMLNamespaceCollectionVtbl; namespaces->ref = 1; - init_dispex(&namespaces->dispex, (IUnknown*)&namespaces->IHTMLNamespaceCollection_iface, &HTMLNamespaceCollection_dispex); + init_dispex_with_compat_mode(&namespaces->dispex, (IUnknown*)&namespaces->IHTMLNamespaceCollection_iface, + &HTMLNamespaceCollection_dispex, compat_mode); *ret = &namespaces->IHTMLNamespaceCollection_iface; return S_OK; }

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheet object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: f35737a0885f4acd349f85b129aa39dd01a9bd85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35737a0885f4acd349f85b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:13 2021 +0100 mshtml: Initialize HTMLStyleSheet object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 7 ++++--- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54273f5a6e0..ad3ce941002 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1733,8 +1733,8 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR if(bstrHref && *bstrHref) { FIXME("semi-stub for href %s\n", debugstr_w(bstrHref)); - *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); - return S_OK; + return create_style_sheet(NULL, dispex_compat_mode(&This->doc_node->node.event_target.dispex), + ppnewStyleSheet); } hres = create_element(This->doc_node, L"style", &elem); diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 14fd8bc8f53..0cb6bac0710 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -198,10 +198,11 @@ static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, assert(nsres == NS_OK); if(ss) { - This->style_sheet = HTMLStyleSheet_Create(ss); + HRESULT hres = create_style_sheet(ss, dispex_compat_mode(&This->element.node.event_target.dispex), + &This->style_sheet); nsIDOMStyleSheet_Release(ss); - if(!This->style_sheet) - return E_OUTOFMEMORY; + if(FAILED(hres)) + return hres; } } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index a4e3254100b..8d535a657a9 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -517,7 +517,9 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection switch(V_VT(pvarIndex)) { case VT_I4: { nsIDOMStyleSheet *nsstylesheet; + IHTMLStyleSheet *stylesheet; nsresult nsres; + HRESULT hres; TRACE("index=%d\n", V_I4(pvarIndex)); @@ -528,9 +530,12 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection return E_INVALIDARG; } - V_VT(pvarResult) = VT_DISPATCH; - V_DISPATCH(pvarResult) = (IDispatch*)HTMLStyleSheet_Create(nsstylesheet); + hres = create_style_sheet(nsstylesheet, dispex_compat_mode(&This->dispex), &stylesheet); + if(FAILED(hres)) + return hres; + V_VT(pvarResult) = VT_DISPATCH; + V_DISPATCH(pvarResult) = (IDispatch*)stylesheet; return S_OK; } @@ -938,23 +943,28 @@ static dispex_static_data_t HTMLStyleSheet_dispex = { HTMLStyleSheet_iface_tids }; -IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet *nsstylesheet) +HRESULT create_style_sheet(nsIDOMStyleSheet *nsstylesheet, compat_mode_t compat_mode, IHTMLStyleSheet **ret) { - HTMLStyleSheet *ret = heap_alloc(sizeof(HTMLStyleSheet)); + HTMLStyleSheet *style_sheet; nsresult nsres; - ret->IHTMLStyleSheet_iface.lpVtbl = &HTMLStyleSheetVtbl; - ret->ref = 1; - ret->nsstylesheet = NULL; + if(!(style_sheet = heap_alloc(sizeof(HTMLStyleSheet)))) + return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheet_iface, &HTMLStyleSheet_dispex); + style_sheet->IHTMLStyleSheet_iface.lpVtbl = &HTMLStyleSheetVtbl; + style_sheet->ref = 1; + style_sheet->nsstylesheet = NULL; + + init_dispex_with_compat_mode(&style_sheet->dispex, (IUnknown*)&style_sheet->IHTMLStyleSheet_iface, + &HTMLStyleSheet_dispex, compat_mode); if(nsstylesheet) { nsres = nsIDOMStyleSheet_QueryInterface(nsstylesheet, &IID_nsIDOMCSSStyleSheet, - (void**)&ret->nsstylesheet); + (void**)&style_sheet->nsstylesheet); if(NS_FAILED(nsres)) ERR("Could not get nsICSSStyleSheet interface: %08x\n", nsres); } - return &ret->IHTMLStyleSheet_iface; + *ret = &style_sheet->IHTMLStyleSheet_iface; + return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index be19d98637f..735f9279b04 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1019,7 +1019,7 @@ HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; -IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; +HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetsCollection object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 23ce468b2ab60636aca66d0dca1b8ec976b6d3b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ce468b2ab60636aca66d0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:24 2021 +0100 mshtml: Initialize HTMLStyleSheetsCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 +++++---- dlls/mshtml/htmlstylesheet.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ad3ce941002..ad326f858ee 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1647,6 +1647,7 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMStyleSheetList *nsstylelist; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -1660,13 +1661,13 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, nsres = nsIDOMHTMLDocument_GetStyleSheets(This->doc_node->nsdoc, &nsstylelist); if(NS_FAILED(nsres)) { ERR("GetStyleSheets failed: %08x\n", nsres); - return E_FAIL; + return map_nsresult(nsres); } - *p = HTMLStyleSheetsCollection_Create(nsstylelist); + hres = create_style_sheet_collection(nsstylelist, + dispex_compat_mode(&This->doc_node->node.event_target.dispex), p); nsIDOMStyleSheetList_Release(nsstylelist); - - return S_OK; + return hres; } static HRESULT WINAPI HTMLDocument_put_onbeforeupdate(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 8d535a657a9..b3ea09e8333 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -573,21 +573,26 @@ static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { HTMLStyleSheetsCollection_iface_tids }; -IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList *nslist) +HRESULT create_style_sheet_collection(nsIDOMStyleSheetList *nslist, compat_mode_t compat_mode, + IHTMLStyleSheetsCollection **ret) { - HTMLStyleSheetsCollection *ret = heap_alloc(sizeof(HTMLStyleSheetsCollection)); + HTMLStyleSheetsCollection *collection; - ret->IHTMLStyleSheetsCollection_iface.lpVtbl = &HTMLStyleSheetsCollectionVtbl; - ret->ref = 1; + if(!(collection = heap_alloc(sizeof(HTMLStyleSheetsCollection)))) + return E_OUTOFMEMORY; + + collection->IHTMLStyleSheetsCollection_iface.lpVtbl = &HTMLStyleSheetsCollectionVtbl; + collection->ref = 1; if(nslist) nsIDOMStyleSheetList_AddRef(nslist); - ret->nslist = nslist; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetsCollection_iface, - &HTMLStyleSheetsCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLStyleSheetsCollection_iface, + &HTMLStyleSheetsCollection_dispex, compat_mode); - return &ret->IHTMLStyleSheetsCollection_iface; + *ret = &collection->IHTMLStyleSheetsCollection_iface; + return S_OK; } static inline HTMLStyleSheet *impl_from_IHTMLStyleSheet(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 735f9279b04..5fc049cf80f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1020,7 +1020,8 @@ HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; -IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT create_style_sheet_collection(nsIDOMStyleSheetList*,compat_mode_t, + IHTMLStyleSheetsCollection**) DECLSPEC_HIDDEN; HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetRule object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 687c6685fce9ca47b5e18120340cb87f89e1fa37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=687c6685fce9ca47b5e18120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:31 2021 +0100 mshtml: Initialize HTMLStyleSheetRule object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b3ea09e8333..74f8fc9dace 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -207,29 +207,32 @@ static dispex_static_data_t HTMLStyleSheetRule_dispex = { HTMLStyleSheetRule_iface_tids }; -static IHTMLStyleSheetRule *HTMLStyleSheetRule_Create(nsIDOMCSSRule *nsstylesheetrule) +static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_mode_t compat_mode, + IHTMLStyleSheetRule **ret) { - HTMLStyleSheetRule *ret; + HTMLStyleSheetRule *rule; nsresult nsres; - if(!(ret = heap_alloc(sizeof(*ret)))) - return NULL; + if(!(rule = heap_alloc(sizeof(*rule)))) + return E_OUTOFMEMORY; - ret->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; - ret->ref = 1; - ret->nsstylesheetrule = NULL; + rule->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; + rule->ref = 1; + rule->nsstylesheetrule = NULL; - init_dispex(&ret->dispex, (IUnknown *)&ret->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex); + init_dispex_with_compat_mode(&rule->dispex, (IUnknown *)&rule->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex, + compat_mode); if (nsstylesheetrule) { nsres = nsIDOMCSSRule_QueryInterface(nsstylesheetrule, &IID_nsIDOMCSSRule, - (void **)&ret->nsstylesheetrule); + (void **)&rule->nsstylesheetrule); if (NS_FAILED(nsres)) ERR("Could not get nsIDOMCSSRule interface: %08x\n", nsres); } - return &ret->IHTMLStyleSheetRule_iface; + *ret = &rule->IHTMLStyleSheetRule_iface; + return S_OK; } static inline HTMLStyleSheetRulesCollection *impl_from_IHTMLStyleSheetRulesCollection(IHTMLStyleSheetRulesCollection *iface) @@ -339,13 +342,13 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu } static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface, - LONG index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule) + LONG index, IHTMLStyleSheetRule **p) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); nsIDOMCSSRule *nsstylesheetrule; nsresult nsres; - TRACE("(%p)->(%d %p)\n", This, index, ppHTMLStyleSheetRule); + TRACE("(%p)->(%d %p)\n", This, index, p); nsres = nsIDOMCSSRuleList_Item(This->nslist, index, &nsstylesheetrule); if(NS_FAILED(nsres)) @@ -353,8 +356,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol if(!nsstylesheetrule) return E_INVALIDARG; - *ppHTMLStyleSheetRule = HTMLStyleSheetRule_Create(nsstylesheetrule); - return *ppHTMLStyleSheetRule ? S_OK : E_OUTOFMEMORY; + return create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); } static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = {

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetRulesCollection object with compat mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6c9c77fdf11a90a9b98998932bf33f0db35a2989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c9c77fdf11a90a9b9899893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:39 2021 +0100 mshtml: Initialize HTMLStyleSheetRulesCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 74f8fc9dace..271b6985d7a 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -381,21 +381,26 @@ static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { HTMLStyleSheetRulesCollection_iface_tids }; -static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsIDOMCSSRuleList *nslist) +static HRESULT create_style_sheet_rules_collection(nsIDOMCSSRuleList *nslist, compat_mode_t compat_mode, + IHTMLStyleSheetRulesCollection **ret) { - HTMLStyleSheetRulesCollection *ret; + HTMLStyleSheetRulesCollection *collection; - ret = heap_alloc(sizeof(*ret)); - ret->IHTMLStyleSheetRulesCollection_iface.lpVtbl = &HTMLStyleSheetRulesCollectionVtbl; - ret->ref = 1; - ret->nslist = nslist; + if(!(collection = heap_alloc(sizeof(*collection)))) + return E_OUTOFMEMORY; + + collection->IHTMLStyleSheetRulesCollection_iface.lpVtbl = &HTMLStyleSheetRulesCollectionVtbl; + collection->ref = 1; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetRulesCollection_iface, &HTMLStyleSheetRulesCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLStyleSheetRulesCollection_iface, + &HTMLStyleSheetRulesCollection_dispex, compat_mode); if(nslist) nsIDOMCSSRuleList_AddRef(nslist); - return &ret->IHTMLStyleSheetRulesCollection_iface; + *ret = &collection->IHTMLStyleSheetRulesCollection_iface; + return S_OK; } static inline HTMLStyleSheetsCollection *impl_from_IHTMLStyleSheetsCollection(IHTMLStyleSheetsCollection *iface) @@ -896,6 +901,7 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); nsIDOMCSSRuleList *nslist = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -905,8 +911,9 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, return E_FAIL; } - *p = HTMLStyleSheetRulesCollection_Create(nslist); - return S_OK; + hres = create_style_sheet_rules_collection(nslist, dispex_compat_mode(&This->dispex), p); + nsIDOMCSSRuleList_Release(nslist); + return hres; } static const IHTMLStyleSheetVtbl HTMLStyleSheetVtbl = {

1 0

Jacek Caban : jscript: Add String.prototype.toLocaleUpperCase and toLocaleLowerCase implementation.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 07cebfc9289d924bc3646d679b5d0628c7bf204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cebfc9289d924bc3646d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 18:19:26 2021 +0100 jscript: Add String.prototype.toLocaleUpperCase and toLocaleLowerCase implementation. They are supposed to be locale-specific, but my testing shows that it's not the case in native. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 36 +++++++++++++++++++++++------------- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index a8bd77dc398..4f6d8cd194d 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1363,13 +1363,11 @@ static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign return do_attributeless_tag_format(ctx, jsthis, r, L"SUP"); } -static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) +static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) { jsstr_t *str; - HRESULT hres; + HRESULT hres; - TRACE("\n"); hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) @@ -1387,7 +1385,7 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } jsstr_flush(str, buf); - for (; len--; buf++) *buf = towlower(*buf); + for (; len--; buf++) *buf = towupper(*buf); *r = jsval_string(ret); } @@ -1395,13 +1393,11 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) +static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) { jsstr_t *str; HRESULT hres; - TRACE("\n"); hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) @@ -1419,7 +1415,7 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } jsstr_flush(str, buf); - for (; len--; buf++) *buf = towupper(*buf); + for (; len--; buf++) *buf = towlower(*buf); *r = jsval_string(ret); } @@ -1427,18 +1423,32 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } +static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("\n"); + return to_lower_case(ctx, jsthis, r); +} + +static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("\n"); + return to_upper_case(ctx, jsthis, r); +} + static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return to_lower_case(ctx, jsthis, r); } static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return to_upper_case(ctx, jsthis, r); } static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index da0ad1e1ebc..564dfc16f30 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -753,10 +753,14 @@ tmp = "test".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); tmp = "tEsT".toLowerCase(); ok(tmp === "test", "''.toLowerCase() = " + tmp); +tmp = "tEsT".toLocaleLowerCase(); +ok(tmp === "test", "''.toLocaleLowerCase() = " + tmp); tmp = "tEsT".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); tmp = ("tE" + String.fromCharCode(0) + "sT").toLowerCase(); ok(tmp === "te" + String.fromCharCode(0) + "st", "''.toLowerCase() = " + tmp); +ok(String.prototype.toLocaleLowerCase != String.prototype.toLowerCase, + "String.prototype.toLocaleLowerCase == String.prototype.toLowerCase"); tmp = "".toUpperCase(); ok(tmp === "", "''.toUpperCase() = " + tmp); @@ -768,8 +772,12 @@ tmp = "tEsT".toUpperCase(); ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "tEsT".toLocaleUpperCase(3); +ok(tmp === "TEST", "''.toLocaleUpperCase(3) = " + tmp); tmp = ("tE" + String.fromCharCode(0) + "sT").toUpperCase(); ok(tmp === "TE" + String.fromCharCode(0) + "ST", "''.toUpperCase() = " + tmp); +ok(String.prototype.toLocaleUpperCase != String.prototype.toUpperCase, + "String.prototype.toLocaleUpperCase == String.prototype.toUpperCase"); tmp = "".anchor(); ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp);

1 0

Jacek Caban : jscript: Raise the stack depth limit.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: e7d265f4b93fe424d6e3c52003fbcb3ebd301f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d265f4b93fe424d6e3c520… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 18:19:33 2021 +0100 jscript: Raise the stack depth limit. Previous limit was roughly similar to IE8. Later IE versions allow much larger stacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b6930a25b65..18dc4c3f139 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -54,7 +54,7 @@ typedef struct { } u; } exprval_t; -static const size_t stack_size = 0x4000; +static const size_t stack_size = 0x40000; static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) {

1 0