Skip to content

Fix return fixup being removed for ComPtr overloads #1195

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
merged 1 commit into from
Jan 1, 2023
Merged

Fix return fixup being removed for ComPtr overloads #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified build/cache/d3d9.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/dstorage.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/dxc.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/dxva.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/win32extras.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/xaudio.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/xinput.json.gz
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions src/Core/Silk.NET.BuildTools/Bind/ClassWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)})]");
}
Expand Down Expand Up @@ -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)})]");
}
Expand Down Expand Up @@ -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)})]");
}
Expand Down Expand Up @@ -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)})]");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.BuildTools/Bind/StructWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)})]");
}
Expand Down Expand Up @@ -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)})]");
}
Expand Down
25 changes: 18 additions & 7 deletions src/Core/Silk.NET.BuildTools/Common/Functions/Function.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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];
Expand All @@ -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();
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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");
}
}
1 change: 0 additions & 1 deletion src/Core/Silk.NET.BuildTools/Cpp/ComVtblProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/DebugEvent.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/EventInstanceHeaderUnion2.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/EventTraceHeaderUnion2.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/ProcessHeapEntryUnion.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContext.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/ReasonContextReason.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader32Union1.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeader64Union1.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Silk.NET.Core.Win32Extras/Structs/TraceLogfileHeaderUnion1.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading