Fix formatting and whitespace issues in WSLA and wsladiag sources

msipackage/CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 
 set_source_files_properties(${OUTPUT_PACKAGE} PROPERTIES GENERATED TRUE)
 
-if (DEFINED WSL_POST_BUILD_COMMAND)
+if (DEFINED WSL_POST_BUILD_COMMAND AND NOT "${WSL_POST_BUILD_COMMAND}" STREQUAL "")
     add_custom_command(
         TARGET msipackage
         POST_BUILD

src/windows/wsladiag/wsladiag.cpp

@@ -1,9 +1,15 @@
-/*++
+/*++
+
 Copyright (c) Microsoft. All rights reserved.
+
 Module Name:
-    main.cpp
+
+    wsladiag.cpp
+
 Abstract:
-    Entry point for the wsladiag tool, performs WSL runtime initialization and parses --list/--help.
+
+    TODO
+
 --*/
 
 #include "precomp.h"

src/windows/wslaservice/exe/WSLASession.cpp

@@ -20,11 +20,7 @@ Abstract:
 
 using wsl::windows::service::wsla::WSLASession;
 
-WSLASession::WSLASession(
+WSLASession::WSLASession(ULONG id, const WSLA_SESSION_SETTINGS& Settings, WSLAUserSessionImpl& userSessionImpl, const VIRTUAL_MACHINE_SETTINGS& VmSettings) :
-    ULONG id,
-    const WSLA_SESSION_SETTINGS& Settings,
-    WSLAUserSessionImpl& userSessionImpl,
-    const VIRTUAL_MACHINE_SETTINGS& VmSettings) :
 
     m_id(id),
     m_sessionSettings(Settings),
@@ -60,18 +56,16 @@ WSLASession::~WSLASession()
     }
 }
 
-void WSLASession::CopyDisplayName(
+void WSLASession::CopyDisplayName(_Out_writes_z_(bufferLength) PWSTR buffer, size_t bufferLength) const
-    _Out_writes_z_(bufferLength) PWSTR buffer,
-    size_t bufferLength) const
 {
     THROW_HR_IF(E_BOUNDS, m_displayName.size() + 1 > bufferLength);
     wcscpy_s(buffer, bufferLength, m_displayName.c_str());
 }
 
-const std::wstring& WSLASession::DisplayName() const
+/** const std::wstring& WSLASession::DisplayName() const
 {
    return m_displayName;
-}
+}*/
 
 HRESULT WSLASession::PullImage(LPCWSTR Image, const WSLA_REGISTRY_AUTHENTICATION_INFORMATION* RegistryInformation, IProgressCallback* ProgressCallback)
 {

src/windows/wslaservice/exe/WSLASession.h

@@ -30,9 +30,13 @@ public:
     {
         return m_id;
     }
-    void CopyDisplayName(
+
-        _Out_writes_z_(bufferLength) PWSTR buffer,
+    const std::wstring& GetDisplayName() const noexcept
-        size_t bufferLength) const;
+    {
+        return m_displayName;
+    }
+
+    void CopyDisplayName(_Out_writes_z_(bufferLength) PWSTR buffer, size_t bufferLength) const;
 
     // Image management.
     IFACEMETHOD(PullImage)(_In_ LPCWSTR Image, _In_ const WSLA_REGISTRY_AUTHENTICATION_INFORMATION* RegistryInformation, _In_ IProgressCallback* ProgressCallback) override;

src/windows/wslaservice/exe/WSLAUserSession.cpp

@@ -54,7 +54,6 @@ HRESULT WSLAUserSessionImpl::CreateSession(const WSLA_SESSION_SETTINGS* Settings
     {
         std::lock_guard lock(m_lock);
         m_sessions.emplace(session.Get());
-       
     }
 
     // Client now owns the session.
@@ -73,7 +72,7 @@ HRESULT WSLAUserSessionImpl::OpenSessionByName(LPCWSTR DisplayName, IWSLASession
     // TODO: Check for duplicate on session creation.
     for (auto& e : m_sessions)
     {
-        if (e->DisplayName() == DisplayName)
+        if (e->GetDisplayName() == DisplayName)
         {
             THROW_IF_FAILED(e->QueryInterface(__uuidof(IWSLASession), (void**)Session));
             return S_OK;
@@ -81,9 +80,9 @@ HRESULT WSLAUserSessionImpl::OpenSessionByName(LPCWSTR DisplayName, IWSLASession
     }
 
     return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
+}
 
-HRESULT wsl::windows::service::wsla::WSLAUserSessionImpl::ListSessions(
+HRESULT wsl::windows::service::wsla::WSLAUserSessionImpl::ListSessions(_Out_ WSLA_SESSION_INFORMATION** Sessions, _Out_ ULONG* SessionsCount)
-    _Out_ WSLA_SESSION_INFORMATION** Sessions, _Out_ ULONG* SessionsCount)
 {
     std::lock_guard lock(m_lock);
     auto output = wil::make_unique_cotaskmem<WSLA_SESSION_INFORMATION[]>(m_sessions.size());
@@ -94,16 +93,13 @@ HRESULT wsl::windows::service::wsla::WSLAUserSessionImpl::ListSessions(
         output[index].SessionId = session->GetId();
         output[index].CreatorPid = 0; // placeholder until we populate this later
 
-        session->CopyDisplayName(
+        session->CopyDisplayName(output[index].DisplayName, _countof(output[index].DisplayName));
-             output[index].DisplayName, 
-             _countof(output[index].DisplayName));
 
         ++index;
     }
     *Sessions = output.release();
     *SessionsCount = static_cast<ULONG>(m_sessions.size());
     return S_OK;
-
 }
 
 wsl::windows::service::wsla::WSLAUserSession::WSLAUserSession(std::weak_ptr<WSLAUserSessionImpl>&& Session) :

src/windows/wslaservice/exe/WSLAUserSession.h

@@ -17,6 +17,8 @@ Abstract:
 #include "WSLASession.h"
 #include <atomic>
 #include <vector>
+#include <mutex>
+#include <unordered_set>
 
 namespace wsl::windows::service::wsla {