mirror of
https://github.com/reactos/reactos.git
synced 2024-10-04 16:36:11 +00:00
[HLINK]
sync hlink with wine 1.1.41 svn path=/trunk/; revision=46319
This commit is contained in:
parent
57d67500da
commit
465e002842
|
@ -155,6 +155,9 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface,
|
|||
HlinkBCImpl *This = (HlinkBCImpl*)iface;
|
||||
TRACE("(%p)->(%p)\n", This, phlbwi);
|
||||
|
||||
if(!phlbwi)
|
||||
return E_INVALIDARG;
|
||||
|
||||
heap_free(This->BrowseWindowInfo);
|
||||
This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize);
|
||||
memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize);
|
||||
|
@ -165,8 +168,18 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface,
|
|||
static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface,
|
||||
HLBWINFO *phlbwi)
|
||||
{
|
||||
FIXME("\n");
|
||||
return E_NOTIMPL;
|
||||
HlinkBCImpl *This = (HlinkBCImpl*)iface;
|
||||
TRACE("(%p)->(%p)\n", This, phlbwi);
|
||||
|
||||
if(!phlbwi)
|
||||
return E_INVALIDARG;
|
||||
|
||||
if(!This->BrowseWindowInfo)
|
||||
phlbwi->cbSize = 0;
|
||||
else
|
||||
memcpy(phlbwi, This->BrowseWindowInfo, This->BrowseWindowInfo->cbSize);
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface,
|
||||
|
|
|
@ -99,6 +99,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
|
|||
{
|
||||
IHlink *hl = NULL;
|
||||
HRESULT r = S_OK;
|
||||
WCHAR *hash, *tgt;
|
||||
const WCHAR *loc;
|
||||
|
||||
TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget),
|
||||
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite,
|
||||
|
@ -108,8 +110,44 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
|
|||
if (FAILED(r))
|
||||
return r;
|
||||
|
||||
IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION,
|
||||
pwzTarget, pwzLocation);
|
||||
if (pwzTarget)
|
||||
{
|
||||
hash = strchrW(pwzTarget, '#');
|
||||
if (hash)
|
||||
{
|
||||
if (hash == pwzTarget)
|
||||
tgt = NULL;
|
||||
else
|
||||
{
|
||||
int tgt_len = hash - pwzTarget;
|
||||
tgt = heap_alloc((tgt_len + 1) * sizeof(WCHAR));
|
||||
if (!tgt)
|
||||
return E_OUTOFMEMORY;
|
||||
memcpy(tgt, pwzTarget, tgt_len * sizeof(WCHAR));
|
||||
tgt[tgt_len] = 0;
|
||||
}
|
||||
if (!pwzLocation)
|
||||
loc = hash + 1;
|
||||
else
|
||||
loc = pwzLocation;
|
||||
}
|
||||
else
|
||||
{
|
||||
tgt = hlink_strdupW(pwzTarget);
|
||||
if (!tgt)
|
||||
return E_OUTOFMEMORY;
|
||||
loc = pwzLocation;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
tgt = NULL;
|
||||
loc = pwzLocation;
|
||||
}
|
||||
|
||||
IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, tgt, loc);
|
||||
|
||||
heap_free(tgt);
|
||||
|
||||
if (pwzFriendlyName)
|
||||
IHlink_SetFriendlyName(hl, pwzFriendlyName);
|
||||
|
|
|
@ -291,6 +291,8 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface,
|
|||
if (grfHLSETF & HLINKSETF_LOCATION)
|
||||
{
|
||||
heap_free(This->Location);
|
||||
This->Location = NULL;
|
||||
if (pwzLocation && *pwzLocation)
|
||||
This->Location = hlink_strdupW( pwzLocation );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue