Jacek Caban : mshtml: Store ConnectionPointContainer pointer in ConnectionPoint.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b0bb5e6a787f30ed1fa51a61d564f0efb5d4b7d5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0bb5e6a787f30ed1fa51a61d5...

Author: Jacek Caban 
Date:   Mon Jan  4 00:37:09 2010 +0100

mshtml: Store ConnectionPointContainer pointer in ConnectionPoint.

---

dlls/mshtml/conpoint.c       |    8 ++++----
 dlls/mshtml/mshtml_private.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c
index 0f49601..3d78827 100644
--- a/dlls/mshtml/conpoint.c
+++ b/dlls/mshtml/conpoint.c
@@ -89,13 +89,13 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface,
 static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface)
 {
     ConnectionPoint *This = CONPOINT_THIS(iface);
-    return IConnectionPointContainer_AddRef(This->container);
+    return IConnectionPointContainer_AddRef(CONPTCONT(This->container));
 }

static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface)
 {
     ConnectionPoint *This = CONPOINT_THIS(iface);
-    return IConnectionPointContainer_Release(This->container);
+    return IConnectionPointContainer_Release(CONPTCONT(This->container));
 }

static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID)
@@ -121,7 +121,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi
     if(!ppCPC)
         return E_POINTER;

-    *ppCPC = This->container;
+    *ppCPC = CONPTCONT(This->container);
     IConnectionPointContainer_AddRef(*ppCPC);
     return S_OK;
 }
@@ -201,7 +201,7 @@ static const IConnectionPointVtbl ConnectionPointVtbl =
 void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *container, REFIID riid, cp_static_data_t *data)
 {
     cp->lpConnectionPointVtbl = &ConnectionPointVtbl;
-    cp->container = CONPTCONT(container);
+    cp->container = container;
     cp->sinks = NULL;
     cp->sinks_size = 0;
     cp->iid = riid;
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index fcdb916..2df6a45 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -286,7 +286,7 @@ typedef struct ConnectionPointContainer {
 struct ConnectionPoint {
     const IConnectionPointVtbl *lpConnectionPointVtbl;

-    IConnectionPointContainer *container;
+    ConnectionPointContainer *container;

union {
         IUnknown *unk;