diff --git a/MSICA/MSICA.cpp b/MSICA/MSICA.cpp index 039b1d8..44a439f 100644 --- a/MSICA/MSICA.cpp +++ b/MSICA/MSICA.cpp @@ -82,7 +82,7 @@ extern "C" BOOL WINAPI DllMain(_In_ HINSTANCE hInstance, _In_ DWORD dwReason, _I // Exported functions //////////////////////////////////////////////////////////////////// -UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall) +UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall) { //::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK); @@ -588,7 +588,7 @@ UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall) } -UINT MSICA_API ExecuteSequence(MSIHANDLE hInstall) +UINT __declspec(dllexport) ExecuteSequence(MSIHANDLE hInstall) { //::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK); diff --git a/MSICA/MSICA.h b/MSICA/MSICA.h index 0ec101f..87bc9e8 100644 --- a/MSICA/MSICA.h +++ b/MSICA/MSICA.h @@ -38,18 +38,6 @@ #include -//////////////////////////////////////////////////////////////////// -// Calling declaration -//////////////////////////////////////////////////////////////////// - -#if defined(MSICA_DLL) -#define MSICA_API __declspec(dllexport) -#elif defined(MSICA_DLLIMP) -#define MSICA_API __declspec(dllimport) -#else -#define MSICA_API -#endif - //////////////////////////////////////////////////////////////////// // Exported functions //////////////////////////////////////////////////////////////////// @@ -58,8 +46,8 @@ extern "C" { #endif - UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall); - UINT MSICA_API ExecuteSequence(MSIHANDLE hInstall); + UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall); + UINT __declspec(dllexport) ExecuteSequence(MSIHANDLE hInstall); #ifdef __cplusplus } diff --git a/MSICA/pch.h b/MSICA/pch.h index 80a156c..87a88ad 100644 --- a/MSICA/pch.h +++ b/MSICA/pch.h @@ -19,10 +19,6 @@ #pragma once -#ifdef _WINDLL -#define MSICA_DLL // This library is compiled as a DLL -#endif - #include #include diff --git a/lib/WinStd b/lib/WinStd index 96e1882..51b262b 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 96e18824059bd8225ab99126e16b33cf50734873 +Subproject commit 51b262b38223fbce3b9b43812ad0ff5ef88bdeb4