try getting VM ID from lxss before command line

Biswa96 · Oct 12, 2024 · 274530b · 274530b
1 parent 837825b
commit 274530b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/GetVmId.cpp b/src/GetVmId.cpp
@@ -16,6 +16,7 @@
 #include "GetVmId.hpp"
 #include "LxssUserSession.hpp"
 #include "Helpers.hpp"
+#include "GetVmIdWsl2.hpp"
 
 #ifndef WSL_DISTRIBUTION_FLAGS_VALID
 
@@ -309,7 +310,15 @@ HRESULT GetVmId(GUID *DistroId, GUID *LxInstanceID, const int LiftedWSLVersion)
 
         if (hRes)
         {
-            LOG_HRESULT_ERROR("CreateLxProcess", hRes);
+            // Try get VM ID from command line of wslHost.exe
+            if (GetVmIdWsl2(LxInstanceID))
+            {
+                hRes = 0;
+            }
+            else
+            {
+                LOG_HRESULT_ERROR("CreateLxProcess", hRes);
+            }
         }
     }
     else if (WindowsBuild < 20211) // Before Build 20211 Fe

diff --git a/src/GetVmIdWsl2.cpp b/src/GetVmIdWsl2.cpp
@@ -107,18 +107,18 @@ std::vector<DWORD> GetProcessIDsByName(const std::wstring& processName) {
 // Extract GUID from wslHost.exe command line
 // Example commandline:
 // wslhost.exe --vm-id {f6446e02-236e-4b24-9916-2d4ad9a1096f} --handle 1664
-bool GetVmIdWsl2(GUID& vmId) {
+bool GetVmIdWsl2(GUID* vmId) {
     std::vector<DWORD>  pids = GetProcessIDsByName(L"wslhost.exe");
     for (DWORD pid : pids) {
         std::wstring cmdLine;
         if (!GetCommandLineForPID(pid, cmdLine))
             continue;
 
         std::wstring cmdVmId;
-        if(!ExtractGUID(L"--vm-id", cmdLine, cmdVmId)) 
+        if(!ExtractGUID(L"--vm-id", cmdLine, cmdVmId))
             continue;
 
-        if (IIDFromString(cmdVmId.c_str(), &vmId) == S_OK) 
+        if (IIDFromString(cmdVmId.c_str(), vmId) == S_OK) 
             return true;
     }
     return false;

diff --git a/src/GetVmIdWsl2.hpp b/src/GetVmIdWsl2.hpp
@@ -3,6 +3,6 @@
 #ifndef VMIDWSL2_HPP
 #define VMIDWSL2_HPP
 
-bool GetVmIdWsl2(GUID& vmId);
+bool GetVmIdWsl2(GUID* vmId);
 
 #endif /* VMIDWSL2_HPP */
diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
@@ -27,7 +27,6 @@
 #include "Environment.hpp"
 #include "TerminalState.hpp"
 #include "windows-sock.h"
-#include "GetVmIdWsl2.hpp"
 
 union IoSockets
 {
@@ -389,8 +388,9 @@ int main(int argc, char *argv[])
         if (LiftedWSLVersion)
             start_dummy(wslPath, wslCmdLine, distroName, debugMode);
 
-        if (!GetVmIdWsl2(VmId))
-            fatal("Failed to get VM ID");
+        const HRESULT hRes = GetVmId(&DistroId, &VmId, LiftedWSLVersion);
+        if (hRes != 0)
+            fatal("GetVmId: %s\n", GetErrorMessage(hRes).c_str());
 
         inputSock = win_vsock_create();
         outputSock = win_vsock_create();