Preizkusil sem delovanje in popravil preverjanje manjkajoče datoteke za razveljavitev/uveljavitev.

Verzijo sem nastavil na 2.0.2.
This commit is contained in:
Simon Rozman 2014-01-14 11:27:22 +00:00
parent 56dfdb9ec7
commit 073488cb22
3 changed files with 8 additions and 5 deletions

View File

@ -235,6 +235,8 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
AMSICA::COpList lstOperations;
BOOL bIsCleanup = ::MsiGetMode(hInstall, MSIRUNMODE_COMMIT) || ::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK);
//assert(0); // Attach debugger here, or press "Ignore"!
// Load operation sequence.
hr = lstOperations.LoadFromFile(sSequenceFilename);
if (SUCCEEDED(hr)) {
@ -317,7 +319,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
}
::DeleteFile(sSequenceFilename);
} else if (hr == ERROR_FILE_NOT_FOUND && bIsCleanup) {
} else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) && bIsCleanup) {
// Sequence file not found and this is rollback/commit action. Either of the following scenarios are possible:
// - The delayed action failed to save the rollback/commit file. The delayed action performed cleanup itself. No further action is required.
// - Somebody removed the rollback/commit file between delayed action and rollback/commit action. No further action is possible.

View File

@ -6,14 +6,14 @@
// Constants
////////////////////////////////////////////////////////////////////////////
#define MSITSCA_VERSION 0x02000100
#define MSITSCA_VERSION 0x02000200
#define MSITSCA_VERSION_MAJ 2
#define MSITSCA_VERSION_MIN 0
#define MSITSCA_VERSION_REV 1
#define MSITSCA_VERSION_REV 2
#define MSITSCA_VERSION_STR "2.0.1"
#define MSITSCA_VERSION_INST "2.0.1"
#define MSITSCA_VERSION_STR "2.0.2"
#define MSITSCA_VERSION_INST "2.0.2"
#if !defined(RC_INVOKED) && !defined(MIDL_PASS)

View File

@ -34,6 +34,7 @@
#include "AMSICA.h"
//#include <assert.h>
#include <corerror.h>
#include <stdlib.h>
#include <time.h>