Fix hardcoded PInvoke class name in ICCloseSafeHandle generation#1697
Merged
Conversation
When a custom className is configured in NativeMethods.json, the
ICCloseSafeHandle.ReleaseHandle() method incorrectly referenced
'PInvoke.ICERR_OK' instead of using the configured class name.
This replaces the hardcoded IdentifierName("PInvoke") with the
existing this.methodsAndConstantsClassName field which correctly
reflects the user's configured className option.
Fixes #1696
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sergio0694
approved these changes
May 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1696 — When a custom
classNameis configured inNativeMethods.json, the generatedICCloseSafeHandle.ReleaseHandle()method incorrectly referencedPInvoke.ICERR_OKinstead of using the configured class name (e.g.,MyPInvoke.ICERR_OK).Changes
src/Microsoft.Windows.CsWin32/Generator.Handle.cs: Replaced hardcodedIdentifierName("PInvoke")withthis.methodsAndConstantsClassNamewhich correctly reflects the configuredclassNameoption.test/CsWin32Generator.Tests/CsWin32GeneratorTests.cs: AddedICCloseSafeHandle_CustomClassNametest that verifiesICOpengeneration (which producesICCloseSafeHandle) compiles successfully with both default and custom class names.