vs2012 express support.

vs2012 express does not have atl so one need to
--disable-atl and --disable-activex

but then the packaging still try to include a few _x64.dll
that are not built.

Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6

scp2/AutoInstall.mk

@@ -35,8 +35,10 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
+ifeq ($(BUILD_X64),TRUE)
 $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
+endif
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
 # vim: set noet sw=4 ts=4:

scp2/InstallModule_winexplorerext.mk

@@ -13,8 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
 	winexplorerextbinarytable \
 	winexplorerext \
 	winexplorerextnt6 \
-	winexplorerextwin64 \
-	winexplorerextwin64nt6 \
+	$(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \
+	winexplorerextwin64nt6) \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\

scp2/inc/macros.inc

@@ -427,6 +427,8 @@ End
 
 #ifdef _MSC_VER
 
+#ifdef BUILD_X64
+
 #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
     RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
         ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
@@ -444,6 +446,18 @@ End
         Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
     End
 
+#else
+#endif
+
+#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; \
+        ComponentCondition = "VersionNT >= 600"; \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
 #else
 #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
 #endif

scp2/source/winexplorerext/module_winexplorerext.scp

@@ -21,8 +21,10 @@
 #include "AutoInstall/winexplorerextbinarytable"
 #include "AutoInstall/winexplorerext"
 #include "AutoInstall/winexplorerextnt6"
+#ifdef BUILD_X64
 #include "AutoInstall/winexplorerextwin64"
 #include "AutoInstall/winexplorerextwin64nt6"
+#endif
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
@@ -37,6 +39,7 @@ Module gid_Module_Optional_Winexplorerext
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
 
+#ifdef BUILD_X64
 Module gid_Module_Optional_Winexplorerext_x64
     ParentID = gid_Module_Optional_Winexplorerext;
     Name = "gid_Module_Optional_Winexplorerext_x64";
@@ -52,3 +55,4 @@ Module gid_Module_Optional_Winexplorerext_x64
              gid_File_Lib_Msvcp110,
              gid_File_Lib_Msvcr110);
 End
+#endif

scp2/source/winexplorerext/registryitem_winexplorerext.scp

@@ -28,6 +28,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -36,6 +38,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -44,6 +48,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     Value = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -52,6 +58,7 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     Name = "ThreadingModel";
     Value = "Apartment";
 End
+#endif
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
@@ -61,6 +68,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved
     Value = "%PRODUCTNAME Infotip Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -70,6 +79,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64
     Value = "%PRODUCTNAME Infotip Handler";
 End
 
+#endif
+
 // End registry items for the Infotip handler
 
 // Begin registry items for the Thumbnail viewer
@@ -81,6 +92,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -89,6 +102,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -98,6 +113,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     Val64 = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -107,6 +124,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     Value = "Apartment";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -115,6 +134,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved
     Value = "%PRODUCTNAME Thumbnail Viewer";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -124,6 +145,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64
     Value = "%PRODUCTNAME Thumbnail Viewer";
 End
 
+#endif
+
 // End registry items for the Thumbnail viewer
 
 // Begin registry items for the Column handler
@@ -135,6 +158,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60C
     Value = "%PRODUCTNAME Column Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -143,6 +168,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60C
     Value = "%PRODUCTNAME Column Handler";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -150,6 +177,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -158,6 +187,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -166,6 +197,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     Value = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -175,6 +208,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     Value = "Apartment";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -183,6 +218,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved
     Value = "%PRODUCTNAME Column Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -192,6 +229,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64
     Value = "%PRODUCTNAME Column Handler";
 End
 
+#endif
+
 // End registry items for the Column handler
 
 // Begin registry items for the MS Indexing server filter component
@@ -203,6 +242,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
     Value = "OpenDocument Format Filter";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -211,6 +252,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64
     Value = "OpenDocument Format Filter";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -219,6 +262,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -227,6 +272,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -235,6 +282,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     Value = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -244,6 +293,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     Value = "Apartment";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -251,6 +302,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
     Value = "OpenDocument Format Persistent Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -259,6 +312,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
     Value = "OpenDocument Format Persistent Handler";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -266,6 +321,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAd
     Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -274,6 +331,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAd
     Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
 End
 
+#endif
+
 // End registry items for the MS Indexing server filter component
 
 // Begin registry entries for the PropertySheet handler
@@ -285,6 +344,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -293,6 +354,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -301,6 +364,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Value = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -310,6 +375,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Value = "Apartment";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -318,6 +385,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved
     Value = "%PRODUCTNAME Property Sheet Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -327,6 +396,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64
     Value = "%PRODUCTNAME Property Sheet Handler";
 End
 
+#endif
+
 // End registry entries for the PropertySheet handler
 
 // Begin registry entries for the Property handler
@@ -339,6 +410,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
     Value = "%PRODUCTNAME Property Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +420,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
     Value = "%PRODUCTNAME Property Handler";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -355,6 +430,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -363,6 +440,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -372,6 +451,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     Value = "Apartment";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -381,6 +462,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     Value = "Apartment";
 End
 
+#endif
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext;
@@ -390,6 +473,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
     Value = "%PRODUCTNAME Property Handler";
 End
 
+#ifdef BUILD_X64
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -399,4 +484,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64
     Value = "%PRODUCTNAME Property Handler";
 End
 
+#endif
+
 // End registry entries for the Property handler