From fae3a5eeca8b0a417161229207ec4cc1a8ae6b3a Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 12 Mar 2014 13:39:15 +0000 Subject: [PATCH] Usposobil sem projekt. Verzijo sem nastavil na 2.1.1. --- .gitattributes | 9 ++-- .gitignore | 11 +++-- MSICA.sln | 36 ++++++++++++++ MSITSCA/MSITSCA.cpp | 18 +++---- MSITSCA/MSITSCA.h | 14 +++--- MSITSCA/{res => }/MSITSCA.rc | Bin MSITSCA/{res => }/MSITSCA.rcx | Bin 5174 -> 5196 bytes MSITSCA/MSITSCA.vcxproj | 82 ++++++++++++++------------------ MSITSCA/MSITSCA.vcxproj.filters | 8 ++-- MSITSCA/StdAfx.cpp | 1 - MSITSCA/stdafx.cpp | 1 + MSITSCA/{StdAfx.h => stdafx.h} | 17 ++----- include/Debug.props | 2 +- include/Release.props | 2 +- include/common.props | 3 ++ 15 files changed, 114 insertions(+), 90 deletions(-) create mode 100644 MSICA.sln rename MSITSCA/{res => }/MSITSCA.rc (100%) rename MSITSCA/{res => }/MSITSCA.rcx (93%) delete mode 100644 MSITSCA/StdAfx.cpp create mode 100644 MSITSCA/stdafx.cpp rename MSITSCA/{StdAfx.h => stdafx.h} (74%) diff --git a/.gitattributes b/.gitattributes index e8fc7d1..ea80065 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ * text=auto !eol +/MSICA.sln svneol=CRLF#text/plain eol=crlf MSICALib/FileOp.cpp -text MSICALib/L10N/sl_SI.po -text MSICALib/MSICALib.cpp -text @@ -13,13 +14,13 @@ MSICALib/stdafx.h -text MSITSCA/L10N/sl_SI.po -text MSITSCA/MSITSCA.cpp -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.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/res/MSITSCA.rc -text svneol=unset#unset -MSITSCA/res/MSITSCA.rcx -text svneol=unset#unset +MSITSCA/stdafx.cpp -text +MSITSCA/stdafx.h -text include/Debug.props -text svneol=unset#text/xml include/Release.props -text svneol=unset#text/xml include/Win32.props -text svneol=unset#text/xml diff --git a/.gitignore b/.gitignore index 9a5302d..f7ffbb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/*.opensdf +/*.sdf +/*.suo MSICALib/*.user MSICALib/L10N/*.mo MSICALib/msm/*-1.idt @@ -12,10 +15,6 @@ MSICALib/msm/*.msm MSICALib/temp MSITSCA/*.user 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/*-2.idt MSITSCA/msm/*-2.idtx @@ -25,4 +24,6 @@ MSITSCA/msm/*.Icon-1 MSITSCA/msm/*.Icon-2 MSITSCA/msm/*.lst MSITSCA/msm/*.msm -MSITSCA/res/*.mo +MSITSCA/temp +/ipch +/output diff --git a/MSICA.sln b/MSICA.sln new file mode 100644 index 0000000..12cbdc1 --- /dev/null +++ b/MSICA.sln @@ -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 diff --git a/MSITSCA/MSITSCA.cpp b/MSITSCA/MSITSCA.cpp index 810fa0c..8105941 100644 --- a/MSITSCA/MSITSCA.cpp +++ b/MSITSCA/MSITSCA.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" //////////////////////////////////////////////////////////////////////////// @@ -43,7 +43,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) UINT uiResult; HRESULT hr; BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL)); - AMSICA::COpList olExecute; + MSICA::COpList olExecute; BOOL bRollbackEnabled; PMSIHANDLE hDatabase, @@ -55,7 +55,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) bRollbackEnabled = uiResult == ERROR_SUCCESS ? _ttoi(sValue) || !sValue.IsEmpty() && _totlower(sValue.GetAt(0)) == _T('y') ? FALSE : TRUE : TRUE; - olExecute.AddTail(new AMSICA::COpRollbackEnable(bRollbackEnabled)); + olExecute.AddTail(new MSICA::COpRollbackEnable(bRollbackEnabled)); // Open MSI database. hDatabase = ::MsiGetActiveDatabase(hInstall); @@ -111,7 +111,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) if (iAction >= INSTALLSTATE_LOCAL) { // Component is or should be installed. Create the task. 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. uiResult = opCreateTask->SetFromRecord(hInstall, hRecord); @@ -134,7 +134,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) olExecute.AddTail(opCreateTask); } else if (iAction >= INSTALLSTATE_REMOVED) { // 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. @@ -232,7 +232,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall) uiResult = ::MsiGetProperty(hInstall, _T("CustomActionData"), sSequenceFilename); if (uiResult == ERROR_SUCCESS) { - AMSICA::COpList lstOperations; + MSICA::COpList lstOperations; BOOL bIsCleanup = ::MsiGetMode(hInstall, MSIRUNMODE_COMMIT) || ::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK); //assert(0); // Attach debugger here, or press "Ignore"! @@ -240,7 +240,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall) // Load operation sequence. hr = lstOperations.LoadFromFile(sSequenceFilename); if (SUCCEEDED(hr)) { - AMSICA::CSession session; + MSICA::CSession session; 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); // 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 sSequenceFilenameRB #else ATL::CAtlStringW(sSequenceFilenameRB) #endif )); - session.m_olRollback.AddTail(new AMSICA::COpFileDelete( + session.m_olRollback.AddTail(new MSICA::COpFileDelete( #ifdef _UNICODE sSequenceFilenameCM #else diff --git a/MSITSCA/MSITSCA.h b/MSITSCA/MSITSCA.h index 18c81f2..36a8b79 100644 --- a/MSITSCA/MSITSCA.h +++ b/MSITSCA/MSITSCA.h @@ -6,15 +6,15 @@ // Constants //////////////////////////////////////////////////////////////////////////// -#define MSITSCA_VERSION 0x02010000 +#define MSITSCA_VERSION 0x02010100 -#define MSITSCA_VERSION_MAJ 2 -#define MSITSCA_VERSION_MIN 1 -#define MSITSCA_VERSION_REV 0 - -#define MSITSCA_VERSION_STR "2.1" -#define MSITSCA_VERSION_INST "2.1" +#define MSITSCA_VERSION_MAJ 2 +#define MSITSCA_VERSION_MIN 1 +#define MSITSCA_VERSION_REV 1 +#define MSITSCA_VERSION_BUILD 0 +#define MSITSCA_VERSION_STR "2.1.1" +#define MSITSCA_BUILD_YEAR_STR "2014" #if !defined(RC_INVOKED) && !defined(MIDL_PASS) diff --git a/MSITSCA/res/MSITSCA.rc b/MSITSCA/MSITSCA.rc similarity index 100% rename from MSITSCA/res/MSITSCA.rc rename to MSITSCA/MSITSCA.rc diff --git a/MSITSCA/res/MSITSCA.rcx b/MSITSCA/MSITSCA.rcx similarity index 93% rename from MSITSCA/res/MSITSCA.rcx rename to MSITSCA/MSITSCA.rcx index 84e768487f28f1777abae9f66ccb29b80d846038..7e577fc506736f9a63ff9022f9c1184a7f4cde6d 100644 GIT binary patch delta 73 zcmdm{aYkc8%*L)fmdP!w3Y<<1p$wi3J`66CIawE@iA-b{oy^0|wfPQf86&eFL&)Yp R_T4O#O;`ms^YCbK000Kf6I}oR delta 92 zcmX@3u}xz_48IdYDMKbh4nqoqACQ$hF;jM9Q~`^i6GJG2CxZ`z3qw3mB9y^*@@JOC dSVRrkMJMyIb8WuITE@6Jf_)duW+fgi4gf!87SjL# diff --git a/MSITSCA/MSITSCA.vcxproj b/MSITSCA/MSITSCA.vcxproj index 4395ad5..cdaf909 100644 --- a/MSITSCA/MSITSCA.vcxproj +++ b/MSITSCA/MSITSCA.vcxproj @@ -49,40 +49,40 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + <_ProjectFileVersion>10.0.30319.1 - ..\Test\$(Configuration).$(Platform)\ + ..\output\$(Configuration).$(Platform)\ true - ..\Test\$(Configuration).$(Platform)\ + ..\output\$(Configuration).$(Platform)\ true - ..\Test\$(Configuration).$(Platform)\ + ..\output\$(Configuration).$(Platform)\ true - ..\Test\$(Configuration).$(Platform)\ + ..\output\$(Configuration).$(Platform)\ true @@ -94,11 +94,9 @@ - res\en_GB.po + L10N\sl_SI.po - - ..\AMSICA\include;%(AdditionalIncludeDirectories) - + @@ -109,11 +107,9 @@ - res\en_GB.po + L10N\sl_SI.po - - ..\AMSICA\include;%(AdditionalIncludeDirectories) - + @@ -124,11 +120,9 @@ - res\en_GB.po + L10N\sl_SI.po - - ..\AMSICA\include;%(AdditionalIncludeDirectories) - + @@ -139,15 +133,13 @@ - res\en_GB.po + L10N\sl_SI.po - - ..\AMSICA\include;%(AdditionalIncludeDirectories) - + - + Create Create Create @@ -156,22 +148,22 @@ - + - + - - - - - {8552ee55-177e-4f51-b51b-baf7d6462cde} - + + + + {8552ee55-177e-4f51-b51b-baf7d6462cde} + + diff --git a/MSITSCA/MSITSCA.vcxproj.filters b/MSITSCA/MSITSCA.vcxproj.filters index fbf7d93..3345abd 100644 --- a/MSITSCA/MSITSCA.vcxproj.filters +++ b/MSITSCA/MSITSCA.vcxproj.filters @@ -18,7 +18,7 @@ Source Files - + Source Files @@ -26,17 +26,17 @@ Header Files - + Header Files - + Resource Files - + Resource Files diff --git a/MSITSCA/StdAfx.cpp b/MSITSCA/StdAfx.cpp deleted file mode 100644 index 9b13c1c..0000000 --- a/MSITSCA/StdAfx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "StdAfx.h" diff --git a/MSITSCA/stdafx.cpp b/MSITSCA/stdafx.cpp new file mode 100644 index 0000000..a27b824 --- /dev/null +++ b/MSITSCA/stdafx.cpp @@ -0,0 +1 @@ +#include "stdafx.h" diff --git a/MSITSCA/StdAfx.h b/MSITSCA/stdafx.h similarity index 74% rename from MSITSCA/StdAfx.h rename to MSITSCA/stdafx.h index aa2c790..e8c5e57 100644 --- a/MSITSCA/StdAfx.h +++ b/MSITSCA/stdafx.h @@ -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, // but are changed infrequently @@ -28,19 +28,10 @@ #include #include -#include "BuildNum.h" - -#include "MSITSCA.h" - -#include "AMSICA.h" - -//#include #include #include #include -#ifdef NDEBUG -#define verify(expr) ((void)(expr)) -#else -#define verify(expr) assert(expr) -#endif +#include "MSITSCA.h" + +#include "..\MSICALib\MSICALib.h" diff --git a/include/Debug.props b/include/Debug.props index a651258..5dbde3a 100644 --- a/include/Debug.props +++ b/include/Debug.props @@ -9,7 +9,7 @@ Disabled _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + MultiThreadedDebug EnableFastChecks true diff --git a/include/Release.props b/include/Release.props index e75c4a6..5dab654 100644 --- a/include/Release.props +++ b/include/Release.props @@ -34,7 +34,7 @@ true NDEBUG;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded NDEBUG;%(PreprocessorDefinitions) diff --git a/include/common.props b/include/common.props index 762da3d..a1a49e6 100644 --- a/include/common.props +++ b/include/common.props @@ -21,6 +21,9 @@ true true + + $(IntDir);%(AdditionalIncludeDirectories) + \ No newline at end of file