mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 13:26:17 +00:00
[0.4.13][NETSHELL] Lan Status Dlg should show on LBUTTONUP in systray,
not on LBUTTONDOWN
by porting back:
0.4.15-dev-5613-g 7a17c7d9ad
CORE-18813 LBUTTONUP
and strip EOL whitespace
This commit is contained in:
parent
4379ba0b17
commit
19c57cab4d
1 changed files with 6 additions and 6 deletions
|
@ -116,7 +116,7 @@ UpdateLanStatusUiDlg(
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
|
UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
|
||||||
{
|
{
|
||||||
MIB_IFROW IfEntry;
|
MIB_IFROW IfEntry;
|
||||||
HICON hIcon, hOldIcon = NULL;
|
HICON hIcon, hOldIcon = NULL;
|
||||||
|
@ -146,7 +146,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
|
||||||
else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2)
|
else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2)
|
||||||
{
|
{
|
||||||
hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 32, 32, LR_SHARED);
|
hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 32, 32, LR_SHARED);
|
||||||
pContext->Status = 2;
|
pContext->Status = 2;
|
||||||
}
|
}
|
||||||
else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3)
|
else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3)
|
||||||
{
|
{
|
||||||
|
@ -295,7 +295,7 @@ InsertColumnToListView(
|
||||||
static
|
static
|
||||||
VOID
|
VOID
|
||||||
AddIPAddressToListView(
|
AddIPAddressToListView(
|
||||||
HWND hDlgCtrl,
|
HWND hDlgCtrl,
|
||||||
PIP_ADDR_STRING pAddr,
|
PIP_ADDR_STRING pAddr,
|
||||||
INT Index)
|
INT Index)
|
||||||
{
|
{
|
||||||
|
@ -593,7 +593,7 @@ LANStatusUiDlg(
|
||||||
{
|
{
|
||||||
if (pContext)
|
if (pContext)
|
||||||
{
|
{
|
||||||
ShowNetConnectionProperties(pContext->pNet, GetParent(pContext->hwndDlg));
|
ShowNetConnectionProperties(pContext->pNet, GetParent(pContext->hwndDlg));
|
||||||
BringWindowToTop(GetParent(pContext->hwndDlg));
|
BringWindowToTop(GetParent(pContext->hwndDlg));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -633,7 +633,7 @@ InitializePropertyDialog(
|
||||||
|
|
||||||
/* get the IfTable */
|
/* get the IfTable */
|
||||||
dwSize = 0;
|
dwSize = 0;
|
||||||
dwResult = GetAdaptersInfo(NULL, &dwSize);
|
dwResult = GetAdaptersInfo(NULL, &dwSize);
|
||||||
if (dwResult!= ERROR_BUFFER_OVERFLOW)
|
if (dwResult!= ERROR_BUFFER_OVERFLOW)
|
||||||
{
|
{
|
||||||
CoTaskMemFree(pStr);
|
CoTaskMemFree(pStr);
|
||||||
|
@ -771,7 +771,7 @@ LANStatusDlg(
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case WM_SHOWSTATUSDLG:
|
case WM_SHOWSTATUSDLG:
|
||||||
if (LOWORD(lParam) == WM_LBUTTONDOWN)
|
if (LOWORD(lParam) == WM_LBUTTONUP)
|
||||||
{
|
{
|
||||||
pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
||||||
if (!pContext)
|
if (!pContext)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue