From 1b250b39a190eac6aade69074cea3663b4d52ce6 Mon Sep 17 00:00:00 2001
From: Shay Rojansky <roji@roji.org>
Date: Mon, 29 Aug 2022 12:26:18 +0200
Subject: [PATCH] Fix TransactionInterop.GetDtcTransaction()

Incorrect COM interop definition

Fixes #74745
---
 .../DtcProxyShim/DtcInterfaces/ITransaction.cs       | 10 ++++++++--
 .../DtcProxyShim/DtcInterfaces/ITransactionCloner.cs | 12 ++++++++++++
 .../System.Transactions.Local/tests/OleTxTests.cs    |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransaction.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransaction.cs
index e516d2c0d038f..a06acb7668a58 100644
--- a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransaction.cs
+++ b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransaction.cs
@@ -11,9 +11,15 @@ namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 [ComImport, Guid(Guids.IID_ITransaction), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 internal interface ITransaction
 {
-    void Commit([MarshalAs(UnmanagedType.Bool)] bool fRetainingt, [MarshalAs(UnmanagedType.U4)] OletxXacttc grfTC, uint grfRM);
+    void Commit(
+        [MarshalAs(UnmanagedType.Bool)] bool fRetainingt,
+        [MarshalAs(UnmanagedType.U4)] OletxXacttc grfTC,
+        uint grfRM);
 
-    void Abort(IntPtr reason, [MarshalAs(UnmanagedType.Bool)] bool retaining, [MarshalAs(UnmanagedType.Bool)] bool async);
+    void Abort(
+        IntPtr reason,
+        [MarshalAs(UnmanagedType.Bool)] bool retaining,
+        [MarshalAs(UnmanagedType.Bool)] bool async);
 
     void GetTransactionInfo(out OletxXactTransInfo xactInfo);
 }
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionCloner.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionCloner.cs
index 7ce0b361bdf5f..731e72214f45a 100644
--- a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionCloner.cs
+++ b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionCloner.cs
@@ -10,5 +10,17 @@ namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 [ComImport, Guid("02656950-2152-11d0-944C-00A0C905416E"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 internal interface ITransactionCloner
 {
+    void Commit(
+        [MarshalAs(UnmanagedType.Bool)] bool fRetainingt,
+        [MarshalAs(UnmanagedType.U4)] OletxXacttc grfTC,
+        uint grfRM);
+
+    void Abort(
+        IntPtr reason,
+        [MarshalAs(UnmanagedType.Bool)] bool retaining,
+        [MarshalAs(UnmanagedType.Bool)] bool async);
+
+    void GetTransactionInfo(out OletxXactTransInfo xactInfo);
+
     void CloneWithCommitDisabled([MarshalAs(UnmanagedType.Interface)] out ITransaction ppITransaction);
 }
diff --git a/src/libraries/System.Transactions.Local/tests/OleTxTests.cs b/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
index e646c09a59326..eaf2d1b972bc2 100644
--- a/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
+++ b/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
@@ -433,8 +433,8 @@ public void GetExportCookie()
             Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
         });
 
-    // Test currently skipped, #74745
-    private void GetDtcTransaction()
+    [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
+    public void GetDtcTransaction()
         => Test(() =>
         {
             using var tx = new CommittableTransaction();