Fix return fixup being removed for ComPtr overloads (#1195)

dotnet · Jan 1, 2023 · 16ae301 · 16ae301
1 parent 2b46977
commit 16ae301
Show file tree

Hide file tree

Showing 85 changed files with 4,851 additions and 4,675 deletions.
diff --git a/build/cache/d3d9.json.gz b/build/cache/d3d9.json.gz
diff --git a/build/cache/dstorage.json.gz b/build/cache/dstorage.json.gz
diff --git a/build/cache/dxc.json.gz b/build/cache/dxc.json.gz
diff --git a/build/cache/dxva.json.gz b/build/cache/dxva.json.gz
diff --git a/build/cache/win32extras.json.gz b/build/cache/win32extras.json.gz
diff --git a/build/cache/xaudio.json.gz b/build/cache/xaudio.json.gz
diff --git a/build/cache/xinput.json.gz b/build/cache/xinput.json.gz
diff --git a/src/Core/Silk.NET.BuildTools/Bind/ClassWriter.cs b/src/Core/Silk.NET.BuildTools/Bind/ClassWriter.cs
@@ -140,7 +140,7 @@ static string GetSignature(Function func)
                             }
                         }
 
-                        foreach (var attr in function.Attributes)
+                        foreach (var attr in function.GetAttributes())
                         {
                             sw.WriteLine($"        [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                         }
@@ -208,7 +208,7 @@ static string GetSignature(Function func)
                             }
                         }
 
-                        foreach (var attr in overload.Signature.Attributes)
+                        foreach (var attr in overload.Signature.GetAttributes())
                         {
                             sw2u.WriteLine($"        [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                         }
@@ -354,7 +354,7 @@ static string GetSignature(Function func)
                                 }
                             }
 
-                            foreach (var attr in function.Attributes)
+                            foreach (var attr in function.GetAttributes())
                             {
                                 sw.WriteLine($"        [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                             }
@@ -429,7 +429,7 @@ static string GetSignature(Function func)
                                 }
                             }
 
-                            foreach (var attr in overload.Signature.Attributes)
+                            foreach (var attr in overload.Signature.GetAttributes())
                             {
                                 sw2u.WriteLine($"        [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                             }

diff --git a/src/Core/Silk.NET.BuildTools/Bind/StructWriter.cs b/src/Core/Silk.NET.BuildTools/Bind/StructWriter.cs
@@ -470,7 +470,7 @@ public static void WriteStruct
                     }
                 }
 
-                foreach (var attr in function.Signature.Attributes)
+                foreach (var attr in function.Signature.GetAttributes())
                 {
                     sw.WriteLine($"        [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                 }
@@ -609,7 +609,7 @@ unsafe BaseInStructure* IChainable.PNext
                         }
                     }
 
-                    foreach (var attr in helper.Signature.Attributes)
+                    foreach (var attr in helper.Signature.GetAttributes())
                     {
                         vt.WriteLine($"    [{attr.Name}({string.Join(", ", attr.Arguments)})]");
                     }

diff --git a/src/Core/Silk.NET.BuildTools/Common/Functions/Function.cs b/src/Core/Silk.NET.BuildTools/Common/Functions/Function.cs
@@ -131,10 +131,10 @@ public string ToString(bool? @unsafe,
 
             GetDeclarationString(sb, @unsafe, partial, accessibility, @static, @delegate, returnType);
 
-            sb.Append("(");
+            sb.Append('(');
             if (Parameters.Count > 0)
             {
-                var parameterDeclarations = Parameters.Select((param) => { return GetDeclarationString(param, appendAttributes); }).ToList();
+                var parameterDeclarations = Parameters.Select(param => GetDeclarationString(param, appendAttributes)).ToList();
                 for (var index = 0; index < parameterDeclarations.Count; index++)
                 {
                     if (index != 0)
@@ -147,11 +147,11 @@ public string ToString(bool? @unsafe,
                 }
             }
 
-            sb.Append(")");
+            sb.Append(')');
 
             if (GenericTypeParameters.Count != 0)
             {
-                sb.Append(" ");
+                sb.Append(' ');
                 for (var index = 0; index < GenericTypeParameters.Count; index++)
                 {
                     var p = GenericTypeParameters[index];
@@ -162,14 +162,14 @@ public string ToString(bool? @unsafe,
                     sb.Append($"where {p.Name} : {constraints}");
                     if (index != GenericTypeParameters.Count - 1)
                     {
-                        sb.Append(" ");
+                        sb.Append(' ');
                     }
                 }
             }
 
             if (semicolon)
             {
-                sb.Append(";");
+                sb.Append(';');
             }
 
             return sb.ToString();
@@ -275,7 +275,12 @@ private static string GetDeclarationString(Parameter parameter, bool appendAttri
                         break;
                 }
 
-                attributes.AddRange(parameter.Attributes.Select(x => x.Name + "(" + string.Join(", ", x.Arguments) + ")"));
+                attributes.AddRange
+                (
+                    parameter.Attributes
+                        .Where(x => x.Name != "BuildToolsIntrinsic")
+                        .Select(x => x.Name + "(" + string.Join(", ", x.Arguments) + ")")
+                );
 
                 if (attributes.Count != 0)
                 {
@@ -362,5 +367,11 @@ public string GetFunctionPointerSignature()
             var paramTypes = string.Join(", ", Parameters.Select(x => x.Type).Concat(new[] {ReturnType}));
             return $"delegate* unmanaged{convention}<{paramTypes}>";
         }
+
+        /// <summary>
+        /// Gets all attributes that are actual attributes and not BuildTools intrinsics.
+        /// </summary>
+        /// <returns>Attributes.</returns>
+        public IEnumerable<Attribute> GetAttributes() => Attributes.Where(x => x.Name != "BuildToolsIntrinsic");
     }
 }
diff --git a/src/Core/Silk.NET.BuildTools/Cpp/ComVtblProcessor.cs b/src/Core/Silk.NET.BuildTools/Cpp/ComVtblProcessor.cs
@@ -128,7 +128,6 @@ public static void Implement
                         ).ToArray()
                     ).Build();
                 Implement(sb, fixedUpFunction, parent, index, true, thisInScope);
