Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 14:28:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HLINK] Sync with Wine Staging 1.9.16. CORE-11866

Browse source 
svn path=/trunk/; revision=72280
This commit is contained in:
Amine Khaldi 2016-08-18 10:06:29 +00:00
parent 2b65c48e2d
commit b2afbea16b
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/hlink/browse_ctx.c
View file

@ -103,10 +103,13 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface,
IMoniker *mon; IMoniker *mon;
IMoniker *composite; IMoniker *composite;
IRunningObjectTable *ROT; IRunningObjectTable *ROT;
HRESULT hr;
FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); 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); CreateGenericComposite(mon, pimk, &composite);
GetRunningObjectTable(0, &ROT); GetRunningObjectTable(0, &ROT);

4
reactos/dll/win32/hlink/hlink_main.c
View file

@ -221,8 +221,8 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj,
IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter,
REFIID riid, void **ppvObj) REFIID riid, void **ppvObj)
{ {
FIXME("%p %p %d %p %p %p\n", FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData,
piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); piunkOuter, debugstr_guid(riid), ppvObj);
*ppvObj = NULL; *ppvObj = NULL;
return E_NOTIMPL; return E_NOTIMPL;
} }

2
reactos/media/doc/README.WINE
View file

@ -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/fusion # Synced to WineStaging-1.9.11
reactos/dll/win32/gdiplus # 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/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/hnetcfg # Synced to WineStaging-1.9.11
reactos/dll/win32/httpapi # 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 reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11