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

[HLINK]

Browse source 
sync hlink with wine 1.1.41

svn path=/trunk/; revision=46319
This commit is contained in:
Christoph von Wittich 2010-03-21 19:28:13 +00:00
parent 57d67500da
commit 465e002842
3 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,6 +155,9 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface,
HlinkBCImpl *This = (HlinkBCImpl*)iface; HlinkBCImpl *This = (HlinkBCImpl*)iface;
TRACE("(%p)->(%p)\n", This, phlbwi); TRACE("(%p)->(%p)\n", This, phlbwi);
if(!phlbwi)
return E_INVALIDARG;
heap_free(This->BrowseWindowInfo); heap_free(This->BrowseWindowInfo);
This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize); This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize);
memcpy(This->BrowseWindowInfo, phlbwi, 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, static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface,
HLBWINFO *phlbwi) HLBWINFO *phlbwi)
{ {
FIXME("\n"); HlinkBCImpl *This = (HlinkBCImpl*)iface;
return E_NOTIMPL; 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, static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface,

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

@ -99,6 +99,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
{ {
IHlink *hl = NULL; IHlink *hl = NULL;
HRESULT r = S_OK; HRESULT r = S_OK;
WCHAR *hash, *tgt;
const WCHAR *loc;
TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget),
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite,
@ -108,8 +110,44 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
if (FAILED(r)) if (FAILED(r))
return r; return r;
IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, if (pwzTarget)
pwzTarget, pwzLocation); {
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) if (pwzFriendlyName)
IHlink_SetFriendlyName(hl, pwzFriendlyName); IHlink_SetFriendlyName(hl, pwzFriendlyName);

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

@ -291,7 +291,9 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface,
if (grfHLSETF & HLINKSETF_LOCATION) if (grfHLSETF & HLINKSETF_LOCATION)
{ {
heap_free(This->Location); heap_free(This->Location);
This->Location = hlink_strdupW( pwzLocation ); This->Location = NULL;
if (pwzLocation && *pwzLocation)
This->Location = hlink_strdupW( pwzLocation );
} }
return S_OK; return S_OK;