Project classes implementing generics and Project arrays

src/Projections/Benchmark/Benchmark.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\TestWinRT\BenchmarkComponent\BenchmarkComponent.vcxproj" />
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
   </ItemGroup>

src/Projections/Test/Test.csproj

@@ -14,66 +14,22 @@
     <ProjectReference Include="..\..\TestWinRT\test_component_derived\test_component_derived.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\test_component_fast\test_component_fast.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
-
-    <!--
     <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />	
-    -->
     <InternalsVisibleTo Include="UnitTest" />
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- Uncomment to generate projection -->
+    <CsWinRTExcludes>
+      TestComponentCSharp.AnotherAssembly;
+    </CsWinRTExcludes>
     <CsWinRTIncludes>
-      TestComponent.Blittable;
-      TestComponent.NonBlittable;
-      TestComponent.Nested;
-      TestComponentCSharp.FlagValue;
-      TestComponentCSharp.EnumValue;
-      TestComponentCSharp.FlagStruct;
-      TestComponentCSharp.EnumStruct;
-      TestComponentCSharp.BlittableStruct;
-      TestComponentCSharp.ComposedBlittableStruct;
-      TestComponentCSharp.NonBlittableStringStruct;
-      TestComponentCSharp.NonBlittableBoolStruct;
-      TestComponentCSharp.NonBlittableRefStruct;
-      TestComponentCSharp.ComposedNonBlittableStruct
-      TestComponentCSharp.CustomDisposableTest;
-      TestComponentCSharp.ICustomDisposableTest;
-      TestComponent.Composable;
-      TestComponent.IComposableStatics;
-      TestComponent.IRequiredOne;
-      TestComponent.IRequiredTwo;
-      TestComponent.IRequiredThree;
-      TestComponent.IRequiredFour;
-      TestComponent.IComposable;
-      TestComponentCSharp.ComImports;
-      TestComponentCSharp.IComImports;
-      TestComponentCSharp.ISingleton;
-      TestComponentCSharp.Singleton;
-      TestComponent.Param1Handler;
-      TestComponent.Param2Handler;
-      TestComponent.Param3Handler;
-      TestComponent.Param4Handler;
-      TestComponent.Param5Handler;
-      TestComponent.Param6Handler;
-      TestComponent.Param7Handler;
-      TestComponent.Param8Handler;
-      TestComponent.Param9Handler;
-      TestComponent.Param10Handler;
-      TestComponent.Param11Handler;
-      TestComponent.Param12Handler;
-      TestComponent.Param13Handler;
-      TestComponent.Param14Handler;
-      TestComponent.Param15Handler;
-      TestComponentCSharp.EventWithReturn;
-      TestComponentCSharp.EventWithGuid;
-      TestComponentCSharp.ProvideInt;
-      TestComponentCSharp.ProvideBool;
-      TestComponentCSharp.ProvideString;
+      TestComponent;
+      TestComponentCSharp;
       test_component_base;
       test_component_derived;
+      test_component_fast;
     </CsWinRTIncludes>
-
+      
     <!--PkgMicrosoft_WindowsAppSDK is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
     <PkgMicrosoft_WindowsAppSDK>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.windowsappsdk', '$(MicrosoftWinAppSDKVersion)'))</PkgMicrosoft_WindowsAppSDK>
   </PropertyGroup>

src/Projections/TestHost.ProbeByClass/TestHost.ProbeByClass.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Tests\TestComponentCSharp\TestComponentCSharp.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\TestComponent\TestComponent.vcxproj" />
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
     <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />

src/Projections/TestPublicExclusiveTo/TestPublicExclusiveTo.csproj

@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestWinRT\TestComponent\TestComponent.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\test_component_base\test_component_base.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\test_component_derived\test_component_derived.vcxproj" />
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
     <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />

src/Projections/TestSubset/TestSubset.csproj

@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestWinRT\TestComponent\TestComponent.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\test_component_base\test_component_base.vcxproj" />
     <ProjectReference Include="..\..\TestWinRT\test_component_derived\test_component_derived.vcxproj" />
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
     <ProjectReference Include="..\WinAppSDK\WinAppSDK.csproj" />

src/Projections/WinAppSDK/WinAppSDK.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
     <PackageReference Include="Microsoft.WindowsAppSDK" GeneratePathProperty="true">

src/Projections/WinUI/WinUI.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <ProjectReference Include="..\Windows\Windows.csproj" />
     <PackageReference Include="Microsoft.WinUI" GeneratePathProperty="true">
@@ -22,22 +22,8 @@
     <CsWinRTFilters>
 -exclude Windows
 -include Microsoft
-# The current WinUI nuget incorrectly references several Windows.* types that should be
-# Microsoft.* types instead.  Temporarily include these to enable the build
--include Windows.UI.Xaml.Interop.Type
--include Windows.UI.Xaml.Interop.NotifyCollectionChangedAction
 -include Windows.UI.Xaml.Markup.ContentPropertyAttribute
--include Windows.UI.Xaml.StyleTypedPropertyAttribute
--include Windows.UI.Xaml.TemplatePartAttribute
--include Windows.UI.Xaml.TemplateVisualStateAttribute
 -include Windows.UI.Xaml.Data.BindableAttribute
--include Windows.UI.Xaml.Markup.ContentPropertyAttribute
--include Windows.UI.Xaml.Markup.FullXamlMetadataProviderAttribute
--include Windows.UI.Xaml.Markup.MarkupExtensionReturnTypeAttribute
--include Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute
--include Windows.UI.Xaml.Media.Animation.IndependentlyAnimatableAttribute
--include Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute
--addition_exclude Windows.UI.Xaml.Media.Animation
     </CsWinRTFilters>
     <!--PkgMicrosoft_WinUI is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
     <PkgMicrosoft_WinUI Condition="'$(PkgMicrosoft_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.winui', '$(MicrosoftWinUIVersion)'))</PkgMicrosoft_WinUI>

src/Projections/Windows.UI.Xaml/ABI.Windows.System/DispatcherQueueProxyHandler.cs

@@ -2,8 +2,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
-using WinRT;
-using WinRT.Interop;
+using WindowsRuntime.InteropServices;
+
+#pragma warning disable CSWINRT3001
 
 #nullable enable
 
