From 19c57cab4d49fffe3ab232c74a4d1fb8e97b919b Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Thu, 2 Feb 2023 12:19:15 +0100 Subject: [PATCH] [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 7a17c7d9adadf88eafc382d792771bea5fc412f8 CORE-18813 LBUTTONUP and strip EOL whitespace --- dll/shellext/netshell/lanstatusui.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 08ade893e56..a3adc70cd1d 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -116,7 +116,7 @@ UpdateLanStatusUiDlg( } VOID -UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) +UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) { MIB_IFROW IfEntry; HICON hIcon, hOldIcon = NULL; @@ -146,7 +146,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) { 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) { @@ -295,7 +295,7 @@ InsertColumnToListView( static VOID AddIPAddressToListView( - HWND hDlgCtrl, + HWND hDlgCtrl, PIP_ADDR_STRING pAddr, INT Index) { @@ -593,7 +593,7 @@ LANStatusUiDlg( { if (pContext) { - ShowNetConnectionProperties(pContext->pNet, GetParent(pContext->hwndDlg)); + ShowNetConnectionProperties(pContext->pNet, GetParent(pContext->hwndDlg)); BringWindowToTop(GetParent(pContext->hwndDlg)); } break; @@ -633,7 +633,7 @@ InitializePropertyDialog( /* get the IfTable */ dwSize = 0; - dwResult = GetAdaptersInfo(NULL, &dwSize); + dwResult = GetAdaptersInfo(NULL, &dwSize); if (dwResult!= ERROR_BUFFER_OVERFLOW) { CoTaskMemFree(pStr); @@ -771,7 +771,7 @@ LANStatusDlg( } break; case WM_SHOWSTATUSDLG: - if (LOWORD(lParam) == WM_LBUTTONDOWN) + if (LOWORD(lParam) == WM_LBUTTONUP) { pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (!pContext)