* implement retrieving column names for nethood & font shell folder

* make column names mui aware

svn path=/trunk/; revision=35157

diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc
index 47b1737..b45b50c 100644 (file)
--- a/reactos/dll/win32/shell32/lang/bg-BG.rc
+++ b/reactos/dll/win32/shell32/lang/bg-BG.rc
@@ -595,8 +595,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Çàáåëåæêè"
        IDS_SHV_COLUMN10            "Ñîáñòâåíèê"
        IDS_SHV_COLUMN11            "Ãðóïà"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Ïúðâîíà÷àëíî ìÿñòî"
        IDS_SHV_COLUMN_DELDATE      "Äàòà íà èçòðèâàíå"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        // special folders 
        IDS_DESKTOP                 "Ðàáîòíà ïëîù"

diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc
index 684923a..ac6db9b 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ca-ES.rc
+++ b/reactos/dll/win32/shell32/lang/ca-ES.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc
index 676ef9a..3b96a8a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/cs-CZ.rc
+++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc
@@ -594,8 +594,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Komentáø"
        IDS_SHV_COLUMN10            "Vlastník"
        IDS_SHV_COLUMN11            "Skupina"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Pùvodní umístìní"
        IDS_SHV_COLUMN_DELDATE      "Odstranìno"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Plocha"

diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc
index 87e4a50..afbf725 100644 (file)
--- a/reactos/dll/win32/shell32/lang/da-DK.rc
+++ b/reactos/dll/win32/shell32/lang/da-DK.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc
index 03a965c..91d1bf4 100644 (file)
--- a/reactos/dll/win32/shell32/lang/de-DE.rc
+++ b/reactos/dll/win32/shell32/lang/de-DE.rc
@@ -594,8 +594,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Kommentar"
        IDS_SHV_COLUMN10            "Besitzer"
        IDS_SHV_COLUMN11            "Gruppe"
+       IDS_SHV_COLUMN12            "Dateinamen"
+       IDS_SHV_COLUMN13            "Kategorie"
        IDS_SHV_COLUMN_DELFROM      "Ursprung"
        IDS_SHV_COLUMN_DELDATE      "Gelöscht am"
+       IDS_SHV_COLUMN_FONTTYPE     "Schriftartentyp"
+       IDS_SHV_COLUMN_WORKGROUP    "Arbeitsgruppe"
+       IDS_SHV_NETWORKLOCATION     "Netzwerkstandort"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc
index fa6dcf7..c11fe4d 100644 (file)
--- a/reactos/dll/win32/shell32/lang/el-GR.rc
+++ b/reactos/dll/win32/shell32/lang/el-GR.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Ó÷üëéá"
        IDS_SHV_COLUMN10            "ÊÜôï÷ïò"
        IDS_SHV_COLUMN11            "ÏìÜäá"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Áñ÷éêÞ èÝóç"
        IDS_SHV_COLUMN_DELDATE      "Çìåñïìçíßá äéáãñáöÞò"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "ÅðéöÜíåéá åñãáóßáò"

diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc
index 04eae99..0e74949 100644 (file)
--- a/reactos/dll/win32/shell32/lang/en-GB.rc
+++ b/reactos/dll/win32/shell32/lang/en-GB.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc
index b54f54c..bd64228 100644 (file)
--- a/reactos/dll/win32/shell32/lang/en-US.rc
+++ b/reactos/dll/win32/shell32/lang/en-US.rc
@@ -593,8 +593,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc
index ca5b758..c6bfe8a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/es-ES.rc
+++ b/reactos/dll/win32/shell32/lang/es-ES.rc
@@ -594,8 +594,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comentarios"
        IDS_SHV_COLUMN10            "Propietario"
        IDS_SHV_COLUMN11            "Grupo"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Ubicación original"
        IDS_SHV_COLUMN_DELDATE      "Fecha de eliminación"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Escritorio"

diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc
index b2b9f75..d0a7c4c 100644 (file)
--- a/reactos/dll/win32/shell32/lang/fi-FI.rc
+++ b/reactos/dll/win32/shell32/lang/fi-FI.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Kommentit"
        IDS_SHV_COLUMN10            "Omistaja"
        IDS_SHV_COLUMN11            "Ryhmä"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Työpöytä"

diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc
index d1fda84..df41379 100644 (file)
--- a/reactos/dll/win32/shell32/lang/fr-FR.rc
+++ b/reactos/dll/win32/shell32/lang/fr-FR.rc
@@ -596,8 +596,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Commentaires"
        IDS_SHV_COLUMN10            "Propriétaire"
        IDS_SHV_COLUMN11            "Groupe"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Localisation d'origine"
        IDS_SHV_COLUMN_DELDATE      "Date de suppression"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Bureau"

diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc
index f13e1a8..370c4fd 100644 (file)
--- a/reactos/dll/win32/shell32/lang/hu-HU.rc
+++ b/reactos/dll/win32/shell32/lang/hu-HU.rc
@@ -595,8 +595,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Megjegyzések"
        IDS_SHV_COLUMN10            "Tulajdonos"
        IDS_SHV_COLUMN11            "Csoport"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Asztal"

diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc
index 630ee78..1530d2a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/it-IT.rc
+++ b/reactos/dll/win32/shell32/lang/it-IT.rc
@@ -593,8 +593,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Commenti"
        IDS_SHV_COLUMN10            "Proprietario"
        IDS_SHV_COLUMN11            "Gruppo"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Posizione originale"
        IDS_SHV_COLUMN_DELDATE      "Data di cancellazione"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc
index a916b5a..a0767b5 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ja-JP.rc
+++ b/reactos/dll/win32/shell32/lang/ja-JP.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "\83R\83\81\83\93\83g"
        IDS_SHV_COLUMN10            "\8f\8a\97L\8eÒ"
        IDS_SHV_COLUMN11            "\83O\83\8b\81[\83v"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "\83f\83X\83N\83g\83b\83v"

diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc
index c8ddf2b..7ec532e 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ko-KR.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KR.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc
index 7646070..358e913 100644 (file)
--- a/reactos/dll/win32/shell32/lang/nl-NL.rc
+++ b/reactos/dll/win32/shell32/lang/nl-NL.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc
index 62d8a95..e90433a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/no-NO.rc
+++ b/reactos/dll/win32/shell32/lang/no-NO.rc
@@ -571,8 +571,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Kommentarer"
        IDS_SHV_COLUMN10            "Eier"
        IDS_SHV_COLUMN11            "Gruppe"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Opprinnelig plassering"
        IDS_SHV_COLUMN_DELDATE      "Dato slettet"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Skrivebord"

diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
index 4b5d0e3..a0bc756 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@@ -598,8 +598,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Komentarz"
        IDS_SHV_COLUMN10            "W³a\9cciciel"
        IDS_SHV_COLUMN11            "Grupa"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Lokacja oryginalna"
        IDS_SHV_COLUMN_DELDATE      "Data usuniêcia"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Pulpit"

diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc
index ffb7359..e96b707 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pt-BR.rc
+++ b/reactos/dll/win32/shell32/lang/pt-BR.rc
@@ -594,8 +594,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comentários"
        IDS_SHV_COLUMN10            "Dono"
        IDS_SHV_COLUMN11            "Grupo"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Área de trabalho"

diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc
index 70b9c18..4c3094c 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pt-PT.rc
+++ b/reactos/dll/win32/shell32/lang/pt-PT.rc
@@ -594,8 +594,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comentários"
        IDS_SHV_COLUMN10            "Dono"
        IDS_SHV_COLUMN11            "Grupo"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Ambiente de trabalho"

diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc
index d9ec952..72f1bb7 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ru-RU.rc
+++ b/reactos/dll/win32/shell32/lang/ru-RU.rc
@@ -591,8 +591,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Êîììåíòàðèé"
        IDS_SHV_COLUMN10            "Âëàäåëåö"
        IDS_SHV_COLUMN11            "Ãðóïïà"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Èçíà÷àëüíîå ðàñïîëîæåíèå"
        IDS_SHV_COLUMN_DELDATE      "Äàòà óäàëåíèÿ"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Ðàáî÷èé ñòîë"

diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc
index c26c7f9..802ac35 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sk-SK.rc
+++ b/reactos/dll/win32/shell32/lang/sk-SK.rc
@@ -598,8 +598,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Poznámky" //Comments
        IDS_SHV_COLUMN10            "Vlastník"
        IDS_SHV_COLUMN11            "Skupina"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Pôvod" //Pôvodné umiestnenie
        IDS_SHV_COLUMN_DELDATE      "Odstránený" //Dátum zmazania
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Pracovná plocha"

diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc
index 7233f2b..63b80b1 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sl-SI.rc
+++ b/reactos/dll/win32/shell32/lang/sl-SI.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc
index 97e9daa..c9da3be 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sv-SE.rc
+++ b/reactos/dll/win32/shell32/lang/sv-SE.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc
index f236f2f..21454bb 100644 (file)
--- a/reactos/dll/win32/shell32/lang/tr-TR.rc
+++ b/reactos/dll/win32/shell32/lang/tr-TR.rc
@@ -592,8 +592,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Açýklamalar"
        IDS_SHV_COLUMN10            "Sahip"
        IDS_SHV_COLUMN11            "Grup"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Özgün konum"
        IDS_SHV_COLUMN_DELDATE      "Silinme tarihi"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Masaüstü"

diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc
index a6db650..0139ea3 100644 (file)
--- a/reactos/dll/win32/shell32/lang/uk-UA.rc
+++ b/reactos/dll/win32/shell32/lang/uk-UA.rc
@@ -593,8 +593,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Ïðèì³òêà"
        IDS_SHV_COLUMN10            "Âëàñíèê"
        IDS_SHV_COLUMN11            "Ãðóïà"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Âèõ³äíå ðîçòàøóâàííÿ"
        IDS_SHV_COLUMN_DELDATE      "Äàòà âèäàëåííÿ"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Ðîáî÷èé ñò³ë"

diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc
index 9972007..23869dd 100644 (file)
--- a/reactos/dll/win32/shell32/lang/zh-CN.rc
+++ b/reactos/dll/win32/shell32/lang/zh-CN.rc
@@ -581,8 +581,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "×ÀÃæ"

diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc
index 0cb39c1..cdc6ad2 100644 (file)
--- a/reactos/dll/win32/shell32/lang/zh-TW.rc
+++ b/reactos/dll/win32/shell32/lang/zh-TW.rc
@@ -593,8 +593,13 @@ BEGIN
        IDS_SHV_COLUMN9             "Comments"
        IDS_SHV_COLUMN10            "Owner"
        IDS_SHV_COLUMN11            "Group"
+       IDS_SHV_COLUMN12            "Filename"
+       IDS_SHV_COLUMN13            "Category"
        IDS_SHV_COLUMN_DELFROM      "Original location"
        IDS_SHV_COLUMN_DELDATE      "Date deleted"
+       IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+       IDS_SHV_COLUMN_WORKGROUP    "Workgroup"
+       IDS_SHV_NETWORKLOCATION     "Network Location"
 
        /* special folders */
        IDS_DESKTOP                 "Desktop"

