native305 #i92977# new Windows INSTALLLOCATION settings

8 files changed, 42 insertions, 50 deletions

diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 593c6177edad..1340d637e009 100644
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@@ -46,7 +46,7 @@ RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
@@ -106,7 +106,7 @@ RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
@@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
@@ -226,7 +226,7 @@ RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b2023aabecd7..6558dd1a55ff 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1190,7 +1190,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "UREINSTALLLOCATION";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]URE\\";
     Inifiletablekey = "UreInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
@@ -1204,7 +1204,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "BASISINSTALLLOCATION";
-    Value = "[BASISINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]Basis\\";
     Inifiletablekey = "BasisInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
@@ -1218,7 +1218,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "OFFICEINSTALLLOCATION";
-    Value = "[OFFICEINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
     Inifiletablekey = "OfficeInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 7021f02efc4a..3cd20ef97142 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
   #else
     HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
   #endif
-    Styles = (OFFICEDIRECTORY);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
 End
 #endif
 
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 47a053f225cd..59ef1673d727 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -289,7 +289,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End
 
@@ -307,7 +307,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -325,7 +325,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (ALWAYS_REQUIRED);
 End
 
@@ -334,7 +334,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -343,7 +343,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End
 
@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 
@@ -370,7 +370,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -379,7 +379,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End
 
@@ -397,7 +397,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ca7a7222b074..ea0492235e91 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1263,5 +1263,5 @@ RegistryItem gid_Regitem_Path
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
     Name = "Path";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
 End
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index caa78335e509..5fad8fadcbba 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -46,6 +46,7 @@ Directory gid_Dir_Ooo_Openofficeorg
   #else
     HostName = "openoffice.org";
   #endif
+    Styles = (ISINSTALLLOCATION);
 End
 
 Directory gid_Dir_Common_Ure
@@ -105,21 +106,4 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
 	Styles = (ALWAYS_REQUIRED);
 End
 
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
 
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 9794fa06719e..d47e14d0a63a 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -46,6 +46,14 @@ End
 
 #ifndef MACOSX
 
+#ifdef WNT
+Directory gid_Dir_Sdkoo_Root
+    ParentID = PREDEFINED_PROGDIR;
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+End
+#endif
+
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
     ParentID = PREDEFINED_PROGDIR;
@@ -77,7 +85,7 @@ Directory gid_Dir_Basis_Sdk
     DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
-    ParentID = PREDEFINED_PROGDIR;
+    ParentID = gid_Dir_Sdkoo_Root;
   #else
     ParentID = gid_Dir_Ooo_Basis_Sdk;
   #endif
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 7c932bac1f28..62911d24fd0e 100755..100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -124,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -167,8 +167,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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -201,8 +201,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     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";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel