fdo#47805 rework handling of 64-bit registry entries

64-bit registry entries were entered via a custom action, which
did not always work. By default the custom action ran with user
privileges, which were not sufficient to write the registry.
It is not necessary to use custom actions for this task. Windows
installer supports it well.

Change-Id: Id65458c363c2b90b3e7d166b4c836bfb1ff19bf4

11 files changed, 278 insertions, 130 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d776797cf91c..893e675e3ad8 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -505,12 +505,18 @@ 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; \
+        ModuleID = gid_Module_Optional_Winexplorerext; \
         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 \
+\
+    RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext_x64; \
+        ComponentCondition = "VersionNT64 >= 600"; \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
     End
 
 #else
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 6cf2817b1dcb..0cf17820f057 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -114,7 +114,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odb_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index d981008dc101..542aed3544ee 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -533,7 +533,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_stc_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -585,7 +585,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxc_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -727,7 +727,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ods_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -955,7 +955,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 367b3a3d6d30..d82a59f6af95 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -505,7 +505,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_std_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -584,7 +584,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxd_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -727,7 +727,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -955,7 +955,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_otg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 5a732fb1f388..d24f43df548d 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -519,7 +519,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sti_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -598,7 +598,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxi_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -742,7 +742,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -984,7 +984,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_otp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 1eea1a49101f..c4f808ff42ab 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -448,7 +448,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -583,7 +583,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odf_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index c111e179c542..077cd6e5e214 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -81,24 +81,6 @@ WindowsCustomAction gid_Customaction_Regactivexdll2
 	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts");
 End
 
-WindowsCustomAction gid_Customaction_Reg64dll1
-	Name = "Reg64dll1";
-	Typ = "65";
-	Source = "reg64msi.dll";
-	Target = "InstallReg64";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" and VersionNT64", "end");
-End
-
-WindowsCustomAction gid_Customaction_Reg64dll2
-	Name = "Reg64dll2";
-	Typ = "65";
-	Source = "reg64msi.dll";
-	Target = "DeinstallReg64";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
-End
-
 #ifdef HAVE_WINDOWS_SDK
 
 WindowsCustomAction gid_Customaction_Jfregcadll1
@@ -139,24 +121,6 @@ End
 
 #endif /* HAVE_WINDOWS_SDK */
 
-WindowsCustomAction gid_Customaction_Shellextensionsdll1
-	Name = "Shellextensionsdll1";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "InstallExecSequenceEntry";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll2
-	Name = "Shellextensionsdll2";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "DeinstallExecSequenceEntry";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
 WindowsCustomAction gid_Customaction_Instooofiltmsidll2
 	Name = "Instooofiltmsidll";
 	Typ = "65";
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 59a009962ad0..f2a2a89e8ec6 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -59,7 +59,7 @@ File gid_File_Lib_Shlxthdl
 End
 
 #ifdef BUILD_X64
-	File gid_File_Lib_Shlxthdl64
+    File gid_File_Lib_Shlxthdl64
     LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
@@ -74,15 +74,17 @@ File gid_File_Lib_PropertyHdl
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "propertyhdl.dll";
+    ComponentCondition = "VersionNT >= 600";
+
 End
 
 #ifdef BUILD_X64
-	File gid_File_Lib_PropertyHdl64
+    File gid_File_Lib_PropertyHdl64
     LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "propertyhdl_x64.dll";
-    ComponentCondition = "VersionNT64";
+    ComponentCondition = "VersionNT64 >= 600";
 End
 
 #endif
@@ -93,11 +95,3 @@ File gid_File_Lib_Shlxtmsi
     Dir = SCP2_OOO_BIN_DIR;
     Name = "shlxtmsi.dll";
 End
-
-File gid_File_Lib_Reg64
-    LIB_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "reg64msi.dll";
-End
-
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index f20edccc59ae..3932e4f4d7c9 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -35,22 +35,21 @@ Module gid_Module_Optional_Winexplorerext
     ParentID = gid_Module_Optional;
     Dirs = (gid_Dir_Shlxthdl);
     Files = (gid_File_Lib_Shlxthdl,
-			 gid_File_Lib_Shlxthdl64,
-			 gid_File_Lib_OOoFilt,
-			 gid_File_Lib_OOoFilt64,
+             gid_File_Lib_OOoFilt,
+             gid_File_Lib_PropertyHdl,
              gid_File_Lib_Shlxtmsi,
-             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);
+Module gid_Module_Optional_Winexplorerext_x64
+    ParentID = gid_Module_Optional_Winexplorerext;
+    Name = "gid_Module_Optional_Winexplorerext_x64";
+    Description = "gid_Module_Optional_Winexplorerext_x64";
+    Sortkey = "1210";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
     Dirs = (gid_Dir_Shlxthdl);
-	Files = (gid_File_Lib_PropertyHdl,
-			 gid_File_Lib_PropertyHdl64);
+    Files = (gid_File_Lib_Shlxthdl64,
+             gid_File_Lib_OOoFilt64,
+             gid_File_Lib_PropertyHdl64);
 End
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 32a5ef8658ca..dc1ec5f50ae1 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -33,20 +33,50 @@
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
-    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+    Value = "%PRODUCTNAME Infotip Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+    Value = "%PRODUCTNAME Infotip Handler";
 End
 
 // End registry items for the Infotip handler
@@ -56,22 +86,53 @@ End
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
     Val64 = "Apartment";
 End
 
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+    Value = "%PRODUCTNAME Thumbnail Viewer";
+End
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+    Value = "%PRODUCTNAME Thumbnail Viewer";
+End
+
 // End registry items for the Thumbnail viewer
 
 // Begin registry items for the Column handler
@@ -79,79 +140,147 @@ End
 RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
     Value = "%PRODUCTNAME Column Handler";
-    Val64 = "%PRODUCTNAME Column Handler";
+End
+
+RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
-    
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
-    Val64 = "Apartment";
 End
-    
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
 // End registry items for the Column handler
 
 // Begin registry items for the MS Indexing server filter component
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Filter";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-    Styles = (X64_ONLY); // Values: X64
     Value = "OpenDocument Format Filter";
-    Val64 = "OpenDocument Format Filter";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Styles = (X64); // Values: X64 / X64_ONLY
     Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt.dll";
     Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+End
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Styles = (X64); // Values: X64
     Name = "ThreadingModel";
     Value = "Apartment";
-    Val64 = "Apartment";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Persistent Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
     Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-    Styles = (X64); // Values: X64
     Value = "OpenDocument Format Persistent Handler";
-    Val64 = "OpenDocument Format Persistent Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Styles = (X64); // Values: X64
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
+    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
     Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
     Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-    Val64 = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
 End
 
 // End registry items for the MS Indexing server filter component
@@ -161,20 +290,50 @@ End
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
-    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+    Value = "%PRODUCTNAME Property Sheet Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+    Value = "%PRODUCTNAME Property Sheet Handler";
 End
 
 // End registry entries for the PropertySheet handler
@@ -183,44 +342,70 @@ End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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_PropHdl_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64 >= 600";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%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;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     ComponentCondition = "VersionNT >= 600";
-    Styles = (X64);
     Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
     Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
-    Val64 = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64 >= 600";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[INSTALLLOCATION]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;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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_InProcServer32_ThreadingModel_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64 >= 600";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
 End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64 >= 600";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%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 f29b5cb5a8cf..26aaf35efe5c 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -592,7 +592,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_stw_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -655,7 +655,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -734,7 +734,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_sxw_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     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";
@@ -883,7 +883,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odt_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -1128,7 +1128,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ott_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -1280,7 +1280,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";
@@ -1474,7 +1474,7 @@ End
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_oth_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ModuleID = gid_Module_Optional_Winexplorerext;
     Subkey = "LibreOffice.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";