[2/2] ole32: Cleanup IClientSecurity interface of a proxy manager
Nikolay Sivov
nsivov at codeweavers.com
Tue Oct 16 01:51:28 CDT 2012
Cleanup IClientSecurity interface of a proxy manager
-------------- next part --------------
>From d788e877acc76cf66d667ff94a8fd274780c1457 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon, 15 Oct 2012 23:30:40 -0400
Subject: [PATCH 2/3] Cleanup IClientSecurity interface of a proxy manager
---
dlls/ole32/marshal.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 9403789..a8df28c 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -57,7 +57,7 @@ struct proxy_manager
{
IMultiQI IMultiQI_iface;
IMarshal IMarshal_iface;
- const IClientSecurityVtbl *lpVtblCliSec;
+ IClientSecurity IClientSecurity_iface;
struct apartment *parent; /* owning apartment (RO) */
struct list entry; /* entry in apartment (CS parent->cs) */
OXID oxid; /* object exported ID (RO) */
@@ -80,7 +80,7 @@ static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface )
static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface )
{
- return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblCliSec));
+ return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface);
}
static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt,
@@ -756,7 +756,7 @@ static HRESULT proxy_manager_construct(
This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl;
This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl;
- This->lpVtblCliSec = &ProxyCliSec_Vtbl;
+ This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl;
list_init(&This->entry);
list_init(&This->interfaces);
@@ -881,8 +881,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This,
}
if (IsEqualIID(riid, &IID_IClientSecurity))
{
- *ppv = &This->lpVtblCliSec;
- IUnknown_AddRef((IUnknown *)*ppv);
+ *ppv = &This->IClientSecurity_iface;
+ IClientSecurity_AddRef(&This->IClientSecurity_iface);
return S_OK;
}
--
1.7.10.4
More information about the wine-patches
mailing list