Jacek Caban : mshtml: Added IConnectionPointContainer iface to all HTMLElement objects.
Alexandre Julliard
julliard at winehq.org
Tue Dec 4 13:25:21 CST 2007
Module: wine
Branch: master
Commit: 2bcd1f0e9eca56fe462a99784c2ac8c6df73499a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd1f0e9eca56fe462a99784c2ac8c6df73499a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Dec 4 13:37:21 2007 +0100
mshtml: Added IConnectionPointContainer iface to all HTMLElement objects.
---
dlls/mshtml/htmlbody.c | 11 +++--------
dlls/mshtml/htmlelem.c | 7 +++++++
dlls/mshtml/mshtml_private.h | 1 +
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c
index 4f8e093..5077638 100644
--- a/dlls/mshtml/htmlbody.c
+++ b/dlls/mshtml/htmlbody.c
@@ -40,7 +40,6 @@ typedef struct {
const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl;
- ConnectionPointContainer cp_container;
ConnectionPoint cp_propnotif;
ConnectionPoint cp_txtcontevents;
@@ -464,9 +463,6 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) {
TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", &This->textcont, ppv);
*ppv = HTMLTEXTCONT(&This->textcont);
- }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
- TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
- *ppv = CONPTCONT(&This->cp_container);
}
if(*ppv) {
@@ -481,7 +477,6 @@ static void HTMLBodyElement_destructor(HTMLDOMNode *iface)
{
HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface);
- ConnectionPointContainer_Destroy(&This->cp_container);
nsIDOMHTMLBodyElement_Release(This->nsbody);
HTMLElement_destructor(&This->textcont.element.node);
@@ -506,9 +501,9 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem)
ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl;
ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl;
- ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLBODY(ret));
- ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink);
- ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->cp_container, &DIID_HTMLTextContainerEvents);
+ ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink);
+ ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->textcont.element.cp_container,
+ &DIID_HTMLTextContainerEvents);
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement,
(void**)&ret->nsbody);
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index bf0ba33..e160175 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -1255,6 +1255,9 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IHTMLElement2, riid)) {
TRACE("(%p)->(IID_IHTMLElement2 %p)\n", This, ppv);
*ppv = HTMLELEM2(This);
+ }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
+ TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
+ *ppv = CONPTCONT(&This->cp_container);
}
if(*ppv) {
@@ -1269,6 +1272,8 @@ void HTMLElement_destructor(HTMLDOMNode *iface)
{
HTMLElement *This = HTMLELEM_NODE_THIS(iface);
+ ConnectionPointContainer_Destroy(&This->cp_container);
+
if(This->nselem)
nsIDOMHTMLElement_Release(This->nselem);
@@ -1285,6 +1290,8 @@ void HTMLElement_Init(HTMLElement *This)
This->node.vtbl = &HTMLElementImplVtbl;
This->lpHTMLElementVtbl = &HTMLElementVtbl;
+ ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This));
+
HTMLElement2_Init(This);
}
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 198486f..b2bba95 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -285,6 +285,7 @@ struct HTMLDOMNode {
typedef struct {
HTMLDOMNode node;
+ ConnectionPointContainer cp_container;
const IHTMLElementVtbl *lpHTMLElementVtbl;
const IHTMLElement2Vtbl *lpHTMLElement2Vtbl;
More information about the wine-cvs
mailing list