7 Aug
2008
7 Aug
'08
1:02 a.m.
Author: janderwald
Date: Wed Aug 6 20:02:34 2008
New Revision: 35153
URL: http://svn.reactos.org/svn/reactos?rev=35153&view=rev
Log:
* halfplement fonts shell folder
* fix registration of nethood shell folder and printer shell folder
- displaying is if'd out currently
Added:
trunk/reactos/dll/win32/shell32/shfldr_fonts.c (with props)
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/el-GR.rc
trunk/reactos/dll/win32/shell32/lang/en-GB.rc
trunk/reactos/dll/win32/shell32/lang/en-US.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-KR.rc
trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
trunk/reactos/dll/win32/shell32/lang/no-NO.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/zh-CN.rc
trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
trunk/reactos/dll/win32/shell32/pidl.c
trunk/reactos/dll/win32/shell32/pidl.h
trunk/reactos/dll/win32/shell32/regsvr.c
trunk/reactos/dll/win32/shell32/shell32.rbuild
trunk/reactos/dll/win32/shell32/shell32_main.h
trunk/reactos/dll/win32/shell32/shellole.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-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -714,8 +714,11 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
-
-
-
-
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
+
+
+
+
Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -710,4 +710,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,4 +712,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,4 +712,7 @@
IDS_PREVIEW_VERB "Vorschau"
IDS_FILE_FOLDER "%u Dateien, %u Ordner"
-END
+ IDS_PRINTERS "Drucker"
+ IDS_FONTS "Schriftarten"
+ IDS_INSTALLNEWFONT "Neue Schriftart installieren..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,4 +712,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -713,4 +713,7 @@
IDS_PREVIEW_VERB "Vista previa"
IDS_FILE_FOLDER "%u Archivos, %u Carpetas"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -715,4 +715,7 @@
IDS_PREVIEW_VERB "Apercevoir"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -714,4 +714,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,4 +712,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -679,4 +679,17 @@
IDS_INI_FILE "Konfigurasjon innstilling"
IDS_LNK_FILE "Snarvei"
IDS_SYS_FILE "Systemfil"
-END
+
+ IDS_OPEN_VERB "Open"
+ IDS_RUNAS_VERB "Run as "
+ IDS_EDIT_VERB "Edit"
+ IDS_FIND_VERB "Find"
+ IDS_PRINT_VERB "Print"
+ IDS_PLAY_VERB "Play"
+ IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -717,4 +717,7 @@
IDS_PREVIEW_VERB "Podgl¹d"
IDS_FILE_FOLDER "%u Plików, %u Katalogów"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -713,4 +713,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -713,4 +713,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -709,4 +709,7 @@
IDS_PREVIEW_VERB "Ïðåäïðîñìîòð"
IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -717,4 +717,7 @@
IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ???
IDS_FILE_FOLDER "súbory: %u, prieèinky: %u"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -711,4 +711,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,4 +712,7 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -699,5 +699,8 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
-END
-
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
+END
+
Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -712,6 +712,9 @@
IDS_PREVIEW_VERB "Preview"
IDS_FILE_FOLDER "%u Files, %u Folders"
+ IDS_PRINTERS "Printers"
+ IDS_FONTS "Fonts"
+ IDS_INSTALLNEWFONT "Install New Font..."
END
#pragma code_page(default)
Modified: trunk/reactos/dll/win32/shell32/pidl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -1643,6 +1643,11 @@
return _ILCreateGuid(PT_GUID, &CLSID_NetworkPlaces);
}
+LPITEMIDLIST _ILCreateFont(void)
+{
+
+ return _ILCreateGuid(PT_GUID, &CLSID_FontsFolderShortcut);
+}
BOOL _ILIsMyComputer(LPCITEMIDLIST pidl)
{
Modified: trunk/reactos/dll/win32/shell32/pidl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -255,7 +255,8 @@
LPITEMIDLIST _ILCreateControlPanel (void);
LPITEMIDLIST _ILCreatePrinters (void);
LPITEMIDLIST _ILCreateNetwork (void);
-LPITEMIDLIST _ILCreateNetHood (void);
+LPITEMIDLIST _ILCreateNetHood (void);
+LPITEMIDLIST _ILCreateFont (void);
LPITEMIDLIST _ILCreateBitBucket (void);
LPITEMIDLIST _ILCreateDrive (LPCWSTR);
Modified: trunk/reactos/dll/win32/shell32/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c…
==============================================================================
--- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -602,24 +602,49 @@
},
{ &CLSID_Printers,
"Printers & Fax",
- 0,
+ IDS_PRINTERS,
+ NULL,
+ "shell32.dll",
+ "Apartment",
+ SHELLFOLDER_ATTRIBUTES,
+ SFGAO_FOLDER,
+ 0,
+ NULL,
+ NULL,
+ IDI_SHELL_PRINTER
+ },
+ { &CLSID_MyComputer,
+ "My Computer",
+ IDS_MYCOMPUTER,
NULL,
"shell32.dll",
"Apartment"
},
- { &CLSID_MyComputer,
- "My Computer",
- IDS_MYCOMPUTER,
- NULL,
- "shell32.dll",
- "Apartment"
- },
{ &CLSID_NetworkPlaces,
- "My Network Places",
- IDS_NETWORKPLACE,
- NULL,
- "shell32.dll",
- "Apartment"
+ "My Network Places",
+ IDS_NETWORKPLACE,
+ NULL,
+ "shell32.dll",
+ "Apartment",
+ SHELLFOLDER_ATTRIBUTES,
+ SFGAO_FOLDER,
+ 0,
+ NULL,
+ NULL,
+ IDI_SHELL_MY_NETWORK_PLACES
+ },
+ { &CLSID_FontsFolderShortcut,
+ "Fonts",
+ IDS_FONTS,
+ NULL,
+ "shell32.dll",
+ "Apartment",
+ SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_CALLFORATTRIBUTES,
+ SFGAO_FOLDER,
+ 0,
+ NULL,
+ NULL,
+ IDI_SHELL_FONTS_FOLDER
},
{ &CLSID_Shortcut,
"Shortcut",
@@ -731,6 +756,8 @@
static const WCHAR wszControlPanel[] = {
'C','o','n','t','r','o','l','P','a','n','e','l',0
};
static const WCHAR wszFolderOptions[] = {
'F','o','l','d','e','r','
','O','p','t','i','o','n','s',0
};
static const WCHAR wszNethoodFolder[] = {
'N','e','t','h','o','o','d','
','f','o','l','d','e','r',0};
+static const WCHAR wszPrinters[] = {
'P','r','i','n','t','e','r','s',0
};
+static const WCHAR wszFonts[] = {
'F','o','n','t','s',0 };
const GUID CLSID_FolderOptions = { 0x6DFD7C5C, 0x2451, 0x11d3,
{0xa2,0x99,0x00,0xC0,0x4F,0x8e,0xf6,0xaf} };
@@ -768,6 +795,11 @@
wszFolderOptions
},
#if 0
+ {
+ &CLSID_FontsFolderShortcut,
+ wszControlPanel,
+ wszFonts
+ },
{
&CLSID_Printers,
wszControlPanel,
Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -75,4 +75,5 @@
<file>shv_item_new.c</file>
<file>folder_options.c</file>
<file>shfldr_netplaces.c</file>
+ <file>shfldr_fonts.c</file>
</module>
Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -95,6 +95,7 @@
HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
HRESULT WINAPI ISF_MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
+HRESULT WINAPI ISF_Fonts_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV);
HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
Modified: trunk/reactos/dll/win32/shell32/shellole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -75,7 +75,8 @@
{&CLSID_FolderShortcut, &FolderShortcut_Constructor},
#endif
{&CLSID_MyDocuments, &ISF_MyDocuments_Constructor},
- {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor},
+ {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor},
+ {&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor},
{&CLSID_Printers, &ISF_Printers_Constructor},
{&CLSID_RecycleBin, &RecycleBin_Constructor},
{&CLSID_OpenWith, &SHEOW_Constructor},
Added: trunk/reactos/dll/win32/shell32/shfldr_fonts.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_fonts.c (added)
+++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -1,0 +1,655 @@
+/*
+ * Fonts folder
+ *
+ * Copyright 2008 Johannes Anderwald <janderwald(a)reactos.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+
+#include "pidl.h"
+#include "enumidlist.h"
+#include "undocshell.h"
+#include "shell32_main.h"
+#include "shresdef.h"
+#include "wine/debug.h"
+#include "debughlp.h"
+#include "shfldr.h"
+#include "shlwapi.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL (shell);
+
+/***********************************************************************
+* IShellFolder implementation
+*/
+
+typedef struct {
+ const IShellFolder2Vtbl *lpVtbl;
+ LONG ref;
+ const IPersistFolder2Vtbl *lpVtblPersistFolder2;
+
+ /* both paths are parsible from the desktop */
+ LPITEMIDLIST pidlRoot; /* absolute pidl */
+} IGenericSFImpl;
+
+static const IShellFolder2Vtbl vt_ShellFolder2;
+static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
+
+
+#define _IPersistFolder2_Offset
((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This =
(class*)(((char*)name)-_IPersistFolder2_Offset);
+
+#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
+#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl)
+#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2)
+
+static shvheader FontsSFHeader[] = {
+ {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+ {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}
+};
+
+#define FontsSHELLVIEWCOLUMNS 2
+
+/**************************************************************************
+* ISF_Fonts_Constructor
+*/
+HRESULT WINAPI ISF_Fonts_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv)
+{
+ IGenericSFImpl *sf;
+
+ TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid));
+
+ if (!ppv)
+ return E_POINTER;
+ if (pUnkOuter)
+ return CLASS_E_NOAGGREGATION;
+
+ sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof
(IGenericSFImpl));
+ if (!sf)
+ return E_OUTOFMEMORY;
+
+ sf->ref = 0;
+ sf->lpVtbl = &vt_ShellFolder2;
+ sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2;
+ sf->pidlRoot = _ILCreateFont(); /* my qualified pidl */
+
+ if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv)))
+ {
+ IUnknown_Release (_IUnknown_ (sf));
+ return E_NOINTERFACE;
+ }
+
+ TRACE ("--(%p)\n", sf);
+ return S_OK;
+}
+
+/**************************************************************************
+ * ISF_Fonts_fnQueryInterface
+ *
+ * NOTE
+ * supports not IPersist/IPersistFolder
+ */
+static HRESULT WINAPI ISF_Fonts_fnQueryInterface (IShellFolder2 *iface, REFIID riid,
LPVOID *ppvObj)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
+
+ *ppvObj = NULL;
+
+ if (IsEqualIID (riid, &IID_IUnknown) ||
+ IsEqualIID (riid, &IID_IShellFolder) ||
+ IsEqualIID (riid, &IID_IShellFolder2))
+ {
+ *ppvObj = This;
+ }
+ else if (IsEqualIID (riid, &IID_IPersist) ||
+ IsEqualIID (riid, &IID_IPersistFolder) ||
+ IsEqualIID (riid, &IID_IPersistFolder2))
+ {
+ *ppvObj = _IPersistFolder2_ (This);
+ }
+
+ if (*ppvObj)
+ {
+ IUnknown_AddRef ((IUnknown *) (*ppvObj));
+ TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj);
+ return S_OK;
+ }
+ TRACE ("-- Interface: E_NOINTERFACE\n");
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ISF_Fonts_fnAddRef (IShellFolder2 * iface)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ ULONG refCount = InterlockedIncrement(&This->ref);
+
+ TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
+
+ return refCount;
+}
+
+static ULONG WINAPI ISF_Fonts_fnRelease (IShellFolder2 * iface)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ ULONG refCount = InterlockedDecrement(&This->ref);
+
+ TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
+
+ if (!refCount) {
+ TRACE ("-- destroying IShellFolder(%p)\n", This);
+ SHFree (This->pidlRoot);
+ HeapFree (GetProcessHeap(), 0, This);
+ }
+ return refCount;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnParseDisplayName
+*/
+static HRESULT WINAPI ISF_Fonts_fnParseDisplayName (IShellFolder2 * iface,
+ HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName,
+ DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ HRESULT hr = E_UNEXPECTED;
+
+ TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", This,
+ hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName),
+ pchEaten, ppidl, pdwAttributes);
+
+ *ppidl = 0;
+ if (pchEaten)
+ *pchEaten = 0; /* strange but like the original */
+
+ TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr);
+
+ return hr;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnEnumObjects
+*/
+static HRESULT WINAPI ISF_Fonts_fnEnumObjects (IShellFolder2 * iface,
+ HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This,
+ hwndOwner, dwFlags, ppEnumIDList);
+
+ *ppEnumIDList = IEnumIDList_Constructor();
+
+ TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);
+
+ return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnBindToObject
+*/
+static HRESULT WINAPI ISF_Fonts_fnBindToObject (IShellFolder2 * iface,
+ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This,
+ pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
+
+ return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut);
+}
+
+/**************************************************************************
+* ISF_Fonts_fnBindToStorage
+*/
+static HRESULT WINAPI ISF_Fonts_fnBindToStorage (IShellFolder2 * iface,
+ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This,
+ pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
+
+ *ppvOut = NULL;
+ return E_NOTIMPL;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnCompareIDs
+*/
+
+static HRESULT WINAPI ISF_Fonts_fnCompareIDs (IShellFolder2 * iface,
+ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ int nReturn;
+
+ TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1,
pidl2);
+ nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2);
+ TRACE ("-- %i\n", nReturn);
+ return nReturn;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnCreateViewObject
+*/
+static HRESULT WINAPI ISF_Fonts_fnCreateViewObject (IShellFolder2 * iface,
+ HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ LPSHELLVIEW pShellView;
+ HRESULT hr = E_INVALIDARG;
+
+ TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This,
+ hwndOwner, shdebugstr_guid (riid), ppvOut);
+
+ if (!ppvOut)
+ return hr;
+
+ *ppvOut = NULL;
+
+ if (IsEqualIID (riid, &IID_IDropTarget))
+ {
+ WARN ("IDropTarget not implemented\n");
+ hr = E_NOTIMPL;
+ }
+ else if (IsEqualIID (riid, &IID_IContextMenu))
+ {
+ WARN ("IContextMenu not implemented\n");
+ hr = E_NOTIMPL;
+ }
+ else if (IsEqualIID (riid, &IID_IShellView))
+ {
+ pShellView = IShellView_Constructor ((IShellFolder *) iface);
+ if (pShellView)
+ {
+ hr = IShellView_QueryInterface (pShellView, riid, ppvOut);
+ IShellView_Release (pShellView);
+ }
+ }
+ TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut);
+ return hr;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnGetAttributesOf
+*/
+static HRESULT WINAPI ISF_Fonts_fnGetAttributesOf (IShellFolder2 * iface,
+ UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ HRESULT hr = S_OK;
+
+ TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This,
+ cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
+
+ if (!rgfInOut)
+ return E_INVALIDARG;
+ if (cidl && !apidl)
+ return E_INVALIDARG;
+
+ if (*rgfInOut == 0)
+ *rgfInOut = ~0;
+
+ if (cidl == 0)
+ {
+ IShellFolder *psfParent = NULL;
+ LPCITEMIDLIST rpidl = NULL;
+
+ hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder,
(LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl);
+ if(SUCCEEDED(hr))
+ {
+ SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut);
+ IShellFolder_Release(psfParent);
+ }
+ }
+ else
+ {
+ while (cidl > 0 && *apidl)
+ {
+ pdump (*apidl);
+ SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut);
+ apidl++;
+ cidl--;
+ }
+ }
+
+ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
+ *rgfInOut &= ~SFGAO_VALIDATE;
+
+ TRACE ("-- result=0x%08x\n", *rgfInOut);
+ return hr;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnGetUIObjectOf
+*
+* PARAMETERS
+* hwndOwner [in] Parent window for any output
+* cidl [in] array size
+* apidl [in] simple pidl array
+* riid [in] Requested Interface
+* prgfInOut [ ] reserved
+* ppvObject [out] Resulting Interface
+*
+*/
+static HRESULT WINAPI ISF_Fonts_fnGetUIObjectOf (IShellFolder2 * iface,
+ HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid,
+ UINT * prgfInOut, LPVOID * ppvOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ LPITEMIDLIST pidl;
+ IUnknown *pObj = NULL;
+ HRESULT hr = E_INVALIDARG;
+
+ TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", This,
+ hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut);
+
+ if (!ppvOut)
+ return hr;
+
+ *ppvOut = NULL;
+
+ if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1))
+ {
+ pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot,
apidl, cidl);
+ hr = S_OK;
+ }
+ else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1))
+ {
+ pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl,
cidl);
+ hr = S_OK;
+ }
+ else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1))
+ {
+ pidl = ILCombine (This->pidlRoot, apidl[0]);
+ pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl);
+ SHFree (pidl);
+ hr = S_OK;
+ }
+ else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1))
+ {
+ pidl = ILCombine (This->pidlRoot, apidl[0]);
+ pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl);
+ SHFree (pidl);
+ hr = S_OK;
+ }
+ else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1))
+ {
+ hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) &
pObj);
+ }
+ else
+ hr = E_NOINTERFACE;
+
+ if (SUCCEEDED(hr) && !pObj)
+ hr = E_OUTOFMEMORY;
+
+ *ppvOut = pObj;
+ TRACE ("(%p)->hr=0x%08x\n", This, hr);
+ return hr;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnGetDisplayNameOf
+*
+*/
+static HRESULT WINAPI ISF_Fonts_fnGetDisplayNameOf (IShellFolder2 * iface,
+ LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet);
+ pdump (pidl);
+
+ if (!strRet)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+/**************************************************************************
+* ISF_Fonts_fnSetNameOf
+* Changes the name of a file object or subfolder, possibly changing its item
+* identifier in the process.
+*
+* PARAMETERS
+* hwndOwner [in] Owner window for output
+* pidl [in] simple pidl of item to change
+* lpszName [in] the items new display name
+* dwFlags [in] SHGNO formatting flags
+* ppidlOut [out] simple pidl returned
+*/
+static HRESULT WINAPI ISF_Fonts_fnSetNameOf (IShellFolder2 * iface,
+ HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */
+ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This,
+ hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
+ return E_FAIL;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnGetDefaultSearchGUID (
+ IShellFolder2 * iface, GUID * pguid)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ FIXME ("(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnEnumSearches (IShellFolder2 * iface,
+ IEnumExtraSearch ** ppenum)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ FIXME ("(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnGetDefaultColumn (IShellFolder2 * iface,
+ DWORD dwRes, ULONG * pSort, ULONG * pDisplay)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ TRACE ("(%p)\n", This);
+
+ if (pSort)
+ *pSort = 0;
+ if (pDisplay)
+ *pDisplay = 0;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnGetDefaultColumnState (
+ IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ TRACE ("(%p)\n", This);
+
+ if (!pcsFlags || iColumn >= FontsSHELLVIEWCOLUMNS)
+ return E_INVALIDARG;
+ *pcsFlags = FontsSFHeader[iColumn].pcsFlags;
+ return S_OK;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnGetDetailsEx (IShellFolder2 * iface,
+ LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+ FIXME ("(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnGetDetailsOf (IShellFolder2 * iface,
+ LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Fonts_fnMapColumnToSCID (IShellFolder2 * iface,
+ UINT column, SHCOLUMNID * pscid)
+{
+ IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+ FIXME ("(%p)\n", This);
+
+ return E_NOTIMPL;
+}
+
+static const IShellFolder2Vtbl vt_ShellFolder2 = {
+ ISF_Fonts_fnQueryInterface,
+ ISF_Fonts_fnAddRef,
+ ISF_Fonts_fnRelease,
+ ISF_Fonts_fnParseDisplayName,
+ ISF_Fonts_fnEnumObjects,
+ ISF_Fonts_fnBindToObject,
+ ISF_Fonts_fnBindToStorage,
+ ISF_Fonts_fnCompareIDs,
+ ISF_Fonts_fnCreateViewObject,
+ ISF_Fonts_fnGetAttributesOf,
+ ISF_Fonts_fnGetUIObjectOf,
+ ISF_Fonts_fnGetDisplayNameOf,
+ ISF_Fonts_fnSetNameOf,
+ /* ShellFolder2 */
+ ISF_Fonts_fnGetDefaultSearchGUID,
+ ISF_Fonts_fnEnumSearches,
+ ISF_Fonts_fnGetDefaultColumn,
+ ISF_Fonts_fnGetDefaultColumnState,
+ ISF_Fonts_fnGetDetailsEx,
+ ISF_Fonts_fnGetDetailsOf,
+ ISF_Fonts_fnMapColumnToSCID
+};
+
+/************************************************************************
+ * INPFldr_PersistFolder2_QueryInterface
+ */
+static HRESULT WINAPI INPFldr_PersistFolder2_QueryInterface (IPersistFolder2 * iface,
+ REFIID iid, LPVOID * ppvObj)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)\n", This);
+
+ return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj);
+}
+
+/************************************************************************
+ * INPFldr_PersistFolder2_AddRef
+ */
+static ULONG WINAPI INPFldr_PersistFolder2_AddRef (IPersistFolder2 * iface)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)->(count=%u)\n", This, This->ref);
+
+ return IUnknown_AddRef (_IUnknown_ (This));
+}
+
+/************************************************************************
+ * ISFPersistFolder_Release
+ */
+static ULONG WINAPI INPFldr_PersistFolder2_Release (IPersistFolder2 * iface)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)->(count=%u)\n", This, This->ref);
+
+ return IUnknown_Release (_IUnknown_ (This));
+}
+
+/************************************************************************
+ * INPFldr_PersistFolder2_GetClassID
+ */
+static HRESULT WINAPI INPFldr_PersistFolder2_GetClassID (
+ IPersistFolder2 * iface, CLSID * lpClassId)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)\n", This);
+
+ if (!lpClassId)
+ return E_POINTER;
+
+ *lpClassId = CLSID_FontsFolderShortcut;
+
+ return S_OK;
+}
+
+/************************************************************************
+ * INPFldr_PersistFolder2_Initialize
+ *
+ * NOTES: it makes no sense to change the pidl
+ */
+static HRESULT WINAPI INPFldr_PersistFolder2_Initialize (
+ IPersistFolder2 * iface, LPCITEMIDLIST pidl)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)->(%p)\n", This, pidl);
+
+ return E_NOTIMPL;
+}
+
+/**************************************************************************
+ * IPersistFolder2_fnGetCurFolder
+ */
+static HRESULT WINAPI INPFldr_PersistFolder2_GetCurFolder (
+ IPersistFolder2 * iface, LPITEMIDLIST * pidl)
+{
+ _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+ TRACE ("(%p)->(%p)\n", This, pidl);
+
+ if (!pidl)
+ return E_POINTER;
+
+ *pidl = ILClone (This->pidlRoot);
+
+ return S_OK;
+}
+
+static const IPersistFolder2Vtbl vt_NP_PersistFolder2 =
+{
+ INPFldr_PersistFolder2_QueryInterface,
+ INPFldr_PersistFolder2_AddRef,
+ INPFldr_PersistFolder2_Release,
+ INPFldr_PersistFolder2_GetClassID,
+ INPFldr_PersistFolder2_Initialize,
+ INPFldr_PersistFolder2_GetCurFolder
+};
Propchange: trunk/reactos/dll/win32/shell32/shfldr_fonts.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/shell32/shresdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Aug 6 20:02:34 2008
@@ -87,6 +87,8 @@
#define IDS_DRIVE_CDROM 73
#define IDS_DRIVE_NETWORK 74
#define IDS_NETWORKPLACE 75
+#define IDS_FONTS 76
+#define IDS_PRINTERS 77
#define IDS_CREATEFOLDER_DENIED 128
#define IDS_CREATEFOLDER_CAPTION 129
@@ -142,6 +144,7 @@
#define IDS_PREVIEW_VERB 306
#define IDS_FILE_FOLDER 307
#define IDS_CREATELINK 308
+#define IDS_INSTALLNEWFONT 309
/* Note: this string is referenced from the registry */
#define IDS_RECYCLEBIN_FOLDER_NAME 8964