Revert "[SHELL32] Move to/Copy to folder should not be displayed when…

… unable to retrieve the file name" This reverts commit a217e83.
TAN-Gaming · May 16, 2023 · f687117 · f687117
1 parent a217e83
commit f687117
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp
@@ -192,7 +192,7 @@ HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl)
 
 CStringW CCopyToMenu::DoGetFileTitle()
 {
-    CStringW ret;
+    CStringW ret = L"(file)";
 
     CDataObjectHIDA pCIDA(m_pDataObject);
     if (FAILED_UNEXPECTEDLY(pCIDA.hr()))
@@ -240,9 +240,6 @@ HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici)
     }
 
     CStringW strFileTitle = DoGetFileTitle();
-    if (strFileTitle.IsEmpty())
-        return hr;
-
     CStringW strTitle;
     strTitle.Format(IDS_COPYTOTITLE, static_cast<LPCWSTR>(strFileTitle));
 

diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp
@@ -191,7 +191,7 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl)
 
 CStringW CMoveToMenu::DoGetFileTitle()
 {
-    CStringW ret;
+    CStringW ret = L"(file)";
 
     CDataObjectHIDA pCIDA(m_pDataObject);
     if (FAILED_UNEXPECTEDLY(pCIDA.hr()))
@@ -239,9 +239,6 @@ HRESULT CMoveToMenu::DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici)
     }
 
     CStringW strFileTitle = DoGetFileTitle();
-    if (strFileTitle.IsEmpty())
-        return hr;
-
     CStringW strTitle;
     strTitle.Format(IDS_MOVETOTITLE, static_cast<LPCWSTR>(strFileTitle));