use MSIRMSHUTDOWN = 1 instead of custom action

Author: Ben Hillis

msipackage/package.wix.in

@@ -241,7 +241,6 @@
 
                 <File Id="wsldevicehost.dll" Source="${WSL_DEVICE_HOST_SOURCE_DIR}/bin/${TARGET_PLATFORM}/wsldevicehost.dll" />
 
-
                 <!-- WSLC COM app - activated through WSLService -->
                 <RegistryKey Root="HKCR" Key="AppID\{E9B79997-57E3-4201-AECC-6A464E530DD2}">
                     <!-- O:BAG:BAD:(A;;CCDCSW;;;AU)(A;;CCDCSW;;;PS)(A;;CCDCSW;;;SY) -->
@@ -524,14 +523,6 @@
             Execute="deferred"
          />
 
-        <CustomAction Id="StopDeviceHostSurrogate"
-            Impersonate="no"
-            BinaryRef="wslinstall.dll"
-            DllEntry="StopDeviceHostSurrogate"
-            Return="check"
-            Execute="deferred"
-         />
-
         <CustomAction Id="DeprovisionMsix"
             Impersonate="no"
             BinaryRef="wslinstall.dll"
@@ -620,11 +611,6 @@
         <InstallExecuteSequence>
             <Custom Action="ValidateInstall" After="InstallInitialize" Condition="(not INSTALLED) and (not SKIPVALIDATION = 1)" />
 
-            <!-- Terminate the dllhost.exe surrogate hosting wsldevicehost.dll so the DLL can be overwritten when installing files.
-                 Must run after StopService (which stops WSLService) but before InstallFiles.
-                 Conditioned on '(not UPGRADINGPRODUCTCODE)' so it does not run in the old product's removal sequence during major upgrades. -->
-            <Custom Action="StopDeviceHostSurrogate" Before="InstallFiles" Condition='(not UPGRADINGPRODUCTCODE)' />
-
             <!-- Must run before InstallServices or else we'll fail if wslservice already exists.
                  Covers cases where:
                  - The MSI package is installed for the first time and the old MSIX needs to be removed
@@ -690,7 +676,7 @@
         <!-- Force all applications to exit during upgrade.
              See: https://learn.microsoft.com/en-us/windows/win32/msi/msirmshutdown
         -->
-        <Property Id="MSIRMSHUTDOWN" Value="0" Secure="yes" />
+        <Property Id="MSIRMSHUTDOWN" Value="1" Secure="yes" />
     </Package>
 </Wix>
 

src/windows/wslinstall/CMakeLists.txt

@@ -14,5 +14,4 @@ target_link_libraries(wslinstall
                       common
                       legacy_stdio_definitions
                       Crypt32.lib
-                      sfc.lib
-                      rstrtmgr.lib)
+                      sfc.lib)

src/windows/wslinstall/DllMain.cpp

@@ -19,7 +19,6 @@ Module Name:
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/windows.management.deployment.h>
 #include <Sfc.h>
-#include <RestartManager.h>
 #include "defs.h"
 
 using unique_msi_handle = wil::unique_any<MSIHANDLE, decltype(MsiCloseHandle), &MsiCloseHandle>;
@@ -801,46 +800,6 @@ extern "C" UINT __stdcall WslFinalizeInstallation(MSIHANDLE install)
     return NOERROR;
 }
 
-extern "C" UINT __stdcall StopDeviceHostSurrogate(MSIHANDLE install)
-{
-    // Use the Restart Manager to find and shut down any process that has wsldevicehost.dll locked.
-    // This must run before InstallFiles to ensure the DLL can be overwritten when installing files.
-
-    try
-    {
-        WSL_INSTALL_LOG("StopDeviceHostSurrogate");
-
-        const auto installRoot = wsl::windows::common::wslutil::GetMsiPackagePath();
-        if (!installRoot.has_value())
-        {
-            return NOERROR;
-        }
-
-        const auto dllPath = installRoot.value() + L"wsldevicehost.dll";
-
-        DWORD session{};
-        WCHAR sessionKey[CCH_RM_SESSION_KEY + 1]{};
-        THROW_IF_WIN32_ERROR(RmStartSession(&session, 0, sessionKey));
-        auto endSession = wil::scope_exit([&] { RmEndSession(session); });
-
-        LPCWSTR file = dllPath.c_str();
-        THROW_IF_WIN32_ERROR(RmRegisterResources(session, 1, &file, 0, nullptr, 0, nullptr));
-
-        // First attempt a graceful shutdown of processes using wsldevicehost.dll.
-        DWORD rmError = RmShutdown(session, 0, nullptr);
-        if (rmError != ERROR_SUCCESS)
-        {
-            // If graceful shutdown failed, do a forced shutdown.
-            WSL_INSTALL_LOG("StopDeviceHostSurrogate: graceful shutdown failed, attempting forced shutdown.");
-            THROW_IF_WIN32_ERROR(RmShutdown(session, RmForceShutdown, nullptr));
-        }
-    }
-    CATCH_LOG();
-
-    // Always succeed — failure to stop the surrogate is not fatal.
-    return NOERROR;
-}
-
 extern "C" UINT __stdcall WslValidateInstallation(MSIHANDLE install)
 try
 {

src/windows/wslinstall/wslinstall.def

@@ -4,7 +4,6 @@ EXPORTS
     CleanExplorerState
     CleanMsixState
     DeprovisionMsix
-    StopDeviceHostSurrogate
     WslValidateInstallation
     WslFinalizeInstallation
     InstallMsix