cleanup: remove duplicate AppId registration for wsldevicehost.dll (#13928)
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Ben Hillis committed
Dec 16, 2025 at 16:30 UTC
f02f8ef91c640252086b5fc9cd9f9d37cf17e6b7
3 files changed
+3
-12
msipackage/package.wix.in
+1
-10
@@ -183,7 +183,7 @@
183
<!-- WslDeviceHost_VirtioFs (admin) -->
184
<RegistryKey Root="HKCR" Key="CLSID\{7e6ad219-d1b3-42d5-b8ee-d96324e64ff6}">
185
<RegistryValue Value="WslDeviceHost_VirtioFs_Admin" Type="string"/>
186
- <RegistryValue Name="AppId" Value="{7F82AD86-755B-4870-86B1-D2E68DFE8A49}" Type="string"/>
186
+ <RegistryValue Name="AppId" Value="{17696EAC-9568-4CF5-BB8C-82515AAD6C09}" Type="string"/>
187
188
<RegistryKey Key="InProcServer32">
189
<RegistryValue Value="[INSTALLDIR]wsldevicehost.dll" Type="string"/>
@@ -191,15 +191,6 @@
191
</RegistryKey>
192
</RegistryKey>
193
194
- <RegistryKey Root="HKCR" Key="AppID\{7F82AD86-755B-4870-86B1-D2E68DFE8A49}">
195
- <RegistryValue Name="DllSurrogate" Value="" Type="string"/>
196
- <RegistryValue Name="AppIDFlags" Value="2048" Type="integer"/><!--0x800-->
197
-
198
- <!-- O:BAG:BAD:(A;;CCDCSW;;;AU)(A;;CCDCSW;;;PS)(A;;CCDCSW;;;SY) -->
199
- <RegistryValue Name="AccessPermission" Value="01000480580000006800000000000000140000000200440003000000000014000B00000001010000000000050B000000000014000B00000001010000000000050A000000000014000B0000000101000000000005120000000102000000000005200000002002000001020000000000052000000020020000" Type="binary" />
200
- <RegistryValue Name="LaunchPermission" Value="01000480580000006800000000000000140000000200440003000000000014000B00000001010000000000050B000000000014000B00000001010000000000050A000000000014000B0000000101000000000005120000000102000000000005200000002002000001020000000000052000000020020000" Type="binary" />
201
- </RegistryKey>
202
-
194
<!-- WslDeviceHost_VirtioFs -->
195
<RegistryKey Root="HKCR" Key="CLSID\{60285AE6-AAF3-4456-B444-A6C2D0DEDA38}">
196
<RegistryValue Value="WslDeviceHost_VirtioFs" Type="string" />
src/windows/wslinstall/DllMain.cpp
+1
-1
@@ -461,7 +461,7 @@ extern "C" UINT __stdcall CleanMsixState(MSIHANDLE install)
461
const std::map<LPCWSTR, LPCWSTR> keys{
462
{L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application", L"WSL"},
463
{L"SOFTWARE\\Classes\\CLSID", L"{7e6ad219-d1b3-42d5-b8ee-d96324e64ff6}"},
464
- {L"SOFTWARE\\Classes\\AppID", L"{7F82AD86-755B-4870-86B1-D2E68DFE8A49}"},
464
+ {L"SOFTWARE\\Classes\\AppID", L"{17696EAC-9568-4CF5-BB8C-82515AAD6C09}"},
465
{L"SOFTWARE\\Microsoft\\Terminal Server Client", L"Default"},
466
{L"SOFTWARE\\Microsoft\\Terminal Server Client\\Default", L"OptionalAddIns"},
467
{L"SOFTWARE\\Microsoft\\Terminal Server Client\\Default\\OptionalAddIns", L"WSLDVC_PACKAGE"}};
test/windows/UnitTests.cpp
+1
-1
@@ -2312,7 +2312,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND
2312
const std::vector<LPCWSTR> serviceKeys{
2313
L"SOFTWARE\\Microsoft\\Terminal Server Client\\Default\\OptionalAddIns\\WSLDVC_PACKAGE",
2314
L"SOFTWARE\\Classes\\CLSID\\{7e6ad219-d1b3-42d5-b8ee-d96324e64ff6}",
2315
- L"SOFTWARE\\Classes\\AppID\\{7F82AD86-755B-4870-86B1-D2E68DFE8A49}"};
2315
+ L"SOFTWARE\\Classes\\AppID\\{17696EAC-9568-4CF5-BB8C-82515AAD6C09}"};
2316
2317
for (const auto* keyName : serviceKeys)
2318
{