Michael Stefaniuc : ole32: Avoid casts from the IMultiQI iface to the COM object.
Module: wine Branch: master Commit: 08e571cf95c50fe2be7d4ad07c3d288f014fbca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e571cf95c50fe2be7d4ad07c... Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:46:56 2016 +0200 ole32: Avoid casts from the IMultiQI iface to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index e0a3c3d..b39dac0 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -73,6 +73,11 @@ struct proxy_manager void *dest_context_data; /* reserved context value (LOCK) */ }; +static inline struct proxy_manager *impl_from_IMultiQI( IMultiQI *iface ) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface); +} + static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) { return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); @@ -231,16 +236,16 @@ static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID rii return hr; } -static ULONG WINAPI ClientIdentity_AddRef(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); TRACE("%p - before %d\n", iface, This->refs); return InterlockedIncrement(&This->refs); } -static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); ULONG refs = InterlockedDecrement(&This->refs); TRACE("%p - after %d\n", iface, refs); if (!refs) @@ -250,7 +255,7 @@ static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); REMQIRESULT *qiresults = NULL; ULONG nonlocal_mqis = 0; ULONG i;
participants (1)
-
Alexandre Julliard