https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77b8505393069f6a11a1524705d8838e06ace89a
commit 77b8505393069f6a11a1524705d8838e06ace89a Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Fri May 1 15:58:58 2020 +0900 Commit: GitHub <[email protected]> CommitDate: Fri May 1 15:58:58 2020 +0900 [SHELL32] Delete IDM_RECENTMENUHEAD resource menu (#2705) Follow-up of #2648. Reduce translation cost and resource data. CORE-3588, CORE-11483 --- dll/win32/shell32/lang/bg-BG.rc | 10 ----- dll/win32/shell32/lang/ca-ES.rc | 10 ----- dll/win32/shell32/lang/cs-CZ.rc | 10 ----- dll/win32/shell32/lang/da-DK.rc | 10 ----- dll/win32/shell32/lang/de-DE.rc | 10 ----- dll/win32/shell32/lang/el-GR.rc | 10 ----- dll/win32/shell32/lang/en-GB.rc | 10 ----- dll/win32/shell32/lang/en-US.rc | 10 ----- dll/win32/shell32/lang/es-ES.rc | 10 ----- dll/win32/shell32/lang/et-EE.rc | 10 ----- dll/win32/shell32/lang/fi-FI.rc | 10 ----- dll/win32/shell32/lang/fr-FR.rc | 10 ----- dll/win32/shell32/lang/he-IL.rc | 10 ----- dll/win32/shell32/lang/hi-IN.rc | 10 ----- dll/win32/shell32/lang/hu-HU.rc | 10 ----- dll/win32/shell32/lang/id-ID.rc | 10 ----- dll/win32/shell32/lang/it-IT.rc | 10 ----- dll/win32/shell32/lang/ja-JP.rc | 10 ----- dll/win32/shell32/lang/ko-KR.rc | 10 ----- dll/win32/shell32/lang/nl-NL.rc | 10 ----- dll/win32/shell32/lang/no-NO.rc | 10 ----- dll/win32/shell32/lang/pl-PL.rc | 10 ----- dll/win32/shell32/lang/pt-BR.rc | 10 ----- dll/win32/shell32/lang/pt-PT.rc | 10 ----- dll/win32/shell32/lang/ro-RO.rc | 10 ----- dll/win32/shell32/lang/ru-RU.rc | 10 ----- dll/win32/shell32/lang/sk-SK.rc | 10 ----- dll/win32/shell32/lang/sl-SI.rc | 10 ----- dll/win32/shell32/lang/sq-AL.rc | 10 ----- dll/win32/shell32/lang/sv-SE.rc | 10 ----- dll/win32/shell32/lang/tr-TR.rc | 10 ----- dll/win32/shell32/lang/uk-UA.rc | 10 ----- dll/win32/shell32/lang/zh-CN.rc | 10 ----- dll/win32/shell32/lang/zh-TW.rc | 10 ----- dll/win32/shell32/shellmenu/CStartMenu.cpp | 68 +++++++++++------------------- dll/win32/shell32/shresdef.h | 1 - 36 files changed, 25 insertions(+), 384 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index be31a2a5fa8..60dfdef12b6 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -89,16 +89,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Търсене на папка" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 4ff2d225cb5..eaa4ef533fa 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 3a376f7cee2..eb22e09d24d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procházet..." diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 090a4fc746e..44024aa74a9 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Søg efter Mappe" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1161df3b3cf..83e925a1c97 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Verzeichnis auswählen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 363fac9c214..c1aa53d59bd 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Αναζήτηση φακέλου" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 6ba9876c71f..4d22e4619a0 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index b2916a320cd..59e73d761b3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index b3901213946..480f3485d0b 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -97,16 +97,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Explorar carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index ac80fae969d..6216de12c16 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -95,16 +95,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Vali kaust" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 43581eadaa6..06a1f29be93 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Valitse Kansio" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 73c689127cc..a6278672fa2 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Parcourir" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index bfcefecc97f..0efa91a6fd9 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "בחירת תיקיה" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 83f6132d795..091a130073a 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "फोल्डर खोंजे" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 0b0d475dac0..0af2780e621 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Mappák böngészése" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 8cb23ff593a..98263fe8e29 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Jelajah Folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a2eca5662f2..2434c653566 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Sfoglia Cartella" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 443bb981d88..fbbaab06efb 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "フォルダの参照" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf28de47ffa..443dc3a49a7 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index f663fc09504..aec45c77f48 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 75763afc44c..1fa6e372702 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bla etter mappe" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 42e6da56d2d..86e87f196ad 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Moje dokumenty", IDM_MYDOCUMENTS - MENUITEM "Moje obrazy", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz folder" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 92e5083e343..8cee41dbe22 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pasta" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b435f9e3933..bc225294c1a 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pastas" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index e6acbd58c2b..42c613287fd 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Specificare dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 27e5ef0c1ec..de203d29dc8 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -95,16 +95,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Обзор" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index bd7365ad04f..a84187e4eb3 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 400bb4a583b..55ba4f299c6 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index c4ad1c21d2e..8bccc16665a 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -92,16 +92,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Shfleto për Dosje" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index b76b26c1683..51bac8cb790 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bläddra efter mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 1891bbed366..5980461b725 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dizin İçin Göz At" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 8a6679163c8..94405fdcd52 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Огляд папок" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index e465aa01a66..d280cb26a3f 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -98,16 +98,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "浏览文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index e8446a8fb3a..292a780ebda 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -97,16 +97,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "瀏覽資料夾" diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index 105be22c5dc..8831ab860b5 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -69,7 +69,6 @@ private: CComPtr<IShellFolder> m_psfPrograms; LPITEMIDLIST m_pidlPrograms; - HMENU m_hRecentMenu; HRESULT OnInitMenu() { @@ -95,12 +94,6 @@ private: if (FAILED_UNEXPECTEDLY(hr)) return hr; - m_hRecentMenu = ::LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(IDM_RECENTMENUHEAD)); - if (m_hRecentMenu == NULL) - { - ERR("m_hRecentMenu == NULL\n"); - } - return hr; } @@ -157,51 +150,38 @@ private: return S_OK; } - HMENU CreateRecentMenu(BOOL bExpandMyDocuments, BOOL bExpandMyPictures) const + void InsertRecentItem(HMENU hMenu, UINT nID, INT csidl, BOOL bExpand) const { - HMENU hMenu = ::CreateMenu(); - if (hMenu == NULL) + WCHAR szPath[MAX_PATH]; + if (!SHGetSpecialFolderPathW(NULL, szPath, csidl, FALSE)) { - ERR("HMenu == NULL\n"); - return NULL; + ERR("SHGetSpecialFolderPathW failed\n"); + return; } - HMENU hSubMenu = ::GetSubMenu(m_hRecentMenu, 0); - if (hSubMenu == NULL) + LPWSTR pszText = PathFindFileNameW(szPath); + if (bExpand) { - ERR("hSubMenu == NULL\n"); - return NULL; + MENUITEMINFOW mii = { sizeof(mii), MIIM_TYPE | MIIM_ID | MIIM_SUBMENU }; + mii.fType = MFT_STRING; + mii.wID = nID; + mii.hSubMenu = ::CreatePopupMenu(); + mii.dwTypeData = pszText; + mii.cch = lstrlenW(pszText); + InsertMenuItemW(hMenu, GetMenuItemCount(hMenu), TRUE, &mii); } - - WCHAR szText[128]; - UINT i, nCount = GetMenuItemCount(hSubMenu); - for (i = 0; i < nCount; ++i) + else { - UINT nID = GetMenuItemID(hSubMenu, i); - if (GetMenuString(hSubMenu, i, szText, _countof(szText), MF_BYPOSITION)) - { - if ((nID == IDM_MYDOCUMENTS && bExpandMyDocuments) || - (nID == IDM_MYPICTURES && bExpandMyPictures)) - { - MENUITEMINFOW mii = { sizeof(mii), MIIM_TYPE | MIIM_ID | MIIM_SUBMENU }; - mii.fType = MFT_STRING; - mii.wID = nID; - mii.hSubMenu = ::CreatePopupMenu(); - mii.dwTypeData = szText; - mii.cch = lstrlenW(szText); - InsertMenuItemW(hMenu, i, TRUE, &mii); - } - else - { - AppendMenuW(hMenu, MF_STRING | MF_ENABLED, nID, szText); - } - } - else - { - AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); - } + AppendMenuW(hMenu, MF_STRING | MF_ENABLED, nID, pszText); } + } + HMENU CreateRecentMenu(BOOL bExpandMyDocuments, BOOL bExpandMyPictures) const + { + HMENU hMenu = ::CreateMenu(); + InsertRecentItem(hMenu, IDM_MYDOCUMENTS, CSIDL_MYDOCUMENTS, bExpandMyDocuments); + InsertRecentItem(hMenu, IDM_MYPICTURES, CSIDL_MYPICTURES, bExpandMyPictures); + AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); return hMenu; } @@ -244,6 +224,8 @@ private: BOOL bExpandMyDocuments = FALSE; /* FIXME: Get value from registry */ BOOL bExpandMyPictures = FALSE; /* FIXME: Get value from registry */ HMENU hMenu = CreateRecentMenu(bExpandMyDocuments, bExpandMyPictures); + if (hMenu == NULL) + ERR("CreateRecentMenu failed\n"); hr = pShellMenu->SetMenu(hMenu, NULL, SMSET_BOTTOM); if (FAILED_UNEXPECTEDLY(hr)) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index f9efb726a3c..21c498e9ed7 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -794,7 +794,6 @@ #define IDM_COPYHERE 0x7 #define IDM_MOVEHERE 0x8 #define IDM_LINKHERE 0xB -#define IDM_RECENTMENUHEAD 401 #define IDM_MYDOCUMENTS 516 #define IDM_MYPICTURES 518
