Update COM interface definitions

Author: AaronRobinsonMSFT

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/IResourceManager.cs

@@ -51,7 +51,7 @@ internal void Enlist(
     internal void Reenlist(
         [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pPrepInfo,
         uint cbPrepInfom,
-        int lTimeout,
+        uint lTimeout,
         [MarshalAs(UnmanagedType.I4)] out OletxXactStat pXactStat);
 
     /// <summary>

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransaction.cs

@@ -22,7 +22,7 @@ internal interface ITransaction
     /// <param name="fRetainingt">Must be FALSE.</param>
     /// <param name="grfTC">Values taken from the <see cref="OletxXacttc" /> enumeration</param>
     /// <param name="grfRM">Must be zero.</param>
-    void Commit(bool fRetainingt, [MarshalAs(UnmanagedType.U4)] OletxXacttc grfTC, uint grfRM);
+    void Commit([MarshalAs(UnmanagedType.Bool)] bool fRetainingt, [MarshalAs(UnmanagedType.U4)] OletxXacttc grfTC, uint grfRM);
 
     /// <summary>
     /// This method aborts the transaction.
@@ -34,7 +34,7 @@ internal interface ITransaction
     /// <param name="async">
     /// When fAsync is true, an asynchronous abort is performed and the caller must use ITransactionOutcomeEvents to learn the outcome of the transaction.
     /// </param>
-    void Abort(IntPtr reason, int retaining, int async);
+    void Abort(IntPtr reason, [MarshalAs(UnmanagedType.Bool)] bool retaining, [MarshalAs(UnmanagedType.Bool)] bool async);
 
     /// <summary>
     /// This method returns information regarding a transaction object.

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransactionExportFactory.cs

@@ -36,7 +36,7 @@ internal interface ITransactionExportFactory
     /// The caller uses the export object returned by this method to marshal a transaction object for export to the destination process.
     /// </param>
     void Create(
-        ulong cbWhereabouts,
+        uint cbWhereabouts,
         [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] rgbWhereabouts,
         [MarshalAs(UnmanagedType.Interface)] out ITransactionExport ppExport);
 }

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransactionImport.cs

@@ -26,7 +26,7 @@ internal interface ITransactionImport
     /// <param name="piid">The interface ID desired on the resulting transaction object.</param>
     /// <param name="ppvTransaction">Reference to the interface on the imported transaction object, requested by the <paramref name="piid" /> parameter.</param>
     void Import(
-        ulong cbTransactionCookie,
+        uint cbTransactionCookie,
         [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] rgbTransactionCookie,
         Guid piid,
         [MarshalAs(UnmanagedType.Interface)] out object ppvTransaction);

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransactionOutcomeEvents.cs

@@ -23,7 +23,7 @@ internal interface ITransactionOutcomeEvents
     /// <param name="fRetaining">Indicates whether retaining Commit was specified. Will be false.</param>
     /// <param name="pNewUOW">Always null.</param>
     /// <param name="hresult">Always S_OK.</param>
-    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW /* always null? */, uint hresult);
+    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW /* always null? */, int hresult);
 
     /// <summary>
     /// This event is raised when the transaction aborted, either as a result of a call to Abort or an unsuccessful call to Commit*.*.
@@ -32,15 +32,15 @@ internal interface ITransactionOutcomeEvents
     /// <param name="fRetaining">Indicates whether retaining Commit was specified. Will be false.</param>
     /// <param name="pNewUOW">Always null.</param>
     /// <param name="hresult">Alawys S_OK.</param>
-    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW, uint hresult);
+    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, int hresult);
 
     /// <summary>
     /// This event is raised when one of the participants in the transaction chooses to heuristically decide the outcome of the transaction.
     /// </summary>
     /// <param name="dwDecision">Values from the enumeration <see cref="OletxTransactionHeuristic" />.</param>
     /// <param name="pboidReason">A BOID indicating why the transaction was heuristically decided. This value is provided by the party making the heuristic decision.</param>
     /// <param name="hresult">Always S_OK.</param>
