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

Usposobil sem projekt.

Browse Source 
Verzijo sem nastavil na 2.1.1.
This commit is contained in:
Simon Rozman 2014-03-12 13:39:15 +00:00
parent 70ec27745a
commit fae3a5eeca
15 changed files with 114 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitattributes vendored
View File

@ -1,4 +1,5 @@
* text=auto !eol * text=auto !eol
/MSICA.sln svneol=CRLF#text/plain eol=crlf
MSICALib/FileOp.cpp -text MSICALib/FileOp.cpp -text
MSICALib/L10N/sl_SI.po -text MSICALib/L10N/sl_SI.po -text
MSICALib/MSICALib.cpp -text MSICALib/MSICALib.cpp -text
@ -13,13 +14,13 @@ MSICALib/stdafx.h -text
MSITSCA/L10N/sl_SI.po -text MSITSCA/L10N/sl_SI.po -text
MSITSCA/MSITSCA.cpp -text MSITSCA/MSITSCA.cpp -text
MSITSCA/MSITSCA.h -text MSITSCA/MSITSCA.h -text
MSITSCA/MSITSCA.rc -text svneol=unset#unset
MSITSCA/MSITSCA.rcx -text svneol=unset#unset
MSITSCA/MSITSCA.vcxproj -text svneol=unset#text/xml MSITSCA/MSITSCA.vcxproj -text svneol=unset#text/xml
MSITSCA/MSITSCA.vcxproj.filters -text svneol=unset#text/xml MSITSCA/MSITSCA.vcxproj.filters -text svneol=unset#text/xml
MSITSCA/StdAfx.cpp -text
MSITSCA/StdAfx.h -text
MSITSCA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250 MSITSCA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250
MSITSCA/res/MSITSCA.rc -text svneol=unset#unset MSITSCA/stdafx.cpp -text
MSITSCA/res/MSITSCA.rcx -text svneol=unset#unset MSITSCA/stdafx.h -text
include/Debug.props -text svneol=unset#text/xml include/Debug.props -text svneol=unset#text/xml
include/Release.props -text svneol=unset#text/xml include/Release.props -text svneol=unset#text/xml
include/Win32.props -text svneol=unset#text/xml include/Win32.props -text svneol=unset#text/xml

11
.gitignore vendored
View File

