Register Kind Names for supported file types for Windows Vista and higher

7 files changed, 220 insertions, 0 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 690a21d97765..d776797cf91c 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -459,6 +459,16 @@ End
         Value = STRING(CONCAT2(LibreOffice.,name)); \
         Styles = (); \
     End
+    
+#define REGISTRY_ENTRY_KINDMAP(name, modid, key) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        ComponentCondition = "VersionNT >= 600"; \
+        Subkey = STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = "document"; \
+    End
 
 #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -472,6 +482,7 @@ End
     REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
     REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
+    REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -485,6 +496,7 @@ End
     REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
     REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+    REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 // ---------------------------------------
 
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 29bde7b43e60..fce66e8978dc 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -104,6 +104,14 @@ RegistryItem gid_Regitem_odb_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odb_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odb";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DatabaseDocument.1\shell";
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 49a648dec1ad..082460844952 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -506,6 +506,14 @@ RegistryItem gid_Regitem_stc_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_stc_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".stc";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Sxc_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -549,6 +557,14 @@ RegistryItem gid_Regitem_sxc_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxc_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxc";
+    Value = "Document";
+End
+
 // new ods file extension 
 
 RegistryItem gid_Regitem_Ods_PersistentHandler
@@ -666,6 +682,14 @@ RegistryItem gid_Regitem_ods_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_ods_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ods";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -790,6 +814,14 @@ RegistryItem gid_Regitem_Fods_Contenttype
     Value = "application/vnd.oasis.opendocument.spreadsheet";
 End
 
+RegistryItem gid_Regitem_fods_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fods";
+    Value = "Document";
+End
+
 // new ots file extension 
 
 RegistryItem gid_Regitem_Ots_PersistentHandler
@@ -859,6 +891,14 @@ RegistryItem gid_Regitem_ots_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_ots_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ots";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell";
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index b30a41cdfa03..5357146a00ae 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -478,6 +478,14 @@ RegistryItem gid_Regitem_std_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_std_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".std";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Sxd_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -548,6 +556,14 @@ RegistryItem gid_Regitem_sxd_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxd_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxd";
+    Value = "Document";
+End
+
 // new odg file extension 
 
 RegistryItem gid_Regitem_Odg_PersistentHandler
@@ -665,6 +681,14 @@ RegistryItem gid_Regitem_odg_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odg";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -789,6 +813,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = (PATCH);
 End
 
+RegistryItem gid_Regitem_fodg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodg";
+    Value = "Document";
+End
+
 // new otg file extension 
 
 RegistryItem gid_Regitem_Otg_PersistentHandler
@@ -858,6 +890,14 @@ RegistryItem gid_Regitem_otg_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_otg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".otg";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell";
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index e9352f1540f0..f18cbab7efc6 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -492,6 +492,14 @@ RegistryItem gid_Regitem_sti_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sti_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sti";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Sxi_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -562,6 +570,14 @@ RegistryItem gid_Regitem_sxi_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxi_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxi";
+    Value = "Document";
+End
+
 // new odp file extension
 
 RegistryItem gid_Regitem_Odp_PersistentHandler
@@ -680,6 +696,14 @@ RegistryItem gid_Regitem_odp_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odp";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -818,6 +842,14 @@ RegistryItem gid_Regitem_Fodp_Contenttype
     Value = "application/vnd.oasis.opendocument.presentation";
 End
 
+RegistryItem gid_Regitem_fodp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodp";
+    Value = "Document";
+End
+
 // new otp file extension
 
 RegistryItem gid_Regitem_Otp_PersistentHandler
@@ -887,6 +919,14 @@ RegistryItem gid_Regitem_otp_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_otp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".otp";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell";
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index f61c32598e1a..be6354ef6e1c 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -438,6 +438,14 @@ RegistryItem gid_Regitem_sxm_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxm_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxm";
+    Value = "Document";
+End
+
 // new odf file extension
 
 RegistryItem gid_Regitem_Odf_PersistentHandler
@@ -547,6 +555,14 @@ RegistryItem gid_Regitem_odf_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odf_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odf";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 1911b15e763b..9871a6723894 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -548,6 +548,14 @@ RegistryItem gid_Regitem_stw_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_stw_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".stw";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Sxg_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -602,6 +610,14 @@ RegistryItem gid_Regitem_sxg_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxg";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Sxw_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -672,6 +688,14 @@ RegistryItem gid_Regitem_sxw_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_sxw_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxw";
+    Value = "Document";
+End
+
 // new odt file extension 
 
 RegistryItem gid_Regitem_Odt_PersistentHandler
@@ -795,6 +819,14 @@ RegistryItem gid_Regitem_odt_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odt_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odt";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -936,6 +968,14 @@ RegistryItem gid_Regitem_Fodt_Contenttype
     Value = "application/vnd.oasis.opendocument.text";
 End
 
+RegistryItem gid_Regitem_fodt_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodt";
+    Value = "Document";
+End
+
 // new ott file extension 
 
 RegistryItem gid_Regitem_Ott_PersistentHandler
@@ -1005,6 +1045,14 @@ RegistryItem gid_Regitem_ott_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_ott_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ott";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -1131,6 +1179,14 @@ RegistryItem gid_Regitem_odm_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_odm_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odm";
+    Value = "Document";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell";
@@ -1299,6 +1355,14 @@ RegistryItem gid_Regitem_oth_FullDetails
 End
 #endif
 
+RegistryItem gid_Regitem_oth_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".oth";
+    Value = "Document";
+End
+
 // "OpenWith" Windows Registry keys for extensions supported by Writer
 
 // .ODT