From b593d27e07e17c107776a81c182574eff08ec94f Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon.rozman@amebis.si>
Date: Wed, 12 Dec 2012 13:14:13 +0000
Subject: [PATCH] =?UTF-8?q?Dodal=20sem=20=C5=A1e=20tabele=20Binary,=20Cust?=
 =?UTF-8?q?omAction=20in=20InstallExecuteSequence=20ter=20usposobil=20prip?=
 =?UTF-8?q?ravo=20namestitvenega=20paketa,=20da=20lahko=20za=C4=8Dnem=20s?=
 =?UTF-8?q?=20pravim=20razvojem=20orodja=20MSITSCA.dll.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MSI/Makefile | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 MSITSCA.cpp  | 18 +++------------
 MSITSCA.h    |  2 +-
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/MSI/Makefile b/MSI/Makefile
index 3249184..ba145a9 100644
--- a/MSI/Makefile
+++ b/MSI/Makefile
@@ -1,6 +1,13 @@
 !INCLUDE "..\..\include\MSINast.mak"
 
 #MSM_IMA_LOKALIZACIJO=1
+!IF "$(CFG)" == "ReleaseU"
+CFG_VC=Unicode Release
+!ELSEIF "$(CFG)" == "DebugU"
+CFG_VC=Unicode Debug
+!ELSE
+CFG_VC=$(CFG)
+!ENDIF
 
 
 ######################################################################
@@ -46,6 +53,62 @@ TaskTrigger	Task_	N			ScheduledTask	1	Identifier		Key of the Trigger's task.
 <<NOKEEP
 
 
+######################################################################
+# Binary
+
+Vse :: \
+	"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt" \
+	"$(JEZIK).$(CFG).$(PLAT).Binary-1\MSITSCA.dll"
+
+"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\include\MSINast.mak" "$(JEZIK).$(CFG).$(PLAT).Binary-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSI_TIP_ID)	v0
+Binary	Name
+binMSITSCA.dll	MSITSCA.dll
+<<NOKEEP
+
+"$(JEZIK).$(CFG).$(PLAT).Binary-1\MSITSCA.dll" : "..\..\Test\$(CFG_VC).$(PLAT)\MSITSCA.dll"
+	copy /y $** $@ > NUL
+
+
+######################################################################
+# CustomAction
+
+Vse :: "$(JEZIK).$(CFG).$(PLAT).CustomAction-1.idt"
+
+"$(JEZIK).$(CFG).$(PLAT).CustomAction-1.idt" : "Makefile" "..\..\include\MSINast.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Action	Type	Source	Target
+s$(MSI_TIP_ID)	i2	S$(MSI_TIP_ID)	S255
+CustomAction	Action
+caEvaluateScheduledTasks	1	binMSITSCA.dll	EvaluateScheduledTasks
+caInstallScheduledTasks	1025	binMSITSCA.dll	InstallScheduledTasks
+caRollbackScheduledTasks	1281	binMSITSCA.dll	RollbackScheduledTasks
+caCommitScheduledTasks	1537	binMSITSCA.dll	CommitScheduledTasks
+<<NOKEEP
+
+
+######################################################################
+# InstallExecuteSequence
+
+Vse :: "$(JEZIK).$(CFG).$(PLAT).InstallExecuteSequence-1.idt"
+
+"$(JEZIK).$(CFG).$(PLAT).InstallExecuteSequence-1.idt" : "Makefile" "..\..\include\MSINast.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Action	Condition	Sequence
+s$(MSI_TIP_ID)	S255	I2
+InstallExecuteSequence	Action
+caEvaluateScheduledTasks		6580
+caInstallScheduledTasks		6581
+caRollbackScheduledTasks		6582
+caCommitScheduledTasks		6583
+<<NOKEEP
+
+
 ######################################################################
 # ScheduledTask
 
diff --git a/MSITSCA.cpp b/MSITSCA.cpp
index 5f5be86..9f11020 100644
--- a/MSITSCA.cpp
+++ b/MSITSCA.cpp
@@ -78,7 +78,10 @@ UINT MSITSCA_API CommitScheduledTasks(MSIHANDLE hInstall)
 
     UINT uiResult;
     BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL));
+    CString msg;
 
+    msg.Format(_T("Pripni razhroščevalnik na proces %u."), ::GetCurrentProcessId());
+    ::MessageBox(NULL, msg, _T("MSITSCA"), MB_OK);
     uiResult = ERROR_SUCCESS;
 
     if (bIsCoInitialized) ::CoUninitialize();
@@ -91,21 +94,6 @@ UINT MSITSCA_API RollbackScheduledTasks(MSIHANDLE hInstall)
     UNREFERENCED_PARAMETER(hInstall);
     assert(::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK));
 
-    UINT uiResult;
-    BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL));
-
-    uiResult = ERROR_SUCCESS;
-
-    if (bIsCoInitialized) ::CoUninitialize();
-    return uiResult;
-}
-
-
-
-UINT MSITSCA_API RemoveScheduledTasks(MSIHANDLE hInstall)
-{
-    UNREFERENCED_PARAMETER(hInstall);
-
     UINT uiResult;
     BOOL bIsCoInitialized = SUCCEEDED(::CoInitialize(NULL));
     CString msg;
diff --git a/MSITSCA.h b/MSITSCA.h
index e8bcad3..8d5c12f 100644
--- a/MSITSCA.h
+++ b/MSITSCA.h
@@ -49,10 +49,10 @@
 extern "C" {
 #endif
 
+    UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall);
     UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall);
     UINT MSITSCA_API CommitScheduledTasks(MSIHANDLE hInstall);
     UINT MSITSCA_API RollbackScheduledTasks(MSIHANDLE hInstall);
-    UINT MSITSCA_API RemoveScheduledTasks(MSIHANDLE hInstall);
 
 #ifdef __cplusplus
 }