Skip to content

Emit full "Impl" types for IReadOnlyList<T> in 'cswinrtgen' #2168

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

Draft
Sergio0694 wants to merge 13 commits into
base: user/sergiopedri/map-changed-event-args-methods
Choose a base branch
from
Draft

Emit full "Impl" types for IReadOnlyList<T> in 'cswinrtgen' #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5c457e8
Add IReadOnlyListAdapterExtensions for string IndexOf
Sergio0694 Dec 24, 2025
a9a87e9
Add Count method to IReadOnlyListAdapter<T>
Sergio0694 Dec 24, 2025
a5e3da6
Refactor variable naming for clarity in ABI implementations
Sergio0694 Dec 24, 2025
51894bc
Add GetAt method for IReadOnlyList<T> interop
Sergio0694 Dec 25, 2025
ceb512a
Add get_Size method to IReadOnlyList interop
Sergio0694 Dec 25, 2025
b6e7185
Add IndexOf method to IReadOnlyList interop
Sergio0694 Dec 27, 2025
6c010a5
Add support for marshalling ReadOnlySpan<char>
Sergio0694 Dec 27, 2025
f127889
Optimize IReadOnlyList<string>.IndexOf interop handling
Sergio0694 Dec 27, 2025
558d03a
Fix GetMany signature in IVector and IVectorView vtables
Sergio0694 Dec 27, 2025
c5426dd
Add 'GetMany' method to IReadOnlyList interop implementation
Sergio0694 Dec 27, 2025
cf24a2c
Fix typo: rename 'paraneterType' to 'parameterType'
Sergio0694 Dec 27, 2025
d139a5b
Fix typo in 'IndexOf' method
Sergio0694 Dec 28, 2025
5be243f
Fix 'GetMany' impl signature
Sergio0694 Dec 28, 2025
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
8 changes: 4 additions & 4 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.Delegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,13 @@ public static void ImplType(

// Track rewriting the two parameters for this method
emitState.TrackManagedParameterMethodRewrite(
paraneterType: senderType,
parameterType: senderType,
method: invokeMethod,
marker: nop_parameter1Rewrite,
parameterIndex: 1);

emitState.TrackManagedParameterMethodRewrite(
paraneterType: argsType,
parameterType: argsType,
method: invokeMethod,
marker: nop_parameter2Rewrite,
parameterIndex: 2);
Expand Down Expand Up @@ -650,15 +650,15 @@ public static void NativeDelegateType(

// Track rewriting the two parameters for this method
emitState.TrackNativeParameterMethodRewrite(
paraneterType: senderType,
parameterType: senderType,
method: invokeMethod,
tryMarker: nop_try_sender,
loadMarker: nop_ld_sender,
finallyMarker: nop_finally_sender,
parameterIndex: 1);

emitState.TrackNativeParameterMethodRewrite(
paraneterType: argsType,
parameterType: argsType,
method: invokeMethod,
tryMarker: nop_try_args,
loadMarker: nop_ld_args,
Expand Down
33 changes: 32 additions & 1 deletion src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IReadOnlyList1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,33 @@ public static void ImplType(
ModuleDefinition module,
out TypeDefinition implType)
{
// Define the 'GetAt' method
MethodDefinition getAtMethod = InteropMethodDefinitionFactory.IReadOnlyList1Impl.GetAt(
readOnlyListType: readOnlyListType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Define the 'get_Size' method
MethodDefinition sizeMethod = InteropMethodDefinitionFactory.IReadOnlyList1Impl.get_Size(
readOnlyListType: readOnlyListType,
interopReferences: interopReferences,
module: module);

// Define the 'IndexOf' method
MethodDefinition indexOfMethod = InteropMethodDefinitionFactory.IReadOnlyList1Impl.IndexOf(
readOnlyListType: readOnlyListType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Define the 'GetMany' method
MethodDefinition getManyMethod = InteropMethodDefinitionFactory.IReadOnlyList1Impl.GetMany(
readOnlyListType: readOnlyListType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

Impl(
interfaceType: ComInterfaceType.InterfaceIsIInspectable,
ns: InteropUtf8NameFactory.TypeNamespace(readOnlyListType),
Expand All @@ -435,7 +462,11 @@ public static void ImplType(
interopReferences: interopReferences,
module: module,
implType: out implType,
vtableMethods: []);
vtableMethods: [
getAtMethod,
sizeMethod,
indexOfMethod,
getManyMethod]);

// Track the type (it may be needed by COM interface entries for user-defined types)
emitState.TrackTypeDefinition(implType, readOnlyListType, "Impl");
Expand Down
6 changes: 3 additions & 3 deletions src/WinRT.Interop.Generator/Factories/InteropMethodDefinitionFactory.IMapMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ public static MethodDefinition Insert(

// Track rewriting the two parameters for this method
emitState.TrackNativeParameterMethodRewrite(
paraneterType: keyType,
parameterType: keyType,
method: insertMethod,
tryMarker: nop_try_key,
loadMarker: nop_ld_key,
finallyMarker: nop_finally_key,
parameterIndex: 1);

emitState.TrackNativeParameterMethodRewrite(
paraneterType: valueType,
parameterType: valueType,
method: insertMethod,
tryMarker: nop_try_value,
loadMarker: nop_ld_value,
Expand Down Expand Up @@ -259,7 +259,7 @@ public static MethodDefinition Remove(

// Track rewriting the return value for this method
emitState.TrackNativeParameterMethodRewrite(
paraneterType: keyType,
parameterType: keyType,
method: removeMethod,
tryMarker: nop_try_key,
loadMarker: nop_ld_key,
Expand Down
4 changes: 2 additions & 2 deletions src/WinRT.Interop.Generator/Factories/InteropMethodDefinitionFactory.IMapViewMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public static MethodDefinition HasKey(

// Track rewriting the return value for this method
emitState.TrackNativeParameterMethodRewrite(
paraneterType: keyType,
parameterType: keyType,
method: hasKeyMethod,
tryMarker: nop_try_key,
loadMarker: nop_ld_key,
Expand Down Expand Up @@ -253,7 +253,7 @@ public static MethodDefinition Lookup(

// Track rewriting the 'key' parameter for this method
emitState.TrackNativeParameterMethodRewrite(
paraneterType: keyType,
parameterType: keyType,
method: lookupMethod,
tryMarker: nop_try_key,
loadMarker: nop_ld_key,
Expand Down
Loading
Loading