From b4d65f595ead9abbf385bac4b0db93a122812821 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 27 Jan 2009 11:36:33 +0100 Subject: [PATCH] hlink: Remove superfluous pointer casts. --- dlls/hlink/extserv.c | 8 ++++---- dlls/hlink/link.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index c4e95abe5f3..d3f9e581463 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -40,10 +40,10 @@ typedef struct { LPWSTR headers; } ExtensionService; -#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) -#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) -#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) -#define EXTENSIONSERVICES(x) ((IExtensionServices*) &(x)->lpIExtensionServicesVtbl) +#define EXTSERVUNK(x) ((IUnknown*)&(x)->lpIUnknownVtbl) +#define AUTHENTICATE(x) (&(x)->lpIAuthenticateVtbl) +#define HTTPNEGOTIATE(x) (&(x)->lpIHttpNegotiateVtbl) +#define EXTENSIONSERVICES(x) (&(x)->lpIExtensionServicesVtbl) #define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 20841f8f89e..689317db429 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -82,8 +82,7 @@ static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) else if (This->Site) { IHlinkSite_GetMoniker(This->Site, This->SiteData, - OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, - (LPVOID)moniker); + OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, moniker); } } @@ -123,9 +122,9 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) *ppvObj = This; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ppvObj = (LPVOID*)&(This->lpPSVtbl); + *ppvObj = &(This->lpPSVtbl); else if (IsEqualIID(riid, &IID_IDataObject)) - *ppvObj = (LPVOID*)&(This->lpDOVtbl); + *ppvObj = &(This->lpDOVtbl); if (*ppvObj) {