urlmon: Use ifaces instead of vtbl pointers in MimeFilter.

dlls/urlmon/mimefilter.c

@@ -22,34 +22,34 @@
 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
-    const IInternetProtocolVtbl      *lpIInternetProtocolVtbl;
-    const IInternetProtocolSinkVtbl  *lpIInternetProtocolSinkVtbl;
+    IInternetProtocol     IInternetProtocol_iface;
+    IInternetProtocolSink IInternetProtocolSink_iface;
 
     LONG ref;
 } MimeFilter;
 
-#define PROTOCOL(x)      ((IInternetProtocol*)      &(x)->lpIInternetProtocolVtbl)
-#define PROTOCOLSINK(x)  ((IInternetProtocolSink*)  &(x)->lpIInternetProtocolSinkVtbl)
-
-#define PROTOCOL_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocol, iface)
+static inline MimeFilter *impl_from_IInternetProtocol(IInternetProtocol *iface)
+{
+    return CONTAINING_RECORD(iface, MimeFilter, IInternetProtocol_iface);
+}
 
 static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
 
     *ppv = NULL;
     if(IsEqualGUID(&IID_IUnknown, riid)) {
         TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
-        *ppv = PROTOCOL(This);
+        *ppv = &This->IInternetProtocol_iface;
     }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
         TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
-        *ppv = PROTOCOL(This);
+        *ppv = &This->IInternetProtocol_iface;
     }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) {
         TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv);
-        *ppv = PROTOCOL(This);
+        *ppv = &This->IInternetProtocol_iface;
     }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) {
         TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv);
-        *ppv = PROTOCOLSINK(This);
+        *ppv = &This->IInternetProtocolSink_iface;
     }
 
     if(*ppv) {
@@ -63,7 +63,7 @@ static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface
 
 static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     LONG ref = InterlockedIncrement(&This->ref);
     TRACE("(%p) ref=%d\n", This, ref);
     return ref;
@@ -71,7 +71,7 @@ static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface)
 
 static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
     TRACE("(%p) ref=%d\n", This, ref);
@@ -89,7 +89,7 @@ static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR
         IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
         DWORD grfPI, HANDLE_PTR dwReserved)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
           pOIBindInfo, grfPI, dwReserved);
     return E_NOTIMPL;
@@ -97,7 +97,7 @@ static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR
 
 static HRESULT WINAPI MimeFilterProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%p)\n", This, pProtocolData);
     return E_NOTIMPL;
 }
@@ -105,28 +105,28 @@ static HRESULT WINAPI MimeFilterProtocol_Continue(IInternetProtocol *iface, PROT
 static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason,
         DWORD dwOptions)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%08x)\n", This, dwOptions);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI MimeFilterProtocol_Suspend(IInternetProtocol *iface)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI MimeFilterProtocol_Resume(IInternetProtocol *iface)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
@@ -134,7 +134,7 @@ static HRESULT WINAPI MimeFilterProtocol_Resume(IInternetProtocol *iface)
 static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv,
         ULONG cb, ULONG *pcbRead)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
     return E_NOTIMPL;
 }
@@ -142,27 +142,25 @@ static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv
 static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove,
         DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)->(%08x)\n", This, dwOptions);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI MimeFilterProtocol_UnlockRequest(IInternetProtocol *iface)
 {
-    MimeFilter *This = PROTOCOL_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocol(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
-#undef PROTOCOL_THIS
-
 static const IInternetProtocolVtbl MimeFilterProtocolVtbl = {
     MimeFilterProtocol_QueryInterface,
     MimeFilterProtocol_AddRef,
@@ -179,31 +177,34 @@ static const IInternetProtocolVtbl MimeFilterProtocolVtbl = {
     MimeFilterProtocol_UnlockRequest
 };
 
-#define PROTSINK_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocolSink, iface)
+static inline MimeFilter *impl_from_IInternetProtocolSink(IInternetProtocolSink *iface)
+{
+    return CONTAINING_RECORD(iface, MimeFilter, IInternetProtocolSink_iface);
+}
 
 static HRESULT WINAPI MimeFilterSink_QueryInterface(IInternetProtocolSink *iface,
         REFIID riid, void **ppv)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
-    return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv);
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
+    return IInternetProtocol_QueryInterface(&This->IInternetProtocol_iface, riid, ppv);
 }
 
 static ULONG WINAPI MimeFilterSink_AddRef(IInternetProtocolSink *iface)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
-    return IInternetProtocol_AddRef(PROTOCOL(This));
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
+    return IInternetProtocol_AddRef(&This->IInternetProtocol_iface);
 }
 
 static ULONG WINAPI MimeFilterSink_Release(IInternetProtocolSink *iface)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
-    return IInternetProtocol_Release(PROTOCOL(This));
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
+    return IInternetProtocol_Release(&This->IInternetProtocol_iface);
 }
 
 static HRESULT WINAPI MimeFilterSink_Switch(IInternetProtocolSink *iface,
         PROTOCOLDATA *pProtocolData)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
     FIXME("(%p)->(%p)\n", This, pProtocolData);
     return E_NOTIMPL;
 }
@@ -211,7 +212,7 @@ static HRESULT WINAPI MimeFilterSink_Switch(IInternetProtocolSink *iface,
 static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface,
         ULONG ulStatusCode, LPCWSTR szStatusText)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
     FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
     return E_NOTIMPL;
 }
@@ -219,7 +220,7 @@ static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface
 static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface,
         DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
     FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
     return E_NOTIMPL;
 }
@@ -227,13 +228,11 @@ static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface,
 static HRESULT WINAPI MimeFilterSink_ReportResult(IInternetProtocolSink *iface,
         HRESULT hrResult, DWORD dwError, LPCWSTR szResult)
 {
-    MimeFilter *This = PROTSINK_THIS(iface);
+    MimeFilter *This = impl_from_IInternetProtocolSink(iface);
     FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
     return E_NOTIMPL;
 }
 
-#undef PROTSINK_THIS
-
 static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = {
     MimeFilterSink_QueryInterface,
     MimeFilterSink_AddRef,
@@ -254,10 +253,10 @@ HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
 
     ret = heap_alloc_zero(sizeof(MimeFilter));
 
-    ret->lpIInternetProtocolVtbl     = &MimeFilterProtocolVtbl;
-    ret->lpIInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl;
+    ret->IInternetProtocol_iface.lpVtbl = &MimeFilterProtocolVtbl;
+    ret->IInternetProtocolSink_iface.lpVtbl = &InternetProtocolSinkVtbl;
     ret->ref = 1;
 
-    *ppobj = PROTOCOL(ret);
+    *ppobj = &ret->IInternetProtocol_iface;
     return S_OK;
 }