Remove undelete which seems unused (#433)

malxau-msft · malxau · web-flow · commit d0877dfaa904 · 2024-03-30T11:00:16.000-07:00
Co-authored-by: Malcolm &lt;malxau@users.noreply.github.com&gt;
diff --git a/src/lang/res_de-DE.rc b/src/lang/res_de-DE.rc
@@ -552,7 +552,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,          "Löschen von Dateien und Verzeichnissen"
     MH_MYITEMS+IDM_RENAME,          "Umbenennen von Dateien und Verzeichnissen"
     MH_MYITEMS+IDM_ATTRIBS,         "Anzeige der Eigenschaften und Setzen von Dateiattributen"
-    MH_MYITEMS+IDM_UNDELETE,        "Ruft zuvor gelöschte Dateien ab"
     MH_MYITEMS+IDM_RUN,             "Startet oder öffnet eine Anwendung oder ein Dokument"
     MH_MYITEMS+IDM_PRINT,           "Drucken eines Dokuments"
     MH_MYITEMS+IDM_ASSOCIATE,       "Zuordnen einer Datei zu einer Anwendung"
@@ -636,7 +635,6 @@ BEGIN
     IDS_SHAREAS,                "F&reigeben als..."
     IDS_STOPSHARE,              "Freigabe been&den..."
     IDS_SHARES,                 "Freigegeben Verzeichnisse &anzeigen..."
-    IDS_UNDELETE,               "&Wiederherstellen..."
     IDS_NEWWINONCONNECT,        "Neues Fenster beim &Verbinden öffnen"
 END
 
diff --git a/src/lang/res_en-US.rc b/src/lang/res_en-US.rc
@@ -554,7 +554,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "Deletes files and directories"
     MH_MYITEMS+IDM_RENAME,      "Renames a file or directory"
     MH_MYITEMS+IDM_ATTRIBS,     "Sets file attributes and displays properties"
-    MH_MYITEMS+IDM_UNDELETE,    "Retrieves previously deleted files"
     MH_MYITEMS+IDM_RUN,         "Starts or opens an application or document"
     MH_MYITEMS+IDM_PRINT,       "Prints a document"
     MH_MYITEMS+IDM_ASSOCIATE,   "Associates a file with an application"
@@ -638,7 +637,6 @@ BEGIN
     IDS_SHAREAS,                "Share &As..."
     IDS_STOPSHARE,              "S&top Sharing..."
     IDS_SHARES,                 "View S&hared Directories..."
-    IDS_UNDELETE,               "&Undelete..."
     IDS_NEWWINONCONNECT,        "&Open New Window on Connect"
 END
 
diff --git a/src/lang/res_he-IL.rc b/src/lang/res_he-IL.rc
@@ -554,7 +554,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "מחיקת קבצים ותיקיות"
     MH_MYITEMS+IDM_RENAME,      "שינוי שם קובץ או תיקיה"
     MH_MYITEMS+IDM_ATTRIBS,     "הגדרה והצגה של תכונות קובץ"
-    MH_MYITEMS+IDM_UNDELETE,    "שחזור קבצים שנמחקו"
     MH_MYITEMS+IDM_RUN, "הפעלה או פתיחה של תכנית או מסמך"
     MH_MYITEMS+IDM_PRINT,       "הדפסת מסמך"
     MH_MYITEMS+IDM_ASSOCIATE,   "שיוך קובץ לתכנית"
@@ -638,7 +637,6 @@ BEGIN
     IDS_SHAREAS,                "&שיתוף בתור..."
     IDS_STOPSHARE,              "ה&פסקת שיתוף..."
     IDS_SHARES,                 "הצגת תיקיות מ&שותפות..."
-    IDS_UNDELETE,               "שחזור..."
     IDS_NEWWINONCONNECT,        "&פתיחת חלון חדש בעת חיבור"
 END
 
diff --git a/src/lang/res_ja-JP.rc b/src/lang/res_ja-JP.rc
@@ -552,7 +552,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "ファイルまたはディレクトリを削除する"
     MH_MYITEMS+IDM_RENAME,      "ファイルまたはディレクトリの名前を変更する"
     MH_MYITEMS+IDM_ATTRIBS,     "ファイルの拡張子を設定する、またはプロパティを表示する"
-    MH_MYITEMS+IDM_UNDELETE,    "削除したファイルを戻す"
     MH_MYITEMS+IDM_RUN, "アプリケーションを実行する、またはドキュメントを開く"
     MH_MYITEMS+IDM_PRINT,       "ドキュメントを印刷する"
     MH_MYITEMS+IDM_ASSOCIATE,   "ファイルの拡張子に関連付けを行う"
@@ -636,7 +635,6 @@ BEGIN
     IDS_SHAREAS,                "共有(&A)..."
     IDS_STOPSHARE,              "共有を停止(&T)..."
     IDS_SHARES,                 "共有ディレクトリの表示(&H)..."
-    IDS_UNDELETE,               "削除の取り消し(&U)..."
     IDS_NEWWINONCONNECT,        "接続時に新しいウィンドウを開く(&O)"
 END
 
diff --git a/src/lang/res_pl-PL.rc b/src/lang/res_pl-PL.rc
@@ -554,7 +554,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,           "Usuwa pliki i katalogi"
     MH_MYITEMS+IDM_RENAME,           "Zmienia nazwę pliku lub katalogu"
     MH_MYITEMS+IDM_ATTRIBS,          "Ustawia atrybuty pliku i wyświetla jego właściwości"
-    MH_MYITEMS+IDM_UNDELETE,         "Odtwarza uprzednio usunięte pliki"
     MH_MYITEMS+IDM_RUN,              "Rozpoczyna lub otwiera aplikację lub dokument"
     MH_MYITEMS+IDM_PRINT,            "Drukuje dokument"
     MH_MYITEMS+IDM_ASSOCIATE,        "Kojarzy plik z aplikacją"
@@ -638,7 +637,6 @@ BEGIN
     IDS_SHAREAS,                "Udos&tępnij jako..."
     IDS_STOPSHARE,              "&Zakończ udostępnianie..."
     IDS_SHARES,                 "Po&każ udostępnione katalogi..."
-    IDS_UNDELETE,               "&Cofnij usunięcie..."
     IDS_NEWWINONCONNECT,        "&Otwórz nowe okno przy podłączeniu"
 END
 
diff --git a/src/lang/res_pt-PT.rc b/src/lang/res_pt-PT.rc
@@ -554,7 +554,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "Elimina ficheiros ou directórios"
     MH_MYITEMS+IDM_RENAME,      "Muda o nome a um ficheiro ou directório"
     MH_MYITEMS+IDM_ATTRIBS,     "Define os atributos de ficheiro e mostra as propriedades"
-    MH_MYITEMS+IDM_UNDELETE,    "Recupera ficheiros previamente eliminados"
     MH_MYITEMS+IDM_RUN,         "Inicia ou abre uma aplicação ou um documento"
     MH_MYITEMS+IDM_PRINT,       "Imprime um documento"
     MH_MYITEMS+IDM_ASSOCIATE,   "Associa um ficheiro a uma aplicação"
@@ -638,7 +637,6 @@ BEGIN
     IDS_SHAREAS,                "Partilhar &Como..."
     IDS_STOPSHARE,              "P&arar Partilha..."
     IDS_SHARES,                 "Ver Directórios &Partilhados..."
-    IDS_UNDELETE,               "&Recuperar..."
     IDS_NEWWINONCONNECT,        "&Abrir N&ova Janela ao Ligar"
 END
 
diff --git a/src/lang/res_tr-TR.rc b/src/lang/res_tr-TR.rc
@@ -505,7 +505,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "Dosyalar ve dizinler siler"
     MH_MYITEMS+IDM_RENAME,      "Bir dosyanın veya dizinin adını değiştirir"
     MH_MYITEMS+IDM_ATTRIBS,     "Dosya özniteliklerini ayarlar ve özelliklerini görüntüler"
-    MH_MYITEMS+IDM_UNDELETE,    "Daha önceden silinen dosyaları geri getirir"
     MH_MYITEMS+IDM_RUN,         "Bir uygulamayı başlatır veya bir belgeyi açar"
     MH_MYITEMS+IDM_PRINT,       "Bir belgeyi yazdırır"
     MH_MYITEMS+IDM_ASSOCIATE,   "Bir dosyayı bir uygulama ile ilişkilendirir"
@@ -582,7 +581,6 @@ BEGIN
     IDS_SHAREAS,                "&Farklı Paylaş..."
     IDS_STOPSHARE,              "Pa&ylaşımı Durdur..."
     IDS_SHARES,                 "Pay&laşılan Dizinleri Görüntüle..."
-    IDS_UNDELETE,               "&Silmeyi Geri Al..."
     IDS_NEWWINONCONNECT,        "Bağla&ntıda Yeni Pencere Aç"
 END
 
diff --git a/src/lang/res_zh-CN.rc b/src/lang/res_zh-CN.rc
@@ -550,7 +550,6 @@ BEGIN
     MH_MYITEMS+IDM_DELETE,      "删除文件及目录"
     MH_MYITEMS+IDM_RENAME,      "重命名文件或目录"
     MH_MYITEMS+IDM_ATTRIBS,     "设置文件属性及显示属性"
-    MH_MYITEMS+IDM_UNDELETE,    "检索先前删除的文件"
     MH_MYITEMS+IDM_RUN, "启动或打开应用程序或文档"
     MH_MYITEMS+IDM_PRINT,       "打印文档"
     MH_MYITEMS+IDM_ASSOCIATE,   "将文件与应用程序产生关联"
@@ -634,7 +633,6 @@ BEGIN
     IDS_SHAREAS,                "共享为(&A)..."
     IDS_STOPSHARE,              "停止共享(&T)..."
     IDS_SHARES,                 "查看共享目录(&H)..."
-    IDS_UNDELETE,               "撤销删除(&U)..."
     IDS_NEWWINONCONNECT,        "在连接时打开新窗口(&O)"
 END
 
diff --git a/src/res.h b/src/res.h
@@ -82,7 +82,7 @@
 #define IDM_UNDO            114
 #define IDM_EXIT            115
 #define IDM_SELECT          116
-#define IDM_UNDELETE        117
+// was IDM_UNDELETE         117
 #define IDM_COPYTOCLIPBOARD 118
 #define IDM_COMPRESS        119
 #define IDM_UNCOMPRESS      120
@@ -596,7 +596,7 @@
 #define IDS_SHAREAS           (MS_EXTRA+3)
 #define IDS_STOPSHARE         (MS_EXTRA+4)  // IDS_STOPSHARE not used anymore, because there is no way to open then 'Stop Share Dialog' with W7/10/11
 #define IDS_SHARES            (MS_EXTRA+5)
-#define IDS_UNDELETE          (MS_EXTRA+6)
+// was IDS_UNDELETE           (MS_EXTRA+6)
 #define IDS_NEWWINONCONNECT   (MS_EXTRA+7)
 
 // TODO: there should be NUMEXTRACOMMANDS strings above; see usage in tbar.c in LoadDesc().
diff --git a/src/tbar.c b/src/tbar.c
@@ -41,7 +41,6 @@ static UINT uExtraCommands[] =
     IDM_STOPSHARE,
     IDM_SHAREAS,
 
-    IDM_UNDELETE,
     IDM_NEWWINONCONNECT,
     IDM_PERMISSIONS,
     IDM_COMPRESS,
diff --git a/src/wfcomman.c b/src/wfcomman.c
@@ -1367,30 +1367,6 @@ AppCommandProc(DWORD id)
 	  }
       break;
 