@@ -150,8 +151,8 @@ private static ref readonly Guid IID_IDispatcherQueueHandler
         [UnmanagedCallersOnly]
         public static int QueryInterface(DispatcherQueueProxyHandler* @this, Guid* riid, void** ppvObject)
         {
-            if (riid->Equals(IID.IID_IUnknown) ||
-                riid->Equals(IID.IID_IAgileObject) ||
+            if (riid->Equals(WellKnownInterfaceIIDs.IID_IUnknown) ||
+                riid->Equals(WellKnownInterfaceIIDs.IID_IAgileObject) ||
                 riid->Equals(IID_IDispatcherQueueHandler))
             {
                 Interlocked.Increment(ref @this->referenceCount);
@@ -214,7 +215,7 @@ public static int Invoke(DispatcherQueueProxyHandler* @this)
                 // Register the exception with the global error handler. The failfast behavior
                 // is governed by the state of the 'UnhandledExceptionEventArgs.Handled' property.
                 // If 'Handled' is true the app continues running, else it failfasts.
-                ExceptionHelpers.ReportUnhandledError(e);
+                RestrictedErrorInfo.ReportUnhandledError(e);
             }
 
             return S_OK;

src/Projections/Windows.UI.Xaml/DispatcherQueueSynchronizationContext.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Threading;
-using WinRT;
+using WindowsRuntime.InteropServices;
+
+#pragma warning disable CSWINRT3001
 
 #nullable enable
 
@@ -13,9 +15,9 @@ namespace Windows.System;
 public sealed partial class DispatcherQueueSynchronizationContext : SynchronizationContext
 {
     /// <summary>
-    /// The <see cref="IObjectReference"/> instance for the target dispatcher queue.
+    /// The <see cref="WindowsRuntimeObjectReference"/> instance for the target dispatcher queue.
     /// </summary>
-    private readonly IObjectReference _objectReference;
+    private readonly WindowsRuntimeObjectReference _objectReference;
 
     /// <summary>
     /// Creates a new <see cref="DispatcherQueueSynchronizationContext"/> instance with the specified parameters.
@@ -26,15 +28,18 @@ public DispatcherQueueSynchronizationContext(global::Windows.System.DispatcherQu
     {
         ArgumentNullException.ThrowIfNull(dispatcherQueue);
 
-        _objectReference = ((IWinRTObject)dispatcherQueue).NativeObject;
+        if (!WindowsRuntimeComWrappersMarshal.TryUnwrapObjectReference(dispatcherQueue, out _objectReference!))
+        {
+            throw new ArgumentException(null, nameof(dispatcherQueue));
+        }
     }
 
     /// <summary>
     /// Creates a new <see cref="DispatcherQueueSynchronizationContext"/> instance with the specified parameters.
     /// </summary>
-    /// <param name="objectReference">The <see cref="IObjectReference"/> instance for the target dispatcher queue.</param>
+    /// <param name="objectReference">The <see cref="WindowsRuntimeObjectReference"/> instance for the target dispatcher queue.</param>
     /// <exception cref="ArgumentNullException">Thrown if <paramref name="objectReference"/> is <see langword="null"/>.</exception>
-    private DispatcherQueueSynchronizationContext(IObjectReference objectReference)
+    private DispatcherQueueSynchronizationContext(WindowsRuntimeObjectReference objectReference)
     {
         ArgumentNullException.ThrowIfNull(objectReference);
 
@@ -51,21 +56,23 @@ public override unsafe void Post(SendOrPostCallback d, object? state)
 
         try
         {
-            void* thisPtr = (void*)_objectReference.ThisPtr;
+            _objectReference.AddRefUnsafe();
+
+            void* thisPtr = _objectReference.GetThisPtrUnsafe();
             bool success;
 
             // Note: we're intentionally ignoring the retval for 'DispatcherQueue::TryEnqueue'.
             // This matches the behavior for the equivalent type on WinUI 3 as well.
             hresult = ((delegate* unmanaged<void*, void*, byte*, int>)(*(void***)thisPtr)[7])(thisPtr, dispatcherQueueProxyHandler, (byte*)&success);
-
-            GC.KeepAlive(_objectReference);
         }
         finally
         {
             dispatcherQueueProxyHandler->Release();
+            _objectReference.ReleaseUnsafe();
         }
 
-        ExceptionHelpers.ThrowExceptionForHR(hresult);
+
+        RestrictedErrorInfo.ThrowExceptionForHR(hresult);
     }
 
     /// <inheritdoc/>

src/Projections/Windows.UI.Xaml/Windows.UI.Xaml.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj" />
+    <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <InternalsVisibleTo Include="UnitTest" />
     <ProjectReference Include="..\..\Authoring\WinRT.SourceGenerator.Roslyn4120\WinRT.SourceGenerator.Roslyn4120.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetPlatform="Platform=x64" />
@@ -19,8 +19,6 @@
     <CsWinRTFilters>
 -exclude Windows
 -include Windows.UI.Xaml
--exclude Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute
--addition_exclude Windows.UI.Xaml.Media.Animation
     </CsWinRTFilters>
   </PropertyGroup>
 

src/Projections/Windows/Windows.csproj

@@ -11,22 +11,18 @@
     <ProjectReference Include="..\..\WinRT.Runtime2\WinRT.Runtime2.csproj" />
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
     <InternalsVisibleTo Include="UnitTest" />
-    <ProjectReference Include="..\..\Authoring\WinRT.SourceGenerator.Roslyn4120\WinRT.SourceGenerator.Roslyn4120.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetPlatform="Platform=x64" />
   </ItemGroup>
 
   <PropertyGroup>
     <!-- TODO: -include Windows -->
     <CsWinRTFilters>
--include Windows.Foundation.Metadata
--include Windows.Foundation.UniversalApiContract
+-include Windows
 # Exclude Windows.UI, Windows.UI.Text, Windows.UI.Xaml per Microsoft.Windows.SDK.WinUI.Contracts NuGet
-# TODO: -include Windows.UI.Popups
+-include Windows.UI.Popups
 -exclude Windows.UI.Colors
 -exclude Windows.UI.IColors
 -exclude Windows.UI.ColorHelper
 -exclude Windows.UI.IColorHelper
--exclude Windows.UI.ColorHelper
--exclude Windows.UI.IColorHelper
 -exclude Windows.UI.IColorHelperStatics
 -exclude Windows.UI.IColorHelperStatics2
 #-exclude Windows.UI.Text (must include Windows.UI.Text to work around WinUI nuget issues)
@@ -38,7 +34,6 @@
 -include Windows.UI.Text.FontWeight
 -include Windows.UI.Text.IFontWeights
 -include Windows.UI.Text.UnderlineType
--include Windows.UI.Xaml.Media.Animation.ConditionallyIndependentlyAnimatableAttribute     
     </CsWinRTFilters>
   </PropertyGroup>
 

src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IEnumerator1.cs

@@ -98,7 +98,7 @@ public static void IIteratorMethods(
             //   [2]: 'void*' (the native value that was retrieved)
             CilLocalVariable loc_0_thisValue = new(interopReferences.WindowsRuntimeObjectReferenceValue.ToValueTypeSignature().Import(module));
             CilLocalVariable loc_1_thisPtr = new(module.CorLibTypeFactory.Void.MakePointerType());
-            CilLocalVariable loc_2_currentNative = new(module.CorLibTypeFactory.Void.MakePointerType());
+            CilLocalVariable loc_2_currentNative = enumeratorType.TypeArguments[0].IsValueType ? new(enumeratorType.TypeArguments[0].Import(module)) : new(module.CorLibTypeFactory.Void.MakePointerType());
 
             // Jump labels
             CilInstruction ldloca_s_0_tryStart = new(Ldloca_S, loc_0_thisValue);
@@ -427,10 +427,18 @@ public static void InterfaceImpl(
                 {
                     { Ldarg_0 },
                     { Callvirt, interopReferences.IEnumerator1get_Current(elementType).Import(module) },
-                    { Ret }
                 }
             };
 
+            // If the element type is a value type, we need to box it
+            if (elementType.IsValueType)
+            {
+                _ = get_IEnumeratorCurrentMethod.CilMethodBody.Instructions.Add(Box, elementType.Import(module).ToTypeDefOrRef());
+            }
+
+            // Add the return
+            _ = get_IEnumeratorCurrentMethod.CilMethodBody.Instructions.Add(Ret);
+
             // Create the 'IEnumerator.Current' property
             PropertyDefinition enumeratorCurrentProperty = new(
                 name: "System.Collections.IEnumerator.Current"u8,

src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.KeyValuePair.cs

@@ -89,6 +89,7 @@ static MethodDefinition GetKeyOrValuePropertyAccessorMethod(
             {
                 int typeArgumentIndex = name == "get_Key" ? 0 : 1;
                 TypeSignature typeArgument = keyValuePairType.TypeArguments[typeArgumentIndex];
+                TypeSignature typeArgumentAbiType = typeArgument.IsValueType ? typeArgument.Import(module).MakePointerType() : module.CorLibTypeFactory.Void.MakePointerType();
 
                 // Define the method as follows:
                 //
@@ -101,7 +102,7 @@ static MethodDefinition GetKeyOrValuePropertyAccessorMethod(
                         returnType: module.CorLibTypeFactory.Int32,
                         parameterTypes: [
                             module.CorLibTypeFactory.Void.MakePointerType(),
-                            typeArgument.Import(module).MakePointerType()]))
+                            typeArgumentAbiType]))
                 {
                     CustomAttributes = { InteropCustomAttributeFactory.UnmanagedCallersOnly(interopReferences, module) }
                 };
@@ -172,7 +173,8 @@ static MethodDefinition GetKeyOrValuePropertyAccessorMethod(
                 _ = instructions.Add(Ldarg_1);
                 _ = instructions.Add(Ldloca_S, loc_1_keyValuePair);
                 _ = instructions.Add(Call, get_MethodRef);
-                _ = instructions.Add(Stind_I);
+                // TODO call marshaler
+                // _ = instructions.Add(Stind_I);
                 _ = instructions.Add(Ldc_I4_0);
                 _ = instructions.Add(Stloc_0);
                 _ = instructions.Add(Leave_S, ldloc_0_returnHResult.CreateLabel());

src/WinRT.Runtime2/ABI/System/Collections/Specialized/INotifyCollectionChanged.cs

@@ -53,13 +53,13 @@ public static unsafe class INotifyCollectionChangedMethods
     /// <summary>
     /// The <see cref="EventSource{T}"/> table for <see cref="INotifyCollectionChanged.CollectionChanged"/>.
     /// </summary>
-    private static ConditionalWeakTable<WindowsRuntimeObject, NotifyCollectionChangedEventSource> CollectionChangedTable
+    private static ConditionalWeakTable<WindowsRuntimeObject, NotifyCollectionChangedEventHandlerEventSource> CollectionChangedTable
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get
         {
             [MethodImpl(MethodImplOptions.NoInlining)]
-            static ConditionalWeakTable<WindowsRuntimeObject, NotifyCollectionChangedEventSource> MakeCollectionChangedTable()
+            static ConditionalWeakTable<WindowsRuntimeObject, NotifyCollectionChangedEventHandlerEventSource> MakeCollectionChangedTable()
             {
                 _ = Interlocked.CompareExchange(ref field, [], null);
 
@@ -71,11 +71,11 @@ static ConditionalWeakTable<WindowsRuntimeObject, NotifyCollectionChangedEventSo
     }
 
     /// <see cref="INotifyCollectionChanged.CollectionChanged"/>
-    public static NotifyCollectionChangedEventSource CollectionChanged(WindowsRuntimeObject thisObject, WindowsRuntimeObjectReference thisReference)
+    public static NotifyCollectionChangedEventHandlerEventSource CollectionChanged(WindowsRuntimeObject thisObject, WindowsRuntimeObjectReference thisReference)
     {
         return CollectionChangedTable.GetOrAdd(
             key: thisObject,
-            valueFactory: static (_, thisReference) => new NotifyCollectionChangedEventSource(thisReference, 6),
+            valueFactory: static (_, thisReference) => new NotifyCollectionChangedEventHandlerEventSource(thisReference, 6),
             factoryArgument: thisReference);
     }
 }