fix exported DLL function names for all CustomActions

Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3
2013-02-13 12:04:11 +01:00
parent eb6fa6be75
commit dbb60dd9ae
35 changed files with 103 additions and 24 deletions
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
--- 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 \
 ))
--- a/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
+++ b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"instooofiltmsi.dll"
+EXPORTS
+			RestartIndexingService
--- 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);

--- a/setup_native/source/win32/customactions/javafilter/jfregca.def
+++ b/setup_native/source/win32/customactions/javafilter/jfregca.def
@@ -0,0 +1,4 @@
+LIBRARY		"jfregca.dll"
+EXPORTS
+			install_jf
+			uninstall_jf
--- a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
+++ b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"qslnkmsi.dll"
+EXPORTS
+			RemoveQuickstarterLink
--- 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];

--- a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
+++ b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"sdqsmsi.dll"
+EXPORTS
+			ShutDownQuickstarter
--- 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 );

--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
@@ -0,0 +1,6 @@
+LIBRARY		"reg4allmsdoc.dll"
+EXPORTS
+			FindRegisteredExtensions
+			LookForRegisteredExtensions
+			RegisterSomeExtensions
+			RestoreRegAllMSDoc 
--- 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" );

--- 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;
--- a/setup_native/source/win32/customactions/regactivex/regactivex.def
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.def
@@ -0,0 +1,4 @@
+LIBRARY		"regactivex.dll"
+EXPORTS
+			InstallActiveXControl
+			DeinstallActiveXControl 
--- 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);

--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
@@ -0,0 +1,3 @@
+LIBRARY		"regpatchactivex.dll"
+EXPORTS
+			PatchActiveXControl
--- a/setup_native/source/win32/customactions/sellang/sellang.def
+++ b/setup_native/source/win32/customactions/sellang/sellang.def
--- 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"));
--- 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") );
--- 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
--- 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

--- 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"));

--- 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);
--- a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
+++ 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
--- 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");
--- 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));
--- 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");
--- 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);

--- a/setup_native/source/win32/customactions/tools/sn_tools.def
+++ b/setup_native/source/win32/customactions/tools/sn_tools.def
@@ -0,0 +1,3 @@
+LIBRARY		"sn_tools.dll"
+EXPORTS
+			CheckVersions