hlink: Use clearer variable names in IHlink_fnNavigate().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
9ff5aae4c8
commit
f3a6d9ea4a
|
@ -472,32 +472,33 @@ static HRESULT WINAPI IHlink_fnGetMiscStatus(IHlink* iface, DWORD* pdwStatus)
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc,
|
static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *user_bind_ctx,
|
||||||
IBindStatusCallback *pbsc, IHlinkBrowseContext *phbc)
|
IBindStatusCallback *bind_callback, IHlinkBrowseContext *browse_ctx)
|
||||||
{
|
{
|
||||||
HlinkImpl *This = impl_from_IHlink(iface);
|
HlinkImpl *This = impl_from_IHlink(iface);
|
||||||
IMoniker *mon = NULL;
|
IMoniker *mon = NULL;
|
||||||
HRESULT r;
|
HRESULT r;
|
||||||
|
|
||||||
FIXME("Semi-Stub:(%p)->(%i %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc);
|
TRACE("hlink %p, flags %#x, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n",
|
||||||
|
This, flags, user_bind_ctx, bind_callback, browse_ctx);
|
||||||
|
|
||||||
r = __GetMoniker(This, &mon, HLINKGETREF_ABSOLUTE);
|
r = __GetMoniker(This, &mon, HLINKGETREF_ABSOLUTE);
|
||||||
TRACE("Moniker %p\n", mon);
|
TRACE("Moniker %p\n", mon);
|
||||||
|
|
||||||
if (SUCCEEDED(r))
|
if (SUCCEEDED(r))
|
||||||
{
|
{
|
||||||
IBindCtx *bcxt = NULL;
|
IBindCtx *bind_ctx = NULL;
|
||||||
IUnknown *unk = NULL;
|
IUnknown *unk = NULL;
|
||||||
IHlinkTarget *target;
|
IHlinkTarget *target;
|
||||||
|
|
||||||
if (phbc)
|
if (browse_ctx)
|
||||||
{
|
{
|
||||||
r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk);
|
r = IHlinkBrowseContext_GetObject(browse_ctx, mon, TRUE, &unk);
|
||||||
if (r != S_OK)
|
if (r != S_OK)
|
||||||
{
|
{
|
||||||
CreateBindCtx(0, &bcxt);
|
CreateBindCtx(0, &bind_ctx);
|
||||||
RegisterBindStatusCallback(bcxt, pbsc, NULL, 0);
|
RegisterBindStatusCallback(bind_ctx, bind_callback, NULL, 0);
|
||||||
r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk);
|
r = IMoniker_BindToObject(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&unk);
|
||||||
}
|
}
|
||||||
if (r == S_OK)
|
if (r == S_OK)
|
||||||
{
|
{
|
||||||
|
@ -506,13 +507,13 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc,
|
||||||
}
|
}
|
||||||
if (r == S_OK)
|
if (r == S_OK)
|
||||||
{
|
{
|
||||||
if (bcxt) IHlinkTarget_SetBrowseContext(target, phbc);
|
if (bind_ctx) IHlinkTarget_SetBrowseContext(target, browse_ctx);
|
||||||
r = IHlinkTarget_Navigate(target, grfHLNF, This->Location);
|
r = IHlinkTarget_Navigate(target, flags, This->Location);
|
||||||
IHlinkTarget_Release(target);
|
IHlinkTarget_Release(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
RevokeBindStatusCallback(bcxt, pbsc);
|
RevokeBindStatusCallback(bind_ctx, bind_callback);
|
||||||
if (bcxt) IBindCtx_Release(bcxt);
|
if (bind_ctx) IBindCtx_Release(bind_ctx);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue