Skip to content

W
wine-winehq
Commit 21a04f56 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

ole32: Cleanup IMarshal interface of proxy manager.

parent 1fab14af
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/ole32/marshal.c
View file @ 21a04f56
...@@ -56,7 +56,7 @@ extern const CLSID CLSID_DfMarshal; ...@@ -56,7 +56,7 @@ extern const CLSID CLSID_DfMarshal;
struct proxy_manager struct proxy_manager
{ {
IMultiQI IMultiQI_iface; IMultiQI IMultiQI_iface;
const IMarshalVtbl *lpVtblMarshal; IMarshal IMarshal_iface;
const IClientSecurityVtbl *lpVtblCliSec; const IClientSecurityVtbl *lpVtblCliSec;
struct apartment *parent; /* owning apartment (RO) */ struct apartment *parent; /* owning apartment (RO) */
struct list entry; /* entry in apartment (CS parent->cs) */ struct list entry; /* entry in apartment (CS parent->cs) */
...@@ -75,7 +75,7 @@ struct proxy_manager ...@@ -75,7 +75,7 @@ struct proxy_manager
static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface )
{ {
return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblMarshal)); return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface);
} }
static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface )
...@@ -755,7 +755,7 @@ static HRESULT proxy_manager_construct( ...@@ -755,7 +755,7 @@ static HRESULT proxy_manager_construct(
} }
This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl;
This->lpVtblMarshal = &ProxyMarshal_Vtbl; This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl;
This->lpVtblCliSec = &ProxyCliSec_Vtbl; This->lpVtblCliSec = &ProxyCliSec_Vtbl;
list_init(&This->entry); list_init(&This->entry);
...@@ -875,8 +875,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, ...@@ -875,8 +875,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This,
} }
if (IsEqualIID(riid, &IID_IMarshal)) if (IsEqualIID(riid, &IID_IMarshal))
{ {
*ppv = &This->lpVtblMarshal; *ppv = &This->IMarshal_iface;
IUnknown_AddRef((IUnknown *)*ppv); IMarshal_AddRef(&This->IMarshal_iface);
return S_OK; return S_OK;
} }
if (IsEqualIID(riid, &IID_IClientSecurity)) if (IsEqualIID(riid, &IID_IClientSecurity))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment