Skip to content

Emit full 'IMapChangedEventArgsMethods' types for args in 'cswinrtgen' #2167

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 8 commits into
base: user/sergiopedri/list-methods
Choose a base branch
from
Draft

Emit full 'IMapChangedEventArgsMethods' types for args in 'cswinrtgen' #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27c7b09
Rename variable for get_Key method generation
Sergio0694 Dec 23, 2025
d54c3ff
Add Conv_U opcode in IEnumerator1 builder
Sergio0694 Dec 23, 2025
59e607f
Refactor IMapChangedEventArgs signatures to factory methods
Sergio0694 Dec 23, 2025
273a1f9
Refactor IMapChangedEventArgs1 Key method generation
Sergio0694 Dec 23, 2025
b876d49
Replace typed with untyped return value signature
Sergio0694 Dec 23, 2025
08fa1cd
Add Conv_U opcode to KeyValuePair method IL
Sergio0694 Dec 23, 2025
185c022
Refactor IEnumerator1Impl method generation
Sergio0694 Dec 23, 2025
e0a14ec
Refactor HasCurrentOrMoveNext to accept adapter method
Sergio0694 Dec 23, 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
7 changes: 3 additions & 4 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IEnumerator1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public static void IIteratorMethods(
{ Stloc_1 },
{ Ldloc_1 },
{ Ldloca_S, loc_2_currentNative },
{ Conv_U },
{ Ldloc_1 },
{ Ldind_I },
{ Ldfld, interopDefinitions.IEnumerator1Vftbl.GetField("get_Current"u8) },
Expand Down Expand Up @@ -445,15 +446,13 @@ public static void ImplType(
module: module);

// Define the 'get_HasCurrent' method
MethodDefinition hasCurrentMethod = InteropMethodDefinitionFactory.IEnumerator1Impl.HasCurrentOrMoveNext(
nameUtf8: "get_HasCurrent"u8,
MethodDefinition hasCurrentMethod = InteropMethodDefinitionFactory.IEnumerator1Impl.get_HasCurrent(
enumeratorType: enumeratorType,
interopReferences: interopReferences,
module: module);

// Define the 'MoveNext' method
MethodDefinition moveNextMethod = InteropMethodDefinitionFactory.IEnumerator1Impl.HasCurrentOrMoveNext(
nameUtf8: "MoveNext"u8,
MethodDefinition moveNextMethod = InteropMethodDefinitionFactory.IEnumerator1Impl.MoveNext(
enumeratorType: enumeratorType,
interopReferences: interopReferences,
module: module);
Expand Down
29 changes: 9 additions & 20 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IMapChangedEventArgs1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Runtime.InteropServices;
using AsmResolver.DotNet;
using AsmResolver.DotNet.Code.Cil;
using AsmResolver.DotNet.Signatures;
using AsmResolver.PE.DotNet.Metadata.Tables;
using WindowsRuntime.InteropGenerator.Factories;
Expand All @@ -27,12 +26,14 @@ public static class IMapChangedEventArgs1
/// <param name="argsType">The <see cref="GenericInstanceTypeSignature"/> for the args type.</param>
/// <param name="interopDefinitions">The <see cref="InteropDefinitions"/> instance to use.</param>
/// <param name="interopReferences">The <see cref="InteropReferences"/> instance to use.</param>
/// <param name="emitState">The emit state for this invocation.</param>
/// <param name="module">The interop module being built.</param>
/// <param name="argsMethodsType">The resulting methods type.</param>
public static void Methods(
GenericInstanceTypeSignature argsType,
InteropDefinitions interopDefinitions,
InteropReferences interopReferences,
InteropGeneratorEmitState emitState,
ModuleDefinition module,
out TypeDefinition argsMethodsType)
{
Expand Down Expand Up @@ -70,30 +71,18 @@ public static void Methods(

argsMethodsType.Methods.Add(collectionChangeMethod);

// Define the 'Key' method as follows:
//
// public static <KEY_TYPE> Key(WindowsRuntimeObjectReference thisReference)
MethodDefinition keyMethod = new(
name: "Key"u8,
attributes: MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Static,
signature: MethodSignature.CreateStatic(
returnType: elementType.Import(module),
parameterTypes: [interopReferences.WindowsRuntimeObjectReference.Import(module).ToReferenceTypeSignature()]));
// Define the 'Key' method
MethodDefinition keyMethod = InteropMethodDefinitionFactory.IMapChangedEventArgs1Methods.Key(
argsType: argsType,
interopDefinitions: interopDefinitions,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Add and implement the 'Key' method
argsMethodsType.AddMethodImplementation(
declaration: interopReferences.IMapChangedEventArgsImpl1Key(elementType).Import(module),
method: keyMethod);

// Create a method body for the 'Key' method
keyMethod.CilMethodBody = new CilMethodBody()
{
Instructions =
{
{ Ldnull },
{ Throw } // TODO
}
};
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/WinRT.Interop.Generator/Factories/InteropMethodDefinitionFactory.IAsyncInfoMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public static MethodDefinition GetResults(
{ Ldloc_1 },
{ Ldind_I },
{ Ldfld, vftblField },
{ Calli, WellKnownTypeSignatureFactory.get_TypedRetVal(resultType.GetAbiType(interopReferences).MakePointerType(), interopReferences).Import(module).MakeStandAloneSignature() },
{ Calli, WellKnownTypeSignatureFactory.get_UntypedRetVal(interopReferences).Import(module).MakeStandAloneSignature() },
{ Call, interopReferences.RestrictedErrorInfoThrowExceptionForHR.Import(module) },
{ Leave_S, nop_finallyEnd.CreateLabel() },

Expand Down
Loading
Loading