Implement ICustomQueryInterface to support aggregation and hidden interfaces

WinRT.Runtime/ComWrappersSupport.net5.cs

@@ -46,7 +46,7 @@ internal static unsafe InspectableInfo GetInspectableInfo(IntPtr pThis)
 
  public static IObjectReference CreateCCWForObject(object obj)
  {
- IntPtr ccw = ComWrappers.GetOrCreateComInterfaceForObject(obj, CreateComInterfaceFlags.CallerDefinedIUnknown | CreateComInterfaceFlags.TrackerSupport);
+ IntPtr ccw = ComWrappers.GetOrCreateComInterfaceForObject(obj, CreateComInterfaceFlags.TrackerSupport);
  return ObjectReference<IUnknownVftbl>.Attach(ref ccw);
  }
 

WinRT.Runtime/ComWrappersSupport.netstandard2.0.cs

@@ -286,6 +286,13 @@ internal uint Release()
  internal int QueryInterface(Guid iid, out IntPtr ptr)
  {
  const int E_NOINTERFACE = unchecked((int)0x80004002);
+ if (ManagedObject is ICustomQueryInterface customQI)
+ {
+ if (customQI.GetInterface(ref iid, out ptr) == CustomQueryInterfaceResult.Handled)
+ {
+ return 0;
+ }
+ }
  if (_managedQITable.TryGetValue(iid, out ptr))
  {
  AddRef();

WinRT.Runtime/ExceptionHelpers.cs

@@ -71,7 +71,7 @@ public static void ThrowExceptionForHR(int hr)
  private static Exception GetExceptionForHR(int hr, bool useGlobalErrorState, out bool restoredExceptionFromGlobalState)
  {
  restoredExceptionFromGlobalState = false;
- if (hr == 0)
+ if (hr >= 0)
  {
  return null;
  }

WinRT.Runtime/Projections/Type.cs

@@ -72,11 +72,7 @@ public static Type GetAbi(Marshaler m)
  {
  return null;
  }
- if (value.Kind != TypeKind.Custom)
- {
- return TypeNameSupport.FindTypeByName(name.AsSpan()).type;
- }
- return global::System.Type.GetType(name, throwOnError: true);
+ return TypeNameSupport.FindTypeByName(name.AsSpan()).type;
  }
 
  public static unsafe void CopyAbi(Marshaler arg, IntPtr dest) =>

WinUI/WinUIDesktopSample.Package/NoBuild.Targets

@@ -0,0 +1,8 @@
+<Project>
+ <!--
+ This target is only imported when building from the command line.
+ It defines an empty Build target because we skip building the
+ project from the command line.
+ -->
+ <Target Name="Build" />
+</Project>

WinUI/WinUIDesktopSample.Package/WinUIDesktopSample.Package.wapproj

@@ -85,6 +85,5 @@
  </ProjectReference>
  </ItemGroup>
  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" Condition="'$(BuildingInsideVisualStudio)'=='true'" />
- <Target Name="Build" Condition="'$(BuildingInsideVisualStudio)'!='true'" />
- <Target Name="Clean" />
+ <Import Project="$(MSBuildThisFileDirectory)NoBuild.targets" Condition="'$(BuildingInsideVisualStudio)'!='true'" />
 </Project>

WinUI/WinUIDesktopSample/App.xaml.cs

@@ -19,23 +19,29 @@ public App()
  {
  }
 
+ Window myWindow;
  protected override void OnLaunched(LaunchActivatedEventArgs args)
  {
+ var button = new Button
+ {
+ Content = "Click me to load MainPage",
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center
+ };
+ button.Click += Button_Click;
  var window = new Microsoft.UI.Xaml.Window
  {
- // This will cause the InvalidCast exception. Once that is fixed, this can
- // be removed and just use the new MainPage() line below for setting content
- Content = new Microsoft.UI.Xaml.Shapes.Rectangle()
- {
- Fill = new SolidColorBrush(Windows.UI.Colors.Red),
- Width = 200,
- Height = 200
- }
+ Content = button
  };
 
- window.Content = new MainPage();
-
  window.Activate();
+
+ myWindow = window;
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ myWindow.Content = new MainPage();
  }
  }
 

WinUI/WinUIDesktopSample/MainPage.xaml.cs

@@ -15,6 +15,7 @@ public partial class MainPage : Page
  {
  public MainPage()
  {
+ InitializeComponent();
  }
  }
 }

WinUI/WinUIDesktopSample/WinUIDesktopSample.csproj

@@ -5,7 +5,6 @@
  <TargetFramework>netcoreapp5.0</TargetFramework>
  <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
  <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
- <GenerateTestProjection>true</GenerateTestProjection>
  <ApplicationManifest>WinUIDesktopSample.exe.manifest</ApplicationManifest>
  <!--
  There seems to be a codegen bug when referencing the cswinrt interop assembly of the Win32XamlHost