December 2010 - Wine-Commits

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in DownloadBSC.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: b74af4aa0fac1270a6ab361b08e00d8f7a3ff3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74af4aa0fac1270a6ab361b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:10 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in DownloadBSC. --- dlls/urlmon/download.c | 69 +++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index cc49849..9759e71 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -22,8 +22,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; + IBindStatusCallback IBindStatusCallback_iface; + IServiceProvider IServiceProvider_iface; LONG ref; @@ -32,27 +32,32 @@ typedef struct { LPWSTR cache_file; } DownloadBSC; -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) -#define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) +static inline DownloadBSC *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, DownloadBSC, IBindStatusCallback_iface); +} -#define STATUSCLB_THIS(iface) DEFINE_THIS(DownloadBSC, BindStatusCallback, iface) +static inline DownloadBSC *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, DownloadBSC, IServiceProvider_iface); +} static HRESULT WINAPI DownloadBSC_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = STATUSCLB(This); + *ppv = &This->IBindStatusCallback_iface; }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); - *ppv = STATUSCLB(This); + *ppv = &This->IBindStatusCallback_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider, %p)\n", This, ppv); - *ppv = SERVPROV(This); + *ppv = &This->IServiceProvider_iface; } if(*ppv) { @@ -66,7 +71,7 @@ static HRESULT WINAPI DownloadBSC_QueryInterface(IBindStatusCallback *iface, static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); @@ -76,7 +81,7 @@ static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface) static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); @@ -95,7 +100,7 @@ static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pbind) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); @@ -107,14 +112,14 @@ static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%p)\n", This, pnPriority); return E_NOTIMPL; } static HRESULT WINAPI DownloadBSC_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%d)\n", This, reserved); return E_NOTIMPL; } @@ -133,7 +138,7 @@ static HRESULT on_progress(DownloadBSC *This, ULONG progress, ULONG progress_max static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); HRESULT hres = S_OK; TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, @@ -167,7 +172,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); @@ -192,7 +197,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); DWORD bindf = 0; TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); @@ -216,7 +221,7 @@ static HRESULT WINAPI DownloadBSC_GetBindInfo(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); @@ -226,13 +231,11 @@ static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); return E_NOTIMPL; } -#undef STATUSCLB_THIS - static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { DownloadBSC_QueryInterface, DownloadBSC_AddRef, @@ -247,31 +250,29 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { DownloadBSC_OnObjectAvailable }; -#define SERVPROV_THIS(iface) DEFINE_THIS(DownloadBSC, ServiceProvider, iface) - static HRESULT WINAPI DwlServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_QueryInterface(STATUSCLB(This), riid, ppv); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); } static ULONG WINAPI DwlServiceProvider_AddRef(IServiceProvider *iface) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_AddRef(STATUSCLB(This)); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } static ULONG WINAPI DwlServiceProvider_Release(IServiceProvider *iface) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_Release(STATUSCLB(This)); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); } static HRESULT WINAPI DwlServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - DownloadBSC *This = SERVPROV_THIS(iface); + DownloadBSC *This = impl_from_IServiceProvider(iface); IServiceProvider *serv_prov; HRESULT hres; @@ -294,8 +295,6 @@ static HRESULT WINAPI DwlServiceProvider_QueryService(IServiceProvider *iface, return E_NOINTERFACE; } -#undef SERVPROV_THIS - static const IServiceProviderVtbl ServiceProviderVtbl = { DwlServiceProvider_QueryInterface, DwlServiceProvider_AddRef, @@ -307,8 +306,8 @@ static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_na { DownloadBSC *ret = heap_alloc(sizeof(*ret)); - ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; - ret->lpServiceProviderVtbl = &ServiceProviderVtbl; + ret->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; + ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; ret->ref = 1; ret->file_name = heap_strdupW(file_name); ret->cache_file = NULL; @@ -317,7 +316,7 @@ static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_na IBindStatusCallback_AddRef(callback); ret->callback = callback; - *ret_callback = STATUSCLB(ret); + *ret_callback = &ret->IBindStatusCallback_iface; return S_OK; }

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in FtpProtocol.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 4d3c6278b41ac3538c50b40a0b3198e539d432f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3c6278b41ac3538c50b40a0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:06 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in FtpProtocol. --- dlls/urlmon/ftp.c | 125 +++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d3c6278b41ac3538c50b…

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in FileProtocol.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 5d60989b3bcbf5c56b98a033322b708a31704dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d60989b3bcbf5c56b98a0333… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:39 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in FileProtocol. --- dlls/urlmon/file.c | 85 +++++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d60989b3bcbf5c56b98a…

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in HttpProtocol.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 4252552399198275d865e4b3fbc8bcf50459be62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4252552399198275d865e4b3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:19 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in HttpProtocol. --- dlls/urlmon/http.c | 126 ++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4252552399198275d865e…

1 0

Alexandre Julliard : ddrawex: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: d3bb2ee8112a8f6ceeea2aa5b29cbc4148f6994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bb2ee8112a8f6ceeea2aa5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:37:09 2010 +0100 ddrawex: Convert dll registration to the IRegistrar mechanism. --- dlls/ddrawex/Makefile.in | 3 +- dlls/ddrawex/ddrawex.idl | 25 ++++ dlls/ddrawex/main.c | 37 +++++-- dlls/ddrawex/regsvr.c | 295 ---------------------------------------------- 4 files changed, 56 insertions(+), 304 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3bb2ee8112a8f6ceeea2…

1 0

Alexandre Julliard : dinput8: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: b89ea84e6ad0c4146a13e243bad39c6582bab67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89ea84e6ad0c4146a13e243b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:45:13 2010 +0100 dinput8: Convert dll registration to the IRegistrar mechanism. --- dlls/dinput8/Makefile.in | 5 +- dlls/dinput8/dinput8.idl | 26 ++++ dlls/dinput8/dinput8_main.c | 35 +++++ dlls/dinput8/regsvr.c | 294 ------------------------------------------- 4 files changed, 64 insertions(+), 296 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b89ea84e6ad0c4146a13e…

1 0

Alexandre Julliard : dinput: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: f4d0d638e8b5e1294b6a4b674bb8b880c54d6e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d0d638e8b5e1294b6a4b674… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:48:24 2010 +0100 dinput: Convert dll registration to the IRegistrar mechanism. --- dlls/dinput/Makefile.in | 5 +- dlls/dinput/dinput_classes.idl | 33 +++ dlls/dinput/dinput_main.c | 18 ++ dlls/dinput/regsvr.c | 496 ---------------------------------------- 4 files changed, 54 insertions(+), 498 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d0d638e8b5e1294b6a4…

1 0

Alexandre Julliard : dpnet: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 578b7e754e6bcdcb29dd2f22eefe3fe88a70c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=578b7e754e6bcdcb29dd2f22e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 13:02:38 2010 +0100 dpnet: Convert dll registration to the IRegistrar mechanism. --- dlls/dpnet/Makefile.in | 3 +- dlls/dpnet/dpnet.idl | 61 ++++++ dlls/dpnet/dpnet_main.c | 30 ++- dlls/dpnet/regsvr.c | 544 ----------------------------------------------- 4 files changed, 87 insertions(+), 551 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=578b7e754e6bcdcb29dd2…

1 0

Alexandre Julliard : ddraw: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 4da54d93e1015eb4d63c11a19103598df2198ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da54d93e1015eb4d63c11a19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:42:08 2010 +0100 ddraw: Convert dll registration to the IRegistrar mechanism. --- dlls/ddraw/Makefile.in | 3 +- dlls/ddraw/ddraw_classes.idl | 40 ++++ dlls/ddraw/main.c | 21 ++ dlls/ddraw/regsvr.c | 439 ------------------------------------------ 4 files changed, 63 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4da54d93e1015eb4d63c1…

1 0

