Pengwin: support migration from WLinux, improve WSL launch behavior, and update branding & terminal profiles

DistroLauncher/DistributionInfo.cpp

@@ -5,28 +5,11 @@
 
 #include "stdafx.h"
 
-HRESULT DistributionInfo::ChangeDefaultUserInWslConf(const std::wstring_view userName)
-{
-    DWORD exitCode = 0;
-
-    wchar_t commandLine[255];
-    _swprintf_p(commandLine, _countof(commandLine),
-                L"if [ $(grep -c \"\\[user\\]\" /etc/wsl.conf) -eq \"0\" ]; then echo -e \"\\n[user]\\ndefault=%1$s\">>/etc/wsl.conf; else sed -i \"s/\\(default=\\)\\(.*\\)/\\1%1$s/\" /etc/wsl.conf ; fi",
-                std::wstring(userName).c_str());
-
-    if (const auto hr = g_wslApi.WslLaunchInteractive(commandLine, true, &exitCode); FAILED(hr) || exitCode != 0)
-    {
-        return hr;
-    }
-
-    return 0;
-}
-
 bool DistributionInfo::CreateUser(std::wstring_view userName)
 {
     // Create the user account.
     DWORD exitCode;
-    std::wstring commandLine = L"/usr/sbin/adduser --quiet --gecos '' ";
+    std::wstring commandLine = L"/usr/sbin/adduser --quiet --comment '' ";
     commandLine += userName;
     auto hr = g_wslApi.WslLaunchInteractive(commandLine.c_str(), true, &exitCode);
     if (FAILED(hr) || exitCode != 0)

DistroLauncher/DistributionInfo.h

@@ -13,7 +13,8 @@ namespace DistributionInfo
     //
     // WARNING: This value must not change between versions of your app,
     // otherwise users upgrading from older versions will see launch failures.
-    const std::wstring NAME = L"WLinux";
+    const std::wstring NAME = L"Pengwin";
+    const std::wstring NAME_OLD = L"WLinux";
 
     // The title bar for the console window while the distribution is installing.
     const std::wstring WINDOW_TITLE = L"Pengwin";
@@ -23,7 +24,4 @@ namespace DistributionInfo
 
     // Query the UID of the user account.
     ULONG QueryUid(std::wstring_view userName);
-
-    // Changes the default user in /etc/wsl.conf
-    HRESULT ChangeDefaultUserInWslConf(std::wstring_view userName);
 }

DistroLauncher/DistroLauncher.cpp

@@ -30,7 +30,7 @@ using namespace Windows::Storage;
 // Helper class for calling WSL Functions:
 // https://msdn.microsoft.com/en-us/library/windows/desktop/mt826874(v=vs.85).aspx
 // ReSharper disable once CppInconsistentNaming
-WslApiLoader g_wslApi(DistributionInfo::NAME);
+WslApiLoader g_wslApi(DistributionInfo::NAME, DistributionInfo::NAME_OLD);
 
 static HRESULT InstallDistribution(bool createUser);
 static HRESULT SetDefaultUser(std::wstring_view userName);
@@ -85,20 +85,7 @@ HRESULT SetDefaultUser(std::wstring_view userName)
         return E_INVALIDARG;
     }
 
-    // Set the default user as root, so ChangeDefaultUserInWslConf chan make the change
-    HRESULT hr = g_wslApi.WslConfigureDistribution(0, WSL_DISTRIBUTION_FLAGS_DEFAULT);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    hr = DistributionInfo::ChangeDefaultUserInWslConf(userName);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    hr = g_wslApi.WslConfigureDistribution(uid, WSL_DISTRIBUTION_FLAGS_DEFAULT);
+    HRESULT hr = g_wslApi.WslConfigureDistribution(uid, WSL_DISTRIBUTION_FLAGS_DEFAULT);
     if (FAILED(hr))
     {
         return hr;
@@ -172,6 +159,17 @@ fire_and_forget ShowPengwinUi()
     }
 }
 