-   case IDM_UNDELETE:
-
-      if (lpfpUndelete) {
-         SendMessage(hwndActive, FS_GETDIRECTORY, COUNTOF(szPath), (LPARAM)szPath);
-         StripBackslash(szPath);
-
-         if (bUndeleteUnicode) {
-            if ((*lpfpUndelete)(hwndActive, szPath) != IDOK)
-               break;
-         } else {
-
-            CHAR szPathA[MAXPATHLEN];
-
-            WideCharToMultiByte(CP_ACP, 0L, szPath, -1,
-               szPathA, COUNTOF(szPathA), NULL, NULL);
-
-            if ((*lpfpUndelete)(hwndActive, (LPTSTR)szPathA) != IDOK)
-               break;
-         }
-
-         RefreshWindow(hwndActive, FALSE, FALSE);
-      }
-      break;
-
    case IDM_ATTRIBS:
       {
          LPTSTR pSel, p;
diff --git a/src/wfext.h b/src/wfext.h
@@ -170,7 +170,6 @@ typedef struct tagFMS_HELPSTRINGW {
 
 
 typedef DWORD (APIENTRY *FM_EXT_PROC)(HWND, WPARAM, LPARAM);
-typedef DWORD (APIENTRY *FM_UNDELETE_PROC)(HWND, LPTSTR);
 
 #ifdef UNICODE
 LONG WINAPI FMExtensionProcW(HWND hwnd, WPARAM wEvent, LPARAM lParam);
diff --git a/src/wfhelp.h b/src/wfhelp.h
@@ -59,7 +59,7 @@
 #define IDH_UNDO  (IDM_UNDO + IDH_HELPFIRST)
 #define IDH_EXIT  (IDM_EXIT + IDH_HELPFIRST)
 #define IDH_SELECT   (IDM_SELECT + IDH_HELPFIRST)
-#define IDH_UNDELETE    (IDM_UNDELETE + IDH_HELPFIRST)
+// was  IDH_UNDELETE    (IDM_UNDELETE + IDH_HELPFIRST)
 #define IDH_COPYTOCLIPBOARD (IDM_COPYTOCLIPBOARD + IDH_HELPFIRST)
 #define IDH_COMPRESS  (IDM_COMPRESS + IDH_HELPFIRST)
 #define IDH_UNCOMPRESS  (IDM_UNCOMPRESS + IDH_HELPFIRST)
diff --git a/src/wfinit.c b/src/wfinit.c
@@ -330,41 +330,6 @@ InitMenus()
    TCHAR szValue[MAXPATHLEN];
    HMENU hMenuOptions;
 
-   TCHAR szPathName[MAXPATHLEN];
-
-   GetPrivateProfileString(szSettings, szUndelete, szNULL, szValue, COUNTOF(szValue), szTheINIFile);
-
-   if (szValue[0]) {
-
-      // create explicit filename to avoid searching the path
-
-      GetSystemDirectory(szPathName, COUNTOF(szPathName));
-      AddBackslash(szPathName);
-      lstrcat(szPathName, szValue);
-
-      hModUndelete = LoadLibrary(szValue);
-
-      if (hModUndelete) {
-         lpfpUndelete = (FM_UNDELETE_PROC)GetProcAddress(hModUndelete, UNDELETE_ENTRYW);
-
-         if (lpfpUndelete) {
-            bUndeleteUnicode = TRUE;
-         } else {
-            lpfpUndelete = (FM_UNDELETE_PROC)GetProcAddress(hModUndelete, UNDELETE_ENTRYA);
-            bUndeleteUnicode = FALSE;
-         }
-
-         if (lpfpUndelete) {
-            hMenu = GetSubMenu(GetMenu(hwndFrame), MapIDMToMenuPos(IDM_FILE));
-            LoadString(hAppInstance, IDS_UNDELETE, szValue, COUNTOF(szValue));
-            InsertMenu(hMenu, 4, MF_BYPOSITION | MF_STRING, IDM_UNDELETE, szValue);
-         }
-      } else {
-         FreeLibrary(hModUndelete);
-         hModUndelete = NULL;
-      }
-   }
-
    //
    // use submenu because we are doing this by position
    //
diff --git a/src/winfile.c b/src/winfile.c
@@ -1035,8 +1035,6 @@ FrameWndProc(HWND hwnd, UINT wMsg, WPARAM wParam, LPARAM lParam)
       if (GET_WM_COMMAND_ID(wParam, lParam) == IDM_EXIT) {
 
             FreeExtensions();
-            if (hModUndelete >= (HANDLE)32)
-               FreeLibrary(hModUndelete);
 
             DestroyWindow(hwnd);
             break;
diff --git a/src/winfile.h b/src/winfile.h
@@ -219,9 +219,6 @@ INT atoiW(LPWSTR sz);
 #define FM_EXT_PROC_ENTRYA "FMExtensionProc"
 #define FM_EXT_PROC_ENTRYW "FMExtensionProcW"
 
-#define UNDELETE_ENTRYA "UndeleteFile"
-#define UNDELETE_ENTRYW "UndeleteFileW"
-
 #define FILE_NOTIFY_CHANGE_FLAGS (FILE_NOTIFY_CHANGE_FILE_NAME | \
    FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_SIZE)
 
@@ -1292,7 +1289,6 @@ Extern TCHAR        szSaveCharset[]         EQ( TEXT("Charset") );
 JAPANEND
 
 Extern TCHAR        szAddons[]              EQ( TEXT("AddOns") );
-Extern TCHAR        szUndelete[]            EQ( TEXT("UNDELETE.DLL") );
 
 Extern TCHAR        szDefPrograms[]         EQ( TEXT("EXE COM BAT PIF") );
 Extern TCHAR        szRoamINIPath[]         EQ( TEXT("\\Microsoft\\Winfile"));
@@ -1372,7 +1368,6 @@ Extern HANDLE hfmifsDll EQ( NULL );
 
 Extern HANDLE  hAccel            EQ( NULL );
 Extern HINSTANCE  hAppInstance;
-Extern HANDLE  hModUndelete      EQ( NULL );
 
 Extern HBITMAP  hbmBitmaps         EQ( NULL );
 Extern HDC  hdcMem                 EQ( NULL );
@@ -1428,12 +1423,6 @@ Extern WCHAR wszWinfileHelp[] EQ( L"WINFILE.HLP" );
 Extern INT iNumExtensions     EQ( 0 );
 Extern EXTENSION extensions[MAX_EXTENSIONS];
 
-Extern DWORD (APIENTRY *lpfpUndelete)(HWND, LPTSTR) EQ( NULL );
-
-#ifdef UNICODE
-Extern BOOL  bUndeleteUnicode EQ( FALSE );
-#endif
-
 Extern HHOOK hhkMsgFilter     EQ( NULL );
 
 Extern DWORD dwContext       EQ( 0 );