-    void HeuristicDecision([MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision, IntPtr pboidReason, uint hresult);
+    void HeuristicDecision([MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision, IntPtr pboidReason, int hresult);
 
     /// <summary>
     /// This event is raised when the outcome of the transaction is in-doubt.

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransactionResourceAsync.cs

@@ -37,15 +37,15 @@ void PrepareRequest(
     /// </summary>
     /// <param name="grfRM">Values from <see cref="OletxXactRm" />.</param>
     /// <param name="pNewUOW">Always null.</param>
-    void CommitRequest(OletxXactRm grfRM, Guid pNewUOW);
+    void CommitRequest(OletxXactRm grfRM, IntPtr pNewUOW);
 
     /// <summary>
     /// The DTC proxy calls this method to abort a transaction.
     /// </summary>
     /// <param name="pboidReason">Unspecified and should be ignored.</param>
     /// <param name="fRetaining">Always will be false.</param>
     /// <param name="pNewUOW">Always will be null.</param>
-    void AbortRequest(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW);
+    void AbortRequest(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW);
 
     /// <summary>
     /// The DTC Proxy calls on this method if the connection to the transaction manager goes down and the resource manager's transaction object is prepared

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DTCInterfaces/ITransactionVoterNotifyAsync2.cs

@@ -24,7 +24,7 @@ internal interface ITransactionVoterNotifyAsync2
     /// <param name="fRetaining">Indicates whether retaining Commit was specified. Will be false.</param>
     /// <param name="pNewUOW">Always null.</param>
     /// <param name="hresult">Always S_OK.</param>
-    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW /* always null? */, uint hresult);
+    void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW /* always null? */, uint hresult);
 
     /// <summary>
     /// This event is raised when the transaction aborted, either as a result of a call to Abort or an unsuccessful call to Commit*.*.
@@ -33,7 +33,7 @@ internal interface ITransactionVoterNotifyAsync2
     /// <param name="fRetaining">Indicates whether retaining Commit was specified. Will be false.</param>
     /// <param name="pNewUOW">Always null.</param>
     /// <param name="hresult">Alawys S_OK.</param>
-    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW, uint hresult);
+    void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, uint hresult);
 
     /// <summary>
     /// This event is raised when one of the participants in the transaction chooses to heuristically decide the outcome of the transaction.

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/EnlistmentNotifyShim.cs

@@ -51,13 +51,13 @@ public void PrepareRequest(bool fRetaining, OletxXactRm grfRM, bool fWantMoniker
         ShimFactory.NewNotification(this);
     }
 
-    public void CommitRequest(OletxXactRm grfRM, Guid pNewUOW)
+    public void CommitRequest(OletxXactRm grfRM, IntPtr pNewUOW)
     {
         NotificationType = ShimNotificationType.CommitRequestNotify;
         ShimFactory.NewNotification(this);
     }
 
-    public void AbortRequest(IntPtr pboidReason, bool fRetaining, Guid pNewUOW)
+    public void AbortRequest(IntPtr pboidReason, bool fRetaining, IntPtr pNewUOW)
     {
         if (!_ignoreSpuriousProxyNotifications)
         {

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/TransactionNotifyShim.cs

@@ -14,19 +14,19 @@ internal TransactionNotifyShim(NotificationShimFactory shimFactory, object? enli
     {
     }
 
-    public void Committed(bool fRetaining, Guid pNewUOW /* always null? */, uint hresult)
+    public void Committed(bool fRetaining, IntPtr pNewUOW /* always null? */, int hresult)
     {
         NotificationType = ShimNotificationType.CommittedNotify;
         ShimFactory.NewNotification(this);
     }
 
-    public void Aborted(IntPtr pboidReason, bool fRetaining, Guid pNewUOW, uint hresult)
+    public void Aborted(IntPtr pboidReason, bool fRetaining, IntPtr pNewUOW, int hresult)
     {
         NotificationType = ShimNotificationType.AbortedNotify;
         ShimFactory.NewNotification(this);
     }
 
-    public void HeuristicDecision(OletxTransactionHeuristic dwDecision, IntPtr pboidReason, uint hresult)
+    public void HeuristicDecision(OletxTransactionHeuristic dwDecision, IntPtr pboidReason, int hresult)
     {
         NotificationType = dwDecision switch
         {

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/TransactionShim.cs

@@ -38,7 +38,7 @@ public void CreateVoter(OletxPhase1VolatileEnlistmentContainer managedIdentifier
 
     public void Export(byte[] whereabouts, out byte[] cookieBuffer)
     {
-        _shimFactory.ExportFactory.Create((ulong)whereabouts.Length, whereabouts, out ITransactionExport export);
+        _shimFactory.ExportFactory.Create((uint)whereabouts.Length, whereabouts, out ITransactionExport export);
 
         uint cookieSizeULong = 0;
 

src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/VoterNotifyShim.cs

@@ -21,9 +21,9 @@ public void VoteRequest()
     }
 
     // TODO
-    public void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW, uint hresult)
+    public void Committed([MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, uint hresult)
         => throw new NotImplementedException();
-    public void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, Guid pNewUOW, uint hresult)
+    public void Aborted(IntPtr pboidReason, [MarshalAs(UnmanagedType.Bool)] bool fRetaining, IntPtr pNewUOW, uint hresult)
         => throw new NotImplementedException();
     public void HeuristicDecision([MarshalAs(UnmanagedType.U4)] OletxTransactionHeuristic dwDecision, IntPtr pboidReason, uint hresult)
         => throw new NotImplementedException();