29 Nov
2019
29 Nov
'19
5:40 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c272a9017955f3bd4ac3…
commit 2c272a9017955f3bd4ac3466aeab449acdcf36c7
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Nov 29 14:40:04 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Nov 29 14:40:04 2019 +0900
[SHELL32] Add desktop.ini more to some folders (#2101)
Provides special icons for special folders by adding desktop.ini. CORE-10045
---
dll/win32/shell32/CSendToMenu.cpp | 2 +-
dll/win32/shell32/lang/bg-BG.rc | 1 +
dll/win32/shell32/lang/ca-ES.rc | 3 ++-
dll/win32/shell32/lang/cs-CZ.rc | 3 ++-
dll/win32/shell32/lang/da-DK.rc | 1 +
dll/win32/shell32/lang/de-DE.rc | 1 +
dll/win32/shell32/lang/el-GR.rc | 3 ++-
dll/win32/shell32/lang/en-GB.rc | 3 ++-
dll/win32/shell32/lang/en-US.rc | 3 ++-
dll/win32/shell32/lang/es-ES.rc | 1 +
dll/win32/shell32/lang/et-EE.rc | 3 ++-
dll/win32/shell32/lang/fi-FI.rc | 1 +
dll/win32/shell32/lang/fr-FR.rc | 1 +
dll/win32/shell32/lang/he-IL.rc | 1 +
dll/win32/shell32/lang/hi-IN.rc | 1 +
dll/win32/shell32/lang/hu-HU.rc | 3 ++-
dll/win32/shell32/lang/id-ID.rc | 1 +
dll/win32/shell32/lang/it-IT.rc | 1 +
dll/win32/shell32/lang/ja-JP.rc | 3 ++-
dll/win32/shell32/lang/ko-KR.rc | 3 ++-
dll/win32/shell32/lang/nl-NL.rc | 3 ++-
dll/win32/shell32/lang/no-NO.rc | 1 +
dll/win32/shell32/lang/pl-PL.rc | 1 +
dll/win32/shell32/lang/pt-BR.rc | 1 +
dll/win32/shell32/lang/pt-PT.rc | 1 +
dll/win32/shell32/lang/ro-RO.rc | 1 +
dll/win32/shell32/lang/ru-RU.rc | 1 +
dll/win32/shell32/lang/sk-SK.rc | 1 +
dll/win32/shell32/lang/sl-SI.rc | 3 ++-
dll/win32/shell32/lang/sq-AL.rc | 1 +
dll/win32/shell32/lang/sv-SE.rc | 3 ++-
dll/win32/shell32/lang/tr-TR.rc | 1 +
dll/win32/shell32/lang/uk-UA.rc | 1 +
dll/win32/shell32/lang/zh-CN.rc | 3 ++-
dll/win32/shell32/lang/zh-TW.rc | 3 ++-
dll/win32/shell32/shresdef.h | 1 +
dll/win32/shell32/wine/shellpath.c | 35 +++++++++++++++++++++--------------
37 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp
index 6c67707534e..9e9fbe8afeb 100644
--- a/dll/win32/shell32/CSendToMenu.cpp
+++ b/dll/win32/shell32/CSendToMenu.cpp
@@ -303,7 +303,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu,
UINT cItems = InsertSendToItems(hSubMenu, idCmdFirst, 0);
- CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO));
+ CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO_MENU));
MENUITEMINFOW mii = { sizeof(mii) };
mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU;
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 9a9d63989bc..f04caa795dc 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -772,6 +772,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index f442d13a2a4..0a844310342 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index e593800de32..4a22af175e6 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -777,6 +777,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit"
IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit"
@@ -823,7 +824,7 @@ BEGIN
IDS_FAVORITES "Oblíbené"
IDS_STARTUP "Nabídka Start\\Programy\\Po spuštění"
IDS_RECENT "Poslední dokumenty"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Nabídka Start"
IDS_MYMUSIC "Hudba"
IDS_MYVIDEO "Filmy"
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index d9605986d8c..22fc8626ab9 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -777,6 +777,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index 0351e32a5c3..624d2d8ce88 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -772,6 +772,7 @@ BEGIN
IDS_DISCONNECT "Trennen"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden
'%1'"
IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden."
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 497dafe7ab5..4ace3aa836e 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index b7c7f4517bc..767c0bb8ce8 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index c13b373e50c..3abbaa21a45 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index dac44bafc0a..45eeb3fba71 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -779,6 +779,7 @@ BEGIN
IDS_DISCONNECT "Desconectar"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'"
IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta"
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 1e376de4dcb..644a1bc77ff 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -778,6 +778,7 @@ BEGIN
IDS_DISCONNECT "Katkesta ühendus"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'"
IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua"
@@ -824,7 +825,7 @@ BEGIN
IDS_FAVORITES "Lemmikud"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Hiljutised"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menüü"
IDS_MYMUSIC "Minu muusika"
IDS_MYVIDEO "Minu videod"
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 854d836a4e2..3f37a24fcb8 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 0d32521b8c0..d8856c9bbb8 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Déconnecter"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'"
IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier"
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index 603132672c2..3b4f96d8213 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "נתק"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 8f359fb58d0..4051fa022d8 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "डिस्कनेक्ट"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ"
IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ"
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 34857dfb04a..3d0cd95cea6 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Kedvencek"
IDS_STARTUP "Start Menu\\Programs\\Automatikus indítás" /* MS style:
Indítópult */
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "Zenék"
IDS_MYVIDEO "Videók"
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 5aeb4d1ae99..659f15172c4 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Putuskan"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'"
IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder"
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index da8b5cbb46e..a8d1a685984 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 1c6ceba915f..dd114ce8cd2 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -768,6 +768,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません"
IDS_CREATEFOLDER_CAPTION "フォルダを作成できません"
@@ -814,7 +815,7 @@ BEGIN
IDS_FAVORITES "お気に入り"
IDS_STARTUP "スタート メニュー\\プログラム\\スタートアップ"
IDS_RECENT "最近使ったドキュメント"
- IDS_SENDTO "送る(&N)"
+ IDS_SENDTO "送る"
IDS_STARTMENU "スタート メニュー"
IDS_MYMUSIC "マイ ミュージック"
IDS_MYVIDEO "マイ ビデオ"
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index e22bff38c38..44e14519876 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index fc734cac927..556f77549e7 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 2b8662a8db1..ef7139eb566 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 46ec68d8480..c74d513f98a 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -776,6 +776,7 @@ BEGIN
IDS_DISCONNECT "Odłącz"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'"
IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu"
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index 26eaad64d1a..ac3d16a51a9 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 7e9d91f3ede..fb8fd3f93f9 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Desligar"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'"
IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta"
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 655ed748ee5..7b6691343fa 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "Deconectea&ză"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”"
IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar"
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 19e432ddef6..d0a826765b4 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -778,6 +778,7 @@ BEGIN
IDS_DISCONNECT "Отсоединить"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'"
IDS_CREATEFOLDER_CAPTION "Невозможно создать папку"
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 26723a857e4..3b6425e9f50 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index e4fba05e92a..7156fc59143 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index e1cef58e5cb..25e327389f7 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -775,6 +775,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index ae0836d3bd4..a8a041b0612 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'"
IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp"
@@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favoriter"
IDS_STARTUP "Start-meny\\Program\\Autostart"
IDS_RECENT "Tidigare"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "Start-meny"
IDS_MYMUSIC "Min musik"
IDS_MYVIDEO "Mina videoklipp"
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 946d1784f93..137f26b50c6 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED """%1"" dizini
oluşturulamıyor."
IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor"
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index d8c5fd58361..3a36763d514 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Відключити"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'"
IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку"
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 8f08b218125..23253b17f70 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -779,6 +779,7 @@ BEGIN
IDS_DISCONNECT "断开"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'"
IDS_CREATEFOLDER_CAPTION "无法创建文件夹"
@@ -827,7 +828,7 @@ BEGIN
IDS_FAVORITES "收藏夹"
IDS_STARTUP "「开始」菜单\\程序\\启动"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "「开始」菜单"
IDS_MYMUSIC "我的音乐"
IDS_MYVIDEO "我的视频"
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index ce149f33525..e5388754625 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -780,6 +780,7 @@ BEGIN
IDS_DISCONNECT "中斷"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
+ IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "無法建立資料夾 '%1'"
IDS_CREATEFOLDER_CAPTION "無法建立資料夾"
@@ -828,7 +829,7 @@ BEGIN
IDS_FAVORITES "我的最愛"
IDS_STARTUP "「開始」功能表\\程式\\啟動"
IDS_RECENT "Recent"
- IDS_SENDTO "Se&nd To"
+ IDS_SENDTO "SendTo"
IDS_STARTMENU "「開始」功能表"
IDS_MYMUSIC "我的音樂"
IDS_MYVIDEO "我的影片"
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index d80365f94a2..875401a23f4 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -230,6 +230,7 @@
#define IDS_OPENFILELOCATION 341
#define IDS_DESKLINK 342
+#define IDS_SENDTO_MENU 343
#define IDS_MENU_EMPTY 34561
diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c
index 1fe931f50e7..6974a4d9628 100644
--- a/dll/win32/shell32/wine/shellpath.c
+++ b/dll/win32/shell32/wine/shellpath.c
@@ -974,7 +974,8 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_ProgramFilesCommonX86,
CSIDL_Type_CurrVer,
CommonFilesDirX86W,
- Program_Files_x86_Common_FilesW
+ Program_Files_x86_Common_FilesW,
+ -IDI_SHELL_PROGRAMS_FOLDER
},
{ /* 0x2d - CSIDL_COMMON_TEMPLATES */
&FOLDERID_CommonTemplates,
@@ -2366,8 +2367,15 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath));
+end:
+ if ((nFolder & CSIDL_FLAG_CREATE) && folder == CSIDL_SENDTO)
+ {
+ DoCreateSendToFiles(szBuildPath);
+ }
+
/* create desktop.ini for custom icon */
- if (CSIDL_Data[folder].nShell32IconIndex)
+ if ((nFolder & CSIDL_FLAG_CREATE) &&
+ CSIDL_Data[folder].nShell32IconIndex)
{
static const WCHAR s_szFormat[] =
L"%%SystemRoot%%\\system32\\shell32.dll,%d";
WCHAR szIconLocation[MAX_PATH];
@@ -2397,12 +2405,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
SetFileAttributesW(szBuildPath, dwAttributes);
}
-end:
- if (folder == CSIDL_SENDTO)
- {
- if (PathIsDirectoryEmptyW(szBuildPath))
- DoCreateSendToFiles(szBuildPath);
- }
TRACE("returning 0x%08x (final path is %s)\n", hr,
debugstr_w(szBuildPath));
return hr;
}
@@ -2479,16 +2481,21 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
szValueName = &buffer[0];
}
- if (RegQueryValueExW(hUserKey, szValueName, NULL,
- &dwType, (LPBYTE)path, &dwPathLen) || (dwType != REG_SZ &&
- dwType != REG_EXPAND_SZ))
+ if (!RegQueryValueExW(hUserKey, szValueName, NULL,
+ &dwType, (LPBYTE)path, &dwPathLen) &&
+ (dwType == REG_SZ || dwType == REG_EXPAND_SZ))
+ {
+ hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE,
+ hToken, SHGFP_TYPE_CURRENT, path);
+ }
+ else
{
*path = '\0';
if (CSIDL_Data[folders[i]].type == CSIDL_Type_User)
- _SHGetUserProfilePath(hToken, SHGFP_TYPE_DEFAULT, folders[i],
+ _SHGetUserProfilePath(hToken, SHGFP_TYPE_CURRENT, folders[i],
path);
else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers)
- _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path);
+ _SHGetAllUsersProfilePath(SHGFP_TYPE_CURRENT, folders[i], path);
else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath)
{
GetWindowsDirectoryW(path, MAX_PATH);
@@ -2510,7 +2517,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
else
{
hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE,
- hToken, SHGFP_TYPE_DEFAULT, path);
+ hToken, SHGFP_TYPE_CURRENT, path);
ret = RegSetValueExW(hKey, szValueName, 0, REG_SZ,
(LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR));
if (ret)