Michael Stefaniuc : urlmon: Standardize the COM usage in sec_mgr.c.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: d98e21035105a826ce243c960dd93fbf64804467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98e21035105a826ce243c960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:25 2010 +0100 urlmon: Standardize the COM usage in sec_mgr.c. --- dlls/urlmon/sec_mgr.c | 54 ++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index f984aa4..6b12a9a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -295,7 +295,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s * */ typedef struct { - const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; + IInternetSecurityManager IInternetSecurityManager_iface; LONG ref; @@ -303,11 +303,14 @@ typedef struct { IInternetSecurityManager *custom_manager; } SecManagerImpl; -#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) +static inline SecManagerImpl *impl_from_IInternetSecurityManager(IInternetSecurityManager *iface) +{ + return CONTAINING_RECORD(iface, SecManagerImpl, IInternetSecurityManager_iface); +} static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* iface,REFIID riid,void** ppvObject) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); @@ -337,7 +340,7 @@ static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* if static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%u\n", This, refCount); @@ -347,7 +350,7 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface) static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n", This, refCount); @@ -370,7 +373,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface) static HRESULT WINAPI SecManagerImpl_SetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite *pSite) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%p)\n", This, pSite); @@ -405,7 +408,7 @@ static HRESULT WINAPI SecManagerImpl_SetSecuritySite(IInternetSecurityManager *i static HRESULT WINAPI SecManagerImpl_GetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite **ppSite) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%p)\n", This, ppSite); @@ -423,7 +426,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); @@ -449,7 +452,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); LPWSTR url, ptr, ptr2; DWORD zone, len; HRESULT hres; @@ -529,7 +532,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); DWORD zone, policy; HRESULT hres; @@ -584,7 +587,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager BYTE *pContext, DWORD cbContext, DWORD dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%s %s %p %p %p %08x %08x )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), @@ -604,7 +607,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, DWORD dwZone, LPCWSTR pwszPattern, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%08x %s %08x)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); @@ -623,7 +626,7 @@ static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *if static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManager *iface, DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%08x %p %08x)\n", iface, dwZone, ppenumString,dwFlags); @@ -662,7 +665,7 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) This = heap_alloc(sizeof(*This)); /* Initialize the virtual function table. */ - This->lpInternetSecurityManagerVtbl = &VT_SecManagerImpl; + This->IInternetSecurityManager_iface.lpVtbl = &VT_SecManagerImpl; This->ref = 1; This->mgrsite = NULL; @@ -680,12 +683,17 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) * */ typedef struct { - const IInternetZoneManagerEx2Vtbl* lpVtbl; + IInternetZoneManagerEx2 IInternetZoneManagerEx2_iface; LONG ref; LPDWORD *zonemaps; DWORD zonemap_count; } ZoneMgrImpl; +static inline ZoneMgrImpl *impl_from_IInternetZoneManagerEx2(IInternetZoneManagerEx2 *iface) +{ + return CONTAINING_RECORD(iface, ZoneMgrImpl, IInternetZoneManagerEx2_iface); +} + /*********************************************************************** * build_zonemap_from_reg [internal] @@ -750,7 +758,7 @@ cleanup: */ static HRESULT WINAPI ZoneMgrImpl_QueryInterface(IInternetZoneManagerEx2* iface, REFIID riid, void** ppvObject) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppvObject); @@ -783,7 +791,7 @@ static HRESULT WINAPI ZoneMgrImpl_QueryInterface(IInternetZoneManagerEx2* iface, */ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -796,7 +804,7 @@ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface) */ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManagerEx2* iface) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -818,7 +826,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa DWORD dwZone, ZONEATTRIBUTES* pZoneAttributes) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); HRESULT hr; HKEY hcu; HKEY hklm = NULL; @@ -957,7 +965,7 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManagerEx2* DWORD* pdwCount, DWORD dwFlags) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD * new_maps; LPDWORD data; DWORD i; @@ -1012,7 +1020,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface, DWORD dwIndex, DWORD* pdwZone) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone); @@ -1035,7 +1043,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface, static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManagerEx2* iface, DWORD dwEnum) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; TRACE("(%p)->(0x%08x)\n", This, dwEnum); @@ -1202,7 +1210,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ZoneMgrImpl* ret = heap_alloc_zero(sizeof(ZoneMgrImpl)); TRACE("(%p %p)\n", pUnkOuter, ppobj); - ret->lpVtbl = &ZoneMgrImplVtbl; + ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->ref = 1; *ppobj = (IInternetZoneManagerEx*)ret;

1 0