Skip to content

Commit 5ab32f0

Browse files
Sergio0694Sergio0694
authored
Refactor IID properties for non-projected ___Impl types in WinRT.Runtime (#2092)
* Use WellKnownWindowsInterfaceIIDs for interface IIDs Replaces direct references to interface implementation IIDs with constants from WellKnownWindowsInterfaceIIDs across multiple ABI and interop files. This change improves consistency and maintainability by centralizing interface ID definitions. * Refactor to use WellKnownInterfaceIIDs for interface IIDs Replaces direct references to interface IID getters (e.g., IUnknownImplget_IID) with WellKnownInterfaceIIDs static properties throughout the InteropTypeDefinitionBuilder classes. Updates InteropReferences to provide WellKnownInterfaceIIDs member references and removes obsolete per-implementation IID getters. This centralizes and simplifies access to well-known interface IIDs. * Use WellKnownInterfaceIIDs for interface IID assignments Replaced direct IID assignments from implementation classes with references to WindowsRuntime.InteropServices.WellKnownInterfaceIIDs constants for standard interfaces. This improves clarity and ensures consistency in IID usage. * Add global namespace to WellKnownInterfaceIIDs references Prefixed references to WindowsRuntime.InteropServices.WellKnownInterfaceIIDs and related implementation classes with 'global::' to ensure correct namespace resolution and avoid potential conflicts. This change improves code clarity and compatibility, especially in projects with custom or nested namespaces.
1 parent 15bd298 commit 5ab32f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+424
-417
lines changed

‎src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.Delegate.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,13 @@ public static void InterfaceEntriesImpl(
291291
implTypes: [
292292
(get_IidMethod, delegateImplType.GetMethod("get_Vtable"u8)),
293293
(get_ReferenceIidMethod, delegateReferenceImplType.GetMethod("get_Vtable"u8)),
294-
(interopReferences.IPropertyValueImplget_IID, interopReferences.IPropertyValueImplget_OtherTypeVtable),
295-
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
296-
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
297-
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
298-
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
299-
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
300-
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
294+
(interopReferences.WellKnownInterfaceIIDsget_IID_IPropertyValue, interopReferences.IPropertyValueImplget_OtherTypeVtable),
295+
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
296+
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
297+
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
298+
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
299+
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
300+
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
301301
}
302302

303303
/// <summary>

‎src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.KeyValuePair.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,12 @@ public static void InterfaceEntriesImplType(
258258
implType: out implType,
259259
implTypes: [
260260
(get_IidMethod, keyValuePairTypeImplType.GetMethod("get_Vtable"u8)),
261-
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
262-
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
263-
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
264-
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
265-
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
266-
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
261+
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
262+
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
263+
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
264+
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
265+
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
266+
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
267267
}
268268
}
269269
}

‎src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.SzArray.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -359,13 +359,13 @@ public static void InterfaceEntriesImpl(
359359
implType: out interfaceEntriesImplType,
360360
implTypes: [
361361
(get_IidMethod, implType.GetMethod("get_Vtable"u8)),
362-
(interopReferences.IPropertyValueImplget_IID, interopReferences.IPropertyValueImplget_OtherTypeVtable), // TODO
363-
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
364-
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
365-
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
366-
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
367-
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
368-
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable)]);
362+
(interopReferences.WellKnownInterfaceIIDsget_IID_IPropertyValue, interopReferences.IPropertyValueImplget_OtherTypeVtable), // TODO
363+
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
364+
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
365+
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
366+
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
367+
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
368+
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable)]);
369369
}
370370

371371
/// <summary>

‎src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.UserDefinedType.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ public static void InterfaceEntriesImpl(
112112

113113
// Add the default entries at the end
114114
entriesList.AddRange(
115-
(interopReferences.IStringableImplget_IID, interopReferences.IStringableImplget_Vtable),
116-
(interopReferences.IWeakReferenceSourceImplget_IID, interopReferences.IWeakReferenceSourceImplget_Vtable),
117-
(interopReferences.IMarshalImplget_IID, interopReferences.IMarshalImplget_Vtable),
118-
(interopReferences.IAgileObjectImplget_IID, interopReferences.IAgileObjectImplget_Vtable),
119-
(interopReferences.IInspectableImplget_IID, interopReferences.IInspectableImplget_Vtable),
120-
(interopReferences.IUnknownImplget_IID, interopReferences.IUnknownImplget_Vtable));
115+
(interopReferences.WellKnownInterfaceIIDsget_IID_IStringable, interopReferences.IStringableImplget_Vtable),
116+
(interopReferences.WellKnownInterfaceIIDsget_IID_IWeakReferenceSource, interopReferences.IWeakReferenceSourceImplget_Vtable),
117+
(interopReferences.WellKnownInterfaceIIDsget_IID_IMarshal, interopReferences.IMarshalImplget_Vtable),
118+
(interopReferences.WellKnownInterfaceIIDsget_IID_IAgileObject, interopReferences.IAgileObjectImplget_Vtable),
119+
(interopReferences.WellKnownInterfaceIIDsget_IID_IInspectable, interopReferences.IInspectableImplget_Vtable),
120+
(interopReferences.WellKnownInterfaceIIDsget_IID_IUnknown, interopReferences.IUnknownImplget_Vtable));
121121

