Fix build

wixtoolset · Apr 26, 2021 · a54fc13 · a54fc13
1 parent eb6592e
commit a54fc13
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
@@ -2860,7 +2860,7 @@ static HRESULT ExecuteMsiCommitTransaction(
     }
     else
     {
-        hr = MsiEngineCommitTransaction();
+        hr = MsiEngineCommitTransaction(NULL, NULL, NULL);
     }
 
     if (SUCCEEDED(hr))
@@ -2905,7 +2905,7 @@ static HRESULT ExecuteMsiRollbackTransaction(
     }
     else
     {
-        hr = MsiEngineRollbackTransaction();
+        hr = MsiEngineRollbackTransaction(NULL, NULL, NULL);
     }
 
 LExit:

diff --git a/src/engine/elevation.cpp b/src/engine/elevation.cpp
@@ -3045,11 +3045,6 @@ static HRESULT OnMsiBeginTransaction(
     ReleaseHandle(hMsiTrnsEvent);
     ReleaseMsi(hMsiTrns);
 
-    if (pRollbackBoundary)
-    {
-        pRollbackBoundary->sczLogPath = NULL;
-    }
-
     return hr;
 }
 
@@ -3061,16 +3056,11 @@ static HRESULT OnMsiCommitTransaction(
 {
     HRESULT hr = S_OK;
 
-    hr = MsiEngineCommitTransaction();
+    hr = MsiEngineCommitTransaction(NULL, NULL, NULL);
     ExitOnFailure(hr, "Failed committing an MSI transaction");
 
 LExit:
 
-    if (pRollbackBoundary)
-    {
-        pRollbackBoundary->sczLogPath = NULL;
-    }
-
     return hr;
 }
 
@@ -3082,16 +3072,11 @@ static HRESULT OnMsiRollbackTransaction(
 {
     HRESULT hr = S_OK;
 
-    hr = MsiEngineRollbackTransaction();
+    hr = MsiEngineRollbackTransaction(NULL, NULL, NULL);
     ExitOnFailure(hr, "Failed rolling back an MSI transaction");
 
 LExit:
 
-    if (pRollbackBoundary)
-    {
-        pRollbackBoundary->sczLogPath = NULL;
-    }
-
     return hr;
 }
 

diff --git a/src/engine/msiengine.cpp b/src/engine/msiengine.cpp
@@ -1045,15 +1045,28 @@ extern "C" HRESULT MsiEngineBeginTransaction(
 }
 
 extern "C" HRESULT MsiEngineCommitTransaction(
+    __inout MSIHANDLE * phTransactionHandle,
+    __inout HANDLE * phChangeOfOwnerEvent,
+    __in_z LPCWSTR szLogPath
     )
 {
     HRESULT hr = S_OK;
 
-    hr = WiuEndTransaction(MSITRANSACTIONSTATE_COMMIT, WIU_LOG_DEFAULT | INSTALLLOGMODE_VERBOSE, NULL);
+    hr = WiuEndTransaction(MSITRANSACTIONSTATE_COMMIT, WIU_LOG_DEFAULT | INSTALLLOGMODE_VERBOSE, szLogPath);
     ExitOnFailure(hr, "Failed to commit the MSI transaction");
 
-LExit:
+    if (phChangeOfOwnerEvent && *phChangeOfOwnerEvent && INVALID_HANDLE_VALUE != *phChangeOfOwnerEvent)
+    {
+        ::CloseHandle(phChangeOfOwnerEvent);
+        *phChangeOfOwnerEvent = NULL;
+    }
+    if (phTransactionHandle && *phTransactionHandle)
+    {
+        ::MsiCloseHandle(*phTransactionHandle);
+        *phTransactionHandle = NULL;
+    }
 
+LExit:
     return hr;
 }
 
@@ -1065,23 +1078,20 @@ extern "C" HRESULT MsiEngineRollbackTransaction(
 {
     HRESULT hr = S_OK;
 
-
     hr = WiuEndTransaction(MSITRANSACTIONSTATE_ROLLBACK, WIU_LOG_DEFAULT | INSTALLLOGMODE_VERBOSE, szLogPath);
     ExitOnFailure(hr, "Failed to rollback the MSI transaction");
 
-    if (*phTransactionHandle)
+    if (phChangeOfOwnerEvent && *phChangeOfOwnerEvent && INVALID_HANDLE_VALUE != *phChangeOfOwnerEvent)
     {
-        ::MsiCloseHandle(*phTransactionHandle);
-        *phTransactionHandle = NULL;
+        ::CloseHandle(phChangeOfOwnerEvent);
+        *phChangeOfOwnerEvent = NULL;
     }
-
-    if (*phChangeOfOwnerEvent && (*phChangeOfOwnerEvent != INVALID_HANDLE_VALUE))
+    if (phTransactionHandle && *phTransactionHandle)
     {
-        ::CloseHandle(*phChangeOfOwnerEvent);
-        *phChangeOfOwnerEvent = NULL;
+        ::MsiCloseHandle(*phTransactionHandle);
+        *phTransactionHandle = NULL;
     }
 
-
 LExit:
 
     return hr;

diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp
@@ -1927,7 +1927,6 @@ static void ResetPlannedRollbackBoundaryState(
     )
 {
     pRollbackBoundary->fActiveTransaction = FALSE;
-    ReleaseNullStr(pRollbackBoundary->sczLogPath);
 }
 
 static HRESULT GetActionDefaultRequestState(
-Original file line number
+Diff line change
@@ Expand Up / @@ -1927,7 +1927,6 @@ static void ResetPlannedRollbackBoundaryState( @@
         )
     {
         pRollbackBoundary->fActiveTransaction = FALSE;
-        ReleaseNullStr(pRollbackBoundary->sczLogPath);
     }
     static HRESULT GetActionDefaultRequestState(
@@ Expand Down @@