[ros-diffs] [janderwald] 30547: - implement setting values WantsFORDisplay && HideAsDeletePerUser (not yet used) - register control panel shell folder - fix a memory leak
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Sun Nov 18 15:17:39 CET 2007
Author: janderwald
Date: Sun Nov 18 17:17:39 2007
New Revision: 30547
URL: http://svn.reactos.org/svn/reactos?rev=30547&view=rev
Log:
- implement setting values WantsFORDisplay && HideAsDeletePerUser (not yet used)
- register control panel shell folder
- fix a memory leak
Modified:
trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
trunk/reactos/dll/win32/shell32/lang/da-DK.rc
trunk/reactos/dll/win32/shell32/lang/de-DE.rc
trunk/reactos/dll/win32/shell32/lang/en-US.rc
trunk/reactos/dll/win32/shell32/lang/eo-EO.rc
trunk/reactos/dll/win32/shell32/lang/es-ES.rc
trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
trunk/reactos/dll/win32/shell32/lang/it-IT.rc
trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
trunk/reactos/dll/win32/shell32/lang/ko-KO.rc
trunk/reactos/dll/win32/shell32/lang/nb-NO.rc
trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
trunk/reactos/dll/win32/shell32/lang/wa-WA.rc
trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
trunk/reactos/dll/win32/shell32/regsvr.c
trunk/reactos/dll/win32/shell32/shfldr_desktop.c
trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-BG.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Ðàáîòíà ïëîù"
IDS_MYCOMPUTER "Ìîÿò êîìïþòúð"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Ãîëåìè çíà÷åòà"
Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-ES.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Plocha"
IDS_MYCOMPUTER "Tento poèítaè"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Vedle sebe"
Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-DK.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-DE.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Nov 18 17:17:39 2007
@@ -359,6 +359,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "Arbeitsplatz"
IDS_RECYCLEBIN_FOLDER_NAME "Papierkorb"
+ IDS_CONTROLPANEL "Systemsteuerung"
/* context menus */
IDS_VIEW_LARGE "&Große Symbole"
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-US.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-EO.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-ES.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Escritorio"
IDS_MYCOMPUTER "Mi PC"
IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Iconos &grandes"
Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-FI.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Työpöytä"
IDS_MYCOMPUTER "Oma Tietokone"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Suuret Kuvakkeet"
Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-FR.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Nov 18 17:17:39 2007
@@ -361,6 +361,7 @@
IDS_DESKTOP "Bureau"
IDS_MYCOMPUTER "Poste de travail"
IDS_RECYCLEBIN_FOLDER_NAME "Corbeille"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Grandes icônes"
Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-HU.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sun Nov 18 17:17:39 2007
@@ -360,6 +360,7 @@
IDS_DESKTOP "Asztal"
IDS_MYCOMPUTER "Számítógép"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Nagy képek"
Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-IT.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "Risorse del Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Icone Grandi"
Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-JP.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "ƒfƒXƒNƒgƒbƒv"
IDS_MYCOMPUTER "ƒ}ƒC ƒRƒ“ƒsƒ
[ƒ^"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "‘å‚«‚¢ƒAƒCƒRƒ“(&G)"
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-KO.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-NO.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Skrivebord"
IDS_MYCOMPUTER "Min datamaskin"
IDS_RECYCLEBIN_FOLDER_NAME "Papirkurv"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Store ikoner"
Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-NL.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-PL.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Pulpit"
IDS_MYCOMPUTER "Mój komputer"
IDS_RECYCLEBIN_FOLDER_NAME "Kosz"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Du¿e Ikony"
Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-BR.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sun Nov 18 17:17:39 2007
@@ -359,6 +359,7 @@
IDS_DESKTOP "Área de trabalho"
IDS_MYCOMPUTER "Meu computador"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Ícones &grandes"
Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-PT.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sun Nov 18 17:17:39 2007
@@ -359,6 +359,7 @@
IDS_DESKTOP "Ambiente de trabalho"
IDS_MYCOMPUTER "O Meu Computador"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Ícones &grandes"
Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-RU.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Ðàáî÷èé ñòîë"
IDS_MYCOMPUTER "Ìîé êîìïüþòåð"
IDS_RECYCLEBIN_FOLDER_NAME "Êîðçèíà"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "&Áîëüøèå çíà÷êè"
Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-SK.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-SI.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-SE.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-TR.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Masaüstü"
IDS_MYCOMPUTER "Bilgisayarým"
IDS_RECYCLEBIN_FOLDER_NAME "Çöp"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Bü&yük Simgeler"
Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-UA.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Nov 18 17:17:39 2007
@@ -366,6 +366,7 @@
IDS_VIEW_DETAILS "&Ïîäðîáèö³"
IDS_SELECT "Âè&áðàòè"
IDS_OPEN "³&äêðèòè"
+ IDS_CONTROLPANEL "Control Panel"
IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: ³äìîâà ó äîñòóï³."
IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè"
Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-WA.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sun Nov 18 17:17:39 2007
@@ -357,6 +357,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-CN.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-TW.rc?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sun Nov 18 17:17:39 2007
@@ -358,6 +358,7 @@
IDS_DESKTOP "Desktop"
IDS_MYCOMPUTER "My Computer"
IDS_RECYCLEBIN_FOLDER_NAME "Trash"
+ IDS_CONTROLPANEL "Control Panel"
/* context menus */
IDS_VIEW_LARGE "Lar&ge Icons"
Modified: trunk/reactos/dll/win32/shell32/regsvr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/regsvr.c (original)
+++ trunk/reactos/dll/win32/shell32/regsvr.c Sun Nov 18 17:17:39 2007
@@ -83,6 +83,8 @@
#define SHELLFOLDER_WANTSFORPARSING 0x00000002
#define SHELLFOLDER_ATTRIBUTES 0x00000004
#define SHELLFOLDER_CALLFORATTRIBUTES 0x00000008
+#define SHELLFOLDER_WANTSFORDISPLAY 0x00000010
+#define SHELLFOLDER_HIDEASDELETEPERUSER 0x00000020
static HRESULT register_coclasses(struct regsvr_coclass const *list);
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
@@ -135,6 +137,8 @@
static WCHAR const contextmenu_keyname[] = { 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'e', 'n', 'u', 'H', 'a', 'n', 'd', 'l', 'e', 'r', 's', 0 };
static char const tmodel_valuename[] = "ThreadingModel";
static char const wfparsing_valuename[] = "WantsFORPARSING";
+static char const wfdisplay_valuename[] = "WantsFORDISPLAY";
+static char const hideasdeleteperuser_valuename[] = "HideAsDeletePerUser";
static char const attributes_valuename[] = "Attributes";
static char const cfattributes_valuename[] = "CallForAttributes";
static char const localized_valuename[] = "LocalizedString";
@@ -335,7 +339,7 @@
}
if (list->flags &
- (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES))
+ (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES|SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_HIDEASDELETEPERUSER))
{
HKEY shellfolder_key;
@@ -351,7 +355,11 @@
if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES)
res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD,
(const BYTE *)&list->dwCallForAttributes, sizeof(DWORD));
- RegCloseKey(shellfolder_key);
+ if (list->flags & SHELLFOLDER_WANTSFORDISPLAY)
+ res = RegSetValueExA(shellfolder_key, wfdisplay_valuename, 0, REG_SZ, (const BYTE *)"", 1);
+ if (list->flags & SHELLFOLDER_HIDEASDELETEPERUSER)
+ res = RegSetValueExA(shellfolder_key, hideasdeleteperuser_valuename, 0, REG_SZ, (const BYTE *)"", 1);
+ RegCloseKey(shellfolder_key);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
@@ -572,6 +580,19 @@
"shell32.dll",
"Apartment"
},
+ { &CLSID_ControlPanel,
+ "Shell Control Panel Folder",
+ IDS_CONTROLPANEL,
+ NULL,
+ "shell32.dll",
+ "Apartment",
+ SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_HIDEASDELETEPERUSER,
+ SFGAO_FOLDER|SFGAO_HASSUBFOLDER,
+ 0,
+ NULL,
+ NULL,
+ IDI_SHELL_CONTROL_PANEL1
+ },
{ &CLSID_DragDropHelper,
"Shell Drag and Drop Helper",
0,
@@ -706,6 +727,8 @@
static const WCHAR wszSlash[] = { '/', 0 };
static const WCHAR wszMyDocuments[] = { 'M','y',' ','D','o','c','u','m','e','n','t','s', 0 };
static const WCHAR wszRecycleBin[] = { 'T','r','a','s','h', 0 };
+static const WCHAR wszMyComputer[] = { 'M','y','C','o','m','p','u','t','e','r',0 };
+static const WCHAR wszControlPanel[] = { 'C','o','n','t','r','o','l',0 };
static struct regsvr_namespace const namespace_extensions_list[] = {
#if 0
@@ -724,6 +747,11 @@
&CLSID_RecycleBin,
wszDesktop,
wszRecycleBin
+ },
+ {
+ &CLSID_ControlPanel,
+ wszMyComputer,
+ wszControlPanel
},
{ NULL }
};
Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_desktop.c?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Sun Nov 18 17:17:39 2007
@@ -289,7 +289,7 @@
}
else
{
- ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid));
+ ret = AddToEnumList(list, pidl);
}
i++;
}
Modified: trunk/reactos/dll/win32/shell32/shresdef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.h?rev=30547&r1=30546&r2=30547&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shresdef.h (original)
+++ trunk/reactos/dll/win32/shell32/shresdef.h Sun Nov 18 17:17:39 2007
@@ -106,6 +106,8 @@
#define IDS_SHELL_ABOUT_AUTHORS 144
#define IDS_SHELL_ABOUT_BACK 145
#define FCIDM_SHVIEW_NEW 146
+#define FCIDM_SHVIEW_VIEW 147
+#define IDS_CONTROLPANEL 148
/* Note: this string is referenced from the registry */
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
@@ -172,7 +174,7 @@
#define IDI_SHELL_TRASH_FILE 142
#define IDI_SHELL_CONFIRM_DELETE 161
#define IDI_SHELL_MY_DOCUMENTS 235
-
+#define IDI_SHELL_CONTROL_PANEL1 330
/*
AVI resources, windows shell32 has 14 of them: 150-152 and 160-170
FIXME: Need to add them, but for now just let them use the same: searching.avi
More information about the Ros-diffs
mailing list