Make IConnectionPointContainer interface heap based.

dlls/shdocvw/events.c

 /*
- * Implementation of event-related interfaces for IE Web Browser control:
+ * Implementation of event-related interfaces for WebBrowser control:
  *
  *  - IConnectionPointContainer
  *  - IConnectionPoint
@@ -36,46 +36,41 @@ static const GUID IID_INotifyDBEvents =
  * Implement the IConnectionPointContainer interface
  */
 
-static HRESULT WINAPI WBCPC_QueryInterface(LPCONNECTIONPOINTCONTAINER iface,
+#define CONPTCONT_THIS(iface) DEFINE_THIS(WebBrowser, ConnectionPointContainer, iface)
+
+static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface,
         REFIID riid, LPVOID *ppobj)
 {
-    FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
-
-    if (ppobj == NULL) return E_POINTER;
-    
-    return E_NOINTERFACE;
+    WebBrowser *This = CONPTCONT_THIS(iface);
+    return IWebBrowser_QueryInterface(WEBBROWSER(This), riid, ppobj);
 }
 
-static ULONG WINAPI WBCPC_AddRef(LPCONNECTIONPOINTCONTAINER iface)
+static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface)
 {
-    SHDOCVW_LockModule();
-
-    return 2; /* non-heap based object */
+    WebBrowser *This = CONPTCONT_THIS(iface);
+    return IWebBrowser_AddRef(WEBBROWSER(This));
 }
 
-static ULONG WINAPI WBCPC_Release(LPCONNECTIONPOINTCONTAINER iface)
+static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface)
 {
-    SHDOCVW_UnlockModule();
-
-    return 1; /* non-heap based object */
+    WebBrowser *This = CONPTCONT_THIS(iface);
+    return IWebBrowser_Release(WEBBROWSER(This));
 }
 
-/* Get a list of connection points inside this container. */
-static HRESULT WINAPI WBCPC_EnumConnectionPoints(LPCONNECTIONPOINTCONTAINER iface,
+static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface,
         LPENUMCONNECTIONPOINTS *ppEnum)
 {
-    FIXME("stub: IEnumConnectionPoints = %p\n", *ppEnum);
-    return S_OK;
+    WebBrowser *This = CONPTCONT_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, ppEnum);
+    return E_NOTIMPL;
 }
 
-/* Retrieve the connection point in this container associated with the
- * riid interface.  When events occur in the control, the control can
- * call backwards into its embedding site, through these interfaces.
- */
-static HRESULT WINAPI WBCPC_FindConnectionPoint(LPCONNECTIONPOINTCONTAINER iface,
+static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface,
         REFIID riid, LPCONNECTIONPOINT *ppCP)
 {
-    TRACE(": IID = %s, IConnectionPoint = %p\n", debugstr_guid(riid), *ppCP);
+    WebBrowser *This = CONPTCONT_THIS(iface);
+
+    FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP);
 
     /* For now, return the same IConnectionPoint object for both
      * event interface requests.
@@ -98,21 +93,17 @@ static HRESULT WINAPI WBCPC_FindConnectionPoint(LPCONNECTIONPOINTCONTAINER iface
     return E_FAIL;
 }
 
-/**********************************************************************
- * IConnectionPointContainer virtual function table for IE Web Browser component
- */
+#undef CONPTCONT_THIS
 
-static const IConnectionPointContainerVtbl WBCPC_Vtbl =
+static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl =
 {
-    WBCPC_QueryInterface,
-    WBCPC_AddRef,
-    WBCPC_Release,
-    WBCPC_EnumConnectionPoints,
-    WBCPC_FindConnectionPoint
+    ConnectionPointContainer_QueryInterface,
+    ConnectionPointContainer_AddRef,
+    ConnectionPointContainer_Release,
+    ConnectionPointContainer_EnumConnectionPoints,
+    ConnectionPointContainer_FindConnectionPoint
 };
 
-IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer = {&WBCPC_Vtbl};
-
 
 /**********************************************************************
  * Implement the IConnectionPoint interface
@@ -207,3 +198,8 @@ static const IConnectionPointVtbl WBCP_Vtbl =
 };
 
 static IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl};
+
+void WebBrowser_Events_Init(WebBrowser *This)
+{
+    This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl;
+}

dlls/shdocvw/shdocvw.h

@@ -61,6 +61,7 @@ typedef struct {
     const IPersistStreamInitVtbl        *lpPersistStreamInitVtbl;
     const IProvideClassInfo2Vtbl        *lpProvideClassInfoVtbl;
     const IQuickActivateVtbl            *lpQuickActivateVtbl;
+    const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl;
 
     LONG ref;
 } WebBrowser;
@@ -73,28 +74,17 @@ typedef struct {
 #define PERSTRINIT(x)   ((IPersistStreamInit*)          &(x)->lpPersistStreamInitVtbl)
 #define CLASSINFO(x)    ((IProvideClassInfo2*)          &(x)->lpProvideClassInfoVtbl)
 #define QUICKACT(x)     ((IQuickActivate*)              &(x)->lpQuickActivateVtbl)
+#define CONPTCONT(x)    ((IConnectionPointContainer*)   &(x)->lpConnectionPointContainerVtbl)
 
 void WebBrowser_OleObject_Init(WebBrowser*);
 void WebBrowser_Persist_Init(WebBrowser*);
 void WebBrowser_ClassInfo_Init(WebBrowser*);
 void WebBrowser_Misc_Init(WebBrowser*);
+void WebBrowser_Events_Init(WebBrowser*);
 
 HRESULT WebBrowser_Create(IUnknown*,REFIID,void**);
 
 /**********************************************************************
- * IConnectionPointContainer declaration for SHDOCVW.DLL
- */
-typedef struct
-{
-    /* IUnknown fields */
-    const IConnectionPointContainerVtbl *lpVtbl;
-    LONG ref;
-} IConnectionPointContainerImpl;
-
-extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;
-
-
-/**********************************************************************
  * IConnectionPoint declaration for SHDOCVW.DLL
  */
 typedef struct

dlls/shdocvw/webbrowser.c

@@ -78,8 +78,8 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser *iface, REFIID riid,
         TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv);
         *ppv = QUICKACT(This);
     }else if(IsEqualGUID (&IID_IConnectionPointContainer, riid)) {
-        FIXME("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
-        *ppv = &SHDOCVW_ConnectionPointContainer;
+        TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
+        *ppv = CONPTCONT(This);
     }
 
     if(*ppv) {
@@ -388,6 +388,7 @@ HRESULT WebBrowser_Create(IUnknown *pOuter, REFIID riid, void **ppv)
     WebBrowser_Persist_Init(ret);
     WebBrowser_ClassInfo_Init(ret);
     WebBrowser_Misc_Init(ret);
+    WebBrowser_Events_Init(ret);
 
     hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv);
     if(SUCCEEDED(hres)) {