[ros-diffs] [reactos] 01/01: [SHELL32] Implement SSF_NOCONFIRMRECYCLE recycler setting (#7434)

[Whindmar Saksit]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52265ae0072c7011d9cf4…

commit 52265ae0072c7011d9cf4c5740b1ca92ef9b8150
Author:     Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Wed Oct 9 22:00:11 2024 +0200
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Oct 9 22:00:11 2024 +0200

    [SHELL32] Implement SSF_NOCONFIRMRECYCLE recycler setting (#7434)
    
    CORE-12309
---
 dll/win32/shell32/dialogs/recycler_prop.cpp | 5 +++++
 dll/win32/shell32/shlfileop.cpp             | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dll/win32/shell32/dialogs/recycler_prop.cpp
b/dll/win32/shell32/dialogs/recycler_prop.cpp
index 10b13500d3a..ea1c9ca2cef 100644
--- a/dll/win32/shell32/dialogs/recycler_prop.cpp
+++ b/dll/win32/shell32/dialogs/recycler_prop.cpp
@@ -290,6 +290,7 @@ RecycleBinDlg(
         case WM_INITDIALOG:
             page = (PROPSHEETPAGE*)lParam;
             InitializeRecycleBinDlg(hwndDlg, (WCHAR)page->lParam);
+            SendDlgItemMessage(hwndDlg, 14004, BM_SETCHECK,
!SHELL_GetSetting(SSF_NOCONFIRMRECYCLE, fNoConfirmRecycle), 0);
             dwStyle = (DWORD) SendDlgItemMessage(hwndDlg, 14000,
LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
             dwStyle = dwStyle | LVS_EX_FULLROWSELECT;
             SendDlgItemMessage(hwndDlg, 14000, LVM_SETEXTENDEDLISTVIEWSTYLE, 0,
dwStyle);
@@ -324,6 +325,10 @@ RecycleBinDlg(
             lppl = (LPNMLISTVIEW) lParam;
             if (lppsn->hdr.code == PSN_APPLY)
             {
+                SHELLSTATE ss;
+                ss.fNoConfirmRecycle = SendDlgItemMessage(hwndDlg, 14004, BM_GETCHECK, 0,
0) == BST_UNCHECKED;
+                SHGetSetSettings(&ss, SSF_NOCONFIRMRECYCLE, TRUE);
+
                 if (GetDefaultItem(hwndDlg, &li) > -1)
                 {
                     pItem = (PDRIVE_ITEM_CONTEXT)li.lParam;
diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp
index b68417bf1ac..53f209a8f4f 100644
--- a/dll/win32/shell32/shlfileop.cpp
+++ b/dll/win32/shell32/shlfileop.cpp
@@ -1596,7 +1596,10 @@ static HRESULT delete_files(FILE_OPERATION *op, const FILE_LIST
*flFrom)
     bTrash = (op->req->fFlags & FOF_ALLOWUNDO)
         && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath);
 
-    if (!(op->req->fFlags & FOF_NOCONFIRMATION) || (!bTrash &&
op->req->fFlags & FOF_WANTNUKEWARNING))
+    BOOL confirm = !(op->req->fFlags & FOF_NOCONFIRMATION);
+    if (bTrash && SHELL_GetSetting(SSF_NOCONFIRMRECYCLE, fNoConfirmRecycle))
+        confirm = FALSE;
+    if (confirm || (!bTrash && op->req->fFlags & FOF_WANTNUKEWARNING))
         if (!confirm_delete_list(op->req->hwnd, op->req->fFlags, bTrash,
flFrom))
         {
             op->req->fAnyOperationsAborted = TRUE;