system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

hlink: Return requested interface when creating IHlinkBrowseContext instance.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-04-11 11:40:30 +03:00 committed by Alexandre Julliard
parent 0dad77afa9
commit 759e2eff8b
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/hlink/browse_ctx.c
View file

@ -53,14 +53,17 @@ static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface,
if (IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IHlinkBrowseContext))
*ppvObj = This;
if (*ppvObj)
{
IUnknown_AddRef((IUnknown*)(*ppvObj));
return S_OK;
*ppvObj = &This->IHlinkBrowseContext_iface;
}
return E_NOINTERFACE;
else
{
*ppvObj = NULL;
return E_NOINTERFACE;
}
IUnknown_AddRef((IUnknown *)*ppvObj);
return S_OK;
}
static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface)
@ -368,6 +371,7 @@ static const IHlinkBrowseContextVtbl hlvt =
HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv)
{
HlinkBCImpl * hl;
HRESULT hr;
TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid));
*ppv = NULL;
@ -383,6 +387,8 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void **
hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt;
list_init(&hl->links);
*ppv = hl;
return S_OK;
hr = IHlinkBrowseContext_QueryInterface(&hl->IHlinkBrowseContext_iface, riid, ppv);
IHlinkBrowseContext_Release(&hl->IHlinkBrowseContext_iface);
return hr;
}

10
dlls/hlink/tests/browse_ctx.c
View file

@ -197,10 +197,20 @@ static void test_GetObject(void)
IMoniker_Release(dummy);
}
static void test_interfaces(void)
{
IHlinkBrowseContext *bc;
HRESULT hr;
hr = HlinkCreateBrowseContext(NULL, &IID_IMoniker, (void **)&bc);
ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
}
START_TEST(browse_ctx)
{
CoInitialize(NULL);
test_interfaces();
test_SetInitialHlink();
test_BrowseWindowInfo();
test_GetObject();