summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rw-r--r--scp2/inc/macros.inc12
-rw-r--r--scp2/prj/build.lst2
-rw-r--r--scp2/source/activex/file_activex.scp10
-rw-r--r--scp2/source/activex/makefile.mk4
-rw-r--r--scp2/source/activex/module_activex.scp2
-rw-r--r--scp2/source/calc/registryitem_calc.scp4
-rw-r--r--scp2/source/draw/registryitem_draw.scp4
-rw-r--r--scp2/source/impress/registryitem_impress.scp4
-rw-r--r--scp2/source/math/registryitem_math.scp4
-rw-r--r--scp2/source/ooo/common_brand.scp3
-rw-r--r--scp2/source/ooo/directory_ooo.scp5
-rw-r--r--scp2/source/ooo/file_library_ooo.scp58
-rw-r--r--scp2/source/ooo/file_ooo.scp18
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp2
-rw-r--r--scp2/source/ooo/makefile.mk8
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp4
-rwxr-xr-xscp2/source/ooo/module_lang_template.scp1
-rw-r--r--scp2/source/ooo/registryitem_ooo.scp61
-rw-r--r--scp2/source/ooo/vc_redist.scp1
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp18
-rw-r--r--scp2/source/winexplorerext/file_winexplorerext.scp52
-rw-r--r--scp2/source/winexplorerext/makefile.mk4
-rw-r--r--scp2/source/winexplorerext/module_winexplorerext.scp6
-rw-r--r--scp2/source/winexplorerext/registryitem_winexplorerext.scp74
-rw-r--r--scp2/source/writer/registryitem_writer.scp4
25 files changed, 268 insertions, 97 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7d9cdbd1d027..27ef93479d36 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -156,6 +156,18 @@
PACKED_LIB_FILE_BODY_PATCH; \
End
+#define SPECIAL_LIB_FILE(id,name) \
+ File id \
+ Name = SPECIAL_NAME(name); \
+ PACKED_LIB_FILE_BODY; \
+ End
+
+#define SPECIAL_LIB_FILE_PATCH(id,name) \
+ File id \
+ Name = SPECIAL_NAME(name); \
+ PACKED_LIB_FILE_BODY_PATCH; \
+ End
+
#define STD_RES_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 342053a288cb..abf5f14740da 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 8cc1c45e17e7..5f257af2e1b8 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -37,6 +37,16 @@ File gid_File_Lib_Soactivex
Name = "so_activex.dll";
End
+#ifdef BUILD_X64
+ File gid_File_Lib_Soactivex64
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "so_activex_x64.dll";
+ ComponentCondition = "VersionNT64";
+ End
+#endif
+
File gid_File_Lib_Regactivex_Msi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index 25a64f07cb64..86097032f455 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -41,6 +41,10 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
.IF "$(GUI)"=="WNT"
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 074e5f36f064..4d39208f5d14 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -37,5 +37,5 @@ Module gid_Module_Optional_Activexcontrol
Default = NO;
Minimal = NO;
ParentID = gid_Module_Optional;
- Files = (gid_File_Lib_Soactivex, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
+ Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
End
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 133dc6952c94..c720c0a85d0f 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index f1f1a086c997..13b32fd71d0d 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 5ba0cecb95d5..2e7d7f471cfe 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 5a55f1bf4b83..84c246f60b3c 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -83,7 +83,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
@@ -202,7 +202,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8a3b0b4443f1..88c1e02a7591 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -101,12 +101,9 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
gid_Brand_File_Oo_Office_Compatibility_Xcu,
- gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01,
gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu,
gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu,
gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu,
- gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01,
- gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration,
gid_Brand_File_Share_Xdg_Base,
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 62b569e8f730..ce9fd987d038 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -892,11 +892,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Setup
HostName = "Setup";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_Inet
- ParentID = gid_Dir_Share_Registry_Modules_Oo;
- HostName = "Inet";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
HostName = "Accelerators";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 16855101dfd2..b25f7f8b222c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -399,7 +399,42 @@ File gid_File_Lib_Vbaobj
#endif
End
+File gid_File_Lib_Vbaswobj
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Dir = gid_Dir_Program;
+ #ifdef UNX
+ Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+ #endif
+End
+
+File gid_File_Lib_Vbamsforms
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Dir = gid_Dir_Program;
+ #ifdef UNX
+ Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
+ #endif
+End
+
#endif // VBA_EXTENSION
+File gid_File_Lib_Vbahelper
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
+ #endif
+End
#endif // ENABLE_VBA
@@ -1410,20 +1445,6 @@ End
#ifdef WNT
-File gid_File_Lib_OOoFilt
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "ooofilt.dll";
-End
-
-File gid_File_Lib_OOoFiltProxy
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "ooofiltproxy.dll";
-End
-
File gid_File_Lib_Instooofiltmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -1472,15 +1493,15 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
STD_LIB_FILE( gid_File_Lib_Sts , sts)
-STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+STD_LIB_FILE_PATCH( gid_File_Lib_Msfilter, msfilter)
+
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
@@ -1561,6 +1582,9 @@ End
#ifndef DISABLE_NEON
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+ #ifndef SYSTEM_NEON
+ SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
+ #endif
#endif
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d1d8bb5cc40..c22fabf74d57 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -503,17 +503,6 @@ End
#endif
#ifdef SOLAR_JAVA
-#ifndef GCJ
-File gid_File_Jar_Sandbox
- TXT_FILE_BODY;
- Name = JARFILENAME(sandbox);
- Dir = gid_Dir_Classes;
- Styles = (PACKED);
-End
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
@@ -2903,6 +2892,13 @@ File gid_File_ImagesCrystal_Zip
Styles = (PACKED);
End
+File gid_File_ImagesOxygen_Zip
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Share_Config;
+ Name = "images_oxygen.zip";
+ Styles = (PACKED);
+End
+
File gid_File_ImagesHicontrast_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 14b02d2dfa83..c0371115788f 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -106,6 +106,8 @@ STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
STD_RES_FILE( gid_File_Res_Svx, svx )
STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
+STD_RES_FILE( gid_File_Res_Cui, cui )
+
STD_RES_FILE( gid_File_Res_Sw, sw )
STD_RES_FILE( gid_File_Res_Tk, tk )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index b7183112d1df..aa8c3178c9fd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -53,6 +53,11 @@ SCPDEFS+=-DENABLE_CRASHDUMP
SCPDEFS+=-DBUILD_SPECIAL
.ENDIF
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
+
SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
.IF "$(PROF_EDITION)"!=""
@@ -212,6 +217,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
.IF "$(DISABLE_NEON)" == "TRUE"
SCPDEFS+=-DDISABLE_NEON
.ENDIF
+.IF "$(SYSTEM_NEON)" == "YES"
+SCPDEFS+=-DSYSTEM_NEON
+.ENDIF
# if yes or unset (neon not used) -> do not install openssl library!
.IF $(SYSTEM_OPENSSL) != "YES"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9607c88b6e0c..4b293e0a6126 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ucbhelper,
gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
+ gid_File_Lib_Neon,
gid_File_Lib_Ucpfile1,
gid_File_Lib_Ucpftp1,
gid_File_Lib_Ucphier1,
@@ -410,8 +411,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Reg4allmsdoc,
gid_File_Lib_Qslnkmsi,
gid_File_Lib_Sdqsmsi,
- gid_File_Lib_OOoFilt,
- gid_File_Lib_OOoFiltProxy,
gid_File_Lib_Instooofiltmsi,
gid_File_Lib_Smplmail,
gid_File_Lib_Gconfebe,
@@ -868,6 +867,7 @@ Module gid_Module_Root_Files_Images
Styles = (HIDDEN_ROOT);
Files = (gid_File_Images_Zip,
gid_File_ImagesCrystal_Zip,
+ gid_File_ImagesOxygen_Zip,
gid_File_ImagesHicontrast_Zip,
gid_File_ImagesIndustrial_Zip,
gid_File_ImagesTango_Zip,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index d28fa5bb54dd..9f6329fabc77 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -96,6 +96,7 @@ Module gid_Module_Langpack_Resource_Template
gid_File_Res_Svt,
gid_File_Res_Svp,
gid_File_Res_Svx,
+ gid_File_Res_Cui,
gid_File_Res_TextConversionDlgs,
gid_File_Res_Sw,
gid_File_Res_Tab,
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 4e34805e33ec..d06c4bd3864c 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -37,6 +37,13 @@ RegistryItem gid_Regitem_Bau
Value = "soffice.StarConfigFile.6";
End
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e
+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
+ ModuleID = gid_Module_Root;
+ Value = "%PRODUCTNAME Service Manager";
+End
+
RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
@@ -44,6 +51,14 @@ RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
End
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID
+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
+ ModuleID = gid_Module_Root;
+ Name = "AppID";
+ Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
+End
+
RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32";
@@ -518,52 +533,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
Value = "<progpath>\program";
End
-// 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;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old: Value = "opendocument.org Filter";
- Value = "OpenDocument Format Filter";
- Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
- Value = "[BASISINSTALLLOCATION]program\ooofiltproxy.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old: Value = "opendocument.org Persistent Handler";
- Value = "OpenDocument Format Persistent Handler";
- Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
- Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-End
-
-// End registry items for the MS Indexing server filter component
-
// "OpenWith" Windows Registry keys for extensions supported by OOo
// new oxt file extension for office extension packages
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 8f0b5e8a1bf9..b7e6e81dc331 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -53,6 +53,7 @@
// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
// End
+
ScpAction scp_Copy_vcredist_x86
#if defined(BUILD_SPECIAL)
Copy = "vcredist_x86_9.0.21022.218.exe";
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index d5ececcbac73..b4ddac39799b 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -75,6 +75,24 @@ 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
+
WindowsCustomAction gid_Customaction_Jfregcadll1
Name = "Jfregcadll1";
Typ = "65";
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index e7b3584b32db..dd8b8912ae8c 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -35,6 +35,40 @@ Directory gid_Dir_Shlxthdl
DosName = "shlxthdl";
End
+File gid_File_Lib_OOoFilt
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofilt.dll";
+End
+
+File gid_File_Lib_OOoFiltProxy
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofiltproxy.dll";
+End
+
+#ifdef BUILD_X64
+
+File gid_File_Lib_OOoFilt64
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofilt_x64.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_OOoFiltProxy64
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofiltproxy_x64.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+#endif
+
File gid_File_Lib_Shlxthdl
TXT_FILE_BODY;
Styles = (PACKED);
@@ -42,6 +76,17 @@ File gid_File_Lib_Shlxthdl
Name = "shlxthdl.dll";
End
+#ifdef BUILD_X64
+ File gid_File_Lib_Shlxthdl64
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "shlxthdl_x64.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+#endif
+
#if defined M1310
File gid_File_Lib_Shlxthdl_Msvcr71
TXT_FILE_BODY;
@@ -80,3 +125,10 @@ File gid_File_Lib_Shlxtmsi
Dir = SCP2_OOO_BIN_DIR;
Name = "shlxtmsi.dll";
End
+
+File gid_File_Lib_Reg64
+ TXT_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "reg64msi.dll";
+End
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index ce5ae0935ba6..6fc8ef03b382 100644
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -41,6 +41,10 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
.IF "$(GUI)"=="WNT"
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 203648b7371e..c1f0ac7f9010 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -38,8 +38,14 @@ 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_OOoFiltProxy,
+ gid_File_Lib_OOoFilt64,
+ gid_File_Lib_OOoFiltProxy64,
gid_File_Lib_Shlxthdl_Msvcr71,
gid_File_Lib_Shlxthdl_Stlport,
gid_File_Lib_Shlxtmsi,
+ gid_File_Lib_Reg64,
gid_File_Tmp_Userinstall_Winexplorerext_Inf);
End
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 54974e9dac1c..87084695ada0 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -36,16 +36,20 @@
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 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+ Val64 = "\"[BASISINSTALLLOCATION]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
// End registry items for the Infotip handler
@@ -55,16 +59,20 @@ 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 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+ Val64 = "\"[BASISINSTALLLOCATION]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
// End registry items for the Thumbnail viewer
@@ -74,42 +82,106 @@ 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 = "OpenOffice.org Column Handler";
+ Val64 = "OpenOffice.org 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 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+ Val64 = "\"[BASISINSTALLLOCATION]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
// 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;
+ Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+// Better?: "OpenOffice.org Format Filter"
+// old: Value = "opendocument.org Filter";
+ 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;
+ Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+ Styles = (X64); // Values: X64 / X64_ONLY
+ Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
+ Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ ModuleID = gid_Module_Root;
+ 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;
+ Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+//? Better: "OpenOffice.org Persistent Handler"
+// old: Value = "opendocument.org Persistent Handler";
+ 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
+ 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
+
// Begin registry entries for the PropertySheet handler
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 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+ Val64 = "\"[BASISINSTALLLOCATION]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
-// End registry entries for the PropertySheet handler
+// End registry entries for the PropertySheet handler \ No newline at end of file
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 545225ca8950..33616500ac29 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
- Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
+ Value = "<progpath>\program\inprocserv.dll";
Styles = (PATCH);
End
generated by cgit (git 2.34.1) at 2025-02-08 06:06:31 +0000