Add a COMTest to verify one of the scenarios that we couldn't get to work previously with interop between CsWin32 and C#/WinRT.

Author: jevansaks

src/CsWin32Generator/Program.cs

@@ -25,12 +25,6 @@ public partial class Program
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
     };
 
-    private static readonly char[] ZeroWhiteSpace = new char[]
-    {
-        '\uFEFF', // ZERO WIDTH NO-BREAK SPACE (U+FEFF)
-        '\u200B', // ZERO WIDTH SPACE (U+200B)
-    };
-
     /// <summary>
     /// Entry point for the command line application.
     /// </summary>
@@ -362,10 +356,10 @@ private static GeneratorOptions LoadGeneratorOptions(FileInfo? nativeMethodsJson
         // Determine language version based on target framework
         LanguageVersion languageVersion = targetFramework switch
         {
-            var tf when tf?.StartsWith("net9.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
-            var tf when tf?.StartsWith("net8.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
-            var tf when tf?.StartsWith("net7.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
-            var tf when tf?.StartsWith("net6.0", StringComparison.Ordinal) == true => LanguageVersion.CSharp9,
+            var tfm when tfm?.StartsWith("net9.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
+            var tfm when tfm?.StartsWith("net8.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
+            var tfm when tfm?.StartsWith("net7.0", StringComparison.Ordinal) == true => LanguageVersion.Latest,
+            var tfm when tfm?.StartsWith("net6.0", StringComparison.Ordinal) == true => LanguageVersion.CSharp9,
             _ => LanguageVersion.CSharp9,
         };
 
@@ -409,7 +403,7 @@ private static GeneratorOptions LoadGeneratorOptions(FileInfo? nativeMethodsJson
     /// <param name="superGenerator">The super generator instance.</param>
     /// <param name="nativeMethodsTxt">Path to the NativeMethods.txt file.</param>
     /// <returns>True if processing succeeded, false otherwise.</returns>
-    private static bool ProcessNativeMethodsFile(SuperGenerator superGenerator, FileInfo nativeMethodsTxt)
+    private static unsafe bool ProcessNativeMethodsFile(SuperGenerator superGenerator, FileInfo nativeMethodsTxt)
     {
         try
         {
@@ -422,7 +416,9 @@ private static bool ProcessNativeMethodsFile(SuperGenerator superGenerator, File
 
             foreach (string line in lines)
             {
-                string name = line.Trim().Trim(ZeroWhiteSpace);
+                string name = line.Trim(
+                    '\uFEFF', // ZERO WIDTH NO-BREAK SPACE (U+FEFF)
+                    '\u200B'); // ZERO WIDTH SPACE (U+200B)
                 if (string.IsNullOrWhiteSpace(name) || name.StartsWith("//", StringComparison.InvariantCulture))
                 {
                     skippedCount++;

test/CsWin32Generator.Tests/CsWin32GeneratorFullTests.cs

@@ -13,6 +13,7 @@ public CsWin32GeneratorFullTests(ITestOutputHelper logger)
     }
 
     [Fact]
+    [Trait("TestCategory", "FailsInCloudTest")] // these take ~4GB of memory to run.
     public async Task FullGeneration()
     {
         this.fullGeneration = true;

test/GenerationSandbox.BuildTask.Tests/COMTests.cs

@@ -8,23 +8,57 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
 using System.Runtime.Versioning;
+using System.Threading.Tasks;
 using Windows.System;
+using Windows.UI.Composition;
 using Windows.Win32;
 using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Direct3D;
+using Windows.Win32.Graphics.Direct3D11;
 using Windows.Win32.System.Com;
+using Windows.Win32.System.WinRT.Composition;
 
 public partial class COMTests
 {
     [Fact]
-    public void Placeholder()
+    public async Task CanInteropWithICompositorInterop()
     {
-    }
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            var controller = DispatcherQueueController.CreateOnDedicatedThread();
+            TaskCompletionSource tcs = new();
+            controller.DispatcherQueue.TryEnqueue(() =>
+            {
+                try
+                {
+                    unsafe // Optional parameters use unsafe
+                    {
+                        Compositor compositor = new();
 
-    [LibraryImport("blah")]
-    internal static unsafe partial void Test(int count, [In][MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] ppBuffer);
+                        PInvoke.D3D11CreateDevice(
+                            null,
+                            D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_HARDWARE,
+                            HINSTANCE.Null,
+                            D3D11_CREATE_DEVICE_FLAG.D3D11_CREATE_DEVICE_BGRA_SUPPORT,
+                            null,
+                            0,
+                            PInvoke.D3D11_SDK_VERSION,
+                            out var device,
+                            null,
+                            out var deviceContext);
 
-    //[LibraryImport("blah.dll")]
-    //internal static unsafe partial void TestOptional(out Nullable<int*> ppBuffer);
+                        var interop = (ICompositorInterop)(object)compositor;
+                        interop.CreateGraphicsDevice(device, out var graphicsDevice);
+                        tcs.SetResult();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
 
-    //unsafe void CreateBuffer(winmdroot.Graphics.Direct3D11.D3D11_BUFFER_DESC* pDesc, [Optional] winmdroot.Graphics.Direct3D11.D3D11_SUBRESOURCE_DATA* pInitialData, [Optional] winmdroot.Graphics.Direct3D11.ID3D11Buffer_unmanaged** ppBuffer);
+            await tcs.Task;
+        }
+    }
 }

test/GenerationSandbox.BuildTask.Tests/NativeMethods.txt

@@ -37,4 +37,7 @@ ChoosePixelFormat
 //ID2D1Factory4
 //ID3D11VideoContext
 RoCreatePropertySetSerializer
-RoRegisterActivationFactories
+RoRegisterActivationFactories
+D3D11CreateDevice
+ICompositorInterop
+D3D11_SDK_VERSION