-
Notifications
You must be signed in to change notification settings - Fork 1.6k
cleanup: remove duplicate AppId registration for wsldevicehost.dll #13928
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR consolidates the COM AppID registration for wsldevicehost.dll by removing a duplicate AppID GUID that was previously used specifically for the admin VirtioFS COM class. The changes update all references from the old admin-specific AppID {7F82AD86-755B-4870-86B1-D2E68DFE8A49} to the shared wsldevicehost AppID {17696EAC-9568-4CF5-BB8C-82515AAD6C09}, as COM impersonation allows the same AppID to handle both elevated and non-elevated scenarios.
Key Changes
- Removed duplicate AppID registry configuration block from the MSI package installer
- Updated CLSID registration for WslDeviceHost_VirtioFs_Admin to reference the consolidated AppID
- Updated cleanup and test code to reference the consolidated AppID
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| msipackage/package.wix.in | Removed duplicate AppID registration block and updated WslDeviceHost_VirtioFs_Admin CLSID to use consolidated AppID |
| src/windows/wslinstall/DllMain.cpp | Updated CleanMsixState function to delete the consolidated AppID during cleanup |
| test/windows/UnitTests.cpp | Updated RegistryKeys test to verify the consolidated AppID exists |
* cleanup: minor tweaks to path translation failed messages (#13892) Co-authored-by: Ben Hillis <[email protected]> * Localization change from build: 135812430 (#13905) * Localization change from build: 135812430 * Apply suggestions from code review Co-authored-by: Copilot <[email protected]> * remove unused string --------- Co-authored-by: WSL localization <[email protected]> Co-authored-by: Ben Hillis <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Ben Hillis <[email protected]> * Resolve issue with config file writing sections outside of their expected header. (#13898) * Resolve issue with config file writing sections outside of their expected header. * add more writewslconfig variations * formatting --------- Co-authored-by: Ben Hillis <[email protected]> * Resolve issue with buttons on notifications not working correctly (#13921) * Resolve issue with buttons on notifications not working correctly * pr feedback --------- Co-authored-by: Ben Hillis <[email protected]> * Fix minor typo in UserConfig.cmake.sample (.exe instead of .dll) (#13926) Co-authored-by: Ben Hillis <[email protected]> * test: extend networking test coverage (#13914) * test: extend coverage of virtioproxy networking mode * test: add dns test variations to all networking classes * remove bridged dns variations * pr feedback --------- Co-authored-by: Ben Hillis <[email protected]> * cleanup: remove duplicate AppId registration for wsldevicehost.dll (#13928) Co-authored-by: Ben Hillis <[email protected]> * Remove the explicit desktop field when creating a Windows process (#13930) * [GH 13837] Remove trailing slash from $XDG_RUNTIME_DIR (#13929) * [GH 13837] Remove trailing slash from $XDG_RUNTIME_DIR * pr feedback --------- Co-authored-by: Ben Hillis <[email protected]> * test: add more path translation variations (#13927) * test: add more path translation variations * Update test/windows/SimpleTests.cpp Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Ben Hillis <[email protected]> * virtiofs: enable additional test cases and skip one racey test (#13933) Co-authored-by: Ben Hillis <[email protected]> * cleanup: add scsi disks during VM creation (#13939) * cleanup: add scsi disks during VM creation * pr feedback --------- Co-authored-by: Ben Hillis <[email protected]> * cleanup: hcs logging improvements (#13942) Co-authored-by: Ben Hillis <[email protected]> * cleanup: switch drvfs.cpp to use common MountUtil helper (#13890) * cleanup: switch drvfs.cpp to use common MountUtil helper * adjust mount.drvfs error logging * adjust mount.drvfs error logging --------- Co-authored-by: Ben Hillis <[email protected]> --------- Co-authored-by: Ben Hillis <[email protected]> Co-authored-by: Blue <[email protected]> Co-authored-by: WSL localization <[email protected]> Co-authored-by: Copilot <[email protected]>
This pull request updates the AppID GUID used for the WslDeviceHost_VirtioFs_Admin COM registration to use the same AppID as the rest of the wsldevicehost COM classes. This was originally thought to support admin / non-admin VirtioFS shares, but the same AppId is able to run at both elevation levels due to COM impersonation.
There are existing tests that verify that admin / non-admin VirtioFs shares get the right permission.