From 97a17526b7cc97065ec67eadcc77b553e30da1e0 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon.rozman@amebis.si>
Date: Tue, 14 Jan 2014 11:27:22 +0000
Subject: [PATCH] =?UTF-8?q?Preizkusil=20sem=20delovanje=20in=20popravil=20?=
 =?UTF-8?q?preverjanje=20manjkajo=C4=8De=20datoteke=20za=20razveljavitev/u?=
 =?UTF-8?q?veljavitev.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Verzijo sem nastavil na 2.0.2.
---
 MSITSCA.cpp | 4 +++-
 MSITSCA.h   | 8 ++++----
 StdAfx.h    | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/MSITSCA.cpp b/MSITSCA.cpp
index bd775cc..810fa0c 100644
--- a/MSITSCA.cpp
+++ b/MSITSCA.cpp
@@ -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.
diff --git a/MSITSCA.h b/MSITSCA.h
index 362cd07..d0b106c 100644
--- a/MSITSCA.h
+++ b/MSITSCA.h
@@ -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)
diff --git a/StdAfx.h b/StdAfx.h
index c41f440..aa2c790 100644
--- a/StdAfx.h
+++ b/StdAfx.h
@@ -34,6 +34,7 @@
 
 #include "AMSICA.h"
 
+//#include <assert.h>
 #include <corerror.h>
 #include <stdlib.h>
 #include <time.h>