mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 08:54:40 +00:00
[NETSHELL]
- Display proper icons in network connections folder svn path=/trunk/; revision=54998
This commit is contained in:
parent
e69c077ca9
commit
2fd2d0327b
|
@ -84,7 +84,6 @@ static __inline LPIContextMenuImpl impl_from_IExtractIcon(IExtractIconW *iface)
|
||||||
return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblExtractIconW));
|
return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblExtractIconW));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static __inline LPIContextMenuImpl impl_from_IObjectWithSite(IObjectWithSite *iface)
|
static __inline LPIContextMenuImpl impl_from_IObjectWithSite(IObjectWithSite *iface)
|
||||||
{
|
{
|
||||||
return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblObjectWithSite));
|
return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblObjectWithSite));
|
||||||
|
@ -1176,19 +1175,28 @@ static HRESULT WINAPI ISF_NetConnect_IExtractIconW_GetIconLocation(
|
||||||
|
|
||||||
*pwFlags = 0;
|
*pwFlags = 0;
|
||||||
if (!GetModuleFileNameW(netshell_hInstance, szIconFile, cchMax))
|
if (!GetModuleFileNameW(netshell_hInstance, szIconFile, cchMax))
|
||||||
|
{
|
||||||
|
ERR("GetModuleFileNameW failed\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
val = _ILGetValueStruct(This->apidl);
|
val = _ILGetValueStruct(This->apidl);
|
||||||
if (!val)
|
if (!val)
|
||||||
|
{
|
||||||
|
ERR("_ILGetValueStruct failed\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
if (INetConnection_GetProperties(val->pItem, &pProperties) != NOERROR)
|
if (INetConnection_GetProperties(val->pItem, &pProperties) != NOERROR)
|
||||||
|
{
|
||||||
|
ERR("INetConnection_GetProperties failed\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
if (pProperties->Status == NCS_CONNECTED || pProperties->Status == NCS_CONNECTING)
|
if (pProperties->Status == NCS_CONNECTED || pProperties->Status == NCS_CONNECTING)
|
||||||
*piIndex = IDI_NET_IDLE;
|
*piIndex = -IDI_NET_IDLE;
|
||||||
else
|
else
|
||||||
*piIndex = IDI_NET_OFF;
|
*piIndex = -IDI_NET_OFF;
|
||||||
|
|
||||||
NcFreeNetconProperties(pProperties);
|
NcFreeNetconProperties(pProperties);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue