From 42554e609862aa7c2ac7b5c38c07f73b5b95144f Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 7 Feb 2015 14:42:39 +0000 Subject: [PATCH] [SHELL32] - Get rid of IDD_FILE_COPY dialog. It was never used, never completed and windows don't really have such a dialog. - Remove SHShowFileOperationDialog which was never completed. This will be replaced shortly with a working solution by Huw Davies svn path=/trunk/; revision=66190 --- reactos/dll/win32/shell32/lang/bg-BG.rc | 10 -- reactos/dll/win32/shell32/lang/ca-ES.rc | 10 -- reactos/dll/win32/shell32/lang/cs-CZ.rc | 10 -- reactos/dll/win32/shell32/lang/da-DK.rc | 10 -- reactos/dll/win32/shell32/lang/de-DE.rc | 10 -- reactos/dll/win32/shell32/lang/el-GR.rc | 10 -- reactos/dll/win32/shell32/lang/en-GB.rc | 10 -- reactos/dll/win32/shell32/lang/en-US.rc | 10 -- reactos/dll/win32/shell32/lang/es-ES.rc | 10 -- reactos/dll/win32/shell32/lang/fi-FI.rc | 10 -- reactos/dll/win32/shell32/lang/fr-FR.rc | 10 -- reactos/dll/win32/shell32/lang/he-IL.rc | 10 -- reactos/dll/win32/shell32/lang/hu-HU.rc | 10 -- reactos/dll/win32/shell32/lang/it-IT.rc | 10 -- reactos/dll/win32/shell32/lang/ja-JP.rc | 10 -- reactos/dll/win32/shell32/lang/ko-KR.rc | 10 -- reactos/dll/win32/shell32/lang/nl-NL.rc | 10 -- reactos/dll/win32/shell32/lang/no-NO.rc | 10 -- reactos/dll/win32/shell32/lang/pl-PL.rc | 10 -- reactos/dll/win32/shell32/lang/pt-BR.rc | 10 -- reactos/dll/win32/shell32/lang/pt-PT.rc | 10 -- reactos/dll/win32/shell32/lang/ro-RO.rc | 10 -- reactos/dll/win32/shell32/lang/ru-RU.rc | 10 -- reactos/dll/win32/shell32/lang/sk-SK.rc | 10 -- reactos/dll/win32/shell32/lang/sl-SI.rc | 10 -- reactos/dll/win32/shell32/lang/sq-AL.rc | 10 -- reactos/dll/win32/shell32/lang/sv-SE.rc | 10 -- reactos/dll/win32/shell32/lang/tr-TR.rc | 10 -- reactos/dll/win32/shell32/lang/uk-UA.rc | 10 -- reactos/dll/win32/shell32/lang/zh-CN.rc | 10 -- reactos/dll/win32/shell32/lang/zh-TW.rc | 10 -- reactos/dll/win32/shell32/shlfileop.cpp | 160 ------------------------ reactos/dll/win32/shell32/shresdef.h | 1 - 33 files changed, 471 deletions(-) diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc index 6acee8d398d..4d0cf76ad0b 100644 --- a/reactos/dll/win32/shell32/lang/bg-BG.rc +++ b/reactos/dll/win32/shell32/lang/bg-BG.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Общи" diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc index 0cd302227ac..a78df2fd7b4 100644 --- a/reactos/dll/win32/shell32/lang/ca-ES.rc +++ b/reactos/dll/win32/shell32/lang/ca-ES.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc index 196b5b579cd..b098139f748 100644 --- a/reactos/dll/win32/shell32/lang/cs-CZ.rc +++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc @@ -401,16 +401,6 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopírování..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Storno", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Soubor", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Obecné" diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc index 56a8031085d..c6a4168b25b 100644 --- a/reactos/dll/win32/shell32/lang/da-DK.rc +++ b/reactos/dll/win32/shell32/lang/da-DK.rc @@ -401,16 +401,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc index aa61915e4ab..78cdc64f569 100644 --- a/reactos/dll/win32/shell32/lang/de-DE.rc +++ b/reactos/dll/win32/shell32/lang/de-DE.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopiere..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Abbrechen", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Allgemein" diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc index 3f8220f5dc8..540592170bd 100644 --- a/reactos/dll/win32/shell32/lang/el-GR.rc +++ b/reactos/dll/win32/shell32/lang/el-GR.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc index 32a5b763f8e..90cdde7666b 100644 --- a/reactos/dll/win32/shell32/lang/en-GB.rc +++ b/reactos/dll/win32/shell32/lang/en-GB.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc index bf1d4a646f1..b86122f2691 100644 --- a/reactos/dll/win32/shell32/lang/en-US.rc +++ b/reactos/dll/win32/shell32/lang/en-US.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc index 298a8ccf003..608ff6c9679 100644 --- a/reactos/dll/win32/shell32/lang/es-ES.rc +++ b/reactos/dll/win32/shell32/lang/es-ES.rc @@ -396,16 +396,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 226, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiando..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancelar", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Archivo", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc index eb643e1ab19..4006862370b 100644 --- a/reactos/dll/win32/shell32/lang/fi-FI.rc +++ b/reactos/dll/win32/shell32/lang/fi-FI.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc index 234b56fb50b..8763011b509 100644 --- a/reactos/dll/win32/shell32/lang/fr-FR.rc +++ b/reactos/dll/win32/shell32/lang/fr-FR.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "En cours de copie..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Annuler", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Fichier", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Général" diff --git a/reactos/dll/win32/shell32/lang/he-IL.rc b/reactos/dll/win32/shell32/lang/he-IL.rc index 917795d3118..c94475ccd09 100644 --- a/reactos/dll/win32/shell32/lang/he-IL.rc +++ b/reactos/dll/win32/shell32/lang/he-IL.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "מעתיק..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "ביטול", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "קובץ", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "כללי" diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc index d7d18af4216..09a5a419a04 100644 --- a/reactos/dll/win32/shell32/lang/hu-HU.rc +++ b/reactos/dll/win32/shell32/lang/hu-HU.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc index 9150d2ff191..4c24f915deb 100644 --- a/reactos/dll/win32/shell32/lang/it-IT.rc +++ b/reactos/dll/win32/shell32/lang/it-IT.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copia in corso..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Annulla", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generale" diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc index c625fd32bc2..5062b02e7c0 100644 --- a/reactos/dll/win32/shell32/lang/ja-JP.rc +++ b/reactos/dll/win32/shell32/lang/ja-JP.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "全般" diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc index e937bb4a103..297c8ad597c 100644 --- a/reactos/dll/win32/shell32/lang/ko-KR.rc +++ b/reactos/dll/win32/shell32/lang/ko-KR.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc index a5a6d8a3050..97ce67ac6c7 100644 --- a/reactos/dll/win32/shell32/lang/nl-NL.rc +++ b/reactos/dll/win32/shell32/lang/nl-NL.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc index c58a911ae4f..d71b9f19f4d 100644 --- a/reactos/dll/win32/shell32/lang/no-NO.rc +++ b/reactos/dll/win32/shell32/lang/no-NO.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generielt" diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc index d3f906e595a..49b6c1476ea 100644 --- a/reactos/dll/win32/shell32/lang/pl-PL.rc +++ b/reactos/dll/win32/shell32/lang/pl-PL.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Ogólne" diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc index 8829f85606b..5df64e30e6e 100644 --- a/reactos/dll/win32/shell32/lang/pt-BR.rc +++ b/reactos/dll/win32/shell32/lang/pt-BR.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiando..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancelar", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Arquivo", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Geral" diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc index b73f6ab0da7..32e3bd29162 100644 --- a/reactos/dll/win32/shell32/lang/pt-PT.rc +++ b/reactos/dll/win32/shell32/lang/pt-PT.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Geral" diff --git a/reactos/dll/win32/shell32/lang/ro-RO.rc b/reactos/dll/win32/shell32/lang/ro-RO.rc index f3570d9abf9..3e3bce105a6 100644 --- a/reactos/dll/win32/shell32/lang/ro-RO.rc +++ b/reactos/dll/win32/shell32/lang/ro-RO.rc @@ -397,16 +397,6 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiere…" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "A&nulează", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Fișier", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generale" diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc index 394b2156760..50fa7a5d8ca 100644 --- a/reactos/dll/win32/shell32/lang/ru-RU.rc +++ b/reactos/dll/win32/shell32/lang/ru-RU.rc @@ -397,16 +397,6 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Копирование..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Отмена", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Файл", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Общие" diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index 3c73f39dbac..5d428ca8520 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc index 086f6a637e9..80c1ecab891 100644 --- a/reactos/dll/win32/shell32/lang/sl-SI.rc +++ b/reactos/dll/win32/shell32/lang/sl-SI.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/sq-AL.rc b/reactos/dll/win32/shell32/lang/sq-AL.rc index 820946463d5..ff43321669e 100644 --- a/reactos/dll/win32/shell32/lang/sq-AL.rc +++ b/reactos/dll/win32/shell32/lang/sq-AL.rc @@ -399,16 +399,6 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopjim..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Anulo", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Dokument", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Përgjithshëm" diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc index 3af1da06099..f98f0ade976 100644 --- a/reactos/dll/win32/shell32/lang/sv-SE.rc +++ b/reactos/dll/win32/shell32/lang/sv-SE.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc index 0de974424e3..6e235f66523 100644 --- a/reactos/dll/win32/shell32/lang/tr-TR.rc +++ b/reactos/dll/win32/shell32/lang/tr-TR.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopyalanıyor..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "İptal", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Dosya", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Genel" diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc index d6b4e4ab747..f6555e545bc 100644 --- a/reactos/dll/win32/shell32/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32/lang/uk-UA.rc @@ -395,16 +395,6 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Копіювання..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Скасувати", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Файл", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Загальні" diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc index 4391795d9fb..fd8d4d82462 100644 --- a/reactos/dll/win32/shell32/lang/zh-CN.rc +++ b/reactos/dll/win32/shell32/lang/zh-CN.rc @@ -404,16 +404,6 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc index e14799f88aa..a6d45aaeabe 100644 --- a/reactos/dll/win32/shell32/lang/zh-TW.rc +++ b/reactos/dll/win32/shell32/lang/zh-TW.rc @@ -403,16 +403,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" diff --git a/reactos/dll/win32/shell32/shlfileop.cpp b/reactos/dll/win32/shell32/shlfileop.cpp index 49b47f0011b..60290640af6 100644 --- a/reactos/dll/win32/shell32/shlfileop.cpp +++ b/reactos/dll/win32/shell32/shlfileop.cpp @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define IsDotDir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))) #define FO_MASK 0xF -#define WM_FILE (WM_USER + 1) -#define TIMER_ID (100) static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; @@ -564,164 +562,6 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir) return GetLastError(); } -static DWORD WINAPI SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) -{ - FILE_OPERATION_CONTEXT * Context; - LARGE_INTEGER Progress; - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lpData; - - if (TotalBytesTransferred.QuadPart) - { - Progress.QuadPart = (TotalBytesTransferred.QuadPart * 100) / TotalFileSize.QuadPart; - } - else - { - Progress.QuadPart = 1; - } - - /* update progress bar */ - SendMessageW(Context->hDlgCtrl, PBM_SETPOS, (WPARAM)Progress.u.LowPart, 0); - - if (TotalBytesTransferred.QuadPart == TotalFileSize.QuadPart) - { - /* file was copied */ - Context->Index++; - PostMessageW(Context->hwndDlg, WM_FILE, 0, 0); - } - - return PROGRESS_CONTINUE; -} - -BOOL -QueueFile( - FILE_OPERATION_CONTEXT * Context) -{ - FILE_ENTRY * from, *to = NULL; - BOOL bRet = FALSE; - - if (Context->Index >= Context->from->dwNumFiles) - return FALSE; - - /* get current file */ - from = &Context->from->feFiles[Context->Index]; - - if (Context->op->req->wFunc != FO_DELETE) - to = &Context->to->feFiles[Context->Index]; - - /* update status */ - SetDlgItemTextW(Context->hwndDlg, 14001, from->szFullPath); - - if (Context->op->req->wFunc == FO_COPY) - { - bRet = CopyFileExW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, &Context->op->bCancelled, 0); - } - else if (Context->op->req->wFunc == FO_MOVE) - { - //bRet = MoveFileWithProgressW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, MOVEFILE_COPY_ALLOWED); - } - else if (Context->op->req->wFunc == FO_DELETE) - { - bRet = DeleteFile(from->szFullPath); - } - - return bRet; -} - -static INT_PTR CALLBACK SHOperationDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - FILE_OPERATION_CONTEXT * Context; - - Context = (FILE_OPERATION_CONTEXT*) GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch(uMsg) - { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lParam; - - /* store progress bar handle */ - Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); - - /* store window handle */ - Context->hwndDlg = hwndDlg; - - /* set progress bar range */ - (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - - /* start file queueing */ - SetTimer(hwndDlg, TIMER_ID, 1000, NULL); - //QueueFile(Context); - - return TRUE; - - case WM_CLOSE: - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == 14002) - { - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - }; break; - - case WM_TIMER: - if (wParam == TIMER_ID) - { - QueueFile(Context); - KillTimer(hwndDlg, TIMER_ID); - }; break; - - case WM_FILE: - if (!QueueFile(Context)) - EndDialog(hwndDlg, Context->op->bCancelled); - default: - break; - } - return FALSE; -} - -HRESULT -SHShowFileOperationDialog(FILE_OPERATION *op, FILE_LIST *flFrom, FILE_LIST *flTo) -{ - HWND hwnd; - BOOL bRet; - MSG msg; - FILE_OPERATION_CONTEXT Context; - - Context.from = flFrom; - Context.to = flTo; - Context.op = op; - Context.Index = 0; - Context.op->bCancelled = FALSE; - - hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(IDD_FILE_COPY), NULL, SHOperationDialog, (LPARAM)&Context); - if (hwnd == NULL) - { - ERR("Failed to create dialog\n"); - return E_FAIL; - } - ShowWindow(hwnd, SW_SHOWNORMAL); - - while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0) - { - if (!IsWindow(hwnd) || !IsDialogMessage(hwnd, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - return NOERROR; -} - - /************************************************************************ * SHNotifyCopyFile [internal] * diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index 04ce9b49d96..f7df2ae67e7 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -291,7 +291,6 @@ #define IDD_NOOPEN 27 /* Not used dialogs */ -#define IDD_FILE_COPY 28 #define IDD_SHUTDOWN 29 #define IDD_LOG_OFF 30 #define IDD_DISCONNECT 31 -- 2.17.1