diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:07:47 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:07:47 +0100 |
commit | 71e851001abe1037395bf96403458ea95c141ecf (patch) | |
tree | 0d3016e5444a8f3688945986fed194c694042cd3 | |
parent | CWS-TOOLING: integrate CWS kohei03 (diff) | |
parent | dv17: #i70994#: Use own component for property handler (diff) | |
download | core-71e851001abe1037395bf96403458ea95c141ecf.tar.gz core-71e851001abe1037395bf96403458ea95c141ecf.zip |
CWS-TOOLING: integrate CWS dv17
-rwxr-xr-x[-rw-r--r--] | scp2/inc/macros.inc | 13 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/base/registryitem_base.scp | 12 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/calc/registryitem_calc.scp | 43 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/draw/registryitem_draw.scp | 41 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/impress/registryitem_impress.scp | 44 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/math/registryitem_math.scp | 23 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/winexplorerext/file_winexplorerext.scp | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/winexplorerext/module_winexplorerext.scp | 14 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/winexplorerext/registryitem_winexplorerext.scp | 64 | ||||
-rwxr-xr-x[-rw-r--r--] | scp2/source/writer/registryitem_writer.scp | 71 | ||||
-rwxr-xr-x[-rw-r--r--] | solenv/inc/set_wntx64.mk | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | solenv/inc/wntgcci.mk | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | solenv/inc/wntmsci11.mk | 1 |
13 files changed, 329 insertions, 17 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 27ef93479d36..4d8f0b3903be 100644..100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -520,6 +520,19 @@ End // --------------------------------------- +#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ + RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \ + ComponentCondition = "VersionNT >= 600"; \ + Styles = (X64); \ + Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ + Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + End + +// --------------------------------------- + #if defined WNT #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin #define SCP2_URE_DL_NORMAL(n) n ".dll" diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp index 616084e9b967..17144832cdf8 100644..100755 --- a/scp2/source/base/registryitem_base.scp +++ b/scp2/source/base/registryitem_base.scp @@ -97,6 +97,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,13"; End +RegistryItem gid_Regitem_odb_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DatabaseDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.DatabaseDocument.1\shell"; @@ -152,3 +160,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbas Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb ) diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 4a30287e6fce..d24c5f5a61ca 100644..100755 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -499,6 +499,14 @@ RegistryItem gid_Regitem_Stc_Contenttype Value = "application/vnd.sun.xml.calc.template"; End +RegistryItem gid_Regitem_stc_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarCalcTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxc_Contenttype ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; @@ -532,6 +540,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxc_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarCalcDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new ods file extension @@ -582,7 +598,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = "application/vnd.oasis.opendocument.spreadsheet"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -640,6 +656,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,3"; End +RegistryItem gid_Regitem_ods_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.CalcDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; @@ -783,6 +807,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,4"; End +RegistryItem gid_Regitem_ots_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.Calctemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.CalcTemplate.1\shell"; @@ -1076,6 +1108,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal Value = "<progpath>"; End +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) + +// registering the mso file types + CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index b06ca6430fe4..47f805cede88 100644..100755 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -473,6 +473,14 @@ RegistryItem gid_Regitem_Std_Contenttype Value = "application/vnd.sun.xml.draw.template"; End +RegistryItem gid_Regitem_std_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarDrawTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxd_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; @@ -533,6 +541,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxd_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarDrawDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odg file extension RegistryItem gid_Regitem_Odg_PersistentHandler @@ -598,7 +614,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Draw_Bin; Name = "application/vnd.oasis.opendocument.graphics"; Value = "opendocument.DrawDocument.1"; Styles = (); @@ -640,6 +656,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,5"; End +RegistryItem gid_Regitem_odg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DrawDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; @@ -783,6 +807,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,6"; End +RegistryItem gid_Regitem_otg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DrawTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.DrawTemplate.1\shell"; @@ -895,3 +927,10 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdra Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std ) diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index cb23b879fc37..c8b745f22760 100644..100755 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -487,6 +487,14 @@ RegistryItem gid_Regitem_Sti_Contenttype Value = "application/vnd.sun.xml.impress.template"; End +RegistryItem gid_Regitem_sti_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarImpressTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxi_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -547,6 +555,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxi_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarImpressDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odp file extension RegistryItem gid_Regitem_Odp_PersistentHandler @@ -596,7 +612,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Impress_Bin; Name = "application/vnd.oasis.opendocument.presentation"; Value = "opendocument.ImpressDocument.1"; Styles = (); @@ -655,6 +671,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,7"; End +RegistryItem gid_Regitem_odp_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.ImpressDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -812,6 +836,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,8"; End +RegistryItem gid_Regitem_otp_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.ImpressTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.ImpressTemplate.1\shell"; @@ -944,6 +976,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simp Value = "<progpath>"; End +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) + +// registering the mso file types + CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) @@ -951,4 +992,3 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM CONDITIONAL_REGISTER_DOC_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) - diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index cc50981da023..8ae9f904319c 100644..100755 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -433,6 +433,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxm_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarMathDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odf file extension RegistryItem gid_Regitem_Odf_PersistentHandler @@ -498,7 +506,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Math_Bin; Name = "application/vnd.oasis.opendocument.formula"; Value = "opendocument.MathDocument.1"; Styles = (); @@ -532,6 +540,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,14"; End +RegistryItem gid_Regitem_odf_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.MathDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; @@ -668,3 +684,8 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smat Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm ) diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index e51b8945903a..4ad1e96a3c99 100644..100755 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -72,6 +72,24 @@ End #endif +File gid_File_Lib_PropertyHdl + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "propertyhdl.dll"; +End + +#ifdef BUILD_X64 + File gid_File_Lib_PropertyHdl64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "propertyhdl_x64.dll"; + ComponentCondition = "VersionNT64"; +End + +#endif + #if defined M1310 File gid_File_Lib_Shlxthdl_Msvcr71 TXT_FILE_BODY; diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 76dd4e5b209d..83c1b42f2921 100644..100755 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -32,7 +32,7 @@ Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); - Sortkey = "1200"; + Sortkey = "1205"; Default = YES; Minimal = YES; ParentID = gid_Module_Optional; @@ -46,3 +46,15 @@ Module gid_Module_Optional_Winexplorerext gid_File_Lib_Reg64, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End + +Module gid_Module_Optional_Winexplorerext_PropertyHdl + ParentID = gid_Module_Optional_Winexplorerext; + Name = "gid_Module_Optional_Winexplorerext_PropertyHdl"; + Description = "gid_Module_Optional_Winexplorerext_PropertyHdl"; + Sortkey = "1210"; + Default = YES; + Styles = (HIDDEN_ROOT); + Dirs = (gid_Dir_Shlxthdl); + Files = (gid_File_Lib_PropertyHdl, + gid_File_Lib_PropertyHdl64); +End diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index b378f3db883e..f6d3ceb4f610 100644..100755 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -38,8 +38,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel @@ -61,8 +61,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel @@ -93,8 +93,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel @@ -170,8 +170,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel @@ -184,4 +184,50 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Val64 = "Apartment"; End -// End registry entries for the PropertySheet handler
\ No newline at end of file +// End registry entries for the PropertySheet handler + +// Begin registry entries for the Property handler + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; + Value = "%PRODUCTNAME Property Handler"; + Val64 = "%PRODUCTNAME Property Handler"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32 + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; + Name = "ThreadingModel"; + Value = "Apartment"; + Val64 = "Apartment"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; + Name = "{AE424E85-F6DF-4910-A6A9-438797986431}"; + Value = "%PRODUCTNAME Property Handler"; + Val64 = "%PRODUCTNAME Property Handler"; +End + +// End registry entries for the Property handler diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 819ba6128663..0dd4004a7803 100644..100755 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -542,6 +542,14 @@ RegistryItem gid_Regitem_Stw_Contenttype Value = "application/vnd.sun.xml.writer.template"; End +RegistryItem gid_Regitem_stw_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxg_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -586,6 +594,14 @@ RegistryItem gid_Regitem_Sxg_Mime_Database Value = ".sxg"; End +RegistryItem gid_Regitem_sxg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterGlobalDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxw_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -646,6 +662,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxw_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odt file extension @@ -696,13 +720,12 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Wrt_Bin; Name = "application/vnd.oasis.opendocument.text"; Value = "opendocument.WriterDocument.1"; Styles = (); End - RegistryItem gid_Regitem_Odt_Contenttype ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -761,6 +784,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable Subkey = "opendocument.WriterDocument.1\Insertable"; End +RegistryItem gid_Regitem_odt_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -921,6 +952,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,2"; End +RegistryItem gid_Regitem_ott_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -1037,6 +1076,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,10"; End +RegistryItem gid_Regitem_odm_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterGlobalDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.WriterGlobalDocument.1\shell"; @@ -1195,6 +1242,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; End +RegistryItem gid_Regitem_oth_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterWebTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // "OpenWith" Windows Registry keys for extensions supported by Writer // .ODT @@ -1428,6 +1483,18 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swri Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg ) + +// registering the mso file types // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type) CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer ) diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 23dbee21d2cd..f68c6e516faf 100644..100755 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -128,6 +128,7 @@ COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib +PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib MSILIB_X64=$(LIBPATH_X64)/msi.lib DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index b45b659d5f84..61e49044941c 100644..100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -218,3 +218,4 @@ UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib +PROPSYSLIB=-lpropsys diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 1bb994f1ad6f..ce4c0d4fbb94 100644..100755 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -380,4 +380,5 @@ UNICOWSLIB=unicows.lib WININETLIB=wininet.lib OLDNAMESLIB=oldnames.lib MSIMG32LIB=msimg32.lib +PROPSYSLIB=propsys.lib |