Author: akhaldi
Date: Thu Aug 18 10:06:29 2016
New Revision: 72280
URL: http://svn.reactos.org/svn/reactos?rev=72280&view=rev
Log:
[HLINK] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/hlink/browse_ctx.c
trunk/reactos/dll/win32/hlink/hlink_main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx.c?rev=72280&r1=72279&r2=72280&view=diff
==============================================================================
--- trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] Thu Aug 18
10:06:29 2016
@@ -103,10 +103,13 @@
IMoniker *mon;
IMoniker *composite;
IRunningObjectTable *ROT;
+ HRESULT hr;
FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister);
- CreateItemMoniker(NULL, szIdent, &mon);
+ hr = CreateItemMoniker(NULL, szIdent, &mon);
+ if (FAILED(hr))
+ return hr;
CreateGenericComposite(mon, pimk, &composite);
GetRunningObjectTable(0, &ROT);
Modified: trunk/reactos/dll/win32/hlink/hlink_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main.c?rev=72280&r1=72279&r2=72280&view=diff
==============================================================================
--- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Thu Aug 18
10:06:29 2016
@@ -221,8 +221,8 @@
IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter,
REFIID riid, void **ppvObj)
{
- FIXME("%p %p %d %p %p %p\n",
- piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj);
+ FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData,
+ piunkOuter, debugstr_guid(riid), ppvObj);
*ppvObj = NULL;
return E_NOTIMPL;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72280&r1=72279&r2=72280&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:06:29 2016
@@ -70,7 +70,7 @@
reactos/dll/win32/fusion # Synced to WineStaging-1.9.11
reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.11
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.16
-reactos/dll/win32/hlink # Synced to WineStaging-1.9.11
+reactos/dll/win32/hlink # Synced to WineStaging-1.9.16
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.11
reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11
reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11
