Skip to content

Fix hardcoded PInvoke class name in ICCloseSafeHandle generation #1697

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
jevansaks merged 1 commit into from
May 20, 2026
Merged

Fix hardcoded PInvoke class name in ICCloseSafeHandle generation #1697

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
2 changes: 1 addition & 1 deletion src/Microsoft.Windows.CsWin32/Generator.Handle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public partial class Generator
break;
case "LRESULT" when releaseMethod == "ICClose":
this.TryGenerateConstantOrThrow("ICERR_OK");
noerror = CastExpression(ParseName("global::Windows.Win32.Foundation.LRESULT"), MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, IdentifierName("PInvoke"), IdentifierName("ICERR_OK")));
noerror = CastExpression(ParseName("global::Windows.Win32.Foundation.LRESULT"), MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, this.methodsAndConstantsClassName, IdentifierName("ICERR_OK")));
releaseInvocation = BinaryExpression(SyntaxKind.EqualsExpression, releaseInvocation, noerror);
break;
case "HGLOBAL":
Expand Down
12 changes: 12 additions & 0 deletions test/CsWin32Generator.Tests/CsWin32GeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,18 @@ public async Task CrossWinMD_IInspectable(
await this.InvokeGeneratorAndCompile($"{nameof(this.CrossWinMD_IInspectable)}_{tfm}_{allowMarshaling}_{pinvokeClassName ?? "null"}");
}

[Theory, CombinatorialData]
public async Task ICCloseSafeHandle_CustomClassName(
[CombinatorialValues([null, "MyPInvoke"])] string? pinvokeClassName)
{
this.nativeMethodsJsonOptions = new NativeMethodsJsonOptions
{
ClassName = pinvokeClassName,
};
this.nativeMethods.Add("ICOpen");
await this.InvokeGeneratorAndCompile($"{nameof(this.ICCloseSafeHandle_CustomClassName)}_{pinvokeClassName ?? "null"}");
}

[Fact]
public async Task CrossWinMD_NTSTATUSSafeHandleConstant()
{
Expand Down
Loading