[ros-diffs] [reactos] 01/01: [TASKMGR] Hold Shift to bypass MessageBox confirmation (#5845)

[Whindmar Saksit]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d1be078f82e372c4dbfb…

commit 5d1be078f82e372c4dbfb055cdb683d8d02dffe9
Author:     Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Wed Nov 1 13:43:33 2023 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Nov 1 13:43:33 2023 +0100

    [TASKMGR] Hold Shift to bypass MessageBox confirmation (#5845)
    
    Allow the user to hold shift to automatically answer IDYES when killing/debugging a
process or changing the priority.
---
 base/applications/taskmgr/debug.c    | 2 +-
 base/applications/taskmgr/endproc.c  | 4 ++--
 base/applications/taskmgr/priority.c | 2 +-
 base/applications/taskmgr/taskmgr.c  | 8 ++++++++
 base/applications/taskmgr/taskmgr.h  | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/base/applications/taskmgr/debug.c b/base/applications/taskmgr/debug.c
index 678597a350c..0e25a2a22f1 100644
--- a/base/applications/taskmgr/debug.c
+++ b/base/applications/taskmgr/debug.c
@@ -30,7 +30,7 @@ void ProcessPage_OnDebug(void)
     LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, _countof(szTemp));
     LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, _countof(szTempA));
 
-    if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING) != IDYES)
+    if (!ConfirmMessageBox(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING))
     {
         GetLastErrorText(strErrorText, _countof(strErrorText));
         LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, _countof(szTemp));
diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c
index 9f4a2ee647e..a94cb9153a0 100644
--- a/base/applications/taskmgr/endproc.c
+++ b/base/applications/taskmgr/endproc.c
@@ -39,7 +39,7 @@ void ProcessPage_OnEndProcess(void)
     /* if this is a standard process just ask for confirmation before doing it */
     LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256);
     LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256);
-    if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST)
!= IDYES)
+    if (!ConfirmMessageBox(hMainWnd, strErrorText, szTitle,
MB_YESNO|MB_ICONWARNING|MB_TOPMOST))
     {
         if (hProcess) CloseHandle(hProcess);
         return;
@@ -169,7 +169,7 @@ void ProcessPage_OnEndProcessTree(void)
 
     LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256);
     LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256);
-    if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES)
+    if (!ConfirmMessageBox(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING))
     {
         if (hProcess) CloseHandle(hProcess);
         return;
diff --git a/base/applications/taskmgr/priority.c b/base/applications/taskmgr/priority.c
index 028c297f8e0..d72eda92365 100644
--- a/base/applications/taskmgr/priority.c
+++ b/base/applications/taskmgr/priority.c
@@ -22,7 +22,7 @@ void DoSetPriority(DWORD priority)
 
     LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256);
     LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szText, 260);
-    if (MessageBoxW(hMainWnd, szText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES)
+    if (!ConfirmMessageBox(hMainWnd, szText, szTitle, MB_YESNO|MB_ICONWARNING))
         return;
 
     hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId);
diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c
index 9dedb5e1093..686abc37352 100644
--- a/base/applications/taskmgr/taskmgr.c
+++ b/base/applications/taskmgr/taskmgr.c
@@ -1056,6 +1056,14 @@ void TaskManager_OnTabWndSelChange(void)
     }
 }
 
+BOOL ConfirmMessageBox(HWND hWnd, LPCWSTR Text, LPCWSTR Title, UINT Type)
+{
+    UINT positive = ((Type & 0xF) <= MB_OKCANCEL ? IDOK : IDYES);
+    if (GetKeyState(VK_SHIFT) < 0)
+        return TRUE;
+    return (MessageBoxW(hWnd, Text, Title, Type) == positive);
+}
+
 VOID ShowWin32Error(DWORD dwError)
 {
     LPWSTR lpMessageBuffer;
diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h
index fe387718c40..d0a8920fa1d 100644
--- a/base/applications/taskmgr/taskmgr.h
+++ b/base/applications/taskmgr/taskmgr.h
@@ -80,6 +80,7 @@ void TaskManager_OnRestoreMainWindow(void);
 void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu);
 void TaskManager_OnViewUpdateSpeed(DWORD);
 void TaskManager_OnTabWndSelChange(void);
+BOOL ConfirmMessageBox(HWND hWnd, LPCWSTR Text, LPCWSTR Title, UINT Type);
 VOID ShowWin32Error(DWORD dwError);
 LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize );
 DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);