diff --git a/reactos/dll/win32/shell32/shfldr_fonts.c b/reactos/dll/win32/shell32/shfldr_fonts.c
index bfe43e9..8539a50 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_fonts.c
+++ b/reactos/dll/win32/shell32/shfldr_fonts.c
@@ -72,11 +72,19 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 #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}
+    {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+    {IDS_SHV_COLUMN_FONTTYPE , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+    {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+    {IDS_SHV_COLUMN12, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}
 };
 
-#define FontsSHELLVIEWCOLUMNS 2
+#define COLUMN_NAME     0
+#define COLUMN_TYPE     1
+#define COLUMN_SIZE     2
+#define COLUMN_FILENAME 3
+
+
+#define FontsSHELLVIEWCOLUMNS (4)
 
 /**************************************************************************
 *      ISF_Fonts_Constructor
@@ -516,6 +524,27 @@ static HRESULT WINAPI ISF_Fonts_fnGetDetailsOf (IShellFolder2 * iface,
                LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
 {
     IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    WCHAR buffer[MAX_PATH] = {0};
+    HRESULT hr = E_FAIL;
+
+    TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd);
+
+    if (iColumn >= FontsSHELLVIEWCOLUMNS)
+        return E_FAIL;
+
+    psd->fmt = FontsSFHeader[iColumn].fmt;
+    psd->cxChar = FontsSFHeader[iColumn].cxChar;
+    if (pidl == NULL)
+    {
+        psd->str.uType = STRRET_WSTR;
+        if (LoadStringW(shell32_hInstance, FontsSFHeader[iColumn].colnameid, buffer, MAX_PATH))
+            hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+
+        return hr;
+    }
+
+    if (iColumn == COLUMN_NAME)
+        return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str);
 
     FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
 

diff --git a/reactos/dll/win32/shell32/shfldr_netplaces.c b/reactos/dll/win32/shell32/shfldr_netplaces.c
index 1216341..adf27f3 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_netplaces.c
+++ b/reactos/dll/win32/shell32/shfldr_netplaces.c
@@ -45,6 +45,7 @@
 #include "wine/debug.h"
 #include "debughlp.h"
 #include "shfldr.h"
+#include "shlwapi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
 
@@ -73,11 +74,18 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 #define _IPersistFolder2_(This)        (IPersistFolder2*)&(This->lpVtblPersistFolder2)
 
 static shvheader NetworkPlacesSFHeader[] = {
-    {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
-    {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}
+    {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+    {IDS_SHV_COLUMN13, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10},
+    {IDS_SHV_COLUMN_WORKGROUP, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
+       {IDS_SHV_NETWORKLOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}
 };
 
-#define NETWORKPLACESSHELLVIEWCOLUMNS 2
+#define COLUMN_NAME          0
+#define COLUMN_CATEGORY      1
+#define COLUMN_WORKGROUP     2
+#define COLUMN_NETLOCATION   3
+
+#define NETWORKPLACESSHELLVIEWCOLUMNS 4
 
 /**************************************************************************
 *      ISF_NetworkPlaces_Constructor
@@ -209,11 +217,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface,
     TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This,
             hwndOwner, dwFlags, ppEnumIDList);
 
-    *ppEnumIDList = IEnumIDList_Constructor();
+    *ppEnumIDList = NULL; //IEnumIDList_Constructor();
 
     TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);
-
-    return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
+ return S_FALSE;
+   // return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
 }
 
 /**************************************************************************
@@ -517,6 +525,25 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDetailsOf (IShellFolder2 * iface,
                LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
 {
     IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    WCHAR buffer[MAX_PATH] = {0};
+    HRESULT hr = E_FAIL;
+
+    if (iColumn >= NETWORKPLACESSHELLVIEWCOLUMNS)
+        return E_FAIL;
+
+    psd->fmt = NetworkPlacesSFHeader[iColumn].fmt;
+    psd->cxChar = NetworkPlacesSFHeader[iColumn].cxChar;
+    if (pidl == NULL)
+    {
+        psd->str.uType = STRRET_WSTR;
+        if (LoadStringW(shell32_hInstance, NetworkPlacesSFHeader[iColumn].colnameid, buffer, MAX_PATH))
+            hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+
+        return hr;
+    }
+
+    if (iColumn == COLUMN_NAME)
+        return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str);
 
     FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
 

diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
index e93a079..7adea1d 100644 (file)
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@@ -145,6 +145,11 @@
 #define IDS_FILE_FOLDER             307
 #define IDS_CREATELINK              308
 #define IDS_INSTALLNEWFONT          309
+#define IDS_SHV_COLUMN_FONTTYPE     310
+#define IDS_SHV_COLUMN12            311
+#define IDS_SHV_COLUMN13            312
+#define IDS_SHV_COLUMN_WORKGROUP    313
+#define IDS_SHV_NETWORKLOCATION     314
 
 /* Note: this string is referenced from the registry */
 #define IDS_RECYCLEBIN_FOLDER_NAME   8964