Skip to content

Refactor IID properties for non-projected ___Impl types in WinRT.Runtime #2092

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

Merged
Sergio0694 merged 4 commits into from
Nov 1, 2025
Merged

Refactor IID properties for non-projected ___Impl types in WinRT.Runtime #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
610d9f2
Use WellKnownWindowsInterfaceIIDs for interface IIDs
Sergio0694 Oct 26, 2025
99a42bf
Refactor to use WellKnownInterfaceIIDs for interface IIDs
Sergio0694 Oct 26, 2025
3093805
Use WellKnownInterfaceIIDs for interface IID assignments
Sergio0694 Oct 26, 2025
4009daf
Add global namespace to WellKnownInterfaceIIDs references
Sergio0694 Oct 26, 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
14 changes: 7 additions & 7 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 @@ -291,13 +291,13 @@ public static void InterfaceEntriesImpl(
implTypes: [
(get_IidMethod, delegateImplType.GetMethod("get_Vtable"u8)),
(get_ReferenceIidMethod, delegateReferenceImplType.GetMethod("get_Vtable"u8)),
(interopReferences.IPropertyValueImplget_IID, interopReferences.IPropertyValueImplget_OtherTypeVtable),
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
(interopReferences.WellKnownInterfaceIIDsget_IID_IPropertyValue, interopReferences.IPropertyValueImplget_OtherTypeVtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
}

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.KeyValuePair.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,12 @@ public static void InterfaceEntriesImplType(
implType: out implType,
implTypes: [
(get_IidMethod, keyValuePairTypeImplType.GetMethod("get_Vtable"u8)),
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
}
}
}
14 changes: 7 additions & 7 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.SzArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,13 @@ public static void InterfaceEntriesImpl(
implType: out interfaceEntriesImplType,
implTypes: [
(get_IidMethod, implType.GetMethod("get_Vtable"u8)),
(interopReferences.IPropertyValueImplget_IID, interopReferences.IPropertyValueImplget_OtherTypeVtable), // TODO
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
(interopReferences.WellKnownInterfaceIIDsget_IID_IPropertyValue, interopReferences.IPropertyValueImplget_OtherTypeVtable), // TODO
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
}

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.UserDefinedType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ public static void InterfaceEntriesImpl(

// Add the default entries at the end
entriesList.AddRange(
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable));
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable));

