Initial attempt at adding strong typing to RAIIFree for #389.

Generated C# looks correct but ILSpy only shows typeof(Type).
microsoft · Nov 21, 2022 · f0deee3 · f0deee3
1 parent 870bbb0
commit f0deee3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/sources/ClangSharpSourceToWinmd/NativeTypedefStructsCreator.cs b/sources/ClangSharpSourceToWinmd/NativeTypedefStructsCreator.cs
@@ -68,7 +68,8 @@ public static void WriteToStream(Dictionary<string, string> methodNamesToNamespa
 
                 if (!string.IsNullOrEmpty(item.CloseApi))
                 {
-                    writer.WriteLine($"    [RAIIFree(\"{item.CloseApi}\")]");
+                    methodNamesToNamespaces.TryGetValue(item.CloseApi, out var closeApiNamespace);
+                    writer.WriteLine($"    [RAIIFree(typeof({closeApiNamespace}.Apis), \"{item.CloseApi}\")]");
                 }
 
                 if (!string.IsNullOrEmpty(item.AlsoUsableFor))

diff --git a/sources/Win32MetadataInterop/RAIIFreeAttribute.cs b/sources/Win32MetadataInterop/RAIIFreeAttribute.cs
@@ -4,12 +4,16 @@ namespace Windows.Win32.Interop
 {
     public class RAIIFreeAttribute : Attribute
     {
-        public RAIIFreeAttribute(string name)
+        public RAIIFreeAttribute(Type type, string name)
         {
+            this.Type = type;
             this.Name = name;
         }
 
-        /// <summary>Gets the name of the type that was used in the native signature.</summary>
+        /// <summary>Gets the containing class for the CloseApi.</summary>
+        public Type Type { get; }
+
+        /// <summary>Gets the name of the CloseApi.</summary>
         public string Name { get; }
     }
 }