@ -1,3 +1,6 @@
/*.opensdf
/*.sdf
/*.suo
MSICALib/*.user MSICALib/*.user
MSICALib/L10N/*.mo MSICALib/L10N/*.mo
MSICALib/msm/*-1.idt MSICALib/msm/*-1.idt
@ -12,10 +15,6 @@ MSICALib/msm/*.msm
MSICALib/temp MSICALib/temp
MSITSCA/*.user MSITSCA/*.user
MSITSCA/L10N/*.mo MSITSCA/L10N/*.mo
MSITSCA/MSITSCA.Debug.Win32
MSITSCA/MSITSCA.Debug.x64
MSITSCA/MSITSCA.Release.Win32
MSITSCA/MSITSCA.Release.x64
MSITSCA/msm/*-1.idt MSITSCA/msm/*-1.idt
MSITSCA/msm/*-2.idt MSITSCA/msm/*-2.idt
MSITSCA/msm/*-2.idtx MSITSCA/msm/*-2.idtx
@ -25,4 +24,6 @@ MSITSCA/msm/*.Icon-1
MSITSCA/msm/*.Icon-2 MSITSCA/msm/*.Icon-2
MSITSCA/msm/*.lst MSITSCA/msm/*.lst
MSITSCA/msm/*.msm MSITSCA/msm/*.msm
MSITSCA/res/*.mo MSITSCA/temp
/ipch
/output

36
MSICA.sln Normal file
View File

@ -0,0 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "MSICALib\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSITSCA", "MSITSCA\MSITSCA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.ActiveCfg = Debug|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.Build.0 = Debug|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.ActiveCfg = Debug|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.Build.0 = Debug|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.ActiveCfg = Release|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.ActiveCfg = Debug|Win32
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.Build.0 = Debug|Win32
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.ActiveCfg = Debug|x64
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.Build.0 = Debug|x64
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.ActiveCfg = Release|Win32
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.Build.0 = Release|Win32
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.ActiveCfg = Release|x64
{A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

18
MSITSCA/MSITSCA.cpp
View File

@ -1,4 +1,4 @@
#include "StdAfx.h" #include "stdafx.h"
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -43,7 +43,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
UINT uiResult; UINT uiResult;
HRESULT hr; HRESULT hr;
BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL)); BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL));
AMSICA::COpList olExecute; MSICA::COpList olExecute;
BOOL bRollbackEnabled; BOOL bRollbackEnabled;
PMSIHANDLE PMSIHANDLE
hDatabase, hDatabase,
@ -55,7 +55,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
bRollbackEnabled = uiResult == ERROR_SUCCESS ? bRollbackEnabled = uiResult == ERROR_SUCCESS ?
_ttoi(sValue) || !sValue.IsEmpty() && _totlower(sValue.GetAt(0)) == _T('y') ? FALSE : TRUE : _ttoi(sValue) || !sValue.IsEmpty() && _totlower(sValue.GetAt(0)) == _T('y') ? FALSE : TRUE :
TRUE; TRUE;
olExecute.AddTail(new AMSICA::COpRollbackEnable(bRollbackEnabled)); olExecute.AddTail(new MSICA::COpRollbackEnable(bRollbackEnabled));
// Open MSI database. // Open MSI database.
hDatabase = ::MsiGetActiveDatabase(hInstall); hDatabase = ::MsiGetActiveDatabase(hInstall);
@ -111,7 +111,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
if (iAction >= INSTALLSTATE_LOCAL) { if (iAction >= INSTALLSTATE_LOCAL) {
// Component is or should be installed. Create the task. // Component is or should be installed. Create the task.
PMSIHANDLE hViewTT; PMSIHANDLE hViewTT;
AMSICA::COpTaskCreate *opCreateTask = new AMSICA::COpTaskCreate(sDisplayName, MSITSCA_TASK_TICK_SIZE); MSICA::COpTaskCreate *opCreateTask = new MSICA::COpTaskCreate(sDisplayName, MSITSCA_TASK_TICK_SIZE);
// Populate the operation with task's data. // Populate the operation with task's data.
uiResult = opCreateTask->SetFromRecord(hInstall, hRecord); uiResult = opCreateTask->SetFromRecord(hInstall, hRecord);
@ -134,7 +134,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
olExecute.AddTail(opCreateTask); olExecute.AddTail(opCreateTask);
} else if (iAction >= INSTALLSTATE_REMOVED) { } else if (iAction >= INSTALLSTATE_REMOVED) {
// Component is installed, but should be degraded to advertised/removed. Delete the task. // Component is installed, but should be degraded to advertised/removed. Delete the task.
olExecute.AddTail(new AMSICA::COpTaskDelete(sDisplayName, MSITSCA_TASK_TICK_SIZE)); olExecute.AddTail(new MSICA::COpTaskDelete(sDisplayName, MSITSCA_TASK_TICK_SIZE));
} }
// The amount of tick space to add for each task to progress indicator. // The amount of tick space to add for each task to progress indicator.
@ -232,7 +232,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
uiResult = ::MsiGetProperty(hInstall, _T("CustomActionData"), sSequenceFilename); uiResult = ::MsiGetProperty(hInstall, _T("CustomActionData"), sSequenceFilename);
if (uiResult == ERROR_SUCCESS) { if (uiResult == ERROR_SUCCESS) {
AMSICA::COpList lstOperations; MSICA::COpList lstOperations;
BOOL bIsCleanup = ::MsiGetMode(hInstall, MSIRUNMODE_COMMIT) || ::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK); BOOL bIsCleanup = ::MsiGetMode(hInstall, MSIRUNMODE_COMMIT) || ::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK);
//assert(0); // Attach debugger here, or press "Ignore"! //assert(0); // Attach debugger here, or press "Ignore"!
@ -240,7 +240,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
// Load operation sequence. // Load operation sequence.
hr = lstOperations.LoadFromFile(sSequenceFilename); hr = lstOperations.LoadFromFile(sSequenceFilename);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
AMSICA::CSession session; MSICA::CSession session;
session.m_hInstall = hInstall; session.m_hInstall = hInstall;
@ -260,14 +260,14 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
sSequenceFilenameCM.Format(_T("%.*ls-cm%ls"), pszExtension - (LPCTSTR)sSequenceFilename, (LPCTSTR)sSequenceFilename, pszExtension); sSequenceFilenameCM.Format(_T("%.*ls-cm%ls"), pszExtension - (LPCTSTR)sSequenceFilename, (LPCTSTR)sSequenceFilename, pszExtension);
// After commit, delete rollback file. After rollback, delete commit file. // After commit, delete rollback file. After rollback, delete commit file.
session.m_olCommit.AddTail(new AMSICA::COpFileDelete( session.m_olCommit.AddTail(new MSICA::COpFileDelete(
#ifdef _UNICODE #ifdef _UNICODE
sSequenceFilenameRB sSequenceFilenameRB
#else #else
ATL::CAtlStringW(sSequenceFilenameRB) ATL::CAtlStringW(sSequenceFilenameRB)
#endif #endif
)); ));
session.m_olRollback.AddTail(new AMSICA::COpFileDelete( session.m_olRollback.AddTail(new MSICA::COpFileDelete(
#ifdef _UNICODE #ifdef _UNICODE
sSequenceFilenameCM sSequenceFilenameCM
#else #else

10
MSITSCA/MSITSCA.h
View File

@ -6,15 +6,15 @@
// Constants // Constants
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
#define MSITSCA_VERSION 0x02010000 #define MSITSCA_VERSION 0x02010100
#define MSITSCA_VERSION_MAJ 2 #define MSITSCA_VERSION_MAJ 2
#define MSITSCA_VERSION_MIN 1 #define MSITSCA_VERSION_MIN 1
#define MSITSCA_VERSION_REV 0 #define MSITSCA_VERSION_REV 1
#define MSITSCA_VERSION_BUILD 0
#define MSITSCA_VERSION_STR "2.1"
#define MSITSCA_VERSION_INST "2.1"
#define MSITSCA_VERSION_STR "2.1.1"
#define MSITSCA_BUILD_YEAR_STR "2014"
#if !defined(RC_INVOKED) && !defined(MIDL_PASS) #if !defined(RC_INVOKED) && !defined(MIDL_PASS)

0
MSITSCA/res/MSITSCA.rc → MSITSCA/MSITSCA.rc
View File

BIN
MSITSCA/res/MSITSCA.rcx → MSITSCA/MSITSCA.rcx
View File

Binary file not shown.

82
MSITSCA/MSITSCA.vcxproj
View File

@ -49,40 +49,40 @@
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" /> <Import Project="..\include\common.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" /> <Import Project="..\include\Win32.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" /> <Import Project="..\include\Release.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" /> <Import Project="..\include\common.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" /> <Import Project="..\include\Win32.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" /> <Import Project="..\include\Debug.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" /> <Import Project="..\include\common.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" /> <Import Project="..\include\x64.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" /> <Import Project="..\include\Release.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" /> <Import Project="..\include\common.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" /> <Import Project="..\include\x64.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" /> <Import Project="..\include\Debug.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Test\$(Configuration).$(Platform)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\output\$(Configuration).$(Platform)\</OutDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\Test\$(Configuration).$(Platform)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\output\$(Configuration).$(Platform)\</OutDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Test\$(Configuration).$(Platform)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\output\$(Configuration).$(Platform)\</OutDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Test\$(Configuration).$(Platform)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\output\$(Configuration).$(Platform)\</OutDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -94,11 +94,9 @@
</Midl> </Midl>
<ClCompile /> <ClCompile />
<ResourceLocalizator> <ResourceLocalizator>
<LanguageCatalogs>res\en_GB.po</LanguageCatalogs> <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
</ResourceLocalizator> </ResourceLocalizator>
<ClCompile> <ClCompile />
<AdditionalIncludeDirectories>..\AMSICA\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link> <Link>
@ -109,11 +107,9 @@
</Midl> </Midl>
<ClCompile /> <ClCompile />
<ResourceLocalizator> <ResourceLocalizator>
<LanguageCatalogs>res\en_GB.po</LanguageCatalogs> <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
</ResourceLocalizator> </ResourceLocalizator>
<ClCompile> <ClCompile />
<AdditionalIncludeDirectories>..\AMSICA\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Link> <Link>
@ -124,11 +120,9 @@
</Midl> </Midl>
<ClCompile /> <ClCompile />
<ResourceLocalizator> <ResourceLocalizator>
<LanguageCatalogs>res\en_GB.po</LanguageCatalogs> <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
</ResourceLocalizator> </ResourceLocalizator>
<ClCompile> <ClCompile />
<AdditionalIncludeDirectories>..\AMSICA\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link> <Link>
@ -139,15 +133,13 @@
</Midl> </Midl>
<ClCompile /> <ClCompile />
<ResourceLocalizator> <ResourceLocalizator>
<LanguageCatalogs>res\en_GB.po</LanguageCatalogs> <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
</ResourceLocalizator> </ResourceLocalizator>
<ClCompile> <ClCompile />
<AdditionalIncludeDirectories>..\AMSICA\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="MSITSCA.cpp" /> <ClCompile Include="MSITSCA.cpp" />
<ClCompile Include="StdAfx.cpp"> <ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@ -156,22 +148,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="MSITSCA.h" /> <ClInclude Include="MSITSCA.h" />
<ClInclude Include="StdAfx.h" /> <ClInclude Include="stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="res\MSITSCA.rc" /> <ResourceCompile Include="MSITSCA.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceLocalizator Include="res\MSITSCA.rcx" /> <ResourceLocalizator Include="MSITSCA.rcx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AMSICA\build\AMSICALib.vcxproj">
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="L10N\sl_SI.po" /> <None Include="L10N\sl_SI.po" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MSICALib\MSICALib.vcxproj">
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.targets" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.targets" />

8
MSITSCA/MSITSCA.vcxproj.filters
View File

@ -18,7 +18,7 @@
<ClCompile Include="MSITSCA.cpp"> <ClCompile Include="MSITSCA.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="StdAfx.cpp"> <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@ -26,17 +26,17 @@
<ClInclude Include="MSITSCA.h"> <ClInclude Include="MSITSCA.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="StdAfx.h"> <ClInclude Include="stdafx.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="res\MSITSCA.rc"> <ResourceCompile Include="MSITSCA.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceLocalizator Include="res\MSITSCA.rcx"> <ResourceLocalizator Include="MSITSCA.rcx">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceLocalizator> </ResourceLocalizator>
</ItemGroup> </ItemGroup>

1
MSITSCA/StdAfx.cpp
View File

@ -1 +0,0 @@
#include "StdAfx.h"

1
MSITSCA/stdafx.cpp Normal file
View File

@ -0,0 +1 @@
#include "stdafx.h"

17
MSITSCA/StdAfx.h → MSITSCA/stdafx.h
View File

@ -1,4 +1,4 @@
// StdAfx.h : include file for standard system include files, // stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, // or project specific include files that are used frequently,
// but are changed infrequently // but are changed infrequently
@ -28,19 +28,10 @@
#include <atlfile.h> #include <atlfile.h>
#include <atlstr.h> #include <atlstr.h>
#include "BuildNum.h"
#include "MSITSCA.h"
#include "AMSICA.h"
//#include <assert.h>
#include <corerror.h> #include <corerror.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#ifdef NDEBUG #include "MSITSCA.h"
#define verify(expr) ((void)(expr))
#else #include "..\MSICALib\MSICALib.h"
#define verify(expr) assert(expr)
#endif

2
include/Debug.props
View File

@ -9,7 +9,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck> <SmallerTypeCheck>true</SmallerTypeCheck>
</ClCompile> </ClCompile>

2
include/Release.props
View File

@ -34,7 +34,7 @@
<ClCompile> <ClCompile>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

3
include/common.props
View File

@ -21,6 +21,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>