Get rid of Windows .def files in setup_native, use __declspec(dllexport)

For one, replacing the dated .def files with equivalent functionality should be
a good move all by itself.  And for another, it paves the way for using
loplugin:external with clang-cl on Windows, which uses the heuristic of not
warning about functions that are explicitly marked as __declspec(dllexport).

Change-Id: I6efd50a8c5ce2a166ca0dd4e5f472118f3f9a071
Reviewed-on: https://gerrit.libreoffice.org/60691
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

34 files changed, 24 insertions, 75 deletions

diff --git a/setup_native/Library_inst_msu_msi.mk b/setup_native/Library_inst_msu_msi.mk
index d423b5168697..8e617b495fe1 100644
--- a/setup_native/Library_inst_msu_msi.mk
+++ b/setup_native/Library_inst_msu_msi.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,inst_msu_msi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,inst_msu_msi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index 36e2e2a6b81c..a0656842cd47 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index f958534f07b1..9893d1c227b5 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,qslnkmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,qslnkmsi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk
index f20fa5ad5aea..6d13ecb97afb 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index 7142b8ee0a7d..96d9095a0f28 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,regactivex,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,regactivex,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/regactivex/regactivex.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index ff9a1bd586a7..8b4c485dfc2d 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,sdqsmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sdqsmsi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 04f8f6edbc46..3289f8fb04d3 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_add_cxxflags,sellangmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sellangmsi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index e6780d014b5f..e80600f300de 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,shlxtmsi,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index aa94f2ebcf02..f99e8b1af75c 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_cxxflags,sn_tools,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sn_tools,\
-	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/tools/sn_tools.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
deleted file mode 100644
index 0126556a48eb..000000000000
--- a/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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 783198fdf08a..4558d6f8a399 100644
--- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -124,7 +124,7 @@ void StartIndexingService(SC_HANDLE hService)
     }
 }
 
-extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE)
+extern "C" __declspec(dllexport) UINT __stdcall RestartIndexingService(MSIHANDLE)
 {
     SC_HANDLE hSCManager = OpenSCManagerW(
         nullptr, // local machine
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
index fee4e6feb58b..91464fdd17de 100644
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
@@ -326,7 +326,7 @@ private:
 // "InstMSUBinary" property and unpacks the binary with that name to a temporary file; sets
 // "cleanup_msu" and "inst_msu" properties to the full name of the extracted temporary file. These
 // properties will become "CustomActionData" property inside relevant deferred actions.
-extern "C" UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall)
+extern "C" __declspec(dllexport) UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall)
 {
     try
     {
@@ -411,7 +411,7 @@ extern "C" UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall)
 
 // Deferred action "inst_msu" that must be run from system account. Receives the tempfile name from
 // "CustomActionData" property, and runs wusa.exe to install it. Waits for it and checks exit code.
-extern "C" UINT __stdcall InstallMSU(MSIHANDLE hInstall)
+extern "C" __declspec(dllexport) UINT __stdcall InstallMSU(MSIHANDLE hInstall)
 {
     try
     {
@@ -486,7 +486,7 @@ extern "C" UINT __stdcall InstallMSU(MSIHANDLE hInstall)
 // Rollback deferred action "cleanup_msu" that is executed on error or cancel.
 // It removes the temporary file created by UnpackMSUForInstall action.
 // MUST be placed IMMEDIATELY AFTER "unpack_msu" in execute sequence.
-extern "C" UINT __stdcall CleanupMSU(MSIHANDLE hInstall)
+extern "C" __declspec(dllexport) UINT __stdcall CleanupMSU(MSIHANDLE hInstall)
 {
     try
     {
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def b/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def
deleted file mode 100644
index 49ade9c0169e..000000000000
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY		"inst_msu_msi.dll"
-EXPORTS
-			UnpackMSUForInstall
-			InstallMSU
-			CleanupMSU
\ 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
deleted file mode 100644
index f50a3a39686e..000000000000
--- a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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 5f720a2b8516..68faed45aac7 100644
--- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
@@ -21,7 +21,7 @@
 
 #include <shlobj.h>
 
-extern "C" UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
 {
     WCHAR    szStartupPath[MAX_PATH];
 
diff --git a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
deleted file mode 100644
index c8df896e579d..000000000000
--- a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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 f3ec02a7772b..c93b000e4b58 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -63,7 +63,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
 }
 
 
-extern "C" UINT __stdcall ShutDownQuickstarter( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) 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
deleted file mode 100644
index cea8b4699569..000000000000
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
+++ /dev/null
@@ -1,6 +0,0 @@
-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 da72f34c7e92..5982dc8f6b13 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -257,7 +257,7 @@ static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const in
     }
 }
 
-extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
 {
     OutputDebugStringFormatW( L"LookForRegisteredExtensions: " );
 
@@ -358,7 +358,7 @@ extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
     return ERROR_SUCCESS;
 }
 
-extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
 {
     OutputDebugStringFormatW( L"RegisterSomeExtensions: " );
 
@@ -412,7 +412,7 @@ extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
     return ERROR_SUCCESS;
 }
 
-extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
 {
     if ( IsSetMsiPropW( handle, L"FILETYPEDIALOGUSED" ) )
     {
@@ -501,7 +501,7 @@ static void restoreOldRegistration( LPCWSTR lpSubKey )
     }
 }
 
-extern "C" UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ )
+extern "C" __declspec(dllexport) UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ )
 {
     OutputDebugStringFormatW( L"RestoreRegAllMSDoc\n" );
 
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 561ced1d906e..c9fb5b5db250 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -259,7 +259,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
     return bResult;
 }
 
-extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
 {
     INSTALLSTATE current_state;
     INSTALLSTATE future_state;
@@ -306,7 +306,7 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
 }
 
 
-extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) 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
deleted file mode 100644
index 8a4c744d78a0..000000000000
--- a/setup_native/source/win32/customactions/regactivex/regactivex.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY		"regactivex.dll"
-EXPORTS
-			InstallActiveXControl
-			DeinstallActiveXControl 
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index aaf8e3ffe7b3..e177ba918445 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -231,7 +231,7 @@ void addMatchingDictionaries(
 
 }
 
-extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall SelectLanguage( MSIHANDLE handle )
 {
     char feature[100];
     MSIHANDLE database, view, record;
diff --git a/setup_native/source/win32/customactions/sellang/sellang.def b/setup_native/source/win32/customactions/sellang/sellang.def
deleted file mode 100644
index 8d3c4d44cd00..000000000000
--- a/setup_native/source/win32/customactions/sellang/sellang.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY		"sellangmsi.dll"
-EXPORTS
-			SelectLanguage
-			SortTree
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index 25354bdea6bf..cb44675b90c9 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -12,7 +12,7 @@
 #include <msi.h>
 #include <commctrl.h>
 
-extern "C" UINT __stdcall SortTree(MSIHANDLE)
+extern "C" __declspec(dllexport) UINT __stdcall SortTree(MSIHANDLE)
 {
     // Sort items (languages) in SelectionTree control, fdo#46355
 
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 9f7080984293..5c68659950ef 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -28,7 +28,7 @@
 #include <systools/win32/uwinapi.h>
 #include "../tools/seterror.hxx"
 
-extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
+extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
 {
     std::wstring sInstallPath = GetMsiPropertyW(handle, L"INSTALLLOCATION");
     std::wstring sOfficeHostnamePath = GetMsiPropertyW(handle, L"OFFICEDIRHOSTNAME");
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 729bce0bc0cb..836b3e655e75 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -38,7 +38,7 @@ static inline void OutputDebugStringFormatW( PCWSTR, ... )
 }
 #endif
 
-extern "C" UINT __stdcall CheckPatchList( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall CheckPatchList( MSIHANDLE handle )
 {
     std::wstring sPatchList = GetMsiPropertyW( handle, L"PATCH" );
     std::wstring sRequiredPatch = GetMsiPropertyW( handle, L"PREREQUIREDPATCH" );
diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
index 9eb5762dc0e8..ee8c71369720 100644
--- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
@@ -21,7 +21,7 @@
 
 #include <malloc.h>
 
-extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
+extern "C" __declspec(dllexport) 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/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index 76de7a7559f0..66bb99ae18e8 100644
--- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <systools/win32/uwinapi.h>
 
-extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
 {
     WCHAR   szValue[8192];
     DWORD   nValueSize = sizeof(szValue); // yes, it is the number of bytes
diff --git a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
deleted file mode 100644
index e0e667953d4f..000000000000
--- a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY		"shlxtmsi.dll"
-EXPORTS
-			CheckInstallDirectory
-			CheckPatchList
-			CompleteInstallPath
-			MigrateInstallPath
-			InstallStartmenuFolderIcon
-			DeinstallStartmenuFolderIcon
-			SetProductInstallMode
-			RenamePrgFolder
-			RemovePrgFolder
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index 7534c4cfc50e..6e95c6e1e69b 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -25,7 +25,7 @@
     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" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
 {
     std::wstring sOfficeMenuFolder = GetMsiPropertyW( handle, L"OfficeMenuFolder" );
     std::wstring sDesktopFile = sOfficeMenuFolder + L"Desktop.ini";
@@ -47,7 +47,7 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
     return ERROR_SUCCESS;
 }
 
-extern "C" UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle)
+extern "C" __declspec(dllexport) UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle)
 {
     std::wstring sOfficeMenuFolder = GetMsiPropertyW( handle, L"OfficeMenuFolder" );
     std::wstring sDesktopFile = sOfficeMenuFolder + L"Desktop.ini";
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
index 9dd726fff606..3b5262ca9826 100644
--- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
@@ -129,7 +129,7 @@ namespace
     }
 } // namespace
 
-extern "C" UINT __stdcall SetProductInstallMode(MSIHANDLE handle)
+extern "C" __declspec(dllexport) UINT __stdcall SetProductInstallMode(MSIHANDLE handle)
 {
     std::wstring upgradeCode = GetMsiPropertyW(handle, L"UpgradeCode");
     upgradeCode = ConvertGuid(std::wstring(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 1d5c0e9f9e22..ee4f7dc0df87 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -80,7 +80,7 @@ static BOOL RemoveCompleteDirectoryW(const std::wstring& rPath)
     return bDirectoryRemoved;
 }
 
-extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
 {
     std::wstring sOfficeInstallPath = GetMsiPropertyW(handle, L"INSTALLLOCATION");
 
@@ -105,7 +105,7 @@ extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
     return ERROR_SUCCESS;
 }
 
-extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
+extern "C" __declspec(dllexport) UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
 {
     std::wstring sOfficeInstallPath = GetMsiPropertyW(handle, L"INSTALLLOCATION");
     std::wstring sRemoveDir = sOfficeInstallPath + L"program_old";
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 12e43a08cdc8..7c4ffec501a4 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -66,7 +66,7 @@ static inline void OutputDebugStringFormatW( PCWSTR, ... )
 #endif
 
 
-extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
+extern "C" __declspec(dllexport) UINT __stdcall CheckVersions( MSIHANDLE hMSI )
 {
     // MessageBoxW(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
deleted file mode 100644
index 3c881861b8d3..000000000000
--- a/setup_native/source/win32/customactions/tools/sn_tools.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY		"sn_tools.dll"
-EXPORTS
-			CheckVersions
\ No newline at end of file