Skip to content

W
wine-winehq
Commit 29944c7c authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

mshtml: COM cleanup for the nsIWebBrowserChrome iface.

parent 6994317b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
dlls/mshtml/mshtml_private.h
View file @ 29944c7c
...@@ -443,7 +443,7 @@ struct HTMLDocumentObj { ...@@ -443,7 +443,7 @@ struct HTMLDocumentObj {
}; };
struct NSContainer { struct NSContainer {
const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; nsIWebBrowserChrome nsIWebBrowserChrome_iface;
const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl; const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl;
const nsIURIContentListenerVtbl *lpURIContentListenerVtbl; const nsIURIContentListenerVtbl *lpURIContentListenerVtbl;
const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl; const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl;
...@@ -627,7 +627,6 @@ struct HTMLDocumentNode { ...@@ -627,7 +627,6 @@ struct HTMLDocumentNode {
#define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl)
#define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl)
#define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl)
#define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl)
#define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl) #define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl)
#define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl) #define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl)
......
dlls/mshtml/nsio.c
View file @ 29944c7c
...@@ -218,11 +218,11 @@ static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) ...@@ -218,11 +218,11 @@ static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer)
if(This->container == nscontainer) if(This->container == nscontainer)
return; return;
TRACE("Changing %p -> %p\n", This->container, nscontainer); TRACE("Changing %p -> %p\n", This->container, nscontainer);
nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface);
} }
if(nscontainer) if(nscontainer)
nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface);
This->container = nscontainer; This->container = nscontainer;
} }
...@@ -1624,7 +1624,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) ...@@ -1624,7 +1624,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface)
if(This->window_ref) if(This->window_ref)
windowref_release(This->window_ref); windowref_release(This->window_ref);
if(This->container) if(This->container)
nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface);
if(This->nsurl) if(This->nsurl)
nsIURL_Release(This->nsurl); nsIURL_Release(This->nsurl);
if(This->nsuri) if(This->nsuri)
...@@ -3099,7 +3099,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva ...@@ -3099,7 +3099,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva
wine_uri->is_doc_uri = TRUE; wine_uri->is_doc_uri = TRUE;
if(!wine_uri->container) { if(!wine_uri->container) {
nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface);
wine_uri->container = nscontainer; wine_uri->container = nscontainer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment