Skip to content

[AI-generated] Fix netvadapterum INF encoding corruption - #1428

Merged
NateD-MSFT merged 4 commits into
mainfrom
fix/netvadapterum-inf-encoding
Oct 20, 2026
Merged

NateD-MSFT merged 4 commits into
mainfrom
fix/netvadapterum-inf-encoding

Conversation

@NateD-MSFT

Copy link
Copy Markdown
Contributor

AI-generated: This pull request was generated by GitHub Copilot at the author's request.

Summary

  • Restore readable content in network/netadaptercx/netvadapter/um/netvadapterum.inf; no INF directives are changed from the last readable version.
  • Store the file as normalized UTF-8/LF in Git. The existing .gitattributes rule continues to produce UTF-16LE with a BOM and CRLF in the working tree.
  • Remove a single whitespace-only line's trailing space so the restored file passes git diff --check.

Cause

Commit a3ca26d, merged through #1425, introduced the garbled text. Its parent still contains a readable UTF-16 file.

The underlying encoding mismatch originated in 5426a64: the file was stored as raw UTF-16 bytes even though .gitattributes already specified working-tree-encoding=UTF-16LE-BOM, which requires Git's stored content to be UTF-8. Applying byte-level LF-to-CRLF conversion to the original UTF-16 bytes and then converting from UTF-16 to UTF-8 reproduces the corrupt blob exactly.

This change restores the original text and normalizes its Git representation rather than reintroducing the raw UTF-16 blob.

Validation

  • Debug/x64 build of netvadapterum.vcxproj passed with the documented UMDF_VERSION_MINOR=33 and UMDF_MINIMUM_VERSION_REQUIRED=33 overrides.
  • Confirmed the restored content matches the readable parent version apart from the single whitespace-only line cleanup.
  • Confirmed the staged blob is ASCII-compatible UTF-8 with LF line endings and that Git's checkout filters reproduce the UTF-16LE-BOM/CRLF working file byte-for-byte.
  • git diff --cached --check passed.

Restore the last readable INF content and normalize its Git representation according to the existing working-tree-encoding attributes.

AI-generated by GitHub Copilot.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 88ab4733-b88d-4cd8-b6ef-9eb5fdf52584
Co-authored-by: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com>
Copilot AI requested a review from a team as a code owner October 19, 2026 23:06
@NateD-MSFT
NateD-MSFT merged commit bb68ed5 into main Oct 20, 2026
21 checks passed
@NateD-MSFT
NateD-MSFT deleted the fix/netvadapterum-inf-encoding branch October 20, 2026 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants