[ros-diffs] [cwittich] 39267: sync hlink with wine 1.1.14
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Sun Feb 1 14:53:09 CET 2009
Author: cwittich
Date: Sun Feb 1 07:53:08 2009
New Revision: 39267
URL: http://svn.reactos.org/svn/reactos?rev=39267&view=rev
Log:
sync hlink with wine 1.1.14
Modified:
trunk/reactos/dll/win32/hlink/extserv.c
trunk/reactos/dll/win32/hlink/link.c
Modified: trunk/reactos/dll/win32/hlink/extserv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?rev=39267&r1=39266&r2=39267&view=diff
==============================================================================
--- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Sun Feb 1 07:53:08 2009
@@ -40,10 +40,10 @@
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)
Modified: trunk/reactos/dll/win32/hlink/link.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev=39267&r1=39266&r2=39267&view=diff
==============================================================================
--- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Sun Feb 1 07:53:08 2009
@@ -82,8 +82,7 @@
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 @@
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)
{
More information about the Ros-diffs
mailing list