+static bool is_current_dir_not_system32()
+{
+    wchar_t system_32dir[MAX_PATH];
+    GetSystemDirectoryW(system_32dir, MAX_PATH);
+
+    wchar_t current_dir[MAX_PATH];
+    GetCurrentDirectoryW(MAX_PATH, current_dir);
+
+    return _wcsicmp(system_32dir, current_dir) != 0;
+}
+
 // ReSharper disable once IdentifierTypo
 int wmain(const int argc, const wchar_t* argv[])
 {
@@ -201,13 +199,6 @@ int wmain(const int argc, const wchar_t* argv[])
     // Install the distribution if it is not already.
     const auto installOnly = arguments.size() > 0 && arguments[0] == ARG_INSTALL;
     auto hr = S_OK;
-    /*
-
-        if (!g_wslApi.WslIsDistributionRegistered())
-        {
-            g_wslApi.SetDistributionName(L"Pengwin");
-        }
-    */
 
     if (!g_wslApi.WslIsDistributionRegistered())
     {
@@ -246,7 +237,11 @@ int wmain(const int argc, const wchar_t* argv[])
 
         if (arguments.empty())
         {
-            hr = g_wslApi.WslLaunchInteractive(L"", false, &exitCode);
+            /* If the current working dir is not System32 then it was called from Open with Terminal
+            option or from command line. In this case is better to start the distro in the current directory */
+            const bool useCurrentWorkingDirectory = is_current_dir_not_system32();
+
+            hr = g_wslApi.WslLaunchInteractive(L"", useCurrentWorkingDirectory, &exitCode);
 
             // Check exitCode to see if wsl.exe returned that it could not start the Linux process
             // then prompt users for input so they can view the error message.

DistroLauncher/WslApiLoader.cpp

@@ -6,8 +6,9 @@
 #include "stdafx.h"
 #include "WslApiLoader.h"
 
-WslApiLoader::WslApiLoader(const std::wstring& distributionName) :
-    _distributionName(distributionName)
+WslApiLoader::WslApiLoader(const std::wstring& distributionName, const std::wstring& distributionNameOld) :
+    _distributionName(distributionName),
+	_distributionNameOld(distributionNameOld)
 {
     _wslApiDll = LoadLibraryEx(L"wslapi.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
     if (_wslApiDll != nullptr)
@@ -40,9 +41,18 @@ BOOL WslApiLoader::WslIsOptionalComponentInstalled() const
         _launch != nullptr;
 }
 
-BOOL WslApiLoader::WslIsDistributionRegistered() const
+BOOL WslApiLoader::WslIsDistributionRegistered()
 {
-    return _isDistributionRegistered(_distributionName.c_str());
+    if (!_isDistributionRegistered(_distributionName.c_str()))
+    {
+	    if (!_isDistributionRegistered(_distributionNameOld.c_str()))
+	    {
+			return FALSE;
+	    }
+        _distributionName = _distributionNameOld;
+        return TRUE;
+    }
+    return TRUE;
 }
 
 HRESULT WslApiLoader::WslRegisterDistribution() const

DistroLauncher/WslApiLoader.h

@@ -23,12 +23,12 @@ using WSL_LAUNCH = HRESULT(STDAPICALLTYPE*)(PCWSTR, PCWSTR, BOOL, HANDLE, HANDLE
 class WslApiLoader
 {
 public:
-    WslApiLoader(const std::wstring& distributionName);
+    WslApiLoader(const std::wstring& distributionName, const std::wstring& distributionNameOld);
     ~WslApiLoader();
 
     BOOL WslIsOptionalComponentInstalled() const;
 
-    BOOL WslIsDistributionRegistered() const;
+    BOOL WslIsDistributionRegistered();
 
     HRESULT WslRegisterDistribution() const;
 
@@ -52,6 +52,7 @@ class WslApiLoader
 
 private:
     std::wstring _distributionName;
+    std::wstring _distributionNameOld;
     HMODULE _wslApiDll;
     WSL_IS_DISTRIBUTION_REGISTERED _isDistributionRegistered;
     WSL_REGISTER_DISTRIBUTION _registerDistribution;

Pengwin/Package.appxmanifest

@@ -11,7 +11,7 @@
   <Identity
     Name="WhitewaterFoundryLtd.Co.16571368D6CFF"
     Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF"
-    Version="25.11.0.0" />
+    Version="26.2.1.0" />
 
   <Properties>
     <DisplayName>Pengwin</DisplayName>
@@ -36,7 +36,7 @@
       <uap:VisualElements
         DisplayName="Pengwin"
         Description="The bespoke WSL distro."
-        BackgroundColor="white"
+        BackgroundColor="black"
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">
 		<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"

x64/pengwin.json

@@ -1,12 +1,15 @@
 {
   "profiles": [
     {
-      "updates": "{7f586916-8357-53d4-bb2b-ca96f639898a}",
-      "commandline": "\"%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_22.11.0.0_x64__kd1vv0z0vy70w\\DistroLauncher\\pengwin.exe\"",
-      "icon": "%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_22.11.0.0_x64__kd1vv0z0vy70w\\Assets\\pengwin.png",
+      "hidden": true,
+      "updates": "{7f586916-8357-53d4-bb2b-ca96f639898a}"
+    },
+    {
+      "commandline": "\"%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_25.11.0.0_x64__kd1vv0z0vy70w\\DistroLauncher\\pengwin.exe\"",
+      "icon": "%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_25.11.0.0_x64__kd1vv0z0vy70w\\Assets\\pengwin.png",
       "name": "Pengwin",
       "acrylicOpacity": 0.9,
-      "backgroundImage": "%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_22.11.0.0_x64__kd1vv0z0vy70w\\Assets\\background1.png",
+      "backgroundImage": "%ProgramFiles%\\WindowsApps\\WhitewaterFoundryLtd.Co.16571368D6CFF_25.11.0.0_x64__kd1vv0z0vy70w\\Assets\\background1.png",
       "backgroundImageAlignment": "bottomRight",
       "backgroundImageOpacity": 0.2,
       "backgroundImageStretchMode": "none",
@@ -16,7 +19,12 @@
       "fontFace": "Cascadia Code",
       "useAcrylic": true,
       "startingDirectory": null,
-      "closeOnExit": "never"
+      "closeOnExit": "never",
+      "showMarksOnScrollbar": true,
+      "autoMarkPrompts": true,
+      "pathTranslationStyle": "wsl",
+      "wsl.distribution-type": "debian",
+      "wsl.distribution-version": "13.0"
     }
   ],
   "schemes": [