-                function.Attributes.RemoveAll(x => x.Name == "BuildToolsIntrinsic");
                 return;
             }
 

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/DebugEvent.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/DebugEvent.gen.cs
@@ -64,8 +64,8 @@ public DebugEvent
         [NativeName("Name", "dwThreadId")]
         public uint DwThreadId;
 
-        [NativeName("Type", "union (unnamed union at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:370:5)")]
-        [NativeName("Type.Name", "union (unnamed union at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:370:5)")]
+        [NativeName("Type", "union (unnamed union at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:370:5)")]
+        [NativeName("Type.Name", "union (unnamed union at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:370:5)")]
         [NativeName("Name", "u")]
         public DebugEventU U;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/EventInstanceHeaderUnion2.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/EventInstanceHeaderUnion2.gen.cs
@@ -45,8 +45,8 @@ public EventInstanceHeaderUnion2
         public uint Version;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:929:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:929:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:929:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:929:9)")]
         [NativeName("Name", "Class")]
         public EventInstanceHeaderUnion2Class Class;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/EventTraceHeaderUnion2.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/EventTraceHeaderUnion2.gen.cs
@@ -45,8 +45,8 @@ public EventTraceHeaderUnion2
         public uint Version;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:889:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:889:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:889:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:889:9)")]
         [NativeName("Name", "Class")]
         public EventTraceHeaderUnion2Class Class;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/ProcessHeapEntryUnion.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/ProcessHeapEntryUnion.gen.cs
@@ -39,14 +39,14 @@ public ProcessHeapEntryUnion
 
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:250:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:250:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:250:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:250:9)")]
         [NativeName("Name", "Block")]
         public ProcessHeapEntryUnionBlock Block;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:254:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:254:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:254:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:254:9)")]
         [NativeName("Name", "Region")]
         public ProcessHeapEntryUnionRegion Region;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContext.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContext.gen.cs
@@ -53,8 +53,8 @@ public ReasonContext
         [NativeName("Name", "Flags")]
         public uint Flags;
 
-        [NativeName("Type", "union (unnamed union at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:273:5)")]
-        [NativeName("Type.Name", "union (unnamed union at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:273:5)")]
+        [NativeName("Type", "union (unnamed union at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:273:5)")]
+        [NativeName("Type.Name", "union (unnamed union at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:273:5)")]
         [NativeName("Name", "Reason")]
         public ReasonContextReason Reason;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContextReason.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContextReason.gen.cs
@@ -39,8 +39,8 @@ public ReasonContextReason
 
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:274:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:274:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:274:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\um\\minwinbase.h:274:9)")]
         [NativeName("Name", "Detailed")]
         public ReasonContextReasonDetailed Detailed;
 

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader32Union1.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader32Union1.gen.cs
@@ -45,8 +45,8 @@ public TraceLogfileHeader32Union1
         public uint Version;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1078:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1078:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1078:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1078:9)")]
         [NativeName("Name", "VersionDetail")]
         public TraceLogfileHeader32Union1VersionDetail VersionDetail;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader64Union1.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader64Union1.gen.cs
@@ -45,8 +45,8 @@ public TraceLogfileHeader64Union1
         public uint Version;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1121:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1121:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1121:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1121:9)")]
         [NativeName("Name", "VersionDetail")]
         public TraceLogfileHeader64Union1VersionDetail VersionDetail;
     }

diff --git a/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeaderUnion1.gen.cs b/src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeaderUnion1.gen.cs
@@ -45,8 +45,8 @@ public TraceLogfileHeaderUnion1
         public uint Version;
 
         [FieldOffset(0)]
-        [NativeName("Type", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1035:9)")]
-        [NativeName("Type.Name", "struct (unnamed struct at C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1035:9)")]
+        [NativeName("Type", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1035:9)")]
+        [NativeName("Type.Name", "struct (unnamed struct at D:\\Windows Kits\\10\\Include\\10.0.22621.0\\shared\\evntrace.h:1035:9)")]
         [NativeName("Name", "VersionDetail")]
         public TraceLogfileHeaderUnion1VersionDetail VersionDetail;
     }