Fix GUID interop in distributed transactions

roji · github-actions · commit d170a14e77ae · 2022-08-25T12:54:52.000Z
And disable tests on ARM for now. Works around #74170
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/IPrepareInfo.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/IPrepareInfo.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/IResourceManagerFactory2.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/IResourceManagerFactory2.cs
@@ -10,15 +10,15 @@ namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 internal interface IResourceManagerFactory2
 {
     internal void Create(
-        Guid pguidRM,
+        in Guid pguidRM,
         [MarshalAs(UnmanagedType.LPStr)] string pszRMName,
         [MarshalAs(UnmanagedType.Interface)] IResourceManagerSink pIResMgrSink,
         [MarshalAs(UnmanagedType.Interface)] out IResourceManager rm);
 
     internal void CreateEx(
-        Guid pguidRM,
+        in Guid pguidRM,
         [MarshalAs(UnmanagedType.LPStr)] string pszRMName,
         [MarshalAs(UnmanagedType.Interface)] IResourceManagerSink pIResMgrSink,
-        Guid riidRequested,
+        in Guid riidRequested,
         [MarshalAs(UnmanagedType.Interface)] out object rm);
 }
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
@@ -1,19 +1,23 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
-using System.Transactions.Oletx;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 
 // https://docs.microsoft.com/previous-versions/windows/desktop/ms686531(v=vs.85)
 [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 fRetaining,
+        [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
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionDispenser.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionDispenser.cs
@@ -7,7 +7,7 @@
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 
-// https://docs.microsoft.com/previous-versions/windows/desktop/ms679525(v=vs.85)
+// https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ms687604(v=vs.85)
 [ComImport, Guid(Guids.IID_ITransactionDispenser), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 internal interface ITransactionDispenser
 {
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionEnlistmentAsync.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionEnlistmentAsync.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionExport.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionExport.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionExportFactory.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionExportFactory.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionImport.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionImport.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
@@ -13,6 +12,6 @@ internal interface ITransactionImport
     void Import(
         uint cbTransactionCookie,
         [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] rgbTransactionCookie,
-        Guid piid,
+        in Guid piid,
         [MarshalAs(UnmanagedType.Interface)] out object ppvTransaction);
 }
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionOptions.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionOptions.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionOutcomeEvents.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionOutcomeEvents.cs
@@ -10,11 +10,21 @@ namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 [ComImport, Guid("3A6AD9E2-23B9-11cf-AD60-00AA00A74CCD"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 internal interface ITransactionOutcomeEvents
 {
-    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW /* always null? */, int hresult);
+    void Committed(
+        [MarshalAs(UnmanagedType.Bool)] bool fRetaining,
+        IntPtr pNewUOW,
+        int hresult);
 
-    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, int hresult);
+    void Aborted(
+        IntPtr pboidReason,
+        [MarshalAs(UnmanagedType.Bool)] bool fRetaining,
+        IntPtr pNewUOW,
+        int hresult);
 
-    void HeuristicDecision([MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision, IntPtr pboidReason, int hresult);
+    void HeuristicDecision(
+        [MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision,
+        IntPtr pboidReason,
+        int hresult);
 
     void Indoubt();
 }
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionReceiver.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionReceiver.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionReceiverFactory.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionReceiverFactory.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionResourceAsync.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionResourceAsync.cs
@@ -1,9 +1,7 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
-using System.Transactions.Oletx;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 
@@ -19,7 +17,10 @@ void PrepareRequest(
 
     void CommitRequest(OletxXactRm grfRM, IntPtr pNewUOW);
 
-    void AbortRequest(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW);
+    void AbortRequest(
+        IntPtr pboidReason,
+        [MarshalAs(UnmanagedType.Bool)] bool fRetaining,
+        IntPtr pNewUOW);
 
     void TMDown();
 }
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionTransmitter.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionTransmitter.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionTransmitterFactory.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionTransmitterFactory.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace System.Transactions.DtcProxyShim.DtcInterfaces;
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionVoterNotifyAsync2.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcInterfaces/ITransactionVoterNotifyAsync2.cs
@@ -10,11 +10,21 @@ namespace System.Transactions.DtcProxyShim.DtcInterfaces;
 [ComImport, Guid("5433376B-414D-11d3-B206-00C04FC2F3EF"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 internal interface ITransactionVoterNotifyAsync2
 {
-    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW /* always null? */, uint hresult);
+    void Committed(
+        [MarshalAs(UnmanagedType.Bool)] bool fRetaining,
+        IntPtr pNewUOW,
+        uint hresult);
 
-    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, uint hresult);
+    void Aborted(
+        IntPtr pboidReason,
+        [MarshalAs(UnmanagedType.Bool)] bool fRetaining,
+        IntPtr pNewUOW,
+        uint hresult);
 
-    void HeuristicDecision([MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision, IntPtr pboidReason, uint hresult);
+    void HeuristicDecision(
+        [MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision,
+        IntPtr pboidReason,
+        uint hresult);
 
     void Indoubt();
 
diff --git a/src/libraries/System.Transactions.Local/tests/OleTxTests.cs b/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
@@ -28,9 +28,11 @@ public OleTxTests(OleTxFixture fixture)
     [InlineData(Phase1Vote.ForceRollback, Phase1Vote.Prepared, EnlistmentOutcome.Aborted, EnlistmentOutcome.Aborted, TransactionStatus.Aborted)]
     public void Two_durable_enlistments_commit(Phase1Vote vote1, Phase1Vote vote2, EnlistmentOutcome expectedOutcome1, EnlistmentOutcome expectedOutcome2, TransactionStatus expectedTxStatus)
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         using var tx = new CommittableTransaction();
@@ -61,9 +63,11 @@ public void Two_durable_enlistments_commit(Phase1Vote vote1, Phase1Vote vote2, E
     [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
     public void Two_durable_enlistments_rollback()
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         using var tx = new CommittableTransaction();
@@ -89,9 +93,11 @@ public void Two_durable_enlistments_rollback()
     [InlineData(2)]
     public void Volatile_and_durable_enlistments(int volatileCount)
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         using var tx = new CommittableTransaction();
@@ -122,9 +128,11 @@ public void Volatile_and_durable_enlistments(int volatileCount)
     [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
     public void Promotion()
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         // This simulates the full promotable flow, as implemented for SQL Server.
@@ -301,9 +309,11 @@ public void SinglePhaseCommit(SinglePhaseEnlistment singlePhaseEnlistment)
     [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
     public void Recovery()
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         // We are going to spin up an external process to also enlist in the transaction, and then to crash when it
@@ -413,9 +423,11 @@ public void InDoubt(Enlistment enlistment)
     [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
     public void TransmitterPropagationToken()
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         using var tx = new CommittableTransaction();
@@ -434,9 +446,11 @@ public void TransmitterPropagationToken()
     [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
     public void GetExportCookie()
     {
-        if (!Environment.Is64BitProcess)
+        if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
         {
-            return; // Temporarily skip on 32-bit where we have an issue
+            // Temporarily skip on 32-bit where we have an issue
+            // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+            return;
         }
 
         using var tx = new CommittableTransaction();
@@ -483,9 +497,11 @@ public class OleTxFixture
     {
         public OleTxFixture()
         {
-            if (!Environment.Is64BitProcess)
+            if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
             {
-                return; // Temporarily skip on 32-bit where we have an issue
+                // Temporarily skip on 32-bit where we have an issue
+                // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
+                return;
             }
 
             // In CI, we sometimes get XACT_E_TMNOTAVAILABLE on the very first attempt to connect to MSDTC;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace System.Transactions.DtcProxyShim.DtcInterfaces;`
`9`	`9`
`10`		`-// https://docs.microsoft.com/previous-versions/windows/desktop/ms679525(v=vs.85)`
	`10`	`+// https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ms687604(v=vs.85)`
`11`	`11`	`[ComImport, Guid(Guids.IID_ITransactionDispenser), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]`
`12`	`12`	`internal interface ITransactionDispenser`
`13`	`13`	`{`