From b2afbea16be528010b0a452dc2a80a91e09780ef Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 18 Aug 2016 10:06:29 +0000 Subject: [PATCH] [HLINK] Sync with Wine Staging 1.9.16. CORE-11866 svn path=/trunk/; revision=72280 --- reactos/dll/win32/hlink/browse_ctx.c | 5 ++++- reactos/dll/win32/hlink/hlink_main.c | 4 ++-- reactos/media/doc/README.WINE | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/hlink/browse_ctx.c b/reactos/dll/win32/hlink/browse_ctx.c index 95e5b97b6f3..0e76284544d 100644 --- a/reactos/dll/win32/hlink/browse_ctx.c +++ b/reactos/dll/win32/hlink/browse_ctx.c @@ -103,10 +103,13 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, 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); diff --git a/reactos/dll/win32/hlink/hlink_main.c b/reactos/dll/win32/hlink/hlink_main.c index 3c64c042c78..2091457fb5c 100644 --- a/reactos/dll/win32/hlink/hlink_main.c +++ b/reactos/dll/win32/hlink/hlink_main.c @@ -221,8 +221,8 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, 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; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 84cacc86b49..74d0fe8e394 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -70,7 +70,7 @@ reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 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