Removed usage of ThrowExceptionForHR for ThrowOnFailure

shmuelie · Dec 17, 2023 · e33dac2 · e33dac2
1 parent 7783e1a
commit e33dac2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Shmuelie.WinRTServer/ComServer.cs b/src/Shmuelie.WinRTServer/ComServer.cs
@@ -130,7 +130,7 @@ public unsafe bool RegisterClassFactory(BaseClassFactory factory)
         proxy.Attach(BaseClassFactoryProxy.Create(factory));
 
         uint cookie;
-        Marshal.ThrowExceptionForHR(CoRegisterClassObject(&clsid, (IUnknown*)proxy.Get(), CLSCTX.CLSCTX_LOCAL_SERVER, (REGCLS.REGCLS_MULTIPLEUSE | REGCLS.REGCLS_SUSPENDED), &cookie));
+        CoRegisterClassObject(&clsid, (IUnknown*)proxy.Get(), CLSCTX.CLSCTX_LOCAL_SERVER, (REGCLS.REGCLS_MULTIPLEUSE | REGCLS.REGCLS_SUSPENDED), &cookie).ThrowOnFailure();
 
         factories.Add(clsid, (factory, cookie));
         return true;
@@ -163,7 +163,7 @@ public unsafe bool UnregisterClassFactory(Guid clsid)
 
         data.factory.InstanceCreated -= Factory_InstanceCreated;
 
-        Marshal.ThrowExceptionForHR(CoRevokeClassObject(data.cookie));
+        CoRevokeClassObject(data.cookie).ThrowOnFailure();
         return true;
     }
 
@@ -201,7 +201,7 @@ public void Start()
 
         firstInstanceCreated = new();
         lifetimeCheckTimer.Start();
-        Marshal.ThrowExceptionForHR(CoResumeClassObjects());
+        CoResumeClassObjects().ThrowOnFailure();
     }
 
     /// <summary>
@@ -221,7 +221,7 @@ public void Stop()
 
         firstInstanceCreated = null;
         lifetimeCheckTimer.Stop();
-        Marshal.ThrowExceptionForHR(CoSuspendClassObjects());
+        CoSuspendClassObjects().ThrowOnFailure();
     }
 
     /// <summary>

diff --git a/src/Shmuelie.WinRTServer/WinRtServer.cs b/src/Shmuelie.WinRTServer/WinRtServer.cs
@@ -56,7 +56,7 @@ public unsafe WinRtServer()
         HRESULT result = RoInitialize(RO_INIT_TYPE.RO_INIT_MULTITHREADED);
         if (result != HRESULT.S_OK && result != HRESULT.S_FALSE)
         {
-            Marshal.ThrowExceptionForHR(result);
+            result.ThrowOnFailure();
         }
 
         using ComPtr<IGlobalOptions> options = default;
@@ -232,7 +232,7 @@ public unsafe void Start()
                 string managedActivatableClassId = managedActivatableClassIds[activatableClassIdIndex];
                 fixed (char* managedActivatableClassIdPtr = managedActivatableClassId)
                 {
-                    Marshal.ThrowExceptionForHR(WindowsCreateString((PCWSTR)managedActivatableClassIdPtr, (uint)managedActivatableClassId.Length, &activatableClassIds[activatableClassIdIndex]));
+                    WindowsCreateString((PCWSTR)managedActivatableClassIdPtr, (uint)managedActivatableClassId.Length, &activatableClassIds[activatableClassIdIndex]).ThrowOnFailure();
                 }
             }
 
@@ -244,7 +244,7 @@ public unsafe void Start()
 
             fixed (RO_REGISTRATION_COOKIE* cookie = &registrationCookie)
             {
-                Marshal.ThrowExceptionForHR(RoRegisterActivationFactories(activatableClassIds, activationFactoryCallbacks, (uint)managedActivatableClassIds.Length, cookie));
+                RoRegisterActivationFactories(activatableClassIds, activationFactoryCallbacks, (uint)managedActivatableClassIds.Length, cookie).ThrowOnFailure();
             }
         }
         finally