Use Marshal.AddRef/Release/QueryInterface. (#1379)

microsoft · Nov 11, 2023 · 0c65b63 · 0c65b63
1 parent e14f5d5
commit 0c65b63
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/WinRT.Runtime/ObjectReference.cs b/src/WinRT.Runtime/ObjectReference.cs
@@ -50,8 +50,8 @@ private unsafe uint RefCount
         {
             get
             {
-                VftblIUnknown.AddRef(ThisPtr);
-                return VftblIUnknown.Release(ThisPtr);
+                Marshal.AddRef(ThisPtr);
+                return (uint)Marshal.Release(ThisPtr);
             }
         }
 
@@ -76,7 +76,7 @@ internal unsafe IntPtr ReferenceTrackerPtr
                 _referenceTrackerPtr = value;
                 if (_referenceTrackerPtr != IntPtr.Zero)
                 {
-                    ReferenceTracker.IUnknownVftbl.AddRef(_referenceTrackerPtr);
+                    Marshal.AddRef(_referenceTrackerPtr);
                     AddRefFromTrackerSource();
                 }
             }
@@ -145,7 +145,7 @@ public unsafe TInterface AsInterface<TInterface>()
             {
                 Guid iid = typeof(TInterface).GUID;
                 IntPtr comPtr = IntPtr.Zero;
-                Marshal.ThrowExceptionForHR(VftblIUnknown.QueryInterface(ThisPtr, &iid, &comPtr));
+                Marshal.ThrowExceptionForHR(Marshal.QueryInterface(ThisPtr, ref iid, out comPtr));
                 try
                 {
                     return (TInterface)Marshal.GetObjectForIUnknown(comPtr);
@@ -180,7 +180,7 @@ public virtual unsafe int TryAs<
             objRef = null;
             ThrowIfDisposed();
             IntPtr thatPtr = IntPtr.Zero;
-            int hr = VftblIUnknown.QueryInterface(ThisPtr, &iid, &thatPtr);
+            int hr = Marshal.QueryInterface(ThisPtr, ref iid, out thatPtr);
             if (hr >= 0)
             {
                 if (IsAggregated)
@@ -217,7 +217,7 @@ public virtual unsafe int TryAs(Guid iid, out IntPtr ppv)
             ppv = IntPtr.Zero;
             ThrowIfDisposed();
             IntPtr thatPtr = IntPtr.Zero;
-            int hr = VftblIUnknown.QueryInterface(ThisPtr, &iid, &thatPtr);
+            int hr = Marshal.QueryInterface(ThisPtr, ref iid, out thatPtr);
             if (hr >= 0)
             {
                 ppv = thatPtr;
@@ -305,7 +305,7 @@ internal bool Resurrect()
 
         protected virtual unsafe void AddRef(bool refFromTrackerSource)
         {
-            VftblIUnknown.AddRef(ThisPtr);
+            Marshal.AddRef(ThisPtr);
             if(refFromTrackerSource)
             {
                 AddRefFromTrackerSource();
@@ -320,13 +320,13 @@ protected virtual unsafe void AddRef()
         protected virtual unsafe void Release()
         {
             ReleaseFromTrackerSource();
-            VftblIUnknown.Release(ThisPtr);
+            Marshal.Release(ThisPtr);
         }
 
         private protected unsafe void ReleaseWithoutContext()
         {
             ReleaseFromTrackerSource();
-            VftblIUnknownFromOriginalContext.Release(ThisPtrFromOriginalContext);
+            Marshal.Release(ThisPtrFromOriginalContext);
         }
 
         internal unsafe bool IsReferenceToManagedObject
@@ -357,7 +357,7 @@ private unsafe void ResurrectTrackerSource()
         {
             if (ReferenceTrackerPtr != IntPtr.Zero)
             {
-                ReferenceTracker.IUnknownVftbl.AddRef(ReferenceTrackerPtr);
+                Marshal.AddRef(ReferenceTrackerPtr);
                 if (!PreventReleaseFromTrackerSourceOnDispose)
                 {
                     ReferenceTracker.AddRefFromTrackerSource(ReferenceTrackerPtr);
@@ -373,7 +373,7 @@ private unsafe void DisposeTrackerSource()
                 {
                     ReferenceTracker.ReleaseFromTrackerSource(ReferenceTrackerPtr);
                 }
-                ReferenceTracker.IUnknownVftbl.Release(ReferenceTrackerPtr);
+                Marshal.Release(ReferenceTrackerPtr);
             }
         }
 
@@ -391,7 +391,7 @@ public ObjectReferenceValue AsValue()
         public unsafe ObjectReferenceValue AsValue(Guid iid)
         {
             IntPtr thatPtr = IntPtr.Zero;
-            Marshal.ThrowExceptionForHR(VftblIUnknown.QueryInterface(ThisPtr, &iid, &thatPtr));
+            Marshal.ThrowExceptionForHR(Marshal.QueryInterface(ThisPtr, ref iid, out thatPtr));
             if (IsAggregated)
             {
                 Marshal.Release(thatPtr);
@@ -451,8 +451,8 @@ public static unsafe ObjectReference<T> FromAbi(IntPtr thisPtr, T vftblT)
             {
                 return null;
             }
+            Marshal.AddRef(thisPtr);
             var obj = new ObjectReference<T>(thisPtr, vftblT);
-            obj.VftblIUnknown.AddRef(obj.ThisPtr);
             return obj;
         }
 
@@ -646,7 +646,7 @@ public override unsafe int TryAs<
             objRef = null;
 
             IntPtr thatPtr = IntPtr.Zero;
-            int hr = VftblIUnknown.QueryInterface(ThisPtr, &iid, &thatPtr);
+            int hr = Marshal.QueryInterface(ThisPtr, ref iid, out thatPtr);
             if (hr >= 0)
             {
                 if (IsAggregated)
@@ -710,7 +710,7 @@ public unsafe readonly IntPtr Detach()
             // If the ptr is not owned by this instance, do an AddRef.
             if (preventReleaseOnDispose && ptr != IntPtr.Zero)
             {
-                (**(IUnknownVftbl**)ptr).AddRef(ptr);
+                Marshal.AddRef(ptr);
             }
 
             // Release tracker source reference as it is no longer a managed ref maintained by RCW.
@@ -731,7 +731,7 @@ public unsafe readonly void Dispose()
 
             if (!preventReleaseOnDispose && ptr != IntPtr.Zero)
             {
-                (**(IUnknownVftbl**)ptr).Release(ptr);
+                Marshal.Release(ptr);
             }
         }
     }