Don't return catch-all error messages for non-WSL specific error codes by OneBlue · Pull Request #40163 · microsoft/WSL

OneBlue · 2026-04-11T00:47:26Z

Summary of the Pull Request

This change updates LxssUserSession to explicitly return error messages when hitting user errors on distribution registration and removes the catch-all logic in wslutil.

This will prevent WSL-specific errors from being displayed in WSLC

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated if needed and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

OneBlue · 2026-04-11T00:48:00Z

src/windows/common/wslutil.cpp

        return Localization::MessageNoDefaultDistro();

-    case HRESULT_FROM_WIN32(WSAECONNABORTED):
-    case HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS):


Open to feedback on this: I chose to remove this because it can be misleading since a closed socket isn't necessarily a sign that the distro is terminating.

Copilot

Pull request overview

This PR refines how error messages are surfaced for distribution registration/import failures by moving WSL-specific user-facing messages to the service layer and removing generic Win32→WSL message translations from wslutil, so non-WSL callers (e.g., WSLC) don’t receive misleading WSL-specific text.

Changes:

Emit explicit, localized user errors from LxssUserSession for distro name/path conflicts during registration.
Remove several Win32 error-code special-cases from wslutil::GetErrorString.
Add a new localized “Failed to create disk …” message for VHD creation failures and update/import tests accordingly.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
test/windows/UnitTests.cpp	Updates import test expectations and adds a new path-conflict registration scenario
src/windows/service/exe/LxssUserSession.cpp	Throws user-facing localized errors for distro name/path conflict cases
src/windows/common/wslutil.cpp	Removes Win32→WSL-specific message mappings from `GetErrorString`
src/windows/common/WslCoreFilesystem.cpp	Wraps CreateVirtualDisk failures with a new user-facing localized error
localization/strings/en-US/Resources.resw	Adds the localized string used for disk creation failure messaging

src/windows/common/wslutil.cpp

localization/strings/en-US/Resources.resw

test/windows/UnitTests.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

test/windows/UnitTests.cpp

src/windows/service/exe/LxssUserSession.cpp

src/windows/common/WslCoreFilesystem.cpp

- ImportDistro: Remove 'Failed to create disk' wrapper since the error occurs before CreateVhd, producing only the raw system error message - ModernDistroInstall: Update to raw Win32 message for ERROR_ALREADY_EXISTS since the mapping was removed from GetErrorString and InstallDistro path doesn't use THROW_HR_WITH_USER_ERROR Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…oneblue/distro-error

…oft/WSL into user/oneblue/distro-error

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

localization/strings/en-US/Resources.resw

test/windows/UnitTests.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

test/windows/UnitTests.cpp

…oneblue/distro-error

guanwenbin123 · 2026-04-13T23:03:35Z

Thanks for the notification. Update received. 获取 Outlook for iOS<https://aka.ms/o0ukef>

…

________________________________ 发件人: Ben Hillis ***@***.***> 发送时间: Tuesday, April 14, 2026 7:03:06 AM 收件人: microsoft/WSL ***@***.***> 抄送: Subscribed ***@***.***> 主题: Re: [microsoft/WSL] Don't return catch-all error messages for non-WSL specific error codes (PR #40163) @benhillis approved this pull request. ― Reply to this email directly, view it on GitHub<#40163 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/B677FUNMIDLJ27KVZPO6HG34VVW2VAVCNFSM6AAAAACXURXGU2VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHM2DCMBSGQZTGNJUGU>. You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

Don't return catch-all error messages for non-WSL specific error codes

e0b97ff

Copilot AI review requested due to automatic review settings April 11, 2026 00:47

OneBlue commented Apr 11, 2026

View reviewed changes

Copilot started reviewing on behalf of OneBlue April 11, 2026 00:50 View session

Copilot AI reviewed Apr 11, 2026

View reviewed changes

src/windows/common/wslutil.cpp Show resolved Hide resolved

localization/strings/en-US/Resources.resw Outdated Show resolved Hide resolved

test/windows/UnitTests.cpp Outdated Show resolved Hide resolved

Apply suggestions from code review

d785fcf

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 11, 2026 00:57

Copilot started reviewing on behalf of OneBlue April 11, 2026 01:01 View session

Copilot AI reviewed Apr 11, 2026

View reviewed changes

test/windows/UnitTests.cpp Outdated Show resolved Hide resolved

src/windows/service/exe/LxssUserSession.cpp Show resolved Hide resolved

src/windows/service/exe/LxssUserSession.cpp Show resolved Hide resolved

src/windows/common/WslCoreFilesystem.cpp Outdated Show resolved Hide resolved

OneBlue and others added 5 commits April 13, 2026 11:37

Merge remote-tracking branch 'origin/feature/wsl-for-apps' into user/…

813bf18

…oneblue/distro-error

Update test messages

41e601c

Format

14ee37d

Merge branch 'user/oneblue/distro-error' of https://github.com/micros…

94e1a39

…oft/WSL into user/oneblue/distro-error

OneBlue marked this pull request as ready for review April 13, 2026 19:39

OneBlue requested a review from a team as a code owner April 13, 2026 19:39

Copilot AI review requested due to automatic review settings April 13, 2026 19:39

Copilot AI reviewed Apr 13, 2026

View reviewed changes

localization/strings/en-US/Resources.resw Outdated Show resolved Hide resolved

test/windows/UnitTests.cpp Show resolved Hide resolved

Copilot started reviewing on behalf of OneBlue April 13, 2026 19:49 View session

Update localization/strings/en-US/Resources.resw

eb649f8

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 13, 2026 20:08

Copilot AI reviewed Apr 13, 2026

View reviewed changes

test/windows/UnitTests.cpp Show resolved Hide resolved

Copilot started reviewing on behalf of OneBlue April 13, 2026 20:22 View session

OneBlue added 2 commits April 13, 2026 13:50

Apply new string name

bf9c05f

Merge remote-tracking branch 'origin/feature/wsl-for-apps' into user/…

322c736

…oneblue/distro-error

benhillis approved these changes Apr 13, 2026

View reviewed changes

Use the right error message for wsl1

3c75797

Copilot AI review requested due to automatic review settings April 13, 2026 23:05

Copilot started reviewing on behalf of OneBlue April 13, 2026 23:07 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

benhillis approved these changes Apr 13, 2026

View reviewed changes

OneBlue merged commit a05c9f8 into feature/wsl-for-apps Apr 14, 2026
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't return catch-all error messages for non-WSL specific error codes#40163

Don't return catch-all error messages for non-WSL specific error codes#40163
OneBlue merged 11 commits intofeature/wsl-for-appsfrom
user/oneblue/distro-error

OneBlue commented Apr 11, 2026

Uh oh!

OneBlue Apr 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

guanwenbin123 commented Apr 13, 2026 via email

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

OneBlue commented Apr 11, 2026

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

OneBlue Apr 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

guanwenbin123 commented Apr 13, 2026 via email

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants