[Libreoffice-commits] core.git: 2 commits - setup_native/Library_instooofiltmsi.mk setup_native/Library_jfregca.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_regpatchactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk setup_native/Library_thidxmsi.mk setup_native/Module_setup_native.mk setup_native/source
Andras Timar
atimar at suse.com
Wed Feb 13 03:12:49 PST 2013
setup_native/Library_instooofiltmsi.mk | 4
setup_native/Library_jfregca.mk | 4
setup_native/Library_qslnkmsi.mk | 4
setup_native/Library_reg4allmsdoc.mk | 6
setup_native/Library_regactivex.mk | 4
setup_native/Library_regpatchactivex.mk | 4
setup_native/Library_sdqsmsi.mk | 4
setup_native/Library_shlxtmsi.mk | 4
setup_native/Library_sn_tools.mk | 4
setup_native/Library_thidxmsi.mk | 28 -
setup_native/Module_setup_native.mk | 1
setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def | 3
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx | 2
setup_native/source/win32/customactions/javafilter/jfregca.def | 4
setup_native/source/win32/customactions/quickstarter/qslnkmsi.def | 3
setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx | 2
setup_native/source/win32/customactions/quickstarter/sdqsmsi.def | 3
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 2
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def | 6
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 8
setup_native/source/win32/customactions/regactivex/regactivex.cxx | 4
setup_native/source/win32/customactions/regactivex/regactivex.def | 4
setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx | 2
setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def | 3
setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx | 2
setup_native/source/win32/customactions/shellextensions/checkpatches.cxx | 2
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx | 2
setup_native/source/win32/customactions/shellextensions/iconcache.cxx | 2
setup_native/source/win32/customactions/shellextensions/layerlinks.cxx | 4
setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx | 2
setup_native/source/win32/customactions/shellextensions/shlxtmsi.def | 14
setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 4
setup_native/source/win32/customactions/shellextensions/upgrade.cxx | 2
setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx | 4
setup_native/source/win32/customactions/thesaurus/thesaurus.cxx | 201 ----------
setup_native/source/win32/customactions/tools/checkversion.cxx | 2
setup_native/source/win32/customactions/tools/sn_tools.def | 3
37 files changed, 103 insertions(+), 254 deletions(-)
New commits:
commit dbb60dd9aeaaa9e4547e80aa7da4ae3a76e2470f
Author: Andras Timar <atimar at suse.com>
Date: Wed Feb 13 12:04:11 2013 +0100
fix exported DLL function names for all CustomActions
Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3
diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index c37f9ff..07900b1 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,instooofiltmsi))
+$(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\
setup_native/source/win32/customactions/indexingfilter/restartindexingservice \
))
diff --git a/setup_native/Library_jfregca.mk b/setup_native/Library_jfregca.mk
index 9dcb3c5..d3eea27 100644
--- a/setup_native/Library_jfregca.mk
+++ b/setup_native/Library_jfregca.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,jfregca))
+$(eval $(call gb_Library_add_ldflags,jfregca,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/javafilter/jfregca.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,jfregca,\
setup_native/source/win32/customactions/javafilter/jfregca \
))
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 602c046..04dd1fb 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,qslnkmsi))
+$(eval $(call gb_Library_add_ldflags,qslnkmsi,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,qslnkmsi,\
setup_native/source/win32/customactions/quickstarter/remove_quickstart_link \
))
diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk
index 819fb7b..6c0b241 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -14,12 +14,16 @@ $(eval $(call gb_Library_add_defs,reg4allmsdoc,\
-D_UNICODE \
))
+$(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi \
))
$(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\
- msi \
+ msi \
kernel32 \
user32 \
advapi32 \
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index fdb5404..e48a2822 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,regactivex))
+$(eval $(call gb_Library_add_ldflags,regactivex,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/regactivex/regactivex.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,regactivex,\
setup_native/source/win32/customactions/regactivex/regactivex \
))
diff --git a/setup_native/Library_regpatchactivex.mk b/setup_native/Library_regpatchactivex.mk
index 4926fd9..2a48e4b 100644
--- a/setup_native/Library_regpatchactivex.mk
+++ b/setup_native/Library_regpatchactivex.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,regpatchactivex))
+$(eval $(call gb_Library_add_ldflags,regpatchactivex,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,regpatchactivex,\
setup_native/source/win32/customactions/regpatchactivex/regpatchactivex \
))
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index d01cf93..ac7f5cc 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,sdqsmsi))
+$(eval $(call gb_Library_add_ldflags,sdqsmsi,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,sdqsmsi,\
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart \
))
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index dfc8f34..d124e76 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Library_Library,shlxtmsi))
$(eval $(call gb_Library_use_external,shlxtmsi,boost_headers))
+$(eval $(call gb_Library_add_ldflags,shlxtmsi,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,shlxtmsi,\
setup_native/source/win32/customactions/shellextensions/startmenuicon \
setup_native/source/win32/customactions/shellextensions/upgrade \
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index d0d273f..6a26601 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,sn_tools))
+$(eval $(call gb_Library_add_ldflags,sn_tools,\
+ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/tools/sn_tools.def \
+))
+
$(eval $(call gb_Library_add_exception_objects,sn_tools,\
setup_native/source/win32/customactions/tools/checkversion \
))
diff --git a/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
new file mode 100644
index 0000000..0126556
--- /dev/null
+++ b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
@@ -0,0 +1,3 @@
+LIBRARY "instooofiltmsi.dll"
+EXPORTS
+ RestartIndexingService
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index d730807..f68936f 100644
--- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -148,7 +148,7 @@ void StartIndexingService(SC_HANDLE hService)
}
}
-extern "C" __declspec(dllexport) UINT __stdcall RestartIndexingService(MSIHANDLE)
+extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE)
{
//MessageBox(NULL, TEXT("Restarting Indexing Service"), TEXT("Message"), MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.def b/setup_native/source/win32/customactions/javafilter/jfregca.def
new file mode 100644
index 0000000..20af538
--- /dev/null
+++ b/setup_native/source/win32/customactions/javafilter/jfregca.def
@@ -0,0 +1,4 @@
+LIBRARY "jfregca.dll"
+EXPORTS
+ install_jf
+ uninstall_jf
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
new file mode 100644
index 0000000..f50a3a3
--- /dev/null
+++ b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
@@ -0,0 +1,3 @@
+LIBRARY "qslnkmsi.dll"
+EXPORTS
+ RemoveQuickstarterLink
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
index 298f9b6..bbd4f02 100644
--- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
@@ -33,7 +33,7 @@
#include "quickstarter.hxx"
-extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
+extern "C" UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
{
CHAR szStartupPath[MAX_PATH];
diff --git a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
new file mode 100644
index 0000000..c8df896
--- /dev/null
+++ b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
@@ -0,0 +1,3 @@
+LIBRARY "sdqsmsi.dll"
+EXPORTS
+ ShutDownQuickstarter
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index bf128b4..d40d378 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -62,7 +62,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
}
-extern "C" __declspec(dllexport) UINT __stdcall ShutDownQuickstarter( MSIHANDLE hMSI )
+extern "C" UINT __stdcall ShutDownQuickstarter( MSIHANDLE hMSI )
{
EnumWindows( EnumWindowsProc, hMSI );
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
new file mode 100644
index 0000000..cea8b46
--- /dev/null
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
@@ -0,0 +1,6 @@
+LIBRARY "reg4allmsdoc.dll"
+EXPORTS
+ FindRegisteredExtensions
+ LookForRegisteredExtensions
+ RegisterSomeExtensions
+ RestoreRegAllMSDoc
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index fa0506e..a0f930a 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -302,7 +302,7 @@ static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const in
}
}
-extern "C" __declspec(dllexport) UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
+extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
{
OutputDebugStringFormat( "LookForRegisteredExtensions: " );
@@ -403,7 +403,7 @@ extern "C" __declspec(dllexport) UINT __stdcall LookForRegisteredExtensions( MSI
return ERROR_SUCCESS;
}
-extern "C" __declspec(dllexport) UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
+extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
{
OutputDebugStringFormat( "RegisterSomeExtensions: " );
@@ -457,7 +457,7 @@ extern "C" __declspec(dllexport) UINT __stdcall RegisterSomeExtensions( MSIHANDL
return ERROR_SUCCESS;
}
-extern "C" __declspec(dllexport) UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
+extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
{
if ( IsSetMsiProp( handle, "FILETYPEDIALOGUSED" ) )
{
@@ -546,7 +546,7 @@ static void restoreOldRegistration( LPCSTR lpSubKey )
}
}
-extern "C" __declspec(dllexport) UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ )
+extern "C" UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ )
{
OutputDebugStringFormat( "RestoreRegAllMSDoc\n" );
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 10175d6..7be03a2 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -294,7 +294,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
return bResult;
}
//----------------------------------------------------------
-extern "C" __declspec(dllexport) UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
+extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
{
INSTALLSTATE current_state;
INSTALLSTATE future_state;
@@ -341,7 +341,7 @@ extern "C" __declspec(dllexport) UINT __stdcall InstallActiveXControl( MSIHANDLE
}
//----------------------------------------------------------
-extern "C" __declspec(dllexport) UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
+extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
{
INSTALLSTATE current_state;
INSTALLSTATE future_state;
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.def b/setup_native/source/win32/customactions/regactivex/regactivex.def
new file mode 100644
index 0000000..8a4c744
--- /dev/null
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.def
@@ -0,0 +1,4 @@
+LIBRARY "regactivex.dll"
+EXPORTS
+ InstallActiveXControl
+ DeinstallActiveXControl
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
index c0945b7..0c51ccb 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
@@ -80,7 +80,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
}
//----------------------------------------------------------
-extern "C" __declspec(dllexport) UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
+extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
{
// MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
new file mode 100644
index 0000000..e5c021d
--- /dev/null
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
@@ -0,0 +1,3 @@
+LIBRARY "regpatchactivex.dll"
+EXPORTS
+ PatchActiveXControl
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/sellang/sellang.def b/setup_native/source/win32/customactions/sellang/sellang.def
old mode 100755
new mode 100644
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 224bdaf..7b35b3c 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -74,7 +74,7 @@ static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty, con
MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
}
-extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
+extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
{
std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
std::_tstring sOfficeHostnamePath = GetMsiProperty(handle, TEXT("OFFICEDIRHOSTNAME"));
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 6e48e03..94a24cd 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -86,7 +86,7 @@ static void SetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
MsiSetProperty( handle, sProperty.c_str(), TEXT("1") );
}
-extern "C" __declspec(dllexport) UINT __stdcall CheckPatchList( MSIHANDLE handle )
+extern "C" UINT __stdcall CheckPatchList( MSIHANDLE handle )
{
std::_tstring sPatchList = GetMsiProperty( handle, TEXT("PATCH") );
std::_tstring sRequiredPatch = GetMsiProperty( handle, TEXT("PREREQUIREDPATCH") );
diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
index c06413d..d56ad5e 100644
--- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
@@ -62,7 +62,7 @@ namespace
}
} // namespace
-extern "C" __declspec(dllexport) UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
+extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
{
// This CustomAction is necessary for updates from OOo 3.0, OOo 3.1 and OOo 3.2 to versions
// OOo 3.3 or later. This is caused by a change of INSTALLLOCATION, that starting with OOo 3.3
diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
index edc66a8..6e87a84 100644
--- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
@@ -29,7 +29,7 @@
#include <stdlib.h>
-extern "C" __declspec(dllexport) UINT __stdcall RebuildShellIconCache(MSIHANDLE)
+extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
{
// Rebuild icon cache on windows OS prior XP
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 893020f..88e020f 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -88,7 +88,7 @@ namespace
}
} // namespace
-extern "C" __declspec(dllexport) UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
+extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
{
string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
@@ -147,7 +147,7 @@ extern "C" __declspec(dllexport) UINT __stdcall CreateLayerLinks(MSIHANDLE handl
return ERROR_SUCCESS;
}
-extern "C" __declspec(dllexport) UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
+extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
{
string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index 8cf3e91..1b159fd 100644
--- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -62,7 +62,7 @@ namespace
}
} // namespace
-extern "C" __declspec(dllexport) UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
+extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
{
TCHAR szValue[8192];
DWORD nValueSize = sizeof(szValue);
diff --git a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
new file mode 100644
index 0000000..328590e
--- /dev/null
+++ b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
@@ -0,0 +1,14 @@
+LIBRARY "shlxtmsi.dll"
+EXPORTS
+ CheckInstallDirectory
+ CheckPatchList
+ CompleteInstallPath
+ RebuildShellIconCache
+ CreateLayerLinks
+ RemoveLayerLinks
+ MigrateInstallPath
+ InstallStartmenuFolderIcon
+ DeinstallStartmenuFolderIcon
+ SetProductInstallMode
+ RenamePrgFolder
+ RemovePrgFolder
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index 188a965..de3f3f6 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -63,7 +63,7 @@ std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
Called during installation to customize the start menu folder icon.
See: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_extending/custom.asp
*/
-extern "C" __declspec(dllexport) UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
+extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
{
std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini");
@@ -107,7 +107,7 @@ extern "C" __declspec(dllexport) UINT __stdcall InstallStartmenuFolderIcon( MSIH
return ERROR_SUCCESS;
}
-extern "C" __declspec(dllexport) UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle)
+extern "C" UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle)
{
std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini");
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
index a58965e..9a54963 100644
--- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
@@ -169,7 +169,7 @@ namespace
}
} // namespace
-extern "C" __declspec(dllexport) UINT __stdcall SetProductInstallMode(MSIHANDLE handle)
+extern "C" UINT __stdcall SetProductInstallMode(MSIHANDLE handle)
{
string upgradeCode = GetMsiProperty(handle, TEXT("UpgradeCode"));
upgradeCode = ConvertGuid(string(upgradeCode.c_str() + 1, upgradeCode.length() - 2));
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 5e01557..7011fcd 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -141,7 +141,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
-extern "C" __declspec(dllexport) UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
+extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
{
std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
@@ -165,7 +165,7 @@ extern "C" __declspec(dllexport) UINT __stdcall RenamePrgFolder( MSIHANDLE handl
return ERROR_SUCCESS;
}
-extern "C" __declspec(dllexport) UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
+extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
{
std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
std::_tstring sRemoveDir = sOfficeInstallPath + TEXT("program_old");
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index d6fe1a0..dc42bfa 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -72,7 +72,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
#endif
//----------------------------------------------------------
-extern "C" __declspec(dllexport) UINT __stdcall CheckVersions( MSIHANDLE hMSI )
+extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
{
// MessageBox(NULL, L"CheckVersions", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/tools/sn_tools.def b/setup_native/source/win32/customactions/tools/sn_tools.def
new file mode 100644
index 0000000..3c88186
--- /dev/null
+++ b/setup_native/source/win32/customactions/tools/sn_tools.def
@@ -0,0 +1,3 @@
+LIBRARY "sn_tools.dll"
+EXPORTS
+ CheckVersions
\ No newline at end of file
commit eb6fa6be7500b9110913174552c156b0504ece07
Author: Andras Timar <atimar at suse.com>
Date: Wed Feb 13 10:55:40 2013 +0100
remove thesaurus indexer CustomAction
It was never integrated and used. If we made the effort to integrate it,
Windows installer would be a few megabytes smaller, because indexes of
thesauri would be generated in install time (instead of packaging
pre-generated indexes).
However, the cons are:
* untested
* presumably slows down instal process which is slow already
* adds complexity to installer which is too complex already
* indexes will not be there in case of administrative install (QA)
* bad experiences with CustomActions that manipulate the installed
application (various, weird permission problems)
Change-Id: I3989b835b1250718bc03107a3807d091e7a9aa0e
diff --git a/setup_native/Library_thidxmsi.mk b/setup_native/Library_thidxmsi.mk
deleted file mode 100644
index 1647bb3..0000000
--- a/setup_native/Library_thidxmsi.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,thidxmsi))
-
-$(eval $(call gb_Library_add_defs,thidxmsi,\
- -D_STLP_USE_STATIC_LIB \
-))
-
-$(eval $(call gb_Library_add_exception_objects,thidxmsi,\
- setup_native/source/win32/customactions/thesaurus/thesaurus \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,thidxmsi,\
- msi \
- kernel32 \
- user32 \
- advapi32 \
- shell32 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index fc6ffea..f8fa967 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
Library_sellangmsi \
Library_shlxtmsi \
Library_sn_tools \
- Library_thidxmsi \
StaticLibrary_quickstarter \
StaticLibrary_seterror \
))
diff --git a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
deleted file mode 100644
index b5c4aec..0000000
--- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0500
-#undef WINVER
-#define WINVER 0x0500
-
-#include <windows.h>
-#include <msiquery.h>
-#include <malloc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <systools/win32/uwinapi.h>
-#include <io.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <map>
-#include <vector>
-#include <stdlib.h>
-#include <string.h>
-using namespace std;
-namespace
-{
-
- string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
- {
- string result;
- TCHAR szDummy[1] = TEXT("");
- DWORD nChars = 0;
-
- if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA)
- {
- DWORD nBytes = ++nChars * sizeof(TCHAR);
- LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
- return result;
- }
-
- inline bool IsSetMsiProperty(MSIHANDLE handle, const string& sProperty)
- {
- return (GetMsiProperty(handle, sProperty).length() > 0);
- }
-
- inline void UnsetMsiProperty(MSIHANDLE handle, const string& sProperty)
- {
- MsiSetProperty(handle, sProperty.c_str(), NULL);
- }
-
- inline void SetMsiProperty(MSIHANDLE handle, const string& sProperty, const string&)
- {
- MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
- }
-
- static const int MAXLINE = 1024*64;
-
-
- void generateIndex(const char *inputFile, const char *outputFile)
- {
-
- ifstream in(inputFile);
- char inputBuffer[MAXLINE];
- map<string, size_t> entries;
- map<string,size_t>::iterator ret(entries.begin());
-
- int line(1);
- in.getline(inputBuffer, MAXLINE);
- const string encoding(inputBuffer);
- size_t currentOffset(encoding.size()+1);
- while (true)
- {
- // Extract the next word, but not the entry count
- in.getline(inputBuffer, MAXLINE, '|');
-
- if (in.eof()) break;
-
- string word(inputBuffer);
- ret = entries.insert(ret, pair<string, size_t>(word, currentOffset));
- currentOffset += word.size() + 1;
- // Next is the entry count
- in.getline(inputBuffer, MAXLINE);
- if (!in.good())
- {
- return;
-
- }
- currentOffset += strlen(inputBuffer)+1;
- int entryCount(strtol(inputBuffer, NULL, 10));
- for (int i(0); i < entryCount; ++i)
- {
- in.getline(inputBuffer, MAXLINE);
- currentOffset += strlen(inputBuffer)+1;
- ++line;
- }
- }
-
- // Use binary mode to prevent any translation of LF to CRLF on Windows
- ofstream outputStream(outputFile, ios_base::binary| ios_base::trunc|ios_base::out);
- if (!outputStream.is_open())
- {
- //cerr << "Unable to open output file " << outputFile << endl;
- return;
- }
-
- cerr << "Doing it now" << outputFile << endl;
- outputStream << encoding << '\n' << entries.size() << '\n';
-
- for (map<string, size_t>::const_iterator ii(entries.begin());
- ii != entries.end();
- ++ii
- )
- {
- outputStream << ii->first << '|' << ii->second << '\n';
- }
- outputStream.close();
- }
-
- void generateIndex(const string &datFile)
- {
- string idxFile(datFile.substr(0, datFile.size()-3)+"idx");
- generateIndex(datFile.c_str(), idxFile.c_str());
- }
- void createIndexesForThesaurusFiles(const string & sOfficeInstallPath)
- {
- vector<string> thesaurusPaths;
-
- string sExtensionsPath = sOfficeInstallPath + "\\share\\extensions\\";
-
- string dictionariesWildcard = sExtensionsPath + "dict-*";
-
- struct _finddatai64_t dictFind;
- long h = _findfirsti64(dictionariesWildcard.c_str(),&dictFind);
- if (h > 0)
- {
- do
- {
- if (dictFind.attrib & _A_SUBDIR)
- {
- struct _finddatai64_t datFind;
- // Find any .dat files in the subdirectory
- string dictPath = sExtensionsPath + dictFind.name + "\\";
- string datWildCard = dictPath + "*.dat";
- long h2 = _findfirsti64(datWildCard.c_str(), &datFind);
- if (h2 > 0)
- {
- do
- {
- thesaurusPaths.push_back(dictPath + datFind.name);
-
- } while (_findnexti64(h2,&datFind) == 0);
- }
- }
-
- } while (_findnexti64(h,&dictFind) == 0);
- }
- for (vector<string>::const_iterator ii(thesaurusPaths.begin());
- ii != thesaurusPaths.end();
- ++ii
- )
- {
- generateIndex(*ii);
- }
- }
-
-} // namespace
-
-
-// Creates the thesaurus .idx files for all installed .dat
-// thesaurus files
-extern "C" __declspec(dllexport) UINT __stdcall CreateIndexes( MSIHANDLE handle )
-{
-
- string sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- createIndexesForThesaurusFiles(sOfficeInstallPath);
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list