Cleanup

Author: ShortDevelopment

XamlIslands/FullTrustUWP/Core/Activation/ApplicationFrameActivator.cs

@@ -1,5 +1,4 @@
 using FullTrustUWP.Core.Interfaces;
-using System;
 
 namespace FullTrustUWP.Core.Activation
 {
@@ -9,7 +8,7 @@ public static IApplicationFrameManager CreateApplicationFrameManager()
         {
             // CLSID_ApplicationFrameManagerPriv = ddc05a5a-351a-4e06-8eaf-54ec1bc2dcea
             // CLSID_ApplicationFrameManager = b9b05098-3e30-483f-87f7-027ca78da287 // b9b05098_3e30_483f_87f7_027ca78da287
-            return Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("b9b05098-3e30-483f-87f7-027ca78da287"))) as IApplicationFrameManager;
+            return InteropHelper.ComCreateInstance<IApplicationFrameManager>("b9b05098-3e30-483f-87f7-027ca78da287")!;
         }
     }
 }

XamlIslands/FullTrustUWP/Core/Activation/CoreWindowActivator.cs

@@ -1,10 +1,7 @@
 using FullTrustUWP.Core.Interfaces;
 using System;
 using System.Runtime.InteropServices;
-using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
-using Windows.UI.ViewManagement;
-using Windows.UI.WindowManagement;
 
 namespace FullTrustUWP.Core.Activation
 {
@@ -21,7 +18,6 @@ public enum WindowType : long
             NOT_IMMERSIVE
         }
 
-        #region CreateCoreWindow
         [DllImport("windows.ui.dll", EntryPoint = "#1500")]
         static extern int PrivateCreateCoreWindow(
             WindowType windowType,
@@ -39,49 +35,7 @@ out ICoreWindowInterop windowRef
         public static CoreWindow CreateCoreWindow(WindowType windowType, string windowTitle, IntPtr hOwnerWindow, int x = 0, int y = 0, uint width = 10, uint height = 10, uint dwAttributes = 0)
         {
             Marshal.ThrowExceptionForHR(PrivateCreateCoreWindow(windowType, windowTitle, x, y, width, height, dwAttributes, hOwnerWindow, typeof(ICoreWindowInterop).GUID, out ICoreWindowInterop windowRef));
-            return windowRef as object as CoreWindow;
+            return (windowRef as object as CoreWindow)!;
         }
-        #endregion
-
-        #region CreateCoreApplicationViewTitleBar
-        [DllImport("twinapi.appcore.dll", EntryPoint = "#501")]
-        static extern int CreateCoreApplicationViewTitleBar(
-            CoreWindow titleBarClientAdapter,
-            IntPtr hWnd,
-            out CoreApplicationViewTitleBar titleBar
-        );
-
-        public static CoreApplicationViewTitleBar CreateCoreApplicationViewTitleBar(CoreWindow coreWindow, IntPtr hWnd)
-        {
-            Marshal.ThrowExceptionForHR(CreateCoreApplicationViewTitleBar(coreWindow, hWnd, out var titleBar));
-            return titleBar;
-        }
-        #endregion
-
-        #region CreateApplicationViewTitleBar
-        [DllImport("twinapi.appcore.dll", EntryPoint = "#502")]
-        static extern int CreateApplicationViewTitleBar(
-            AppWindow titleBarClientAdapter,
-            IntPtr hWnd,
-            out ApplicationViewTitleBar titleBar
-        );
-
-        public static ApplicationViewTitleBar CreateApplicationViewTitleBar(AppWindow titleBarClientAdapter, IntPtr hWnd)
-        {
-            Marshal.ThrowExceptionForHR(CreateApplicationViewTitleBar(titleBarClientAdapter, hWnd, out var titleBar));
-            return titleBar;
-        }
-        #endregion
-
-        /// <summary>
-        /// Not really working?!
-        /// </summary>
-        /// <param name="hWnd"></param>
-        /// <returns></returns>
-        [DllImport("twinapi.appcore.dll", EntryPoint = "#12")]
-        public static extern bool IsImmersiveWindow(IntPtr hWnd);
-
-        [DllImport("CoreUIComponents.dll", SetLastError = true)]
-        public static extern int CoreUICreateICoreWindowFactory(IntPtr a, IntPtr reserved1, IntPtr reserved2, out ICoreWindowFactory coreWindowFactory);
     }
 }

XamlIslands/FullTrustUWP/Core/Activation/CoreWindowFactoryActivator.cs

@@ -12,7 +12,7 @@ public static ICoreWindowFactory CreateInstance()
             Guid clsid = new(CLSID_CoreUICoreWindowFactoryProxy);
             Guid iid = new("00000000-0000-0000-C000-000000000046");
             Marshal.ThrowExceptionForHR(InteropHelper.CoCreateInstance(ref clsid, null, 1026, ref iid, out object factoryPtr));
-            return factoryPtr as ICoreWindowFactory;
+            return (factoryPtr as ICoreWindowFactory)!;
         }
     }
 }

XamlIslands/FullTrustUWP/Core/Activation/ImmersiveShellActivator.cs

@@ -6,10 +6,7 @@ namespace FullTrustUWP.Core.Activation
     public static class ImmersiveShellActivator
     {
         public static Interfaces.IServiceProvider CreateImmersiveShellServiceProvider()
-        {
-            var shellType = Type.GetTypeFromCLSID(new Guid("c2f03a33-21f5-47fa-b4bb-156362a2f239"));
-            return (Interfaces.IServiceProvider)Activator.CreateInstance(shellType);
-        }
+            => InteropHelper.ComCreateInstance<Interfaces.IServiceProvider>("c2f03a33-21f5-47fa-b4bb-156362a2f239")!;
 
         public static T QueryService<T>(this Interfaces.IServiceProvider serviceProvider)
         {

XamlIslands/FullTrustUWP/Core/Activation/SplashScreenActivator.cs

@@ -1,14 +1,10 @@
 using FullTrustUWP.Core.Interfaces;
-using System;
 
 namespace FullTrustUWP.Core.Activation
 {
     public static class VirtualDesktopManagerActivator
     {
         public static IVirtualDesktopManager CreateVirtualDesktopManager()
-        {
-            Type type = Type.GetTypeFromCLSID(new Guid("aa509086-5ca9-4c25-8f95-589d3c07b48a"));
-            return (IVirtualDesktopManager)Activator.CreateInstance(type);
-        }
+            => InteropHelper.ComCreateInstance<IVirtualDesktopManager>("aa509086-5ca9-4c25-8f95-589d3c07b48a")!;
     }
 }

XamlIslands/FullTrustUWP/Core/Activation/VirtualDesktopManagerActivator.cs

@@ -34,7 +34,7 @@ public static XamlWindow CreateNewWindow(XamlWindowConfig config)
                 coreWindow = CoreWindowActivator.CreateCoreWindow(CoreWindowActivator.WindowType.NOT_IMMERSIVE, config.Title, IntPtr.Zero, 30, 30, 1024, 768, 0);
 
             // Create CoreApplicationView
-            var coreApplicationPrivate = InteropHelper.GetActivationFactory<Interfaces.ICoreApplicationPrivate2>("Windows.ApplicationModel.Core.CoreApplication");
+            var coreApplicationPrivate = InteropHelper.RoGetActivationFactory<Interfaces.ICoreApplicationPrivate2>("Windows.ApplicationModel.Core.CoreApplication");
             Marshal.ThrowExceptionForHR(coreApplicationPrivate.CreateNonImmersiveView(out var coreView));
 
             // Mount Xaml rendering