Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix regression in IBindableIterator #1690

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Fix regression in IBindableIterator #1690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/WinRT.Runtime/Projections/IEnumerable.net5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,11 +917,20 @@ public ComWrappers.ComInterfaceEntry[] GetExposedInterfaces()
{
return new ComWrappers.ComInterfaceEntry[]
{
new ComWrappers.ComInterfaceEntry
{
IID = typeof(ABI.Microsoft.UI.Xaml.Interop.IBindableIterator).GUID,
Vtable = ABI.Microsoft.UI.Xaml.Interop.IBindableIterator.AbiToProjectionVftablePtr
}
new ComWrappers.ComInterfaceEntry
{
IID = typeof(ABI.Microsoft.UI.Xaml.Interop.IBindableIterator).GUID,
Vtable = ABI.Microsoft.UI.Xaml.Interop.IBindableIterator.AbiToProjectionVftablePtr
},
new ComWrappers.ComInterfaceEntry
{
// IBindableIterator is intentionally used here as the vtable because
// we provide the same functions on the vtable as IIterator<object>
// and this allows to avoid introducing another class to initialize the
// IIterator<object> vtable.
IID = ABI.System.Collections.Generic.IEnumeratorMethods<object>.IID,
Vtable = ABI.Microsoft.UI.Xaml.Interop.IBindableIterator.AbiToProjectionVftablePtr
}
};
}
}
Expand Down Expand Up @@ -970,9 +979,9 @@ public static void DisposeAbi(IntPtr abi) =>

public static string GetGuidSignature() => GuidGenerator.GetSignature(typeof(IEnumerator<T>));

// Limiting projected surface to IBindableIterator as we only create a CCW for it during those scenarios.
// In IEnumerator<> scenarios, we use this as a helper for the implementation and don't actually use it to
// create a CCW.
// Limiting projected surface to IBindableIterator and IIterator<object> as we only create a CCW for it during the IEnumerator scenario.
// In IEnumerator<T> scenarios, we use this as a helper for the implementation and don't actually use it to create a CCW.
// We include IIterator<object> in IEnumerator scenarios due to compat reasons with how WinUI uses it where it treats both as the same.
[global::WinRT.WinRTExposedType(typeof(IBindableIteratorTypeDetails))]
#pragma warning disable CA2257 // This member is a type (so it cannot be invoked)
public sealed class ToAbiHelper : global::Windows.Foundation.Collections.IIterator<T>, global::Microsoft.UI.Xaml.Interop.IBindableIterator
Expand Down