ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-03-14 14:14:38 +01:00 committed by Alexandre Julliard
parent 2a6cb251f9
commit 120bf0eba9
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mshtml/htmldoc.c
View File

@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface)
This->basedoc.doc_node->basedoc.doc_obj = NULL; This->basedoc.doc_node->basedoc.doc_obj = NULL;
htmldoc_release(&This->basedoc.doc_node->basedoc); htmldoc_release(&This->basedoc.doc_node->basedoc);
} }
if(This->basedoc.window) { if(This->basedoc.window)
This->basedoc.window->doc_obj = NULL;
IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface);
}
if(This->advise_holder) if(This->advise_holder)
IOleAdviseHolder_Release(This->advise_holder); IOleAdviseHolder_Release(This->advise_holder);
@ -5498,8 +5496,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
doc->basedoc.window = doc->nscontainer->content_window; doc->basedoc.window = doc->nscontainer->content_window;
IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface); IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface);
doc->basedoc.window->doc_obj = doc;
if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) { if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) {
doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc;
htmldoc_addref(&doc->basedoc.doc_node->basedoc); htmldoc_addref(&doc->basedoc.doc_node->basedoc);

2
dlls/mshtml/htmlwindow.c
View File

@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow
window->base.outer_window = window; window->base.outer_window = window;
window->base.inner_window = NULL; window->base.inner_window = NULL;
window->doc_obj = browser->doc;
window->browser = browser; window->browser = browser;
list_add_head(&browser->outer_windows, &window->browser_entry); list_add_head(&browser->outer_windows, &window->browser_entry);

1
dlls/mshtml/mshtml_private.h
View File

@ -475,7 +475,6 @@ struct HTMLOuterWindow {
LONG task_magic; LONG task_magic;
HTMLDocumentObj *doc_obj;
nsIDOMWindow *nswindow; nsIDOMWindow *nswindow;
mozIDOMWindowProxy *window_proxy; mozIDOMWindowProxy *window_proxy;
HTMLOuterWindow *parent; HTMLOuterWindow *parent;