Improvements on DistroLauncher.

MahStudio · Mar 18, 2022 · 6b9a386 · 6b9a386
1 parent 8503572
commit 6b9a386
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/src/WSLackwareLauncher/DistroLauncher/DistroLauncher.cpp b/src/WSLackwareLauncher/DistroLauncher/DistroLauncher.cpp
@@ -50,11 +50,8 @@ HRESULT InstallDistribution(bool createUser)
         if (FAILED(hr)) {
             return hr;
         }
-
     }
 
-
-
     return hr;
 }
 
@@ -75,7 +72,7 @@ HRESULT SetDefaultUser(std::wstring_view userName)
     return hr;
 }
 
-int wmain(int argc, wchar_t const *argv[])
+int wmain(int argc, wchar_t const* argv[])
 {
     // Update the title bar of the console window.
     SetConsoleTitleW(DistributionInfo::WindowTitle.c_str());
@@ -110,7 +107,8 @@ int wmain(int argc, wchar_t const *argv[])
                 Helpers::PrintMessage(MSG_INSTALL_ALREADY_EXISTS);
             }
 
-        } else {
+        }
+        else {
             Helpers::PrintMessage(MSG_INSTALL_SUCCESS);
         }
 
@@ -128,8 +126,9 @@ int wmain(int argc, wchar_t const *argv[])
                 Helpers::PromptForInput();
             }
 
-        } else if ((arguments[0] == ARG_RUN) ||
-                   (arguments[0] == ARG_RUN_C)) {
+        }
+        else if ((arguments[0] == ARG_RUN) ||
+            (arguments[0] == ARG_RUN_C)) {
 
             std::wstring command;
             for (size_t index = 1; index < arguments.size(); index += 1) {
@@ -139,7 +138,8 @@ int wmain(int argc, wchar_t const *argv[])
 
             hr = g_wslApi.WslLaunchInteractive(command.c_str(), true, &exitCode);
 
-        } else if (arguments[0] == ARG_CONFIG) {
+        }
+        else if (arguments[0] == ARG_CONFIG) {
             hr = E_INVALIDARG;
             if (arguments.size() == 3) {
                 if (arguments[1] == ARG_CONFIG_DEFAULT_USER) {
@@ -151,7 +151,8 @@ int wmain(int argc, wchar_t const *argv[])
                 exitCode = 0;
             }
 
-        } else {
+        }
+        else {
             Helpers::PrintMessage(MSG_USAGE);
             return exitCode;
         }
@@ -162,7 +163,12 @@ int wmain(int argc, wchar_t const *argv[])
         if (hr == HRESULT_FROM_WIN32(ERROR_LINUX_SUBSYSTEM_NOT_PRESENT)) {
             Helpers::PrintMessage(MSG_MISSING_OPTIONAL_COMPONENT);
 
-        } else {
+        }
+        else if (hr == HCS_E_HYPERV_NOT_INSTALLED) {
+            Helpers::PrintMessage(MSG_ENABLE_VIRTUALIZATION);
+
+        }
+        else {
             Helpers::PrintErrorMessage(hr);
         }
 
@@ -172,4 +178,4 @@ int wmain(int argc, wchar_t const *argv[])
     }
 
     return SUCCEEDED(hr) ? exitCode : 1;
-}
+}
diff --git a/src/WSLackwareLauncher/DistroLauncher/messages.h b/src/WSLackwareLauncher/DistroLauncher/messages.h
@@ -176,3 +176,13 @@
 //
 #define MSG_INSTALL_ALREADY_EXISTS       0x000003F5L
 
+//
+// MessageId: MSG_ENABLE_VIRTUALIZATION
+//
+// MessageText:
+//
+// Please enable the Virtual Machine Platform Windows feature and ensure virtualization is enabled in the BIOS.
+// For information please visit https://aka.ms/enablevirtualization
+//
+#define MSG_ENABLE_VIRTUALIZATION        0x000003F6L
+
diff --git a/src/WSLackwareLauncher/DistroLauncher/messages.mc b/src/WSLackwareLauncher/DistroLauncher/messages.mc
@@ -89,3 +89,9 @@ Language=English
 The distribution installation has become corrupted.
 Please select Reset from App Settings or uninstall and reinstall the app.
 .
+
+MessageId=1014 SymbolicName=MSG_ENABLE_VIRTUALIZATION
+Language=English
+Please enable the Virtual Machine Platform Windows feature and ensure virtualization is enabled in the BIOS.
+For information please visit https://aka.ms/enablevirtualization
+.