Author: hbelusca
Date: Wed Dec 24 15:25:42 2014
New Revision: 65819
URL:
http://svn.reactos.org/svn/reactos?rev=65819&view=rev
Log:
[NETSHELL]
Fix flags usage for LoadImage / CopyImage, that made network tray applet icons uglily
being downscaled from 32px versions instead of their 16px counterparts.
Modified:
trunk/reactos/dll/shellext/netshell/lanstatusui.cpp
Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lans…
==============================================================================
--- trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] Wed Dec 24 15:25:42
2014
@@ -185,22 +185,22 @@
{
if (pContext->dwInOctets == IfEntry.dwInOctets &&
pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0)
{
- hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE),
IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 0;
}
else if (pContext->dwInOctets != IfEntry.dwInOctets &&
pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1)
{
- hIcon = (HICON)LoadImage(netshell_hInstance,
MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance,
MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 1;
}
else if (pContext->dwInOctets != IfEntry.dwInOctets &&
pContext->Status != 2)
{
- hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC),
IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 2;
}
else if (pContext->dwOutOctets != IfEntry.dwOutOctets &&
pContext->Status != 3)
{
- hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS),
IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 3;
}
}
@@ -208,7 +208,7 @@
{
if (pContext->Status != 4)
{
- hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF),
IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 4;
}
}
@@ -216,7 +216,7 @@
{
if (pContext->Status != 5)
{
- hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF),
IMAGE_ICON, 32, 32, LR_SHARED);
pContext->Status = 5;
}
}
@@ -239,7 +239,7 @@
if (pProperties->dwCharacter & NCCF_SHOW_ICON)
{
if (hwndDlg)
- nid.hIcon = (HICON)CopyImage(hIcon, IMAGE_ICON, 16, 16, 0);
+ nid.hIcon = (HICON)CopyImage(hIcon, IMAGE_ICON, 16, 16,
LR_COPYFROMRESOURCE);
else
nid.hIcon = hIcon;