Module: wine Branch: master Commit: 120bf0eba9c50708b80f6ee7529d5e0e041483fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=120bf0eba9c50708b80f6ee75...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Mar 14 14:14:38 2019 +0100
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
---
dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlwindow.c | 2 -- dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d5e2a70..013fffb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); } - if(This->basedoc.window) { - This->basedoc.window->doc_obj = NULL; + if(This->basedoc.window) IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); - } if(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; 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) { doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; htmldoc_addref(&doc->basedoc.doc_node->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fd18ce0..92b0537 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow
window->base.outer_window = window; window->base.inner_window = NULL; - - window->doc_obj = browser->doc; window->browser = browser; list_add_head(&browser->outer_windows, &window->browser_entry);
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 966da77..f2939da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -475,7 +475,6 @@ struct HTMLOuterWindow {
LONG task_magic;
- HTMLDocumentObj *doc_obj; nsIDOMWindow *nswindow; mozIDOMWindowProxy *window_proxy; HTMLOuterWindow *parent;