system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

mshtml: Use single navigator instance per inner window.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-03-15 16:17:45 +01:00 committed by Alexandre Julliard
parent 4cfac484db
commit 000321b234
5 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/mshtml/htmlwindow.c
View file

@ -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)

3
dlls/mshtml/mshtml_private.h
View file

@ -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;

9
dlls/mshtml/omnavigator.c
View file

@ -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 {

4
dlls/mshtml/tests/dom.c
View file

@ -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");
}

10
dlls/mshtml/tests/dom.js
View file

@ -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);
});