Kaydet (Commit) dbb60dd9 authored tarafından Andras Timar's avatar Andras Timar

fix exported DLL function names for all CustomActions

Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3
üst eb6fa6be
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
))
......
LIBRARY "instooofiltmsi.dll"
EXPORTS
RestartIndexingService
\ No newline at end of file
......@@ -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);
......
LIBRARY "jfregca.dll"
EXPORTS
install_jf
uninstall_jf
\ No newline at end of file
LIBRARY "qslnkmsi.dll"
EXPORTS
RemoveQuickstarterLink
\ No newline at end of file
......@@ -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];
......
LIBRARY "sdqsmsi.dll"
EXPORTS
ShutDownQuickstarter
\ No newline at end of file
......@@ -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 );
......
LIBRARY "reg4allmsdoc.dll"
EXPORTS
FindRegisteredExtensions
LookForRegisteredExtensions
RegisterSomeExtensions
RestoreRegAllMSDoc
\ No newline at end of file
......@@ -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" );
......
......@@ -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;
......
LIBRARY "regactivex.dll"
EXPORTS
InstallActiveXControl
DeinstallActiveXControl
\ No newline at end of file
......@@ -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);
......
LIBRARY "regpatchactivex.dll"
EXPORTS
PatchActiveXControl
\ No newline at end of file
......@@ -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"));
......
......@@ -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") );
......
......@@ -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
......
......@@ -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
......
......@@ -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"));
......
......@@ -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);
......
LIBRARY "shlxtmsi.dll"
EXPORTS
CheckInstallDirectory
CheckPatchList
CompleteInstallPath
RebuildShellIconCache
CreateLayerLinks
RemoveLayerLinks
MigrateInstallPath
InstallStartmenuFolderIcon
DeinstallStartmenuFolderIcon
SetProductInstallMode
RenamePrgFolder
RemovePrgFolder
\ No newline at end of file
......@@ -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");
......
......@@ -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));
......
......@@ -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");
......
......@@ -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);
......
LIBRARY "sn_tools.dll"
EXPORTS
CheckVersions
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment