From 376ecff8cb73724825323192509b231d9adbf76e Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Wed, 29 May 2019 07:43:42 -0400
Subject: [PATCH 01/11] Code to add WSLProfiles.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 50 +++++++++++++++++++
 src/cascadia/TerminalApp/TerminalApp.vcxproj  | 12 +----
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index f0e31ea9c03..eca6e0b8e9f 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -4,6 +4,9 @@
 #include "pch.h"
 #include <argb.h>
 #include <conattrs.hpp>
+#include <fstream>
+#include <io.h>
+#include <fcntl.h>
 #include "CascadiaSettings.h"
 #include "../../types/inc/utils.hpp"
 #include "../../inc/DefaultSettings.h"
@@ -227,6 +230,53 @@ void CascadiaSettings::_CreateDefaultProfiles()
 
     _profiles.emplace_back(powershellProfile);
     _profiles.emplace_back(cmdProfile);
+
+    HANDLE readPipe;
+    HANDLE writePipe;
+    SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
+    if (CreatePipe(&readPipe, &writePipe, &sa, 0)) {
+        STARTUPINFO si{};
+        si.cb = sizeof(si);
+        si.dwFlags = STARTF_USESTDHANDLES;
+        si.hStdOutput = writePipe;
+        si.hStdError = writePipe;
+
+        PROCESS_INFORMATION pi{};
+        std::wstring command = L"wsl.exe --list";
+        bool processSuccess = CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
+            TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi);
+        if (processSuccess) {
+            WaitForSingleObject(pi.hProcess, INFINITE);
+            DWORD exitCode;
+            HRESULT hr = 0;
+            if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
+                hr = E_INVALIDARG;
+            }
+            if (SUCCEEDED(hr)) {
+                DWORD bytesAvailable = 0;
+                PeekNamedPipe(readPipe, nullptr, NULL, nullptr, &bytesAvailable, nullptr);
+                std::wfstream pipe{ _wfdopen(_open_osfhandle((intptr_t)readPipe, _O_WTEXT | _O_RDONLY), L"r") };
+                std::wstring wline = L"";
+                std::getline(pipe, wline); //remove the header from the output.
+                while (pipe.tellp() < bytesAvailable) {
+                    std::getline(pipe, wline);
+                    std::wstringstream   wlinestream(wline);
+                    std::wstring name = L"";
+                    if (wlinestream) {
+                        std::getline(wlinestream, name, L' ');
+                        auto WSLDistro{ _CreateDefaultProfile(name) };
+                        WSLDistro.SetCommandline(L"wsl.exe -d " + name);
+                        WSLDistro.SetColorScheme({ L"Campbell" });
+                        _profiles.emplace_back(WSLDistro);
+                    }
+                }
+            }
+            CloseHandle(pi.hProcess);
+            CloseHandle(pi.hThread);
+        }
+        CloseHandle(readPipe);
+        CloseHandle(writePipe);
+    }
 }
 
 // Method Description:
diff --git a/src/cascadia/TerminalApp/TerminalApp.vcxproj b/src/cascadia/TerminalApp/TerminalApp.vcxproj
index 0aa7e8fb1f8..b152b3cdba0 100644
--- a/src/cascadia/TerminalApp/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalApp.vcxproj
@@ -15,7 +15,6 @@
     <ProjectName>TerminalApp</ProjectName>
     <RootNamespace>TerminalApp</RootNamespace>
   </PropertyGroup>
-
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
     <!-- HERE BE DRAGONS:
@@ -33,7 +32,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup> -->
-
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="Tab.h" />
@@ -50,7 +48,6 @@
       <DependentUpon>App.xaml</DependentUpon>
     </ClInclude>
   </ItemGroup>
-
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
     <ClCompile Include="Tab.cpp" />
@@ -71,7 +68,6 @@
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
-
   <!-- ========================= idl Files ======================== -->
   <ItemGroup>
     <Midl Include="App.idl">
@@ -79,13 +75,11 @@
     </Midl>
     <Midl Include="AppKeyBindings.idl" />
   </ItemGroup>
-
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="TerminalApp.def" />
   </ItemGroup>
-
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
     <!--
@@ -99,14 +93,12 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj">
       <Project>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</Project>
     </ProjectReference>
-
     <!-- This is needed to be able to reference the XamlApplication type. -->
     <ProjectReference Include="..\Microsoft.UI.Xaml.Markup\Microsoft.UI.Xaml.Markup.vcxproj">
       <Project>{015a0047-772d-4f1a-88c9-45c18f0adfb6}</Project>
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
-
   </ItemGroup>
   <PropertyGroup>
     <!--
@@ -118,7 +110,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Kernel32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
@@ -130,4 +122,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.1.190405001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.1.190405001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From f2c6ea66b8c9908ca3e2e372db1f1374f01ad0c7 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Thu, 30 May 2019 22:15:54 -0400
Subject: [PATCH 02/11] Updates recomended by miniksa

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 102 ++++++++++--------
 src/cascadia/TerminalApp/CascadiaSettings.h   |   1 +
 src/cascadia/TerminalApp/TerminalApp.vcxproj  |   2 +-
 3 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index eca6e0b8e9f..354733342cf 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -231,52 +231,7 @@ void CascadiaSettings::_CreateDefaultProfiles()
     _profiles.emplace_back(powershellProfile);
     _profiles.emplace_back(cmdProfile);
 
-    HANDLE readPipe;
-    HANDLE writePipe;
-    SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
-    if (CreatePipe(&readPipe, &writePipe, &sa, 0)) {
-        STARTUPINFO si{};
-        si.cb = sizeof(si);
-        si.dwFlags = STARTF_USESTDHANDLES;
-        si.hStdOutput = writePipe;
-        si.hStdError = writePipe;
-
-        PROCESS_INFORMATION pi{};
-        std::wstring command = L"wsl.exe --list";
-        bool processSuccess = CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
-            TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi);
-        if (processSuccess) {
-            WaitForSingleObject(pi.hProcess, INFINITE);
-            DWORD exitCode;
-            HRESULT hr = 0;
-            if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
-                hr = E_INVALIDARG;
-            }
-            if (SUCCEEDED(hr)) {
-                DWORD bytesAvailable = 0;
-                PeekNamedPipe(readPipe, nullptr, NULL, nullptr, &bytesAvailable, nullptr);
-                std::wfstream pipe{ _wfdopen(_open_osfhandle((intptr_t)readPipe, _O_WTEXT | _O_RDONLY), L"r") };
-                std::wstring wline = L"";
-                std::getline(pipe, wline); //remove the header from the output.
-                while (pipe.tellp() < bytesAvailable) {
-                    std::getline(pipe, wline);
-                    std::wstringstream   wlinestream(wline);
-                    std::wstring name = L"";
-                    if (wlinestream) {
-                        std::getline(wlinestream, name, L' ');
-                        auto WSLDistro{ _CreateDefaultProfile(name) };
-                        WSLDistro.SetCommandline(L"wsl.exe -d " + name);
-                        WSLDistro.SetColorScheme({ L"Campbell" });
-                        _profiles.emplace_back(WSLDistro);
-                    }
-                }
-            }
-            CloseHandle(pi.hProcess);
-            CloseHandle(pi.hThread);
-        }
-        CloseHandle(readPipe);
-        CloseHandle(writePipe);
-    }
+    _CreateWslProfiles(_profiles);
 }
 
 // Method Description:
@@ -517,6 +472,61 @@ bool CascadiaSettings::_isPowerShellCoreInstalledInPath(const std::wstring_view
     return false;
 }
 
+// Function Description:
+// - Adds all of the WSL profiles to the provided container.
+// Arguments:
+// - A ref to the profiles container where the WSL profiles are to be added
+// Return Value:
+// - <none>
+void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& profileStorage)
+{
+    try
+    {
+        DWORD bytesAvailable = 0;
+        DWORD exitCode = 0;
+        std::wstring command = L"wsl.exe --list";
+        std::wstring wline = L"";
+        std::wstring distName = L"";
+        wil::unique_handle readPipe;
+        wil::unique_handle writePipe;
+        SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
+        THROW_IF_WIN32_BOOL_FALSE(CreatePipe(&readPipe, &writePipe, &sa, 0));
+        STARTUPINFO si{};
+        si.cb = sizeof(si);
+        si.dwFlags = STARTF_USESTDHANDLES;
+        si.hStdOutput = writePipe.get();
+        si.hStdError = writePipe.get();
+        wil::unique_process_information pi{};
+
+        THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
+                                                    TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
+        if (WaitForSingleObject(pi.hProcess, INFINITE) != NULL)
+        {
+            throw;
+        }
+        if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
+            THROW_HR(E_INVALIDARG);
+        }
+        THROW_IF_WIN32_BOOL_FALSE(PeekNamedPipe(readPipe.get(), nullptr, NULL, nullptr, &bytesAvailable, nullptr));
+        FILE* hPipe = _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r");
+            //don't call fclose on hPipe because the readPipe handle is managed by wil and this will cause an error.
+        std::wfstream pipe{ hPipe };
+        std::getline(pipe, wline); //remove the header from the output.
+        while (pipe.tellp() < bytesAvailable) {
+            std::getline(pipe, wline);
+            std::wstringstream   wlinestream(wline);
+            if (wlinestream) {
+                std::getline(wlinestream, distName, L' ');
+                auto WSLDistro{ _CreateDefaultProfile(distName) };
+                WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
+                WSLDistro.SetColorScheme({ L"Campbell" });
+                profileStorage.emplace_back(WSLDistro);
+            }
+        }
+    }
+    CATCH_LOG()
+}
+
 // Function Description:
 // - Get a environment variable string.
 // Arguments:
diff --git a/src/cascadia/TerminalApp/CascadiaSettings.h b/src/cascadia/TerminalApp/CascadiaSettings.h
index fd350fc0624..a6cef85b14b 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.h
+++ b/src/cascadia/TerminalApp/CascadiaSettings.h
@@ -70,6 +70,7 @@ class TerminalApp::CascadiaSettings final
     static std::optional<winrt::hstring> _LoadAsUnpackagedApp();
     static bool _isPowerShellCoreInstalledInPath(const std::wstring_view programFileEnv, std::filesystem::path& cmdline);
     static bool _isPowerShellCoreInstalled(std::filesystem::path& cmdline);
+    static void _CreateWslProfiles(std::vector<TerminalApp::Profile>& profileStorage);
     static std::wstring ExpandEnvironmentVariableString(std::wstring_view source);
     static Profile _CreateDefaultProfile(const std::wstring_view name);
 };
diff --git a/src/cascadia/TerminalApp/TerminalApp.vcxproj b/src/cascadia/TerminalApp/TerminalApp.vcxproj
index b152b3cdba0..e283d416c9d 100644
--- a/src/cascadia/TerminalApp/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalApp.vcxproj
@@ -110,7 +110,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>Kernel32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(OpenConsoleDir)src\common.build.post.props" />

From 20c62a9b04e50a08aab97522d242427c6dd9fb0b Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Fri, 31 May 2019 12:29:31 -0400
Subject: [PATCH 03/11] Corrections from Mauve

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 12 ++++++------
 src/cascadia/TerminalApp/TerminalApp.vcxproj  | 10 +++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 354733342cf..e70619cbea4 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -482,11 +482,6 @@ void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& pro
 {
     try
     {
-        DWORD bytesAvailable = 0;
-        DWORD exitCode = 0;
-        std::wstring command = L"wsl.exe --list";
-        std::wstring wline = L"";
-        std::wstring distName = L"";
         wil::unique_handle readPipe;
         wil::unique_handle writePipe;
         SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
@@ -497,6 +492,7 @@ void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& pro
         si.hStdOutput = writePipe.get();
         si.hStdError = writePipe.get();
         wil::unique_process_information pi{};
+        std::wstring command = L"wsl.exe --list";
 
         THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
                                                     TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
@@ -504,18 +500,22 @@ void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& pro
         {
             throw;
         }
+        DWORD exitCode;
         if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
             THROW_HR(E_INVALIDARG);
         }
+        DWORD bytesAvailable;
         THROW_IF_WIN32_BOOL_FALSE(PeekNamedPipe(readPipe.get(), nullptr, NULL, nullptr, &bytesAvailable, nullptr));
         FILE* hPipe = _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r");
             //don't call fclose on hPipe because the readPipe handle is managed by wil and this will cause an error.
         std::wfstream pipe{ hPipe };
+        std::wstring wline;
         std::getline(pipe, wline); //remove the header from the output.
         while (pipe.tellp() < bytesAvailable) {
             std::getline(pipe, wline);
-            std::wstringstream   wlinestream(wline);
+            std::wstringstream wlinestream(wline);
             if (wlinestream) {
+                std::wstring distName;
                 std::getline(wlinestream, distName, L' ');
                 auto WSLDistro{ _CreateDefaultProfile(distName) };
                 WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
diff --git a/src/cascadia/TerminalApp/TerminalApp.vcxproj b/src/cascadia/TerminalApp/TerminalApp.vcxproj
index e283d416c9d..0aa7e8fb1f8 100644
--- a/src/cascadia/TerminalApp/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalApp.vcxproj
@@ -15,6 +15,7 @@
     <ProjectName>TerminalApp</ProjectName>
     <RootNamespace>TerminalApp</RootNamespace>
   </PropertyGroup>
+
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
     <!-- HERE BE DRAGONS:
@@ -32,6 +33,7 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup> -->
+
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="Tab.h" />
@@ -48,6 +50,7 @@
       <DependentUpon>App.xaml</DependentUpon>
     </ClInclude>
   </ItemGroup>
+
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
     <ClCompile Include="Tab.cpp" />
@@ -68,6 +71,7 @@
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
+
   <!-- ========================= idl Files ======================== -->
   <ItemGroup>
     <Midl Include="App.idl">
@@ -75,11 +79,13 @@
     </Midl>
     <Midl Include="AppKeyBindings.idl" />
   </ItemGroup>
+
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="TerminalApp.def" />
   </ItemGroup>
+
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
     <!--
@@ -93,12 +99,14 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj">
       <Project>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</Project>
     </ProjectReference>
+
     <!-- This is needed to be able to reference the XamlApplication type. -->
     <ProjectReference Include="..\Microsoft.UI.Xaml.Markup\Microsoft.UI.Xaml.Markup.vcxproj">
       <Project>{015a0047-772d-4f1a-88c9-45c18f0adfb6}</Project>
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
+
   </ItemGroup>
   <PropertyGroup>
     <!--
@@ -122,4 +130,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.1.190405001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.1.190405001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From ab3029715eebfc1cc3b2df9f6578204f4ee537eb Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Fri, 31 May 2019 16:04:18 -0400
Subject: [PATCH 04/11] More updates from miniska (clarified
 WaitForSingleObject errors, and moved the try block to the calling function)

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 96 ++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index e70619cbea4..ac7ae24a1fe 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -230,8 +230,11 @@ void CascadiaSettings::_CreateDefaultProfiles()
 
     _profiles.emplace_back(powershellProfile);
     _profiles.emplace_back(cmdProfile);
-
-    _CreateWslProfiles(_profiles);
+    try
+    {
+        _CreateWslProfiles(_profiles);
+    }
+    CATCH_LOG()
 }
 
 // Method Description:
@@ -480,51 +483,54 @@ bool CascadiaSettings::_isPowerShellCoreInstalledInPath(const std::wstring_view
 // - <none>
 void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& profileStorage)
 {
-    try
-    {
-        wil::unique_handle readPipe;
-        wil::unique_handle writePipe;
-        SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
-        THROW_IF_WIN32_BOOL_FALSE(CreatePipe(&readPipe, &writePipe, &sa, 0));
-        STARTUPINFO si{};
-        si.cb = sizeof(si);
-        si.dwFlags = STARTF_USESTDHANDLES;
-        si.hStdOutput = writePipe.get();
-        si.hStdError = writePipe.get();
-        wil::unique_process_information pi{};
-        std::wstring command = L"wsl.exe --list";
-
-        THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
-                                                    TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
-        if (WaitForSingleObject(pi.hProcess, INFINITE) != NULL)
-        {
-            throw;
-        }
-        DWORD exitCode;
-        if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
-            THROW_HR(E_INVALIDARG);
-        }
-        DWORD bytesAvailable;
-        THROW_IF_WIN32_BOOL_FALSE(PeekNamedPipe(readPipe.get(), nullptr, NULL, nullptr, &bytesAvailable, nullptr));
-        FILE* hPipe = _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r");
-            //don't call fclose on hPipe because the readPipe handle is managed by wil and this will cause an error.
-        std::wfstream pipe{ hPipe };
-        std::wstring wline;
-        std::getline(pipe, wline); //remove the header from the output.
-        while (pipe.tellp() < bytesAvailable) {
-            std::getline(pipe, wline);
-            std::wstringstream wlinestream(wline);
-            if (wlinestream) {
-                std::wstring distName;
-                std::getline(wlinestream, distName, L' ');
-                auto WSLDistro{ _CreateDefaultProfile(distName) };
-                WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
-                WSLDistro.SetColorScheme({ L"Campbell" });
-                profileStorage.emplace_back(WSLDistro);
-            }
+    wil::unique_handle readPipe;
+    wil::unique_handle writePipe;
+    SECURITY_ATTRIBUTES sa{ sizeof(sa), nullptr, true };
+    THROW_IF_WIN32_BOOL_FALSE(CreatePipe(&readPipe, &writePipe, &sa, 0));
+    STARTUPINFO si{};
+    si.cb = sizeof(si);
+    si.dwFlags = STARTF_USESTDHANDLES;
+    si.hStdOutput = writePipe.get();
+    si.hStdError = writePipe.get();
+    wil::unique_process_information pi{};
+    std::wstring command = L"wsl.exe --list";
+
+    THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
+                                                TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
+    switch (WaitForSingleObject(pi.hProcess, INFINITE)) {
+    case WAIT_OBJECT_0:
+        break;
+    case WAIT_ABANDONED:
+    case WAIT_TIMEOUT:
+        THROW_HR(ERROR_CHILD_NOT_COMPLETE);
+    case WAIT_FAILED:
+        //The function has failed. To get extended error information, call GetLastError. 
+    default:
+        THROW_HR(ERROR_UNHANDLED_EXCEPTION);
+    }
+    DWORD exitCode;
+    if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
+        THROW_HR(E_INVALIDARG);
+    }
+    DWORD bytesAvailable;
+    THROW_IF_WIN32_BOOL_FALSE(PeekNamedPipe(readPipe.get(), nullptr, NULL, nullptr, &bytesAvailable, nullptr));
+    FILE* hPipe = _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r");
+        //don't call fclose on hPipe because the readPipe handle is managed by wil and this will cause an error.
+    std::wfstream pipe{ hPipe };
+    std::wstring wline;
+    std::getline(pipe, wline); //remove the header from the output.
+    while (pipe.tellp() < bytesAvailable) {
+        std::getline(pipe, wline);
+        std::wstringstream wlinestream(wline);
+        if (wlinestream) {
+            std::wstring distName;
+            std::getline(wlinestream, distName, L' ');
+            auto WSLDistro{ _CreateDefaultProfile(distName) };
+            WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
+            WSLDistro.SetColorScheme({ L"Campbell" });
+            profileStorage.emplace_back(WSLDistro);
         }
     }
-    CATCH_LOG()
 }
 
 // Function Description:

From a74edffbbab676d43ace1193d163b34cf73984a4 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Fri, 31 May 2019 16:31:57 -0400
Subject: [PATCH 05/11] Added THROW_LAST_ERROR for WAIT_FAILED instead of
 passing an unhandled exception.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index ac7ae24a1fe..0ce2a3d65a4 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -504,7 +504,7 @@ void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& pro
     case WAIT_TIMEOUT:
         THROW_HR(ERROR_CHILD_NOT_COMPLETE);
     case WAIT_FAILED:
-        //The function has failed. To get extended error information, call GetLastError. 
+        THROW_LAST_ERROR();
     default:
         THROW_HR(ERROR_UNHANDLED_EXCEPTION);
     }

From e1975559d26ceda6b5bb56621ce16a57f90284b2 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Fri, 31 May 2019 16:48:39 -0400
Subject: [PATCH 06/11] Migrate STL dependancies to LibraryIncludes.h

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 1 -
 src/inc/LibraryIncludes.h                     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 0ce2a3d65a4..6faaf3a19e9 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -4,7 +4,6 @@
 #include "pch.h"
 #include <argb.h>
 #include <conattrs.hpp>
-#include <fstream>
 #include <io.h>
 #include <fcntl.h>
 #include "CascadiaSettings.h"
diff --git a/src/inc/LibraryIncludes.h b/src/inc/LibraryIncludes.h
index 705a06237b6..b44c3516773 100644
--- a/src/inc/LibraryIncludes.h
+++ b/src/inc/LibraryIncludes.h
@@ -37,6 +37,7 @@
 #include <iterator>
 #include <math.h>
 #include <sstream>
+#include <fstream>
 #include <iomanip>
 #include <filesystem>
 #include <functional>

From 6af7f1f05ea5c515f5b52d9f5b2e891c64257e05 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Mon, 3 Jun 2019 10:04:38 -0400
Subject: [PATCH 07/11] Renamed function to provide more clarity

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 4 ++--
 src/cascadia/TerminalApp/CascadiaSettings.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 6faaf3a19e9..3b80514be56 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -231,7 +231,7 @@ void CascadiaSettings::_CreateDefaultProfiles()
     _profiles.emplace_back(cmdProfile);
     try
     {
-        _CreateWslProfiles(_profiles);
+        _AppendWslProfiles(_profiles);
     }
     CATCH_LOG()
 }
@@ -480,7 +480,7 @@ bool CascadiaSettings::_isPowerShellCoreInstalledInPath(const std::wstring_view
 // - A ref to the profiles container where the WSL profiles are to be added
 // Return Value:
 // - <none>
-void CascadiaSettings::_CreateWslProfiles(std::vector<TerminalApp::Profile>& profileStorage)
+void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& profileStorage)
 {
     wil::unique_handle readPipe;
     wil::unique_handle writePipe;
diff --git a/src/cascadia/TerminalApp/CascadiaSettings.h b/src/cascadia/TerminalApp/CascadiaSettings.h
index a6cef85b14b..9c4dcc6978f 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.h
+++ b/src/cascadia/TerminalApp/CascadiaSettings.h
@@ -70,7 +70,7 @@ class TerminalApp::CascadiaSettings final
     static std::optional<winrt::hstring> _LoadAsUnpackagedApp();
     static bool _isPowerShellCoreInstalledInPath(const std::wstring_view programFileEnv, std::filesystem::path& cmdline);
     static bool _isPowerShellCoreInstalled(std::filesystem::path& cmdline);
-    static void _CreateWslProfiles(std::vector<TerminalApp::Profile>& profileStorage);
+    static void _AppendWslProfiles(std::vector<TerminalApp::Profile>& profileStorage);
     static std::wstring ExpandEnvironmentVariableString(std::wstring_view source);
     static Profile _CreateDefaultProfile(const std::wstring_view name);
 };

From 548c453f1cfb957e877ac55cda6d22130801deda Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Tue, 4 Jun 2019 16:45:01 -0400
Subject: [PATCH 08/11] Set WSL starting directory.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 3b80514be56..98e54efd7c9 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -526,6 +526,7 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
             std::getline(wlinestream, distName, L' ');
             auto WSLDistro{ _CreateDefaultProfile(distName) };
             WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
+            WSLDistro.SetStartingDirectory(L"~");
             WSLDistro.SetColorScheme({ L"Campbell" });
             profileStorage.emplace_back(WSLDistro);
         }

From 1664d11a4c25e8c95051ba2af053ead34b7252f5 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Wed, 5 Jun 2019 15:14:50 -0400
Subject: [PATCH 09/11] Default Linux icon and brackets on new lines.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 98e54efd7c9..434fafb0f01 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -23,6 +23,7 @@ static constexpr GUID TERMINAL_PROFILE_NAMESPACE_GUID =
 
 static constexpr std::wstring_view PACKAGED_PROFILE_ICON_PATH{ L"ms-appx:///ProfileIcons/" };
 static constexpr std::wstring_view PACKAGED_PROFILE_ICON_EXTENSION{ L".png" };
+static constexpr std::wstring_view DEFAULT_LINUX_ICON_GUID{ L"{9acb9455-ca41-5af7-950f-6bca1bc9722f}" };
 
 CascadiaSettings::CascadiaSettings() :
     _globals{},
@@ -496,7 +497,8 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
 
     THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
                                                 TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
-    switch (WaitForSingleObject(pi.hProcess, INFINITE)) {
+    switch (WaitForSingleObject(pi.hProcess, INFINITE))
+    {
     case WAIT_OBJECT_0:
         break;
     case WAIT_ABANDONED:
@@ -508,7 +510,8 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
         THROW_HR(ERROR_UNHANDLED_EXCEPTION);
     }
     DWORD exitCode;
-    if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0)) {
+    if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0))
+    {
         THROW_HR(E_INVALIDARG);
     }
     DWORD bytesAvailable;
