Skip to content

Null-terminate PCSTR friendly overload strings #1781

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
Jevan Saks (jevansaks) merged 3 commits into from
Aug 13, 2026
+15 −2
Merged

Null-terminate PCSTR friendly overload strings #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb3b52
Null-terminate PCSTR friendly overload strings
jevansaks Aug 11, 2026
c3e5836
Test PCSTR null termination at runtime
jevansaks Aug 11, 2026
2250a50
Move PCSTR coverage to runtime tests
jevansaks Aug 11, 2026
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
9 changes: 7 additions & 2 deletions src/Microsoft.Windows.CsWin32/Generator.FriendlyOverloads.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ private IEnumerable<MethodDeclarationSyntax> DeclareFriendlyOverload(
parameters[paramIndex] = externParam
.WithType(PredefinedType(TokenWithSpace(SyntaxKind.StringKeyword)));

// fixed (byte* someLocal = some is object ? System.Text.Encoding.Default.GetBytes(some) : null)
// fixed (byte* someLocal = some is object ? System.Text.Encoding.Default.GetBytes(some + "\0") : null)
fixedBlocks.Add(VariableDeclaration(
PointerType(PredefinedType(Token(SyntaxKind.ByteKeyword))),
[
Expand All @@ -1003,7 +1003,12 @@ private IEnumerable<MethodDeclarationSyntax> DeclareFriendlyOverload(
SyntaxKind.SimpleMemberAccessExpression,
ParseTypeName("global::System.Text.Encoding.Default"),
IdentifierName(nameof(Encoding.GetBytes))),
[Argument(origName)]),
[
Argument(BinaryExpression(
SyntaxKind.AddExpression,
origName,
LiteralExpression(SyntaxKind.StringLiteralExpression, Literal("\0"))))
]),
LiteralExpression(SyntaxKind.NullLiteralExpression))))
]));

Expand Down
7 changes: 7 additions & 0 deletions test/GenerationSandbox.Tests/BasicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,13 @@ public unsafe void GetProcAddress_String()
Assert.NotEqual(0u, ticks);
}

[Fact]
public void PCSTR_StringOverloadNullTerminates()
{
const string value = "12345678";
Assert.Equal(value.Length, PInvoke.lstrlen(value));
}

[Fact]
public void StructCharFieldsMarshaledAsUtf16()
{
Expand Down
1 change: 1 addition & 0 deletions test/GenerationSandbox.Tests/NativeMethods.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ IShellWindows
IStream
KEY_EVENT_RECORD
LoadLibrary
lstrlen
LOWORD
MainAVIHeader
MAKELPARAM
Expand Down
Loading