[ros-diffs] [reactos] 01/01: [SHELL32] Fix copyto/moveto actions of Search Results (#5816)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f6b01696316bd4213f4f8b2157f032f3c8a1047

commit 8f6b01696316bd4213f4f8b2157f032f3c8a1047
Author:     Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
AuthorDate: Fri Oct 27 12:34:51 2023 +0900
Commit:     GitHub <nore...@github.com>
CommitDate: Fri Oct 27 12:34:51 2023 +0900

    [SHELL32] Fix copyto/moveto actions of Search Results (#5816)
    
    - Extend CDefView::InvokeContextMenuCommand 2nd parameter to LPCSTR.
    - Add CDefView::_DoCopyToMoveToFolder method.
    - Use CDefView::_DoCopyToMoveToFolder for FCIDM_SHVIEW_COPYTO
      and FCIDM_SHVIEW_MOVETO command actions.
    CORE-18426
---
 dll/win32/shell32/CDefView.cpp | 47 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index 9f12fd09549..a06feb085b4 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -163,6 +163,7 @@ class CDefView :
         INT _FindInsertableIndexFromPoint(POINT pt);
         void _HandleStatusBarResize(int width);
         void _ForceStatusBarResize();
+        void _DoCopyToMoveToFolder(BOOL bCopy);
 
     public:
         CDefView();
@@ -197,7 +198,7 @@ class CDefView :
         void OnDeactivate();
         void DoActivate(UINT uState);
         HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD 
*pdwEffect);
-        HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT 
uCommand, POINT* pt);
+        HRESULT InvokeContextMenuCommand(CComPtr<IContextMenu>& pCM, LPCSTR 
lpVerb, POINT* pt = NULL);
         LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection);
 
         // *** IOleWindow methods ***
@@ -1513,14 +1514,14 @@ UINT CDefView::GetSelections()
     return m_cidl;
 }
 
-HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT 
uCommand, POINT* pt)
+HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu>& pCM, LPCSTR 
lpVerb, POINT* pt)
 {
     CMINVOKECOMMANDINFOEX cmi;
 
     ZeroMemory(&cmi, sizeof(cmi));
     cmi.cbSize = sizeof(cmi);
-    cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
     cmi.hwnd = m_hWnd;
+    cmi.lpVerb = lpVerb;
 
     if (GetKeyState(VK_SHIFT) & 0x8000)
         cmi.fMask |= CMIC_MASK_SHIFT_DOWN;
@@ -1583,7 +1584,7 @@ HRESULT CDefView::OpenSelectedItems()
         return E_FAIL;
     }
 
-    InvokeContextMenuCommand(pCM, uCommand, NULL);
+    InvokeContextMenuCommand(pCM, MAKEINTRESOURCEA(uCommand), NULL);
 
     return hResult;
 }
@@ -1682,7 +1683,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, 
LPARAM lParam, BOOL &b
     if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK)
         return 0;
 
-    InvokeContextMenuCommand(m_pCM, uCommand - CONTEXT_MENU_BASE_ID, &pt);
+    InvokeContextMenuCommand(m_pCM, MAKEINTRESOURCEA(uCommand - 
CONTEXT_MENU_BASE_ID), &pt);
 
     return 0;
 }
@@ -1731,7 +1732,7 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL 
bUseSelection)
     }
 
     // FIXME: We should probably use the objects position?
-    InvokeContextMenuCommand(pCM, uCommand, NULL);
+    InvokeContextMenuCommand(pCM, MAKEINTRESOURCEA(uCommand), NULL);
     return 0;
 }
 
@@ -1818,6 +1819,29 @@ void CDefView::DoActivate(UINT uState)
     TRACE("--\n");
 }
 
+void CDefView::_DoCopyToMoveToFolder(BOOL bCopy)
+{
+    if (!GetSelections())
+        return;
+
+    SFGAOF rfg = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_FILESYSTEM;
+    HRESULT hr = m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &rfg);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return;
+
+    if (!bCopy && !(rfg & SFGAO_CANMOVE))
+        return;
+    if (bCopy && !(rfg & SFGAO_CANCOPY))
+        return;
+
+    CComPtr<IContextMenu> pCM;
+    hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, IID_IContextMenu, 
0, (void **)&pCM);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return;
+
+    InvokeContextMenuCommand(pCM, (bCopy ? "copyto" : "moveto"), NULL);
+}
+
 /**********************************************************
 * ShellView_OnActivate()
 */
@@ -1954,26 +1978,31 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, 
LPARAM lParam, BOOL &bHand
         case FCIDM_SHVIEW_COPY:
         case FCIDM_SHVIEW_RENAME:
         case FCIDM_SHVIEW_PROPERTIES:
-        case FCIDM_SHVIEW_COPYTO:
-        case FCIDM_SHVIEW_MOVETO:
             if (SHRestricted(REST_NOVIEWCONTEXTMENU))
                 return 0;
 
             return OnExplorerCommand(dwCmdID, TRUE);
 
+        case FCIDM_SHVIEW_COPYTO:
+        case FCIDM_SHVIEW_MOVETO:
+            _DoCopyToMoveToFolder(dwCmdID == FCIDM_SHVIEW_COPYTO);
+            return 0;
+
         case FCIDM_SHVIEW_INSERT:
         case FCIDM_SHVIEW_UNDO:
         case FCIDM_SHVIEW_INSERTLINK:
         case FCIDM_SHVIEW_NEWFOLDER:
             return OnExplorerCommand(dwCmdID, FALSE);
         default:
+        {
             /* WM_COMMAND messages from the file menu are routed to the 
CDefView so as to let m_pFileMenu handle the command */
             if (m_pFileMenu && dwCmd == 0)
             {
                 HMENU Dummy = NULL;
                 MenuCleanup _(m_pFileMenu, Dummy);
-                InvokeContextMenuCommand(m_pFileMenu, dwCmdID, NULL);
+                InvokeContextMenuCommand(m_pFileMenu, 
MAKEINTRESOURCEA(dwCmdID), NULL);
             }
+        }
     }
 
     return 0;