@@ -518,16 +521,22 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
     std::wfstream pipe{ hPipe };
     std::wstring wline;
     std::getline(pipe, wline); //remove the header from the output.
-    while (pipe.tellp() < bytesAvailable) {
+    while (pipe.tellp() < bytesAvailable)
+    {
         std::getline(pipe, wline);
         std::wstringstream wlinestream(wline);
-        if (wlinestream) {
+        if (wlinestream)
+        {
             std::wstring distName;
             std::getline(wlinestream, distName, L' ');
             auto WSLDistro{ _CreateDefaultProfile(distName) };
             WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
             WSLDistro.SetStartingDirectory(L"~");
             WSLDistro.SetColorScheme({ L"Campbell" });
+            std::wstring iconPath{ PACKAGED_PROFILE_ICON_PATH };
+            iconPath.append(DEFAULT_LINUX_ICON_GUID);
+            iconPath.append(PACKAGED_PROFILE_ICON_EXTENSION);
+            WSLDistro.SetIconPath(iconPath);
             profileStorage.emplace_back(WSLDistro);
         }
     }

From f61df869f0778771dfa7d928c002f1fe9e5aa3a7 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Thu, 6 Jun 2019 15:13:04 -0400
Subject: [PATCH 10/11] Added system path so we don't rely on execution from
 the PATH environment variable.  Removed incorrect error useage.  Removed
 variable that was not required.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index 434fafb0f01..e51979870af 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -493,7 +493,10 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
     si.hStdOutput = writePipe.get();
     si.hStdError = writePipe.get();
     wil::unique_process_information pi{};
-    std::wstring command = L"wsl.exe --list";
+    wil::unique_cotaskmem_string systemPath;
+    THROW_IF_FAILED(wil::GetSystemDirectoryW(systemPath));
+    std::wstring command(systemPath.get());
+    command += L"\\wsl.exe --list";
 
     THROW_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr, const_cast<LPWSTR>(command.c_str()), nullptr, nullptr,
                                                 TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi));
@@ -510,15 +513,18 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
         THROW_HR(ERROR_UNHANDLED_EXCEPTION);
     }
     DWORD exitCode;
-    if ((GetExitCodeProcess(pi.hProcess, &exitCode) == false) || (exitCode != 0))
+    if (GetExitCodeProcess(pi.hProcess, &exitCode) == false)
     {
         THROW_HR(E_INVALIDARG);
     }
+    else if (exitCode != 0)
+    {
+        return;
+    }
     DWORD bytesAvailable;
     THROW_IF_WIN32_BOOL_FALSE(PeekNamedPipe(readPipe.get(), nullptr, NULL, nullptr, &bytesAvailable, nullptr));
-    FILE* hPipe = _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r");
-        //don't call fclose on hPipe because the readPipe handle is managed by wil and this will cause an error.
-    std::wfstream pipe{ hPipe };
+    std::wfstream pipe{ _wfdopen(_open_osfhandle((intptr_t)readPipe.get(), _O_WTEXT | _O_RDONLY), L"r") };
+        //don't worry about the handle returned from wfdOpen, readPipe handle is already managed by wil and closing the file handle will cause an error.
     std::wstring wline;
     std::getline(pipe, wline); //remove the header from the output.
     while (pipe.tellp() < bytesAvailable)

From 2150a7ae41862a4875ea71f0be572d53370acb44 Mon Sep 17 00:00:00 2001
From: Jeremy Banks <jeremy.banks@gmail.com>
Date: Thu, 6 Jun 2019 15:32:40 -0400
Subject: [PATCH 11/11] Remove default directory setting.

---
 src/cascadia/TerminalApp/CascadiaSettings.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
index e51979870af..9262df2581c 100644
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -537,7 +537,6 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& pro
             std::getline(wlinestream, distName, L' ');
             auto WSLDistro{ _CreateDefaultProfile(distName) };
             WSLDistro.SetCommandline(L"wsl.exe -d " + distName);
-            WSLDistro.SetStartingDirectory(L"~");
             WSLDistro.SetColorScheme({ L"Campbell" });
             std::wstring iconPath{ PACKAGED_PROFILE_ICON_PATH };
             iconPath.append(DEFAULT_LINUX_ICON_GUID);