[HLINK] Sync with Wine Staging 2.2. CORE-12823
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 26 Feb 2017 17:20:48 +0000 (17:20 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 26 Feb 2017 17:20:48 +0000 (17:20 +0000)
f6b1e12 hlink: Properly return interface pointers.
4709902 hlink: Add missing parameter to TRACE() message.

svn path=/trunk/; revision=73946

reactos/dll/win32/hlink/hlink_main.c
reactos/dll/win32/hlink/link.c
reactos/media/doc/README.WINE

index 2091457..36b8052 100644 (file)
@@ -516,14 +516,14 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface,
 {
     CFImpl *This = impl_from_IClassFactory(iface);
 
-    TRACE("(%p)->(%s)\n",This,debugstr_guid(riid));
+    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj);
 
     *ppvObj = NULL;
 
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IClassFactory))
     {
-        *ppvObj = This;
+        *ppvObj = &This->IClassFactory_iface;
         return S_OK;
     }
 
index e91bc03..c240fcc 100644 (file)
@@ -124,7 +124,7 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid,
     *ppvObj = NULL;
 
     if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink)))
-        *ppvObj = This;
+        *ppvObj = &This->IHlink_iface;
     else if (IsEqualIID(riid, &IID_IPersistStream))
         *ppvObj = &This->IPersistStream_iface;
     else if (IsEqualIID(riid, &IID_IDataObject))
index c43eba9..70f7e6a 100644 (file)
@@ -70,7 +70,7 @@ reactos/dll/win32/fontsub             # Synced to WineStaging-1.9.13
 reactos/dll/win32/fusion              # Synced to WineStaging-1.9.23
 reactos/dll/win32/gdiplus             # Synced to WineStaging-1.9.23
 reactos/dll/win32/hhctrl.ocx          # Synced to WineStaging-2.2
-reactos/dll/win32/hlink               # Synced to WineStaging-1.9.16
+reactos/dll/win32/hlink               # Synced to WineStaging-2.2
 reactos/dll/win32/hnetcfg             # Synced to WineStaging-1.9.16
 reactos/dll/win32/httpapi             # Synced to WineStaging-1.9.11
 reactos/dll/win32/iccvid              # Synced to WineStaging-1.9.11