Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HLINK] Sync with Wine Staging 2.2. CORE-12823

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

svn path=/trunk/; revision=73946
This commit is contained in:
Amine Khaldi 2017-02-26 17:20:48 +00:00
parent 2721d9f046
commit 4634a076c4
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -516,14 +516,14 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface,
{ {
CFImpl *This = impl_from_IClassFactory(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; *ppvObj = NULL;
if (IsEqualIID(riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IClassFactory)) IsEqualIID(riid, &IID_IClassFactory))
{ {
*ppvObj = This; *ppvObj = &This->IClassFactory_iface;
return S_OK; return S_OK;
} }

2
reactos/dll/win32/hlink/link.c
View file

@ -124,7 +124,7 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid,
*ppvObj = NULL; *ppvObj = NULL;
if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink)))
*ppvObj = This; *ppvObj = &This->IHlink_iface;
else if (IsEqualIID(riid, &IID_IPersistStream)) else if (IsEqualIID(riid, &IID_IPersistStream))
*ppvObj = &This->IPersistStream_iface; *ppvObj = &This->IPersistStream_iface;
else if (IsEqualIID(riid, &IID_IDataObject)) else if (IsEqualIID(riid, &IID_IDataObject))

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.23 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23
reactos/dll/win32/gdiplus # 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/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/hnetcfg # Synced to WineStaging-1.9.16
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