122122
InteropTypeDefinitionBuilder.InterfaceEntriesImpl(
123123
ns: "WindowsRuntime.Interop.UserDefinedTypes"u8,

‎src/WinRT.Interop.Generator/References/InteropReferences.cs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -961,39 +961,67 @@ public InteropReferences(
961961
public MemberReference ComInterfaceEntryVtable => field ??= ComInterfaceEntry.CreateMemberReference("Vtable"u8, new FieldSignature(_corLibTypeFactory.IntPtr));
962962

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

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

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

984984
/// <summary>
985-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IInspectableImpl.get_Vtable()</c>.
985+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IStringable()</c>.
986986
/// </summary>
987-
public MemberReference IInspectableImplget_Vtable => field ??= IInspectableImpl
987+
public MemberReference WellKnownInterfaceIIDsget_IID_IStringable => field ??= WellKnownInterfaceIIDs
988+
.CreateMemberReference("get_IID_IStringable"u8, MethodSignature.CreateStatic(
989+
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
990+
991+
/// <summary>
992+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IMarshal()</c>.
993+
/// </summary>
994+
public MemberReference WellKnownInterfaceIIDsget_IID_IMarshal => field ??= WellKnownInterfaceIIDs
995+
.CreateMemberReference("get_IID_IMarshal"u8, MethodSignature.CreateStatic(
996+
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
997+
998+
/// <summary>
999+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IWeakReferenceSource()</c>.
1000+
/// </summary>
1001+
public MemberReference WellKnownInterfaceIIDsget_IID_IWeakReferenceSource => field ??= WellKnownInterfaceIIDs
1002+
.CreateMemberReference("get_IID_IWeakReferenceSource"u8, MethodSignature.CreateStatic(
1003+
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1004+
1005+
/// <summary>
1006+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.WellKnownInterfaceIIDs.get_IID_IAgileObject()</c>.
1007+
/// </summary>
1008+
public MemberReference WellKnownInterfaceIIDsget_IID_IAgileObject => field ??= WellKnownInterfaceIIDs
1009+
.CreateMemberReference("get_IID_IAgileObject"u8, MethodSignature.CreateStatic(
1010+
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1011+
1012+
/// <summary>
1013+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IUnknownImpl.get_Vtable()</c>.
1014+
/// </summary>
1015+
public MemberReference IUnknownImplget_Vtable => field ??= IUnknownImpl
9881016
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
9891017
returnType: _corLibTypeFactory.IntPtr));
9901018

9911019
/// <summary>
992-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IPropertyValueImpl.get_IID()</c>.
1020+
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IInspectableImpl.get_Vtable()</c>.
9931021
/// </summary>
994-
public MemberReference IPropertyValueImplget_IID => field ??= IPropertyValueImpl
995-
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
996-
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1022+
public MemberReference IInspectableImplget_Vtable => field ??= IInspectableImpl
1023+
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
1024+
returnType: _corLibTypeFactory.IntPtr));
9971025

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

1019-
/// <summary>
1020-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IStringableImpl.get_IID()</c>.
1021-
/// </summary>
1022-
public MemberReference IStringableImplget_IID => field ??= IStringableImpl
1023-
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
1024-
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1025-
10261047
/// <summary>
10271048
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IStringableImpl.get_Vtable()</c>.
10281049
/// </summary>
10291050
public MemberReference IStringableImplget_Vtable => field ??= IStringableImpl
10301051
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
10311052
returnType: _corLibTypeFactory.IntPtr));
10321053

1033-
/// <summary>
1034-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IMarshalImpl.get_IID()</c>.
1035-
/// </summary>
1036-
public MemberReference IMarshalImplget_IID => field ??= IMarshalImpl
1037-
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
1038-
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1039-
10401054
/// <summary>
10411055
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IMarshalImpl.get_Vtable()</c>.
10421056
/// </summary>
10431057
public MemberReference IMarshalImplget_Vtable => field ??= IMarshalImpl
10441058
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
10451059
returnType: _corLibTypeFactory.IntPtr));
10461060

1047-
/// <summary>
1048-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IWeakReferenceSourceImpl.get_IID()</c>.
1049-
/// </summary>
1050-
public MemberReference IWeakReferenceSourceImplget_IID => field ??= IWeakReferenceSourceImpl
1051-
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
1052-
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1053-
10541061
/// <summary>
10551062
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IWeakReferenceSourceImpl.get_Vtable()</c>.
10561063
/// </summary>
10571064
public MemberReference IWeakReferenceSourceImplget_Vtable => field ??= IWeakReferenceSourceImpl
10581065
.CreateMemberReference("get_Vtable"u8, MethodSignature.CreateStatic(
10591066
returnType: _corLibTypeFactory.IntPtr));
10601067

1061-
/// <summary>
1062-
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IAgileObjectImpl.get_IID()</c>.
1063-
/// </summary>
1064-
public MemberReference IAgileObjectImplget_IID => field ??= IAgileObjectImpl
1065-
.CreateMemberReference("get_IID"u8, MethodSignature.CreateStatic(
1066-
returnType: WellKnownTypeSignatureFactory.InGuid(this)));
1067-
10681068
/// <summary>
10691069
/// Gets the <see cref="MemberReference"/> for <c>WindowsRuntime.InteropServices.IAgileObjectImpl.get_Vtable()</c>.
10701070
/// </summary>

‎src/WinRT.Runtime2/ABI/System/Boolean.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ static BooleanInterfaceEntriesImpl()
8686
{
8787
Entries.IReferenceOfBoolean.IID = WellKnownWindowsInterfaceIIDs.IID_IReferenceOfBool;
8888
Entries.IReferenceOfBoolean.Vtable = BooleanReferenceImpl.Vtable;
89-
Entries.IPropertyValue.IID = IPropertyValueImpl.IID;
89+
Entries.IPropertyValue.IID = WellKnownWindowsInterfaceIIDs.IID_IPropertyValue;
9090
Entries.IPropertyValue.Vtable = BooleanPropertyValueImpl.Vtable;
91-
Entries.IStringable.IID = IStringableImpl.IID;
91+
Entries.IStringable.IID = WellKnownWindowsInterfaceIIDs.IID_IStringable;
9292
Entries.IStringable.Vtable = IStringableImpl.Vtable;
93-
Entries.IWeakReferenceSource.IID = IWeakReferenceSourceImpl.IID;
93+
Entries.IWeakReferenceSource.IID = WellKnownWindowsInterfaceIIDs.IID_IWeakReferenceSource;
9494
Entries.IWeakReferenceSource.Vtable = IWeakReferenceSourceImpl.Vtable;
95-
Entries.IMarshal.IID = IMarshalImpl.IID;
95+
Entries.IMarshal.IID = WellKnownWindowsInterfaceIIDs.IID_IMarshal;
9696
Entries.IMarshal.Vtable = IMarshalImpl.Vtable;
97-
Entries.IAgileObject.IID = IAgileObjectImpl.IID;
97+
Entries.IAgileObject.IID = WellKnownWindowsInterfaceIIDs.IID_IAgileObject;
9898
Entries.IAgileObject.Vtable = IAgileObjectImpl.Vtable;
99-
Entries.IInspectable.IID = IInspectableImpl.IID;
99+
Entries.IInspectable.IID = WellKnownWindowsInterfaceIIDs.IID_IInspectable;
100100
Entries.IInspectable.Vtable = IInspectableImpl.Vtable;
101-
Entries.IUnknown.IID = IUnknownImpl.IID;
101+
Entries.IUnknown.IID = WellKnownWindowsInterfaceIIDs.IID_IUnknown;
102102
Entries.IUnknown.Vtable = IUnknownImpl.Vtable;
103103
}
104104
}

‎src/WinRT.Runtime2/ABI/System/Byte.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ static ByteInterfaceEntriesImpl()
8686
{
8787
Entries.IReferenceOfByte.IID = WellKnownWindowsInterfaceIIDs.IID_IReferenceOfByte;
8888
Entries.IReferenceOfByte.Vtable = ByteReferenceImpl.Vtable;
89-
Entries.IPropertyValue.IID = IPropertyValueImpl.IID;
89+
Entries.IPropertyValue.IID = WellKnownWindowsInterfaceIIDs.IID_IPropertyValue;
9090
Entries.IPropertyValue.Vtable = BytePropertyValueImpl.Vtable;
91-
Entries.IStringable.IID = IStringableImpl.IID;
91+
Entries.IStringable.IID = WellKnownWindowsInterfaceIIDs.IID_IStringable;
9292
Entries.IStringable.Vtable = IStringableImpl.Vtable;
93-
Entries.IWeakReferenceSource.IID = IWeakReferenceSourceImpl.IID;
93+
Entries.IWeakReferenceSource.IID = WellKnownWindowsInterfaceIIDs.IID_IWeakReferenceSource;
9494
Entries.IWeakReferenceSource.Vtable = IWeakReferenceSourceImpl.Vtable;
95-
Entries.IMarshal.IID = IMarshalImpl.IID;
95+
Entries.IMarshal.IID = WellKnownWindowsInterfaceIIDs.IID_IMarshal;
9696
Entries.IMarshal.Vtable = IMarshalImpl.Vtable;
97-
Entries.IAgileObject.IID = IAgileObjectImpl.IID;
97+
Entries.IAgileObject.IID = WellKnownWindowsInterfaceIIDs.IID_IAgileObject;
9898
Entries.IAgileObject.Vtable = IAgileObjectImpl.Vtable;
99-
Entries.IInspectable.IID = IInspectableImpl.IID;
99+
Entries.IInspectable.IID = WellKnownWindowsInterfaceIIDs.IID_IInspectable;
100100
Entries.IInspectable.Vtable = IInspectableImpl.Vtable;
101-
Entries.IUnknown.IID = IUnknownImpl.IID;
101+
Entries.IUnknown.IID = WellKnownWindowsInterfaceIIDs.IID_IUnknown;
102102
Entries.IUnknown.Vtable = IUnknownImpl.Vtable;
103103
}
104104
}

0 commit comments

Comments
 (0)