[ros-diffs] [akhaldi] 73946: [HLINK] Sync with Wine Staging 2.2. CORE-12823 f6b1e12 hlink: Properly return interface pointers. 4709902 hlink: Add missing parameter to TRACE() message.

Author: akhaldi
Date: Sun Feb 26 17:20:48 2017
New Revision: 73946

URL: http://svn.reactos.org/svn/reactos?rev=73946&view=rev
Log:
[HLINK] Sync with Wine Staging 2.2. CORE-12823

f6b1e12 hlink: Properly return interface pointers.
4709902 hlink: Add missing parameter to TRACE() message.

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

Modified: trunk/reactos/dll/win32/hlink/hlink_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main…
==============================================================================
--- trunk/reactos/dll/win32/hlink/hlink_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/hlink_main.c	[iso-8859-1] Sun Feb 26 17:20:48 2017
@@ -516,14 +516,14 @@
 {
     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;
     }
 

Modified: trunk/reactos/dll/win32/hlink/link.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/hlink/link.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/link.c	[iso-8859-1] Sun Feb 26 17:20:48 2017
@@ -124,7 +124,7 @@
     *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))

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Feb 26 17:20:48 2017
@@ -70,7 +70,7 @@
 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