forked from Mirrors/wine-wine
hlink: Remove superfluous pointer casts.
parent
905ff8fdaa
commit
b4d65f595e
|
@ -40,10 +40,10 @@ typedef struct {
|
||||||
LPWSTR headers;
|
LPWSTR headers;
|
||||||
} ExtensionService;
|
} ExtensionService;
|
||||||
|
|
||||||
#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl)
|
#define EXTSERVUNK(x) ((IUnknown*)&(x)->lpIUnknownVtbl)
|
||||||
#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl)
|
#define AUTHENTICATE(x) (&(x)->lpIAuthenticateVtbl)
|
||||||
#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl)
|
#define HTTPNEGOTIATE(x) (&(x)->lpIHttpNegotiateVtbl)
|
||||||
#define EXTENSIONSERVICES(x) ((IExtensionServices*) &(x)->lpIExtensionServicesVtbl)
|
#define EXTENSIONSERVICES(x) (&(x)->lpIExtensionServicesVtbl)
|
||||||
|
|
||||||
#define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface)
|
#define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface)
|
||||||
|
|
||||||
|
|
|
@ -82,8 +82,7 @@ static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker)
|
||||||
else if (This->Site)
|
else if (This->Site)
|
||||||
{
|
{
|
||||||
IHlinkSite_GetMoniker(This->Site, This->SiteData,
|
IHlinkSite_GetMoniker(This->Site, This->SiteData,
|
||||||
OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER,
|
OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, moniker);
|
||||||
(LPVOID)moniker);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,9 +122,9 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid,
|
||||||
if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink)))
|
if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink)))
|
||||||
*ppvObj = This;
|
*ppvObj = This;
|
||||||
else if (IsEqualIID(riid, &IID_IPersistStream))
|
else if (IsEqualIID(riid, &IID_IPersistStream))
|
||||||
*ppvObj = (LPVOID*)&(This->lpPSVtbl);
|
*ppvObj = &(This->lpPSVtbl);
|
||||||
else if (IsEqualIID(riid, &IID_IDataObject))
|
else if (IsEqualIID(riid, &IID_IDataObject))
|
||||||
*ppvObj = (LPVOID*)&(This->lpDOVtbl);
|
*ppvObj = &(This->lpDOVtbl);
|
||||||
|
|
||||||
if (*ppvObj)
|
if (*ppvObj)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue