Jacek Caban : mshtml: Remove document observer before releasing nsdoc.
Alexandre Julliard
julliard at winehq.org
Fri Feb 6 09:55:56 CST 2009
Module: wine
Branch: master
Commit: 21e1b15795d3d34ebea1eef1066e80ef7d7b26c9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e1b15795d3d34ebea1eef1066e80ef7d7b26c9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Feb 5 21:18:16 2009 +0100
mshtml: Remove document observer before releasing nsdoc.
---
dlls/mshtml/htmldoc.c | 4 +++-
dlls/mshtml/mshtml_private.h | 1 +
dlls/mshtml/mutation.c | 15 +++++++++++++++
dlls/mshtml/nsembed.c | 4 +++-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 32da2e0..a6aa73f 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -214,8 +214,10 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface)
ConnectionPointContainer_Destroy(&This->cp_container);
- if(This->nsdoc)
+ if(This->nsdoc) {
+ remove_mutation_observer(This->nscontainer, This->nsdoc);
nsIDOMHTMLDocument_Release(This->nsdoc);
+ }
if(This->nscontainer)
NSContainer_Release(This->nscontainer);
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index e4c98a7..b67c485 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -510,6 +510,7 @@ void NSContainer_Release(NSContainer*);
void init_mutation(NSContainer*);
void set_mutation_observer(NSContainer*,nsIDOMHTMLDocument*);
+void remove_mutation_observer(NSContainer*,nsIDOMHTMLDocument*);
void HTMLDocument_LockContainer(HTMLDocument*,BOOL);
void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*);
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index ea61d5a..ab9649c 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -55,6 +55,21 @@ void set_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmld
nsIDOMNSDocument_Release(nsdoc);
}
+void remove_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmldoc)
+{
+ nsIDOMNSDocument *nsdoc;
+ nsresult nsres;
+
+ nsres = nsIDOMHTMLDocument_QueryInterface(nshtmldoc, &IID_nsIDOMNSDocument, (void**)&nsdoc);
+ if(NS_FAILED(nsres)) {
+ ERR("Could not get nsIDOMNSDocument: %08x\n", nsres);
+ return;
+ }
+
+ nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(nscontainer));
+ nsIDOMNSDocument_Release(nsdoc);
+}
+
#define IE_MAJOR_VERSION 7
#define IE_MINOR_VERSION 0
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index ee386ac..16ac21e 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -857,8 +857,10 @@ void update_nsdocument(HTMLDocument *doc)
return;
}
- if(doc->nsdoc)
+ if(doc->nsdoc) {
+ remove_mutation_observer(doc->nscontainer, doc->nsdoc);
nsIDOMHTMLDocument_Release(doc->nsdoc);
+ }
doc->nsdoc = nsdoc;
More information about the wine-cvs
mailing list