Undo basis/brand split: Moved the rest of the WNT-only stuff.

5 files changed, 19 insertions, 47 deletions

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 4a2b6d092c4f..d54b5e11e6d1 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -42,7 +42,7 @@ End
 #if defined WNT
 File gid_File_Exe_Odbcconfig
     BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = EXENAME(odbcconfig);
     Styles = (PACKED);
 End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5d60eb5e11e8..d83d6cffaec6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -103,7 +103,7 @@ File gid_File_Lib_Cli_Oootypes_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
     Name = "cli_oootypes.dll";
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Assemblyname = "cli_oootypes";
     PublicKeyToken = "ce2cb7e279207b9e";
     Version = "${CLI_OOOTYPES_NEW_VERSION}";
@@ -119,7 +119,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
     Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
     PublicKeyToken = "ce2cb7e279207b9e";
     Version = "${CLI_OOOTYPES_POLICY_VERSION}";
@@ -136,7 +136,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Config
     TXT_FILE_BODY;
     Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
     Name = "cli_oootypes.config";
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
 End
 
@@ -894,32 +894,6 @@ STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
 
 STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
 
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_File_Lib_Mingw_GccS
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = MINGW_GCCDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_File_Lib_Mingw_Stdcpp
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = MINGW_GXXDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
 STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
@@ -1587,7 +1561,7 @@ End
 File gid_File_Moz_Msvc80crt_Manifest
     BIN_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "Microsoft.VC80.CRT.manifest";
 End
 #endif
@@ -1813,7 +1787,7 @@ End
 File gid_File_Lib_sellangmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "sellangmsi.dll";
 End
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3ba48efa2d49..20d9b166fcef 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -454,8 +454,6 @@ Module gid_Module_Root_Files_5
 #endif
     gid_File_Lib_sn_tools,
     GID_FILE_LIB_WPD,
-    gid_File_Lib_Mingw_GccS,
-    gid_File_Lib_Mingw_Stdcpp,
 	gid_File_Lib_Msvcp70,
 	gid_File_Lib_Msvcr70,
 	gid_File_Lib_Ole,
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index a03a55ee944d..97a898150f18 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -28,7 +28,7 @@
 #include "macros.inc"
 
 Directory gid_Dir_Shlxthdl
-    ParentID = gid_Dir_Program;
+    ParentID = gid_Brand_Dir_Program;
     DosName = "shlxthdl";
 End
 
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 62911d24fd0e..78de7890f810 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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]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 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]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 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]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 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
+    Value = "[INSTALLLOCATION]shlxthdl\propertyhdl.dll";
+    Val64 = "[INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel