Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.7][NETSHELL] Lan Status Dlg should show on LBUTTONUP in systray,

Browse source 
not on LBUTTONDOWN

by porting back:
0.4.15-dev-5613-g 7a17c7d9ad CORE-18813 LBUTTONUP
0.4.9-dev-126-g 0182dcd71b *only the lanstatusui.cpp-part* DWL->DWLP x64compat
0.4.8-dev-972-g af4bdd4388 [NETSHELL] Don't use hardcoded values.
and strip EOL whitespace
This commit is contained in:
Joachim Henze 2023-02-02 12:25:39 +01:00
parent 4af9e16e6e
commit 4471bfb7cb
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dll/shellext/netshell/lanstatusui.cpp
View file

@ -44,15 +44,15 @@ class CLanStatus final :
virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut);
virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI AddRef();
virtual ULONG WINAPI Release(); virtual ULONG WINAPI Release();
// IOleCommandTarget // IOleCommandTarget
virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText); virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText);
virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
private: private:
HRESULT InitializeNetTaskbarNotifications(); HRESULT InitializeNetTaskbarNotifications();
HRESULT ShowStatusDialogByCLSID(const GUID *pguidCmdGroup); HRESULT ShowStatusDialogByCLSID(const GUID *pguidCmdGroup);
INetConnectionManager *m_lpNetMan; INetConnectionManager *m_lpNetMan;
LONG m_ref; LONG m_ref;
NOTIFICATION_ITEM *m_pHead; NOTIFICATION_ITEM *m_pHead;
@ -166,7 +166,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;
@ -196,7 +196,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)
{ {
@ -232,7 +232,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
nid.cbSize = sizeof(nid); nid.cbSize = sizeof(nid);
nid.uID = pContext->uID; nid.uID = pContext->uID;
nid.hWnd = pContext->hwndStatusDlg; nid.hWnd = pContext->hwndStatusDlg;
nid.uVersion = 3; nid.uVersion = NOTIFYICON_VERSION;
if (pContext->pNet->GetProperties(&pProperties) == S_OK) if (pContext->pNet->GetProperties(&pProperties) == S_OK)
{ {
@ -345,7 +345,7 @@ InsertColumnToListView(
static static
VOID VOID
AddIPAddressToListView( AddIPAddressToListView(
HWND hDlgCtrl, HWND hDlgCtrl,
PIP_ADDR_STRING pAddr, PIP_ADDR_STRING pAddr,
INT Index) INT Index)
{ {
@ -769,7 +769,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;
@ -784,7 +784,7 @@ LANStatusUiDlg(
if (lppsn->hdr.code == PSN_APPLY || lppsn->hdr.code == PSN_RESET) if (lppsn->hdr.code == PSN_APPLY || lppsn->hdr.code == PSN_RESET)
{ {
pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER);
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
pContext->hwndDlg = NULL; pContext->hwndDlg = NULL;
return TRUE; return TRUE;
} }
@ -809,7 +809,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);
@ -926,7 +926,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)
@ -1041,7 +1041,7 @@ CLanStatus::InitializeNetTaskbarNotifications()
nid.cbSize = sizeof(nid); nid.cbSize = sizeof(nid);
nid.uID = Index++; nid.uID = Index++;
nid.uFlags = NIF_MESSAGE; nid.uFlags = NIF_MESSAGE;
nid.uVersion = 3; nid.uVersion = NOTIFYICON_VERSION;
nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.uCallbackMessage = WM_SHOWSTATUSDLG;
nid.hWnd = hwndDlg; nid.hWnd = hwndDlg;