Amebis/MSICA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline MSICA_API

Browse Source 
It's deterministic: MSICA is always DLL. It's exported functions are
used by MsiExec and always loaded dynamically (never imported using
MSICA.lib).

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2021-03-30 12:02:50 +02:00
parent 00032cd404
commit d3320ca1f3
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MSICA/MSICA.cpp
View File

@ -82,7 +82,7 @@ extern "C" BOOL WINAPI DllMain(_In_ HINSTANCE hInstance, _In_ DWORD dwReason, _I
// Exported functions // Exported functions
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall) UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall)
{ {
//::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK); //::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); //::MessageBox(NULL, _T(__FUNCTION__), _T("MSICA"), MB_OK);

16
MSICA/MSICA.h
View File

@ -38,18 +38,6 @@
#include <msi.h> #include <msi.h>
////////////////////////////////////////////////////////////////////
// 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 // Exported functions
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -58,8 +46,8 @@
extern "C" { extern "C" {
#endif #endif
UINT MSICA_API MSICAInitialize(MSIHANDLE hInstall); UINT __declspec(dllexport) MSICAInitialize(MSIHANDLE hInstall);
UINT MSICA_API ExecuteSequence(MSIHANDLE hInstall); UINT __declspec(dllexport) ExecuteSequence(MSIHANDLE hInstall);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
MSICA/pch.h
View File

@ -19,10 +19,6 @@
#pragma once #pragma once
#ifdef _WINDLL
#define MSICA_DLL // This library is compiled as a DLL
#endif
#include <WinStd\COM.h> #include <WinStd\COM.h>
#include <Windows.h> #include <Windows.h>

2
lib/WinStd

@ -1 +1 @@
Subproject commit 96e18824059bd8225ab99126e16b33cf50734873 Subproject commit 51b262b38223fbce3b9b43812ad0ff5ef88bdeb4