InteropTypeDefinitionBuilder.InterfaceEntriesImpl(
ns: "WindowsRuntime.Interop.UserDefinedTypes"u8,
Expand Down
88 changes: 44 additions & 44 deletions src/WinRT.Interop.Generator/References/InteropReferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,39 +961,67 @@ public InteropReferences(
public MemberReference ComInterfaceEntryVtable => field ??= ComInterfaceEntry.CreateMemberReference("Vtable"u8, new FieldSignature(_corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IUnknownImpl.get_IID()</c>.
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IUnknown()</c>.
/// </summary>
public MemberReference IUnknownImplget_IID => field ??= IUnknownImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
public MemberReference WellKnownInterfaceIIDsget_IID_IUnknown => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IUnknown"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IUnknownImpl.get_Vtable()</c>.
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IInspectable()</c>.
/// </summary>
public MemberReference IUnknownImplget_Vtable => field ??= IUnknownImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));
public MemberReference WellKnownInterfaceIIDsget_IID_IInspectable => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IInspectable"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IInspectableImpl.get_IID()</c>.
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IPropertyValue()</c>.
/// </summary>
public MemberReference IInspectableImplget_IID => field ??= IInspectableImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
public MemberReference WellKnownInterfaceIIDsget_IID_IPropertyValue => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IPropertyValue"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IInspectableImpl.get_Vtable()</c>.
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IStringable()</c>.
/// </summary>
public MemberReference IInspectableImplget_Vtable => field ??= IInspectableImpl
public MemberReference WellKnownInterfaceIIDsget_IID_IStringable => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IStringable"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IMarshal()</c>.
/// </summary>
public MemberReference WellKnownInterfaceIIDsget_IID_IMarshal => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IMarshal"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IWeakReferenceSource()</c>.
/// </summary>
public MemberReference WellKnownInterfaceIIDsget_IID_IWeakReferenceSource => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IWeakReferenceSource"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IAgileObject()</c>.
/// </summary>
public MemberReference WellKnownInterfaceIIDsget_IID_IAgileObject => field ??= WellKnownInterfaceIIDs
.CreateMemberReference("get_IID_IAgileObject"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IUnknownImpl.get_Vtable()</c>.
/// </summary>
public MemberReference IUnknownImplget_Vtable => field ??= IUnknownImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IPropertyValueImpl.get_IID()</c>.
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IInspectableImpl.get_Vtable()</c>.
/// </summary>
public MemberReference IPropertyValueImplget_IID => field ??= IPropertyValueImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
public MemberReference IInspectableImplget_Vtable => field ??= IInspectableImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IPropertyValueImpl.get_OtherTypeVtable()</c>.
Expand All @@ -1016,55 +1044,27 @@ public InteropReferences(
.CreateMemberReference("get_InspectableArrayVtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IStringableImpl.get_IID()</c>.
/// </summary>
public MemberReference IStringableImplget_IID => field ??= IStringableImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IStringableImpl.get_Vtable()</c>.
/// </summary>
public MemberReference IStringableImplget_Vtable => field ??= IStringableImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IMarshalImpl.get_IID()</c>.
/// </summary>
public MemberReference IMarshalImplget_IID => field ??= IMarshalImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IMarshalImpl.get_Vtable()</c>.
/// </summary>
public MemberReference IMarshalImplget_Vtable => field ??= IMarshalImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IWeakReferenceSourceImpl.get_IID()</c>.
/// </summary>
public MemberReference IWeakReferenceSourceImplget_IID => field ??= IWeakReferenceSourceImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IWeakReferenceSourceImpl.get_Vtable()</c>.
/// </summary>
public MemberReference IWeakReferenceSourceImplget_Vtable => field ??= IWeakReferenceSourceImpl
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
returnType: _corLibTypeFactory.IntPtr));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IAgileObjectImpl.get_IID()</c>.
/// </summary>
public MemberReference IAgileObjectImplget_IID => field ??= IAgileObjectImpl
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
returnType: WellKnownTypeSignatureFactory.InGuid(this)));

/// <summary>
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IAgileObjectImpl.get_Vtable()</c>.
/// </summary>
Expand Down
14 changes: 7 additions & 7 deletions src/WinRT.Runtime2/ABI/System/Boolean.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ static BooleanInterfaceEntriesImpl()
{
Entries.IReferenceOfBoolean.IID = WellKnownWindowsInterfaceIIDs.IID_IReferenceOfBool;
Entries.IReferenceOfBoolean.Vtable = BooleanReferenceImpl.Vtable;
Entries.IPropertyValue.IID = IPropertyValueImpl.IID;
Entries.IPropertyValue.IID = WellKnownWindowsInterfaceIIDs.IID_IPropertyValue;
Entries.IPropertyValue.Vtable = BooleanPropertyValueImpl.Vtable;
Entries.IStringable.IID = IStringableImpl.IID;
Entries.IStringable.IID = WellKnownWindowsInterfaceIIDs.IID_IStringable;
Entries.IStringable.Vtable = IStringableImpl.Vtable;
Entries.IWeakReferenceSource.IID = IWeakReferenceSourceImpl.IID;
Entries.IWeakReferenceSource.IID = WellKnownWindowsInterfaceIIDs.IID_IWeakReferenceSource;
Entries.IWeakReferenceSource.Vtable = IWeakReferenceSourceImpl.Vtable;
Entries.IMarshal.IID = IMarshalImpl.IID;
Entries.IMarshal.IID = WellKnownWindowsInterfaceIIDs.IID_IMarshal;
Entries.IMarshal.Vtable = IMarshalImpl.Vtable;
Entries.IAgileObject.IID = IAgileObjectImpl.IID;
Entries.IAgileObject.IID = WellKnownWindowsInterfaceIIDs.IID_IAgileObject;
Entries.IAgileObject.Vtable = IAgileObjectImpl.Vtable;
Entries.IInspectable.IID = IInspectableImpl.IID;
Entries.IInspectable.IID = WellKnownWindowsInterfaceIIDs.IID_IInspectable;
Entries.IInspectable.Vtable = IInspectableImpl.Vtable;
Entries.IUnknown.IID = IUnknownImpl.IID;
Entries.IUnknown.IID = WellKnownWindowsInterfaceIIDs.IID_IUnknown;
Entries.IUnknown.Vtable = IUnknownImpl.Vtable;
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/WinRT.Runtime2/ABI/System/Byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ static ByteInterfaceEntriesImpl()
{
Entries.IReferenceOfByte.IID = WellKnownWindowsInterfaceIIDs.IID_IReferenceOfByte;
Entries.IReferenceOfByte.Vtable = ByteReferenceImpl.Vtable;
Entries.IPropertyValue.IID = IPropertyValueImpl.IID;
Entries.IPropertyValue.IID = WellKnownWindowsInterfaceIIDs.IID_IPropertyValue;
Entries.IPropertyValue.Vtable = BytePropertyValueImpl.Vtable;
Entries.IStringable.IID = IStringableImpl.IID;
Entries.IStringable.IID = WellKnownWindowsInterfaceIIDs.IID_IStringable;
Entries.IStringable.Vtable = IStringableImpl.Vtable;
Entries.IWeakReferenceSource.IID = IWeakReferenceSourceImpl.IID;
Entries.IWeakReferenceSource.IID = WellKnownWindowsInterfaceIIDs.IID_IWeakReferenceSource;
Entries.IWeakReferenceSource.Vtable = IWeakReferenceSourceImpl.Vtable;
Entries.IMarshal.IID = IMarshalImpl.IID;
Entries.IMarshal.IID = WellKnownWindowsInterfaceIIDs.IID_IMarshal;
Entries.IMarshal.Vtable = IMarshalImpl.Vtable;
Entries.IAgileObject.IID = IAgileObjectImpl.IID;
Entries.IAgileObject.IID = WellKnownWindowsInterfaceIIDs.IID_IAgileObject;
Entries.IAgileObject.Vtable = IAgileObjectImpl.Vtable;
Entries.IInspectable.IID = IInspectableImpl.IID;
Entries.IInspectable.IID = WellKnownWindowsInterfaceIIDs.IID_IInspectable;
Entries.IInspectable.Vtable = IInspectableImpl.Vtable;
Entries.IUnknown.IID = IUnknownImpl.IID;
Entries.IUnknown.IID = WellKnownWindowsInterfaceIIDs.IID_IUnknown;
Entries.IUnknown.Vtable = IUnknownImpl.Vtable;
}
}
Expand Down
Loading
Loading