diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 03c66f2..a01dda2 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -184,10 +184,10 @@ configuration: The scipt will output the path of the log file once done. - Once completed please upload the output files to this Github issue. + Once completed please upload the output files to this GitHub issue. - [Click here](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method) for more info on logging + See [Collect WSL logs (recommended method)](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method). If you choose to email these logs instead of attaching to the bug, please send them to wsl-gh-logs@microsoft.com with the number of the github issue in the subject, and in the message a link to your comment in the github issue. @@ -229,10 +229,10 @@ configuration: The scipt will output the path of the log file once done. - Once completed please upload the output files to this Github issue. + Once completed please upload the output files to this GitHub issue. - [Click here](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method) for more info on logging + See [Collect WSL logs (recommended method)](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method). Thank you! diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index 1bfcbc9..d8bde29 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -1,4 +1,4 @@ -name: Publish to Winget +name: Publish to WinGet on: release: diff --git a/.pipelines/build-stage.yml b/.pipelines/build-stage.yml index 9b656ae..d1e5467 100644 --- a/.pipelines/build-stage.yml +++ b/.pipelines/build-stage.yml @@ -168,7 +168,7 @@ stages: workingDirectory: "." cmakeArgs: . --fresh -A ${{ platform }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION=10.0.26100.0 -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DSKIP_PACKAGE_SIGNING=${{ parameters.isRelease }} -DOFFICIAL_BUILD=${{ parameters.isRelease }} -DPIPELINE_BUILD_ID=$(Build.BuildId) -DVSO_ORG=${{ parameters.vsoOrg }} -DVSO_PROJECT=${{ parameters.vsoProject }} -DWSL_BUILD_WSL_SETTINGS=true - # This additional Restore NuGet package task is added as a workaround for WSL Settings to have its' packages restored properly. + # This additional Restore NuGet package task is added as a workaround for WSL Settings to have its packages restored properly. # Without this, building wsl settings may encounter the following error: # # The plugin credential provider could not acquire credentials. Authentication may require manual action. diff --git a/.pipelines/flight-stage.yml b/.pipelines/flight-stage.yml index 5b5b8bb..d60f03a 100644 --- a/.pipelines/flight-stage.yml +++ b/.pipelines/flight-stage.yml @@ -100,7 +100,7 @@ stages: zipPath: $(StoreBrokerPayloadPath)\WindowsSubsystemForLinux.zip force: true skipPolling: true # skips polling Partner Centre/store API for the state of the package; skipping will mean that errors in the process will only show up in Partner Center - targetPublishMode: Immediate # on completion of this task, the package will be published to the WSL SelfHost flight once ceritified (no manual clicking of any buttons in Partner Center) + targetPublishMode: Immediate # on completion of this task, the package will be published to the WSL SelfHost flight once certified (no manual clicking of any buttons in Partner Center) preserveSubmissionId: false deletePackages: true numberOfPackagesToKeep: 0 @@ -115,6 +115,6 @@ stages: pip install --user -r tools/devops/requirements.txt python tools/devops/create-release.py '${{ parameters.packageVersion }}' drop\bundle\Microsoft.WSL_${{ parameters.packageVersion }}.0_x64_ARM64.msixbundle drop\bundle\wsl.${{ parameters.packageVersion }}.0.arm64.msi drop\bundle\wsl.${{ parameters.packageVersion }}.0.x64.msi --no-fetch --github-token "$env:token" ${{ iif(parameters.publishPackage, '--publish --auto-release-notes', '--use-current-ref') }} - displayName: Create Github release + displayName: Create GitHub release env: token: $(GITHUB_RELEASE_TOKEN) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 476b805..d857336 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ You can file issues for WSL at the WSL repository, or linked repositories. Befor 1. If your issue is related to WSL documentation, please file it at [microsoftdocs/wsl](https://github.com/microsoftdocs/WSL/issues) 2. If your issue is related to a Linux GUI app, please file it at [microsoft/wslg](https://github.com/microsoft/wslg/issues) -3. Otherwise if you have a technical issue related to WSL in general, such as start up issues, etc., please file it at [microsoft/wsl](https://github.com/microsoft/WSL/issues) +3. Otherwise, if you have a technical issue related to WSL in general, such as start up issues, etc., please file it at [microsoft/wsl](https://github.com/microsoft/WSL/issues) Please provide as much information as possible when reporting a bug or filing an issue on the Windows Subsystem for Linux, and be sure to include logs as necessary! @@ -94,7 +94,7 @@ After reboot, the kernel dump will be in `%SystemRoot%\MEMORY.DMP` (unless this Please send this dump to: secure@microsoft.com . Make sure that the email body contains: -- The Github issue number, if any +- The GitHub issue number, if any - That this dump is intended for the WSL team ### 11) Reporting a WSL process crash diff --git a/cloudtest/TestMap.xml.in b/cloudtest/TestMap.xml.in index 023cd92..9af1a53 100644 --- a/cloudtest/TestMap.xml.in +++ b/cloudtest/TestMap.xml.in @@ -12,21 +12,21 @@ - + - + - + diff --git a/doc/docs/technical-documentation/boot-process.md b/doc/docs/technical-documentation/boot-process.md index 2493627..89cb232 100644 --- a/doc/docs/technical-documentation/boot-process.md +++ b/doc/docs/technical-documentation/boot-process.md @@ -43,7 +43,7 @@ sequenceDiagram ## CreateInstance() -When [wslervice.exe](wslservice.exe.md) receives the CreateInstance() call via COM, it will: +When [wslservice.exe](wslservice.exe.md) receives the CreateInstance() call via COM, it will: 1) Identify which distribution the user wants to create. This is done by looking up the `DistributionRegistration` (see `src/windows/service/exe/DistributionRegistration.cpp`) in the Windows registry, matching either on the distribution ID, or using the default if none is provided. diff --git a/doc/docs/technical-documentation/drvfs.md b/doc/docs/technical-documentation/drvfs.md index 6955c4f..3912b52 100644 --- a/doc/docs/technical-documentation/drvfs.md +++ b/doc/docs/technical-documentation/drvfs.md @@ -14,9 +14,9 @@ When a Linux process is created, [wslservice.exe](wslservice.exe.md) determines *Note: This section only applies to WSL2 distributions. * -When a [session leader](session-leader.md) is created, [wslsevice.exe](wslservice.exe.md) starts a [plan9](https://9fans.github.io/plan9port/man/man9/intro.html) file server. This file server can be connected to from the WSL2 virtual machine to mount Windows drives. +When a [session leader](session-leader.md) is created, [wslservice.exe](wslservice.exe.md) starts a [plan9](https://9fans.github.io/plan9port/man/man9/intro.html) file server. This file server can be connected to from the WSL2 virtual machine to mount Windows drives. -When the WSL distribution is created, [wslservice.exe](wslservice.exe.md) uses the `LX_INIT_CONFIGURATION_INFORMATION` message to indicate wether the process that created the distribution is elevated or not. Based on this, [init](init.md) will mount either or the elevated, or un-elevated version of the plan9 server. +When the WSL distribution is created, [wslservice.exe](wslservice.exe.md) uses the `LX_INIT_CONFIGURATION_INFORMATION` message to indicate whether the process that created the distribution is elevated or not. Based on this, [init](init.md) will mount either or the elevated, or un-elevated version of the plan9 server. Later when the first command is created in the namespace that hasn't been mounted yet, (either elevated, or non-elevated), [wslservice.exe](wslservice.exe.md) sends a `LxInitMessageRemountDrvfs` to [init](init.md), which tell `init` to mount the other namespace. diff --git a/doc/docs/technical-documentation/systemd.md b/doc/docs/technical-documentation/systemd.md index bd0ab5b..2f33aef 100644 --- a/doc/docs/technical-documentation/systemd.md +++ b/doc/docs/technical-documentation/systemd.md @@ -20,4 +20,4 @@ When systemd is enabled, WSL tries synchronizes launching processes with systemd To improve compatibility with systemd, WSL creates various systemd configuration files during boot (under `/run`). These configurations files are used to: - Protect the WSL [binfmt interpret](interop.md) from being deleted by `systemd-binfmt.service` -- Protect the X11 socket from being deleted by `systemd-tmpfiles.serviceè \ No newline at end of file +- Protect the X11 socket from being deleted by `systemd-tmpfiles-setup.service` diff --git a/intune/en-US/WSL.adml b/intune/en-US/WSL.adml index cdca0f5..2b58477 100644 --- a/intune/en-US/WSL.adml +++ b/intune/en-US/WSL.adml @@ -32,7 +32,7 @@ When set to disabled, this policy disables nested virtualization configuration via .wslconfig (wsl2.nestedVirtualization). This policy only applies to Store WSL. Allow kernel debugging - When set to disabled, this policy disables kernel kernel debugging configuration via .wslconfig (wsl2.kernelDebugPort). This policy only applies to Store WSL. + When set to disabled, this policy disables kernel debugging configuration via .wslconfig (wsl2.kernelDebugPort). This policy only applies to Store WSL. Allow custom networking configuration When set to disabled, this policy disables custom networking configuration via .wslconfig (wsl2.networkingmode). This policy only applies to Store WSL. diff --git a/nuget.config b/nuget.config index 5729388..3fb4a71 100644 --- a/nuget.config +++ b/nuget.config @@ -21,7 +21,7 @@ - diff --git a/src/linux/init/DnsServer.cpp b/src/linux/init/DnsServer.cpp index 4f5d051..cf5cac9 100644 --- a/src/linux/init/DnsServer.cpp +++ b/src/linux/init/DnsServer.cpp @@ -118,7 +118,7 @@ try return; } - // Stop tracking the request, irrespective of the DNS response being succesfully sent + // Stop tracking the request, irrespective of the DNS response being successfully sent const auto removeDnsRequest = wil::scope_exit([&] { m_udpRequests.erase(dnsClientIdentifier.DnsClientId); }); sockaddr_in& remoteAddr = it->second; diff --git a/src/linux/init/DnsTunnelingChannel.cpp b/src/linux/init/DnsTunnelingChannel.cpp index 29d6f2d..7a30791 100644 --- a/src/linux/init/DnsTunnelingChannel.cpp +++ b/src/linux/init/DnsTunnelingChannel.cpp @@ -103,7 +103,7 @@ void DnsTunnelingChannel::ReceiveLoop() noexcept return; } - // Get the message type from the the message header + // Get the message type from the message header switch (message->MessageType) { case LxGnsMessageDnsTunneling: diff --git a/src/linux/init/GnsEngine.cpp b/src/linux/init/GnsEngine.cpp index 5df4407..37ee355 100644 --- a/src/linux/init/GnsEngine.cpp +++ b/src/linux/init/GnsEngine.cpp @@ -53,7 +53,7 @@ Interface GnsEngine::OpenAdapterImpl(const GUID& id) if (adapterId.has_value() && adapterId.value() == id) { interfaceName = e.path().filename().string(); - // Special case _wlanxx interfaces: look for the the wlanxx version instead. + // Special case _wlanxx interfaces: look for the wlanxx version instead. if (interfaceName.compare(0, 5, "_wlan") == 0) { continue; diff --git a/src/linux/init/binfmt.cpp b/src/linux/init/binfmt.cpp index e32ebfc..0bc10e2 100644 --- a/src/linux/init/binfmt.cpp +++ b/src/linux/init/binfmt.cpp @@ -785,7 +785,7 @@ Arguments: MessageType - Supplies the message type. - Argc - Supplies the command line agrument count. + Argc - Supplies the command line argument count. Argv - Supplies the command line arguments. diff --git a/src/linux/init/binfmt.h b/src/linux/init/binfmt.h index c2d2ce2..367a7fe 100644 --- a/src/linux/init/binfmt.h +++ b/src/linux/init/binfmt.h @@ -15,13 +15,13 @@ Abstract: #pragma once // -// Name of the WSL binfmt_misc intrepreter. +// Name of the WSL binfmt_misc interpreter. // #define LX_INIT_BINFMT_NAME "WSLInterop" // -// Name of the WSL 'late' binfmt_misc intrepreter. +// Name of the WSL 'late' binfmt_misc interpreter. // This name is used by the wsl-binfmt systemd unit which // registers the interpreter a second time after systemd-binfmt to make sure // that wsl's interpreter is always registered last. diff --git a/src/linux/init/config.cpp b/src/linux/init/config.cpp index 2afba5c..7ca9f7e 100644 --- a/src/linux/init/config.cpp +++ b/src/linux/init/config.cpp @@ -854,7 +854,7 @@ try if (WI_IsFlagSet(Config.FeatureFlags.value(), LxInitFeatureRootfsCompressed)) { - LOG_WARNING("{} root file system is compressed, performance may be severly impacted.", DistributionName); + LOG_WARNING("{} root file system is compressed, performance may be severely impacted.", DistributionName); } // @@ -1967,7 +1967,7 @@ try // Initialize the mount options. // // N.B. If the options weren't specified, ConfigDrvFsOptions will be an - // emptry string. Since DrvFs ignores empty mount options, the extra + // empty string. Since DrvFs ignores empty mount options, the extra // comma on the end in that case is not a problem. // @@ -2454,7 +2454,7 @@ Arguments: Return Value: - The file descriptor represending the mount namespace on soccess, -1 on failure. + The file descriptor representing the mount namespace on success, -1 on failure. --*/ @@ -2505,7 +2505,7 @@ try // Attempt to open the /etc/default/locale file. If the file does not exist // then the $LANG environment variable will not be updated. // - // N.B. This file is being opened by root. The only user-visable content + // N.B. This file is being opened by root. The only user-visible content // will be the contents of the last line of the file that contains // "LANG=". // diff --git a/src/linux/init/drvfs.cpp b/src/linux/init/drvfs.cpp index f17ee25..a652d80 100644 --- a/src/linux/init/drvfs.cpp +++ b/src/linux/init/drvfs.cpp @@ -258,7 +258,7 @@ try // For virtio-9p, there are two errors that could indicate the PCI device is not ready: // EBUSY - Returned if all devices with the tag are already in use. // ENOENT - Returned if there are no devices with the tag, which can happen after the VM first boots. - // In this case, check if the the target exists; if it doesn't, ENOENT is for that and there's no reason to retry. + // In this case, check if the target exists; if it doesn't, ENOENT is for that and there's no reason to retry. // // For virtiofs, EINVAL will be returned if the tag is not ready. auto savedErrno = wil::ResultFromCaughtException(); @@ -336,7 +336,7 @@ try return MountFilesystem(DRVFS_FS_TYPE, Source, Target, Options, ExitCode); } - // Use virtiofs if the source of the mount is the root of a drive, otherwise use 9p. + // Use virtiofs if the source of the mount is the root of a drive; otherwise, use 9p. if (WSL_USE_VIRTIO_FS(Config)) { if (wsl::shared::string::IsDriveRoot(Source)) diff --git a/src/linux/init/init.cpp b/src/linux/init/init.cpp index 8dc8d97..27450be 100644 --- a/src/linux/init/init.cpp +++ b/src/linux/init/init.cpp @@ -356,7 +356,7 @@ ExecStart=/bin/mount -o bind,ro,X-mount.mkdir -t none /mnt/wslg/.X11-unix /tmp/. { // N.B. ExecStop is required to prevent distributions from removing the WSL binfmt entry on shutdown. auto systemdBinfmtContent = std::format( - R"(# Note: This file is generated by WSL to prevent binfmt.d from overriding WSL's binfmt interpretor. + R"(# Note: This file is generated by WSL to prevent binfmt.d from overriding WSL's binfmt interpreter. # To disable this unit, add the following to /etc/wsl.conf: # [boot] # protectBinfmt=false @@ -1821,7 +1821,7 @@ Return Value: if (BytesWritten < 0) { // - // If writing on stdin's pipe would block, mark the write as pending an continue. + // If writing on stdin's pipe would block, mark the write as pending and continue. // This is required blocking on the write() could lead to a deadlock if the child process // is blocking trying to write on stderr / stdout while the relay tries to write stdin. // @@ -2318,7 +2318,7 @@ Return Value: } // - // Initialize distro init agruments and environment. + // Initialize distro init arguments and environment. // auto InitializeStringVector = [&](std::vector& PointerVector, @@ -2685,7 +2685,7 @@ Routine Description: Arguments: - Config - Supplies the distribution configuraiton. + Config - Supplies the distribution configuration. Return Value: @@ -2845,7 +2845,7 @@ Return Value: // // - // N.B. SIGTTOU along with most other signals are blocked, otherwise + // N.B. SIGTTOU along with most other signals are blocked. Otherwise, // this could generate a signal with the default behavior of // stopping the process (waiting for SIGCONT to continue). // @@ -3343,7 +3343,7 @@ void WaitForBootProcess(wsl::linux::WslDistributionConfig& Config) } // - // Launch the boot process wait for for it to finish booting. + // Launch the boot process wait for it to finish booting. // MESSAGE_HEADER Message{}; diff --git a/src/linux/init/localhost.cpp b/src/linux/init/localhost.cpp index fbfcc29..d743b32 100644 --- a/src/linux/init/localhost.cpp +++ b/src/linux/init/localhost.cpp @@ -319,7 +319,7 @@ bool IsSameSockAddr(const sockaddr_storage& left, const sockaddr_storage& right) // Start looking for ports bound to localhost or wildcard. int ScanProcNetTCP(wsl::shared::SocketChannel& channel) { - // Peridocally scan procfs for listening TCP sockets. + // Periodically scan procfs for listening TCP sockets. std::vector relays{}; int result = 0; for (;;) diff --git a/src/linux/init/main.cpp b/src/linux/init/main.cpp index c50a5e6..3dc9680 100644 --- a/src/linux/init/main.cpp +++ b/src/linux/init/main.cpp @@ -762,7 +762,7 @@ void EnableCrashDumpCollection() return; } - // If the first character is a pipe, then the kernel will interperet this path as a command. + // If the first character is a pipe, then the kernel will interpret this path as a command. constexpr auto core_pattern = "|/" LX_INIT_WSL_CAPTURE_CRASH " %t %E %p %s"; WriteToFile("/proc/sys/kernel/core_pattern", core_pattern); } @@ -1745,7 +1745,7 @@ try }; // - // Set the communicaiton channel to expected file descriptor value. + // Set the communication channel to expected file descriptor value. // if (SocketFd != LX_INIT_UTILITY_VM_INIT_SOCKET_FD) @@ -1779,7 +1779,7 @@ try { // // Creating the temporary mount can fail if: - // - The distro VHD was mounted read-only (because an fsck is needed) + // - The distro VHD was mounted read-only (because a fsck is needed) // - The distro VHD is full // // Mount a writable overlay if that's the case so the distro can start. @@ -1873,7 +1873,7 @@ try } // - // Bind mount the init deamon into the distro namespace. + // Bind mount the init daemon into the distro namespace. // auto Path = std::format("{}{}", Target, LX_INIT_PATH); @@ -2107,7 +2107,7 @@ try } // - // Mount to a temporary location if overlayfs was requested, otherwise mount + // Mount to a temporary location if overlayfs was requested; otherwise, mount // the device directly on the target. // @@ -2260,7 +2260,7 @@ Return Value: } // - // Chroot to system system distro mount point. + // Chroot to system distro mount point. // // N.B. This allows running binaries present in the system distro without having to chroot. // @@ -2362,7 +2362,7 @@ try auto* DeviceName = &DevicePath[sizeof(DEVFS_PATH)]; // - // Find the partion on the specified device. + // Find the partition on the specified device. // // N.B. A retry is needed because there is a delay between when a device is // hot-added, and when the device is available in the guest. @@ -2492,7 +2492,7 @@ void ProcessLaunchInitMessage( // // Allow /etc/wsl.conf in the user distro to opt-out of GUI support. // - // N.B. A connection for the system disto must established even if the distro opts out + // N.B. A connection for the system distro must established even if the distro opts out // of GUI app support because WslService is waiting to accept a connection. // @@ -3168,7 +3168,7 @@ Routine Description: Arguments: - MessageFd - Supplies a file desciptor to the socket the message was received + MessageFd - Supplies a file descriptor to the socket the message was received on. This is used for operations that require responses, for example a VHD eject request. @@ -3579,7 +3579,7 @@ Return Value: // set to SYS_BIND to make bind system call. #ifdef __x86_64__ // 32bit: - // If syscall_nr == __NR_socketcall then contine else goto allow: + // If syscall_nr == __NR_socketcall then continue else goto allow: BPF_STMT(BPF_LD + BPF_W + BPF_ABS, syscall_nr), BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, I386_NR_socketcall, 0, 3), // if syscall arg0 == SYS_BIND then goto user_notify: else goto allow: @@ -3905,7 +3905,7 @@ int main(int Argc, char* Argv[]) } // - // Open kmesg for logging and ensure that the file descriptor is not set to one of the standard file descriptors. + // Open kmsg for logging and ensure that the file descriptor is not set to one of the standard file descriptors. // // N.B. This is to work around a rare race condition where init is launched without /dev/console set as the controlling terminal. // diff --git a/src/linux/init/telemetry.cpp b/src/linux/init/telemetry.cpp index 6f63a0f..06f012a 100644 --- a/src/linux/init/telemetry.cpp +++ b/src/linux/init/telemetry.cpp @@ -236,7 +236,7 @@ unsigned int StartTelemetryAgent() } } - // Regularily flush messages back to the service. + // Regularly flush messages back to the service. auto now = std::chrono::steady_clock::now(); if (drvfsNotifyCommand.has_value() || now > nextFlush) diff --git a/src/linux/init/util.cpp b/src/linux/init/util.cpp index 0090a51..04e9f5a 100644 --- a/src/linux/init/util.cpp +++ b/src/linux/init/util.cpp @@ -733,8 +733,8 @@ Arguments: CommandLine - Supplies the command line of the process to launch. - Output - Supplies an optional pointer to an std::string to receive the output of the command. - If no buffer is provied the output will appear in stdout. + Output - Supplies an optional pointer to a std::string to receive the output of the command. + If no buffer is provided the output will appear in stdout. ExpectedStatus - Supplies the expected return status of the command. @@ -1433,7 +1433,7 @@ Return Value: // // Check if the prefix matches. // - // N.B. For Windows paths, this is done case insensitive. + // N.B. For Windows paths, this is done case-insensitive. // if (!wsl::shared::string::StartsWith(Path, Prefix, WinPath)) @@ -2894,7 +2894,7 @@ Arguments: Path - Supplies the path to translate. Reverse - Supplies a bool, if set perform translation from Windows->Linux - path, otherwise translation from Linux->Windows path. + path; otherwise, translation from Linux->Windows path. Return Value: @@ -3015,7 +3015,7 @@ Arguments: Path - Supplies the path to translate. Reverse - Supplies a bool, if set perform translation from Windows->Linux - path, otherwise translation from Linux->Windows path. + path; otherwise, translation from Linux->Windows path. Return Value: @@ -3350,7 +3350,7 @@ int ProcessCreateProcessMessage(wsl::shared::SocketChannel& channel, gsl::span void Interface::ChangeAddressImpl(const Address& address, const std::optional
& broadcastAddress, Operation operation) { diff --git a/src/linux/netlinkutil/Makefile.linux b/src/linux/netlinkutil/Makefile.linux index 0b3a4f5..973c6d5 100644 --- a/src/linux/netlinkutil/Makefile.linux +++ b/src/linux/netlinkutil/Makefile.linux @@ -1,4 +1,4 @@ -# This makefile is used to work from a linux environement and is not part of the OS build process. +# This makefile is used to work from a linux environment and is not part of the OS build process. CXXFLAGS += -std=c++20 -Wall -Wextra -g3 -fPIC -I../inc LDFLAGS += diff --git a/src/linux/plan9/expected.h b/src/linux/plan9/expected.h index 5bf716b..3e51071 100644 --- a/src/linux/plan9/expected.h +++ b/src/linux/plan9/expected.h @@ -30,7 +30,7 @@ namespace details { new (P9_EXPECTED_STD addressof(value)) T(P9_EXPECTED_STD forward(args)...); } - // Storage for the BasicExpected class for types that are trivially destructable. + // Storage for the BasicExpected class for types that are trivially destructible. template struct TrivialExpectedStorage { @@ -98,7 +98,7 @@ namespace details { return *this; } - // Default destructor, because the value type is trivially destructable. + // Default destructor, because the value type is trivially destructible. ~TrivialExpectedStorage() = default; bool HasValue; @@ -111,7 +111,7 @@ namespace details { }; }; - // Storage for the BasicExpected class for types that are not trivially destructable. + // Storage for the BasicExpected class for types that are not trivially destructible. template struct NonTrivialExpectedStorage { @@ -204,7 +204,7 @@ namespace details { }; }; - // Class that helps to select between the storage for trivially and non-trivially destructable + // Class that helps to select between the storage for trivially and non-trivially destructible // types. template struct ExpectedStorage diff --git a/src/linux/plan9/p9data.h b/src/linux/plan9/p9data.h index 3a5bee7..dc93ff9 100644 --- a/src/linux/plan9/p9data.h +++ b/src/linux/plan9/p9data.h @@ -21,7 +21,7 @@ namespace p9fs { // the message if all dynamic content is omitted. In the case of strings, the // size of the two-byte length field is included, but the string length itself // is not. The omitted components are listed with each message type, and the -// caller is responsible for adding the the right values if necessary. +// caller is responsible for adding the right values if necessary. constexpr UINT32 GetMessageSize(MessageType messageType) { switch (messageType) diff --git a/src/linux/plan9/p9file.h b/src/linux/plan9/p9file.h index 739362c..d82b19c 100644 --- a/src/linux/plan9/p9file.h +++ b/src/linux/plan9/p9file.h @@ -18,7 +18,7 @@ struct Root final : public IRoot { Root(std::shared_ptr share, int rootFd, uid_t uid, gid_t gid) : Share{share}, RootFd{rootFd}, Uid{uid}, Gid{gid} { - Plan9TraceLoggingProvider::LogMessage(std::format("Instanciate root, uid={}", uid)); + Plan9TraceLoggingProvider::LogMessage(std::format("Instantiate root, uid={}", uid)); if (uid == -1) { return; // No uid passed, don't try to get the additional groups. diff --git a/src/linux/plan9/p9fs.cpp b/src/linux/plan9/p9fs.cpp index eb2c981..11bff4e 100644 --- a/src/linux/plan9/p9fs.cpp +++ b/src/linux/plan9/p9fs.cpp @@ -105,7 +105,7 @@ Expected> ShareList::MakeRoot(std::string_view anam { // The server is not running as root, which won't work. // N.B. It's possible to make this work as long as the server has CAP_SETUID, but that - // is currrently not needed. + // is currently not needed. return LxError{LX_EPERM}; } diff --git a/src/linux/plan9/p9handler.cpp b/src/linux/plan9/p9handler.cpp index f8ee7b7..9dd41a8 100644 --- a/src/linux/plan9/p9handler.cpp +++ b/src/linux/plan9/p9handler.cpp @@ -1218,7 +1218,7 @@ private: // Utilize a small stack-allocated buffer that's large enough for the largest response // without dynamic content (which is Rgetattr). Messages requiring a larger response will - // allocate a dynamic buffer by calling MessageResonse::EnsureSize. + // allocate a dynamic buffer by calling MessageResponse::EnsureSize. // N.B. Message handlers that only return the header (e.g. HandleClunk) don't need to call // EnsureSize since the static buffer is always big enough for that. gsl::byte staticBuffer[c_staticBufferSize]; diff --git a/src/linux/plan9/p9io.cpp b/src/linux/plan9/p9io.cpp index 8cbef5b..be5d92c 100644 --- a/src/linux/plan9/p9io.cpp +++ b/src/linux/plan9/p9io.cpp @@ -79,7 +79,7 @@ void CoroutineIoIssuer::PostIssue(CoroutineIoOperation& operation, CancelToken& else if (token.Cancelled()) { // The IO did not complete synchronously, but the operation has been - // cancelled. Depending on when the cancel occured, the IO may not have + // cancelled. Depending on when the cancel occurred, the IO may not have // been cancelled, so cancel it now. aio_cancel(operation.ControlBlock.aio_fildes, &operation.ControlBlock); } diff --git a/src/linux/plan9/p9scheduler.cpp b/src/linux/plan9/p9scheduler.cpp index efd0a1c..3b32012 100644 --- a/src/linux/plan9/p9scheduler.cpp +++ b/src/linux/plan9/p9scheduler.cpp @@ -140,7 +140,7 @@ Scheduler::Unblocker Scheduler::Unblock() noexcept /// Try to claim queue ownership for the current thread. If this function /// returns true, then the caller must call RunAndRelease to process the queue. /// -/// If fromKick, then the caller is the thread that was explictly kicked to +/// If fromKick, then the caller is the thread that was explicitly kicked to /// process the queue. Otherwise, this is an IO completion or other /// opportunistic thread. bool Scheduler::Claim(bool fromKick) noexcept diff --git a/src/linux/plan9/p9tracelogging.cpp b/src/linux/plan9/p9tracelogging.cpp index ecab39d..94d21e0 100644 --- a/src/linux/plan9/p9tracelogging.cpp +++ b/src/linux/plan9/p9tracelogging.cpp @@ -271,7 +271,7 @@ void LogMessageBuilder::AddRawValue(UINT64 value, int base) m_message += ConvertNumber(buffer, c_numberBufferSize, value, base); } -// Adds an qid value without any separators or prefix. +// Adds a qid value without any separators or prefix. void LogMessageBuilder::AddRawValue(const Qid& value) { m_message += "{"; diff --git a/src/shared/configfile/configfile.cpp b/src/shared/configfile/configfile.cpp index 6b5538a..3078387 100644 --- a/src/shared/configfile/configfile.cpp +++ b/src/shared/configfile/configfile.cpp @@ -816,7 +816,7 @@ InvalidLine: { // Write out the rest of the remaining // invalid line. WEOF and '\n' will be - // handled/writen by the NewLine label. + // handled/written by the NewLine label. configFileOutput += ch; } } diff --git a/src/shared/inc/CommandLine.h b/src/shared/inc/CommandLine.h index 2fc2a01..791d561 100644 --- a/src/shared/inc/CommandLine.h +++ b/src/shared/inc/CommandLine.h @@ -375,7 +375,7 @@ public: const TChar* value = nullptr; if (e.Positional) { - value = m_argv[i]; // Positonal arguments directly receive arvg[i] + value = m_argv[i]; // Positional arguments directly receive arvg[i] } else if (i + 1 < m_argc) { @@ -465,7 +465,7 @@ private: } else { - // Otherwise we need an actual value + // Otherwise, we need an actual value if (Value == nullptr) { return -1; diff --git a/src/shared/inc/conncheckshared.h b/src/shared/inc/conncheckshared.h index 7e251fd..b477ce5 100644 --- a/src/shared/inc/conncheckshared.h +++ b/src/shared/inc/conncheckshared.h @@ -147,7 +147,7 @@ inline unique_socket ConnCheckConnectSocket(int family, const char* hostname, co // Attempts to establish a TCPv4 and a TCPv6 connection to a port on a host. // ipv6hostname is an optional parameter in case the IPv6 equivalent hostname is different. -// example: www.msftconnectest.com and ipv6.msftconnectest.com +// example: www.msftconnecttest.com and ipv6.msftconnecttest.com // This API is blocking/synchronous. inline ConnCheckResult CheckConnection(const char* hostname, const char* ipv6hostname, const char* port) { diff --git a/src/shared/inc/lxinitshared.h b/src/shared/inc/lxinitshared.h index f6ba9bb..145afdf 100644 --- a/src/shared/inc/lxinitshared.h +++ b/src/shared/inc/lxinitshared.h @@ -76,7 +76,7 @@ Abstract: #define LX_INIT_DEFAULT_ROUTE_V6_PREFIX LX_INIT_UNSPECIFIED_V6_ADDRESS "/0" // -// The hard-coded link-local addressess used for communicating over the loopback to the host +// The hard-coded link-local addresses used for communicating over the loopback to the host // #define LX_INIT_IPV4_LOOPBACK_GATEWAY_ADDRESS "169.254.73.152" #define LX_INIT_IPV6_LOOPBACK_GATEWAY_ADDRESS "fe80::500:4aef:feef:2aa2" @@ -155,7 +155,7 @@ Abstract: // // Typical default DrvFs-specific 9p mount options. // -// N.B. These are used to pre-populate virtiofs shares with default mount options. +// N.B. These are used to prepopulate virtiofs shares with default mount options. // These will match the default values used by the system distro, and will typically // match the default uid / gid for the user distro. If the values do not match, a new // virtiofs share will be created. @@ -176,7 +176,7 @@ Abstract: #define LX_INIT_HVSOCKET_TIMEOUT_SECONDS (30) // -// The data for begining a port listener. +// The data for beginning a port listener. // #define LX_INIT_LOCALHOST_RELAY "localhost" diff --git a/src/shared/inc/stringshared.h b/src/shared/inc/stringshared.h index f230648..e000153 100644 --- a/src/shared/inc/stringshared.h +++ b/src/shared/inc/stringshared.h @@ -713,7 +713,7 @@ inline MacAddress ParseMacAddress(const std::basic_string& Input, T Separator } template -inline std::basic_string FormatMacAddress(const MacAddress& input, TChar seperator) +inline std::basic_string FormatMacAddress(const MacAddress& input, TChar separator) { std::basic_string output(17, '\0'); @@ -724,15 +724,15 @@ inline std::basic_string FormatMacAddress(const MacAddress& input, TChar output.size() + 1, MAC_ADDRESS_FORMAT_STRING, input[0], - seperator, + separator, input[1], - seperator, + separator, input[2], - seperator, + separator, input[3], - seperator, + separator, input[4], - seperator, + separator, input[5]); } else if constexpr (std::is_same_v) @@ -742,15 +742,15 @@ inline std::basic_string FormatMacAddress(const MacAddress& input, TChar output.size() + 1, STRING_TO_WIDE_STRING(MAC_ADDRESS_FORMAT_STRING), input[0], - seperator, + separator, input[1], - seperator, + separator, input[2], - seperator, + separator, input[3], - seperator, + separator, input[4], - seperator, + separator, input[5]); } else diff --git a/src/windows/common/Distribution.cpp b/src/windows/common/Distribution.cpp index bb57973..332d22c 100644 --- a/src/windows/common/Distribution.cpp +++ b/src/windows/common/Distribution.cpp @@ -141,7 +141,7 @@ DistributionList ReadFromManifest(const std::wstring& url) } } - // The "Default" string takes precendence. If not present, use the first legacy distro entry. + // The "Default" string takes precedence. If not present, use the first legacy distro entry. if (!distros.Default.has_value() && distros.Distributions.has_value() && distros.Distributions->size() > 0) { distros.Default = (*distros.Distributions)[0].Name; diff --git a/src/windows/common/ExecutionContext.h b/src/windows/common/ExecutionContext.h index 24fcce2..0fe473d 100644 --- a/src/windows/common/ExecutionContext.h +++ b/src/windows/common/ExecutionContext.h @@ -64,7 +64,7 @@ enum Context : ULONGLONG Install = 0x4000000000, ReadDistroConfig = 0x8000000000, UpdatePackage = 0x10000000000, - QueryLatestGithubRelease = 0x20000000000, + QueryLatestGitHubRelease = 0x20000000000, VerifyChecksum = 0x40000000000, }; diff --git a/src/windows/common/Localization.cpp b/src/windows/common/Localization.cpp index b3c2e8d..cb2875d 100644 --- a/src/windows/common/Localization.cpp +++ b/src/windows/common/Localization.cpp @@ -45,7 +45,7 @@ std::vector GetUserLanguages(bool impersonate) { if (g_runningInService) { - // N.B. If we're in the service the locale needs to be queried everytime since different users + // N.B. If we're in the service the locale needs to be queried every time since different users // can have different language configurations. std::optional revert; if (impersonate) diff --git a/src/windows/common/SubProcess.cpp b/src/windows/common/SubProcess.cpp index a10b34d..947d0a9 100644 --- a/src/windows/common/SubProcess.cpp +++ b/src/windows/common/SubProcess.cpp @@ -166,7 +166,7 @@ wil::unique_handle SubProcess::Start() StartupInfo.StartupInfo.cb = sizeof(StartupInfo); StartupInfo.StartupInfo.dwFlags = STARTF_USESTDHANDLES; - // N.B. Passing a pseudoconsole requires all standard handlles to be null + // N.B. Passing a pseudoconsole requires all standard handles to be null if (m_pseudoConsole == nullptr) { StartupInfo.StartupInfo.hStdInput = ARGUMENT_PRESENT(m_stdIn) ? m_stdIn : GetStdHandle(STD_INPUT_HANDLE); diff --git a/src/windows/common/WslClient.cpp b/src/windows/common/WslClient.cpp index 9c7f416..2d8452d 100644 --- a/src/windows/common/WslClient.cpp +++ b/src/windows/common/WslClient.cpp @@ -630,7 +630,7 @@ int Install(_In_ std::wstring_view commandLine) if (legacyDistro != nullptr) { - wsl::windows::common::distribution::Launch(*legacyDistro, installResult.InstalledViaGithub, !installResult.Alreadyinstalled); + wsl::windows::common::distribution::Launch(*legacyDistro, installResult.InstalledViaGitHub, !installResult.Alreadyinstalled); } else { @@ -1076,7 +1076,7 @@ LaunchProcessOptions ParseLegacyArguments(_Inout_ std::wstring_view& commandLine // Strip any leading whitespace. commandLine = wsl::windows::common::string::StripLeadingWhitespace(commandLine); - // Check for a distributon GUID as the first parameter and strip it out if present. + // Check for a distribution GUID as the first parameter and strip it out if present. auto argument = wsl::windows::common::helpers::ParseArgument(commandLine); auto distroGuid = wsl::shared::string::ToGuid(argument); if (distroGuid.has_value()) @@ -1523,7 +1523,7 @@ int RunDebugShell() // a pipe is connected, so it's lost. THROW_IF_WIN32_BOOL_FALSE(WriteFile(pipe.get(), "\n", 1, nullptr, nullptr)); - // Create a thread to realy stdin to the pipe. + // Create a thread to relay stdin to the pipe. wsl::windows::common::SvcCommIo Io; auto exitEvent = wil::unique_event(wil::EventOptions::ManualReset); std::thread inputThread( diff --git a/src/windows/common/WslCoreConfig.cpp b/src/windows/common/WslCoreConfig.cpp index e313351..52fdd0a 100644 --- a/src/windows/common/WslCoreConfig.cpp +++ b/src/windows/common/WslCoreConfig.cpp @@ -314,10 +314,10 @@ void wsl::core::Config::Initialize(_In_opt_ HANDLE UserToken) MemorySizeBytes = std::min(MemorySizeBytes, MaximumMemorySizeBytes); } - // Use the user-defined swap size if one was specified, otherwise set to 25% + // Use the user-defined swap size if one was specified; otherwise, set to 25% // the memory size rounded up to the nearest GB. // - // N.B. This heuristic is modeled after RedHat and Ubuntu's recommended swap size. + // N.B. This heuristic is modeled after Red Hat and Ubuntu's recommended swap size. if (SwapSizeBytes == UINT64_MAX) { SwapSizeBytes = ((MemorySizeBytes / 4 + _1GB - 1) & ~(_1GB - 1)); diff --git a/src/windows/common/WslCoreFirewallSupport.cpp b/src/windows/common/WslCoreFirewallSupport.cpp index fc7233a..eb8417f 100644 --- a/src/windows/common/WslCoreFirewallSupport.cpp +++ b/src/windows/common/WslCoreFirewallSupport.cpp @@ -175,7 +175,7 @@ try // // Currently, there are 3 possible levels of Hyper-V firewall OS support: // 1 - No Hyper-V firewall OS support. - // 2 - Initial Hyper-V firewall support (Support for mirrrored mode only). + // 2 - Initial Hyper-V firewall support (Support for mirrored mode only). // To check for this support, we query for the 'MSFT_NetFirewallHyperVVMCreator' object. // 3 - Enterprise Hyper-V firewall support (Support for NAT mode, configuring default settings values, and configuring per-profile configs). // To check for this support, we query for the 'MSFT_NetFirewallHyperVProfile' object. diff --git a/src/windows/common/WslCoreNetworkingSupport.h b/src/windows/common/WslCoreNetworkingSupport.h index a046f59..a1ac364 100644 --- a/src/windows/common/WslCoreNetworkingSupport.h +++ b/src/windows/common/WslCoreNetworkingSupport.h @@ -73,7 +73,7 @@ inline bool operator<(const SOCKADDR_INET& lhs, const SOCKADDR_INET& rhs) noexce return lhs.Ipv4.sin_addr.S_un.S_addr < rhs.Ipv4.sin_addr.S_un.S_addr; } - // implmenting the comparison operation following the shortcut from mstcpip.h IN6_ADDR_EQUAL + // implementing the comparison operation following the shortcut from mstcpip.h IN6_ADDR_EQUAL const __int64 UNALIGNED* lhsRawPointer = (__int64 UNALIGNED*)(&lhs.Ipv6.sin6_addr); const __int64 UNALIGNED* rhsRawPointer = (__int64 UNALIGNED*)(&rhs.Ipv6.sin6_addr); if (lhsRawPointer[0] == rhsRawPointer[0]) @@ -94,7 +94,7 @@ inline bool operator>(const SOCKADDR_INET& lhs, const SOCKADDR_INET& rhs) noexce return lhs.Ipv4.sin_addr.S_un.S_addr > rhs.Ipv4.sin_addr.S_un.S_addr; } - // implmenting the comparison operation following the shortcut from mstcpip.h IN6_ADDR_EQUAL + // implementing the comparison operation following the shortcut from mstcpip.h IN6_ADDR_EQUAL const __int64 UNALIGNED* lhsRawPointer = (__int64 UNALIGNED*)(&lhs.Ipv6.sin6_addr); const __int64 UNALIGNED* rhsRawPointer = (__int64 UNALIGNED*)(&rhs.Ipv6.sin6_addr); if (lhsRawPointer[0] == rhsRawPointer[0]) diff --git a/src/windows/common/WslInstall.cpp b/src/windows/common/WslInstall.cpp index e4d426a..ca68676 100644 --- a/src/windows/common/WslInstall.cpp +++ b/src/windows/common/WslInstall.cpp @@ -145,7 +145,7 @@ try std::tie(installResult.Name, installResult.Id) = InstallModernDistribution(*distro, version, localName, location, vhdSize, fixedVhd); - installResult.InstalledViaGithub = true; + installResult.InstalledViaGitHub = true; } else if (const auto* distro = std::get_if(&*installResult.Distribution)) { @@ -193,7 +193,7 @@ try } installResult.Name = distro->FriendlyName; - installResult.InstalledViaGithub = useGitHub; + installResult.InstalledViaGitHub = useGitHub; } else { diff --git a/src/windows/common/WslInstall.h b/src/windows/common/WslInstall.h index 36f62b3..1cf7497 100644 --- a/src/windows/common/WslInstall.h +++ b/src/windows/common/WslInstall.h @@ -24,7 +24,7 @@ public: std::wstring Name; std::optional Id; std::optional Distribution; - bool InstalledViaGithub{}; + bool InstalledViaGitHub{}; bool Alreadyinstalled{}; }; diff --git a/src/windows/common/WslSecurity.cpp b/src/windows/common/WslSecurity.cpp index d39023a..be1ff0a 100644 --- a/src/windows/common/WslSecurity.cpp +++ b/src/windows/common/WslSecurity.cpp @@ -46,7 +46,7 @@ void wsl::windows::common::security::ApplyProcessMitigationPolicies() LOG_IF_WIN32_BOOL_FALSE(SetProcessMitigationPolicy(ProcessDynamicCodePolicy, &codePolicy, sizeof(codePolicy))); // Note: Enabling PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY::DisallowWin32kSystemCalls - // breaks the service initialization logic (CoIntializeSecurity fails). + // breaks the service initialization logic (CoInitializeSecurity fails). PROCESS_MITIGATION_FONT_DISABLE_POLICY fontPolicy{}; fontPolicy.DisableNonSystemFonts = true; diff --git a/src/windows/common/filesystem.cpp b/src/windows/common/filesystem.cpp index 2d9ae7d..2c6c585 100644 --- a/src/windows/common/filesystem.cpp +++ b/src/windows/common/filesystem.cpp @@ -213,7 +213,7 @@ revert_dir_case_sensitivity EnableNtfsDirCaseSensitivity() // // Just in case, make sure at least the main enable flag is set after - // reverting, otherwise WSL will break. + // reverting; otherwise, WSL will break. // WI_SetFlag(Flags, c_enableDirCaseSensitivity); @@ -326,7 +326,7 @@ void EnsureCaseSensitiveDirectoryRecursive(_In_ HANDLE Directory) } // - // After all children are processed, mark the directory case sensitive. + // After all children are processed, mark the directory case-sensitive. // // N.B. This is done with a retry because if the NtfsEnableDirCaseSensitivity // flag was just changed from 3 to 1, NTFS may not have updated its @@ -562,7 +562,7 @@ void wsl::windows::common::filesystem::CreateRootFs(_In_ PCWSTR Path, _In_ ULONG } // - // Make sure the directory is marked case sensitive. + // Make sure the directory is marked case-sensitive. // // N.B. This is done without impersonating the client because setting this // attribute requires the "delete subfolders and files" permission on @@ -649,7 +649,7 @@ std::pair wsl::windows::common::filesystem::EnumerateFixedDrives(H void wsl::windows::common::filesystem::EnsureCaseSensitiveDirectory(_In_ PCWSTR Path, _In_ ULONG Flags) { - // N.B. Passing SYNCHRONIZE and FILE_SYNCHRONOUS_IO_NONALERT is required, otherwise NtQueryDirectoryFile + // N.B. Passing SYNCHRONIZE and FILE_SYNCHRONOUS_IO_NONALERT is required; otherwise, NtQueryDirectoryFile // might return STATUS_PENDING, which would break our folder enumeration logic. const wil::unique_hfile Directory{CreateFileW( @@ -753,8 +753,8 @@ void wsl::windows::common::filesystem::EnsureDirectoryWithAttributes( SetExtendedAttributes(Path, LX_S_IFDIR | Mode, Uid, Gid, DistroVersion); // - // Mark a new directory case sensitive, or upgrade the entire tree if it - // exists. If the root is already case sensitive, it's assumed the entire + // Mark a new directory case-sensitive, or upgrade the entire tree if it + // exists. If the root is already case-sensitive, it's assumed the entire // tree is. // @@ -804,7 +804,7 @@ std::pair wsl::windows::common::filesystem::GetHostAnd WI_VERIFY(GetComputerNameExA(ComputerNameDnsDomain, nullptr, &size) == FALSE); // If there is no domain name, initialize with a default. Truncate the - // domain name to the max size that the the driver allows. + // domain name to the max size that the driver allows. // N.B. If the buffer is too small, GetComputerNameEx() sets 'size' to the string size, // ** including ** the null terminator. On success it returns the string size, // See: https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getcomputernameexa @@ -909,7 +909,7 @@ std::string wsl::windows::common::filesystem::GetWindowsHosts(const std::filesys std::string LineCopy = Line; // Each line is in the following format: - // ... + // ... // // N.B. There must be at least one host aliases for each host address. diff --git a/src/windows/common/filesystem.hpp b/src/windows/common/filesystem.hpp index 934f12a..1a89f8b 100644 --- a/src/windows/common/filesystem.hpp +++ b/src/windows/common/filesystem.hpp @@ -36,7 +36,7 @@ DEFINE_ENUM_FLAG_OPERATORS(TempFileFlags); // Used only in unit tests. constexpr ULONG c_case_sensitive_folders_only = 0x100; -// Make sure that the above flag doesn't conflict with create intance flags +// Make sure that the above flag doesn't conflict with create instance flags static_assert((LXSS_CREATE_INSTANCE_FLAGS_ALL & c_case_sensitive_folders_only) == 0); struct TempFile @@ -124,7 +124,7 @@ std::pair EnumerateFixedDrives(HANDLE Token = nullptr); bool EnsureDirectory(_In_ LPCWSTR pPath); /// -/// Marks every directory in a tree case sensitive. +/// Marks every directory in a tree case-sensitive. /// void EnsureCaseSensitiveDirectory(_In_ PCWSTR Path, _In_ ULONG Flags); diff --git a/src/windows/common/interop.cpp b/src/windows/common/interop.cpp index a70679d..49aeeb6 100644 --- a/src/windows/common/interop.cpp +++ b/src/windows/common/interop.cpp @@ -348,7 +348,7 @@ std::string FormatCommandLine(gsl::span CommandLineData, USHORT Comma // // N.B. Any empty arguments or arguments that contain whitespace must be // encapsulated in quotes. Quotes must also be escaped according to - // stardard command-line parsing rules: + // standard command-line parsing rules: // https://msdn.microsoft.com/en-us/library/17w5ykft.aspx. // // This logic is largely taken from AppendQuotedForWindows in diff --git a/src/windows/common/lxssbusclient.cpp b/src/windows/common/lxssbusclient.cpp index f995295..b22dc77 100644 --- a/src/windows/common/lxssbusclient.cpp +++ b/src/windows/common/lxssbusclient.cpp @@ -392,7 +392,7 @@ Arguments: BufferSize - Supplies the size of the buffer in bytes. - SizeReceieved - Supplies a buffer to store the number of bytes received. + SizeReceived - Supplies a buffer to store the number of bytes received. Return Value: @@ -469,7 +469,7 @@ Arguments: BufferSize - Supplies the size of the buffer in bytes. - SizeReceieved - Supplies a buffer to store the number of bytes received. + SizeReceived - Supplies a buffer to store the number of bytes received. IoStatus - Supplies a pointer to an io status block. @@ -754,7 +754,7 @@ LxBusClientWaitForConnection(_In_ HANDLE ServerPortHandle, _Out_ PLXBUS_IPC_SERV Routine Description: - Waits for for a client connection on the provided server port. + Waits for a client connection on the provided server port. Arguments: @@ -780,7 +780,7 @@ LxBusClientWaitForLxProcess(_In_ HANDLE LxProcessHandle, _Out_ PLXBUS_IPC_LX_PRO Routine Description: - Waits for for a client connection on the provided server port. + Waits for a client connection on the provided server port. Arguments: diff --git a/src/windows/common/svccomm.cpp b/src/windows/common/svccomm.cpp index 4f782e9..d2f1c09 100644 --- a/src/windows/common/svccomm.cpp +++ b/src/windows/common/svccomm.cpp @@ -552,14 +552,14 @@ wsl::windows::common::SvcComm::SvcComm() THROW_IF_FAILED(m_userSession->QueryInterface(IID_PPV_ARGS(&clientSecurity))); // Get the current proxy blanket settings. - DWORD authnSvc, authzSvc, authnLvl, capabilites; - THROW_IF_FAILED(clientSecurity->QueryBlanket(m_userSession.get(), &authnSvc, &authzSvc, NULL, &authnLvl, NULL, NULL, &capabilites)); + DWORD authnSvc, authzSvc, authnLvl, capabilities; + THROW_IF_FAILED(clientSecurity->QueryBlanket(m_userSession.get(), &authnSvc, &authzSvc, NULL, &authnLvl, NULL, NULL, &capabilities)); // Make sure that dynamic cloaking is used. - WI_ClearFlag(capabilites, EOAC_STATIC_CLOAKING); - WI_SetFlag(capabilites, EOAC_DYNAMIC_CLOAKING); + WI_ClearFlag(capabilities, EOAC_STATIC_CLOAKING); + WI_SetFlag(capabilities, EOAC_DYNAMIC_CLOAKING); THROW_IF_FAILED(clientSecurity->SetBlanket( - m_userSession.get(), authnSvc, authzSvc, NULL, authnLvl, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, capabilites)); + m_userSession.get(), authnSvc, authzSvc, NULL, authnLvl, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, capabilities)); } wsl::windows::common::SvcComm::~SvcComm() diff --git a/src/windows/common/wslutil.cpp b/src/windows/common/wslutil.cpp index b43f5b8..5b9d6d4 100644 --- a/src/windows/common/wslutil.cpp +++ b/src/windows/common/wslutil.cpp @@ -31,7 +31,7 @@ using namespace wsl::windows::common::wslutil; constexpr auto c_latestReleaseUrl = L"https://api.github.com/repos/Microsoft/WSL/releases/latest"; constexpr auto c_releaseListUrl = L"https://api.github.com/repos/Microsoft/WSL/releases"; constexpr auto c_specificReleaseListUrl = L"https://api.github.com/repos/Microsoft/WSL/releases/tags/"; -constexpr auto c_userAgent = L"wsl-install"; // required to use the Github API +constexpr auto c_userAgent = L"wsl-install"; // required to use the GitHub API constexpr auto c_pipePrefix = L"\\\\.\\pipe\\"; namespace { @@ -171,7 +171,7 @@ static const std::map g_contextStrings{ X(UnregisterDistro), X(RegisterLxBus), X(MountDisk), - X(QueryLatestGithubRelease), + X(QueryLatestGitHubRelease), X(DebugShell), X(Plugin), X(CallMsi), @@ -255,7 +255,7 @@ int UpdatePackageImpl(bool preRelease, bool repair) PrintMessage(Localization::MessageCheckingForUpdates()); } - auto [version, release] = GetLatestGithubRelease(preRelease); + auto [version, release] = GetLatestGitHubRelease(preRelease); if (!repair && ParseWslPackageVersion(version) <= wsl::shared::PackageVersion) { @@ -825,7 +825,7 @@ std::wstring wsl::windows::common::wslutil::GetErrorString(HRESULT result) return Localization::MessageOsNotSupported(helpers::GetWindowsVersionString().c_str(), kbUrl.c_str()); - // All the errors below this comment are not supposed to be reachable here (since there's meant to be emmited from the + // All the errors below this comment are not supposed to be reachable here (since there's meant to be emitted from the // service). But if we somehow hit them here, it's better show something useful to the user. case WSL_E_VM_MODE_MOUNT_NAME_ALREADY_EXISTS: return Localization::MessageDiskMountNameAlreadyExists(); @@ -899,7 +899,7 @@ std::wstring wsl::windows::common::wslutil::GetErrorString(HRESULT result) return GetSystemErrorString(result); } -std::optional> wsl::windows::common::wslutil::GetGithubAssetFromRelease(const GithubRelease& Release) +std::optional> wsl::windows::common::wslutil::GetGitHubAssetFromRelease(const GitHubRelease& Release) { auto findAsset = [&Release](LPCWSTR Suffix) { for (const auto& asset : Release.assets) @@ -913,7 +913,7 @@ std::optional> wsl::windows::common: } } - return std::optional>(); + return std::optional>(); }; // Look for an MSI package first @@ -929,31 +929,31 @@ std::optional> wsl::windows::common: return asset.value(); } -std::pair wsl::windows::common::wslutil::GetLatestGithubRelease(bool preRelease) +std::pair wsl::windows::common::wslutil::GetLatestGitHubRelease(bool preRelease) { - ExecutionContext context(Context::QueryLatestGithubRelease); + ExecutionContext context(Context::QueryLatestGitHubRelease); auto registryKey = registry::OpenLxssMachineKey(); const auto url = registry::ReadString(registryKey.get(), nullptr, c_githubUrlOverrideRegistryValue, preRelease ? c_releaseListUrl : c_latestReleaseUrl); - WSL_LOG("PollLatestGithubRelease", TraceLoggingValue(url.c_str(), "url")); + WSL_LOG("PollLatestGitHubRelease", TraceLoggingValue(url.c_str(), "url")); winrt::Windows::Web::Http::HttpClient client; client.DefaultRequestHeaders().Append(L"User-Agent", c_userAgent); const auto response = client.GetAsync(winrt::Windows::Foundation::Uri(url)).get(); response.EnsureSuccessStatusCode(); - return GetLatestGithubRelease(preRelease, response.Content().ReadAsStringAsync().get().c_str()); + return GetLatestGitHubRelease(preRelease, response.Content().ReadAsStringAsync().get().c_str()); } -std::pair wsl::windows::common::wslutil::GetLatestGithubRelease(bool preRelease, LPCWSTR releases) +std::pair wsl::windows::common::wslutil::GetLatestGitHubRelease(bool preRelease, LPCWSTR releases) { - std::optional parsed{}; + std::optional parsed{}; if (preRelease) { std::optional> highestVersion; - for (const auto& e : wsl::shared::FromJson>(releases)) + for (const auto& e : wsl::shared::FromJson>(releases)) { auto version = ParseWslPackageVersion(e.name); if (!highestVersion.has_value() || version > highestVersion) @@ -965,21 +965,21 @@ std::pair wsl::windows::common::wslutil::GetLa } else { - parsed = wsl::shared::FromJson(releases); + parsed = wsl::shared::FromJson(releases); } THROW_HR_IF(E_UNEXPECTED, !parsed.has_value()); // Find the latest release with an msix package asset - auto asset = GetGithubAssetFromRelease(parsed.value()); + auto asset = GetGitHubAssetFromRelease(parsed.value()); THROW_HR_IF_MSG(E_UNEXPECTED, !asset.has_value(), "No suitable WSL release found on github"); return asset.value(); } -GithubRelease wsl::windows::common::wslutil::GetGithubReleaseByTag(_In_ const std::wstring& inTag) +GitHubRelease wsl::windows::common::wslutil::GetGitHubReleaseByTag(_In_ const std::wstring& inTag) { - ExecutionContext context(Context::QueryLatestGithubRelease); + ExecutionContext context(Context::QueryLatestGitHubRelease); const winrt::Windows::Web::Http::HttpClient client; client.DefaultRequestHeaders().Append(L"User-Agent", c_userAgent); @@ -989,7 +989,7 @@ GithubRelease wsl::windows::common::wslutil::GetGithubReleaseByTag(_In_ const st const auto content = response.Content().ReadAsStringAsync().get(); - return wsl::shared::FromJson(content.c_str()); + return wsl::shared::FromJson(content.c_str()); } int wsl::windows::common::wslutil::GetLogicalProcessorCount() diff --git a/src/windows/common/wslutil.h b/src/windows/common/wslutil.h index b1ac821..1d05526 100644 --- a/src/windows/common/wslutil.h +++ b/src/windows/common/wslutil.h @@ -41,26 +41,26 @@ inline constexpr GUID WslTerminalNamespace = {0xbe9372fe, 0x59e1, 0x4876, {0xbd, inline constexpr GUID GeneratedProfilesTerminalNamespace = {0x2bde4a90, 0xd05f, 0x401c, {0x94, 0x92, 0xe4, 0x8, 0x84, 0xea, 0xd1, 0xd8}}; inline auto c_msixPackageFamilyName = L"MicrosoftCorporationII.WindowsSubsystemForLinux_8wekyb3d8bbwe"; -inline auto c_githubUrlOverrideRegistryValue = L"GithubUrlOverride"; +inline auto c_githubUrlOverrideRegistryValue = L"GitHubUrlOverride"; inline auto c_vhdFileExtension = L".vhd"; inline auto c_vhdxFileExtension = L".vhdx"; -struct GithubReleaseAsset +struct GitHubReleaseAsset { std::wstring url; uint64_t id{}; std::wstring name; - NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GithubReleaseAsset, url, id, name); + NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GitHubReleaseAsset, url, id, name); }; -struct GithubRelease +struct GitHubRelease { std::wstring name; - std::vector assets; + std::vector assets; std::wstring created_at; - NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GithubRelease, name, assets, created_at); + NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GitHubRelease, name, assets, created_at); }; template @@ -98,13 +98,13 @@ DWORD GetDefaultVersion(void); std::wstring GetErrorString(_In_ HRESULT result); -std::optional> GetGithubAssetFromRelease(const GithubRelease& Release); +std::optional> GetGitHubAssetFromRelease(const GitHubRelease& Release); -std::pair GetLatestGithubRelease(_In_ bool preRelease); +std::pair GetLatestGitHubRelease(_In_ bool preRelease); -std::pair GetLatestGithubRelease(_In_ bool preRelease, _In_ LPCWSTR releases); +std::pair GetLatestGitHubRelease(_In_ bool preRelease, _In_ LPCWSTR releases); -GithubRelease GetGithubReleaseByTag(_In_ const std::wstring& Version); +GitHubRelease GetGitHubReleaseByTag(_In_ const std::wstring& Version); int GetLogicalProcessorCount(); diff --git a/src/windows/inc/WmiService.h b/src/windows/inc/WmiService.h index 8c99f6d..1404c35 100644 --- a/src/windows/inc/WmiService.h +++ b/src/windows/inc/WmiService.h @@ -448,7 +448,7 @@ public: } // Invokes an instance method with zero -> 5 arguments from the instantiated IWbemClassObject - // Returns a WmiInstace containing the [out] parameters from the method call + // Returns a WmiInstance containing the [out] parameters from the method call // (the property "ReturnValue" contains the return value) WmiInstance execute_method(PCWSTR method) { @@ -468,11 +468,11 @@ public: // Instantiate a class object to iterate through each property const WmiClassObject propertyObject(m_wbemServices, inParamsDefinition); - auto propertyItererator = propertyObject.property_begin(); + auto propertyIterator = propertyObject.property_begin(); // write the property WmiInstance propertyclassObject(m_wbemServices, inParamsInstance); - propertyclassObject.set(*propertyItererator, arg1); + propertyclassObject.set(*propertyIterator, arg1); // execute the method with the properties set return execute_method_impl(method, inParamsInstance.get()); @@ -491,13 +491,13 @@ public: // Instantiate a class object to iterate through each property const WmiClassObject propertyObject(m_wbemServices, inParamsDefinition); - auto propertyItererator = propertyObject.property_begin(); + auto propertyIterator = propertyObject.property_begin(); // write each property WmiInstance propertyclassObject(m_wbemServices, inParamsInstance); - propertyclassObject.set(*propertyItererator, arg1); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg2); + propertyclassObject.set(*propertyIterator, arg1); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg2); // execute the method with the properties set return execute_method_impl(method, inParamsInstance.get()); @@ -516,15 +516,15 @@ public: // Instantiate a class object to iterate through each property const WmiClassObject propertyObject(m_wbemServices, inParamsDefinition); - auto propertyItererator = propertyObject.property_begin(); + auto propertyIterator = propertyObject.property_begin(); // write each property WmiInstance propertyclassObject(m_wbemServices, inParamsInstance); - propertyclassObject.set(*propertyItererator, arg1); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg2); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg3); + propertyclassObject.set(*propertyIterator, arg1); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg2); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg3); // execute the method with the properties set return execute_method_impl(method, inParamsInstance.get()); @@ -543,17 +543,17 @@ public: // Instantiate a class object to iterate through each property const WmiClassObject propertyObject(m_wbemServices, inParamsDefinition); - auto propertyItererator = propertyObject.property_begin(); + auto propertyIterator = propertyObject.property_begin(); // write each property WmiInstance propertyclassObject(m_wbemServices, inParamsInstance); - propertyclassObject.set(*propertyItererator, arg1); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg2); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg3); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg4); + propertyclassObject.set(*propertyIterator, arg1); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg2); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg3); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg4); // execute the method with the properties set return execute_method_impl(method, inParamsInstance.get()); @@ -572,20 +572,20 @@ public: // Instantiate a class object to iterate through each property const WmiClassObject propertyObject(m_wbemServices, inParamsDefinition); - auto propertyItererator = propertyObject.property_begin(); + auto propertyIterator = propertyObject.property_begin(); // write each property // WmiInstance propertyclassObject(m_wbemServices, inParamsInstance); - propertyclassObject.set(*propertyItererator, arg1); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg2); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg3); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg4); - ++propertyItererator; - propertyclassObject.set(*propertyItererator, arg5); + propertyclassObject.set(*propertyIterator, arg1); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg2); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg3); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg4); + ++propertyIterator; + propertyclassObject.set(*propertyIterator, arg5); // execute the method with the properties set return execute_method_impl(method, inParamsInstance.get()); @@ -807,7 +807,7 @@ public: private: WmiService m_wbemServices; - // Marking wbemEnumerator mutabale to allow for const correctness of begin() and end() + // Marking wbemEnumerator mutable to allow for const correctness of begin() and end() // specifically, invoking Reset() is an implementation detail and should not affect external contracts mutable wil::com_ptr m_wbemEnumerator; }; diff --git a/src/windows/inc/WmiVariant.h b/src/windows/inc/WmiVariant.h index c89e3d2..441198a 100644 --- a/src/windows/inc/WmiVariant.h +++ b/src/windows/inc/WmiVariant.h @@ -479,7 +479,7 @@ inline bool WmiReadFromVariant(_In_ const VARIANT* variant, _Inout_ std::vector< inline wil::unique_variant WmiMakeVariant(const std::vector& data) { - // WMI marshaler complaines type mismatch using VT_UI2 | VT_ARRAY, and VT_I4 | VT_ARRAY works fine. + // WMI marshaler complains type mismatch using VT_UI2 | VT_ARRAY, and VT_I4 | VT_ARRAY works fine. auto* const tempSafeArray = SafeArrayCreateVector(VT_I4, 0, static_cast(data.size())); THROW_IF_NULL_ALLOC(tempSafeArray); auto guardArray = wil::scope_exit([&]() noexcept { SafeArrayDestroy(tempSafeArray); }); @@ -506,7 +506,7 @@ inline wil::unique_variant WmiMakeVariant(const std::vector& dat inline bool WmiReadFromVariant(_In_ const VARIANT* variant, _Inout_ std::vector* value) { - // WMI marshaler complaines type mismatch using VT_UI2 | VT_ARRAY, and VT_I4 | VT_ARRAY works fine. + // WMI marshaler complains type mismatch using VT_UI2 | VT_ARRAY, and VT_I4 | VT_ARRAY works fine. if (IsVariantEmptyOrNull(variant)) { return false; diff --git a/src/windows/inc/WslCoreConfigInterface.h b/src/windows/inc/WslCoreConfigInterface.h index cd5a267..e126c4d 100644 --- a/src/windows/inc/WslCoreConfigInterface.h +++ b/src/windows/inc/WslCoreConfigInterface.h @@ -34,7 +34,7 @@ enum WslConfigEntry AutoProxyEnabled, InitialAutoProxyTimeout, DNSProxyEnabled, - DNSTunellingEnabled, + DNSTunnelingEnabled, BestEffortDNSParsingEnabled, AutoMemoryReclaim, GUIApplicationsEnabled, diff --git a/src/windows/inc/WslPluginApi.h b/src/windows/inc/WslPluginApi.h index 7b32b09..373579f 100644 --- a/src/windows/inc/WslPluginApi.h +++ b/src/windows/inc/WslPluginApi.h @@ -67,7 +67,7 @@ struct WSLSessionInformation struct WSLDistributionInformation { - GUID Id; // Distribution ID, guaranteed to be the same accross reboots + GUID Id; // Distribution ID, guaranteed to be the same across reboots LPCWSTR Name; uint64_t PidNamespace; LPCWSTR PackageFamilyName; // Package family name, or NULL if none @@ -78,7 +78,7 @@ struct WSLDistributionInformation struct WslOfflineDistributionInformation { - GUID Id; // Distribution ID, guaranteed to be the same accross reboots + GUID Id; // Distribution ID, guaranteed to be the same across reboots LPCWSTR Name; LPCWSTR PackageFamilyName; // Package family name, or NULL if none LPCWSTR Flavor; // Type of distribution (ubuntu, debian, ...). Introduced in 2.4.4 @@ -120,7 +120,7 @@ typedef HRESULT (*WSLPluginAPI_OnDistributionStarted)(const struct WSLSessionInf // In this case, it's possible for this notification to be called multiple times for the same distribution. typedef HRESULT (*WSLPluginAPI_OnDistributionStopping)(const struct WSLSessionInformation* Session, const struct WSLDistributionInformation* Distribution); -// Called when a distribution is registered or unregisteed. +// Called when a distribution is registered or unregistered. // Returning failure will NOT cause the operation to fail. typedef HRESULT (*WSLPluginAPI_OnDistributionRegistered)(const struct WSLSessionInformation* Session, const struct WslOfflineDistributionInformation* Distribution); diff --git a/src/windows/inc/comservicehelper.h b/src/windows/inc/comservicehelper.h index 05755cb..9c412db 100644 --- a/src/windows/inc/comservicehelper.h +++ b/src/windows/inc/comservicehelper.h @@ -59,7 +59,7 @@ namespace Windows { namespace Internal { } else { - // Otherwise take a reference on the MTA apartment. + // Otherwise, take a reference on the MTA apartment. m_hrMtaInitialized = CoIncrementMTAUsage(&m_mtaUsageCookie); } RETURN_IF_FAILED(m_hrMtaInitialized); @@ -277,7 +277,7 @@ namespace Windows { namespace Internal { RETURN_IF_WIN32_BOOL_FALSE(MakeAbsoluteSD( pSDRelative, pSDAbsolute, &cbSDAbsolute, pDacl, &cbDacl, pSacl, &cbSacl, pOwner, &cbOwner, pPrimaryGroup, &cbPrimaryGroup)); - // ...and now we can call CoInitializeSecuirity + // ...and now we can call CoInitializeSecurity RETURN_IF_FAILED(CoInitializeSecurity( pSDAbsolute, -1, nullptr, nullptr, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IDENTIFY, NULL, EOAC_NONE, nullptr)); @@ -296,7 +296,7 @@ namespace Windows { namespace Internal { // COM callback object to support unloading shared-process services Microsoft::WRL::ComPtr m_icc; - // COM Server descritptor + // COM Server descriptor ServerDescriptor m_serverDescriptor{}; }; @@ -644,7 +644,7 @@ namespace Windows { namespace Internal { // control codes to the service. // // We stop asynchronously to have the same codepath as system - // stop requestes. + // stop requests. // reinterpret_cast(this)->OnSystemShutdown(); StopAsync(); diff --git a/src/windows/inc/wslversioninfo.h b/src/windows/inc/wslversioninfo.h index 78881f0..cb6b6f3 100644 --- a/src/windows/inc/wslversioninfo.h +++ b/src/windows/inc/wslversioninfo.h @@ -8,7 +8,7 @@ Module Name: Abstract: - This file contains version definitions for WSL binairies. + This file contains version definitions for WSL binaries. --*/ diff --git a/src/windows/libwsl/WslCoreConfigInterface.cpp b/src/windows/libwsl/WslCoreConfigInterface.cpp index 0db1bff..bdb2f33 100644 --- a/src/windows/libwsl/WslCoreConfigInterface.cpp +++ b/src/windows/libwsl/WslCoreConfigInterface.cpp @@ -113,7 +113,7 @@ WslConfigSetting GetWslConfigSetting(WslConfig_t wslConfig, WslConfigEntry wslCo case IgnoredPorts: { // The IgnoredPorts member is stored as a set of 16-bit unsigned integers. - // These are convereted back to a string here for the caller to consume. + // These are converted back to a string here for the caller to consume. wslConfig->IgnoredPortsStr.clear(); std::vector ignoredPorts{wslConfig->Config.IgnoredPorts.begin(), wslConfig->Config.IgnoredPorts.end()}; std::sort(ignoredPorts.begin(), ignoredPorts.end()); @@ -144,7 +144,7 @@ WslConfigSetting GetWslConfigSetting(WslConfig_t wslConfig, WslConfigEntry wslCo static_assert(std::is_sameConfig.EnableDnsProxy)>::value); wslConfigSetting.BoolValue = wslConfig->Config.EnableDnsProxy; break; - case DNSTunellingEnabled: + case DNSTunnelingEnabled: static_assert(std::is_sameConfig.EnableDnsTunneling)>::value); wslConfigSetting.BoolValue = wslConfig->Config.EnableDnsTunneling; break; @@ -451,7 +451,7 @@ unsigned long SetWslConfigSetting(WslConfig_t wslConfig, WslConfigSetting wslCon case DNSProxyEnabled: return SetWslConfigSetting( wslConfig, ConfigSetting::DnsProxy, defaultConfig.EnableDnsProxy, wslConfigSetting.BoolValue, wslConfig->Config.EnableDnsProxy); - case DNSTunellingEnabled: + case DNSTunnelingEnabled: { static_assert(std::is_sameConfig.EnableDnsTunneling)>::value); ConfigKey key({ConfigSetting::DnsTunneling, ConfigSetting::Experimental::DnsTunneling}, wslConfigSetting.BoolValue); diff --git a/src/windows/service/exe/DistributionRegistration.h b/src/windows/service/exe/DistributionRegistration.h index 6787a73..61fc161 100644 --- a/src/windows/service/exe/DistributionRegistration.h +++ b/src/windows/service/exe/DistributionRegistration.h @@ -105,7 +105,7 @@ namespace Property { inline DistributionPropertyWithDefault RunOOBE{L"RunOOBE", 0}; inline DistributionPropertyWithDefault Modern{L"Modern", 0}; - inline DistributionPropertyWithDefault> DefaultEnvironmnent{ + inline DistributionPropertyWithDefault> DefaultEnvironment{ L"DefaultEnvironment", {"HOSTTYPE=x86_64", "LANG=en_US.UTF-8", diff --git a/src/windows/service/exe/DnsResolver.cpp b/src/windows/service/exe/DnsResolver.cpp index fde74c8..090e9b4 100644 --- a/src/windows/service/exe/DnsResolver.cpp +++ b/src/windows/service/exe/DnsResolver.cpp @@ -179,7 +179,7 @@ try m_dnsChannel.Stop(); - // Stop interface change notificaions + // Stop interface change notifications m_interfaceNotificationHandle.reset(); GenerateTelemetry(); diff --git a/src/windows/service/exe/LxssCreateProcess.cpp b/src/windows/service/exe/LxssCreateProcess.cpp index e96db74..e5f5037 100644 --- a/src/windows/service/exe/LxssCreateProcess.cpp +++ b/src/windows/service/exe/LxssCreateProcess.cpp @@ -104,7 +104,7 @@ CreateLxProcessData LxssCreateProcess::ParseArguments( return Parsed; } -// static function defintions +// static function definitions std::vector LxssCreateProcess::CreateMessage(_In_ LX_MESSAGE_TYPE MessageType, _In_ const CreateLxProcessData& CreateProcessData, _In_ ULONG DefaultUid) { // @@ -226,7 +226,7 @@ std::vector LxssCreateProcess::CreateMessage(_In_ LX_MESSAGE_TYPE Mes Common->CurrentWorkingDirectoryOffset = wsl::shared::string::CopyToSpan(CreateProcessData.CurrentWorkingDirectory, CommonSpan, Offset); // - // Populate the CommmandLine strings. + // Populate the CommandLine strings. // WI_ASSERT(CreateProcessData.CommandLine.size() <= USHORT_MAX); diff --git a/src/windows/service/exe/LxssHttpProxy.cpp b/src/windows/service/exe/LxssHttpProxy.cpp index 644dda9..6842541 100644 --- a/src/windows/service/exe/LxssHttpProxy.cpp +++ b/src/windows/service/exe/LxssHttpProxy.cpp @@ -266,7 +266,7 @@ try else { // note that the DropReason is not included in AreProxyStringsIdentical as we don't want to toast if that is only change, - // but we still want to make sure the drop reason is updated, otherwise we risk not reporting the correct drop reason to user + // but we still want to make sure the drop reason is updated; otherwise, we risk not reporting the correct drop reason to user if (newProxySettings.UnsupportedProxyDropReason != m_proxySettings->UnsupportedProxyDropReason) { m_proxySettings->UnsupportedProxyDropReason = newProxySettings.UnsupportedProxyDropReason; @@ -552,7 +552,7 @@ std::optional HttpProxyStateTracker::WaitForInitialProxySetti void HttpProxyStateTracker::ConfigureNetworkingMode(wsl::core::NetworkingMode mode) noexcept { auto lock = m_proxySettingsLock.lock(); - // if we fallback to NAT mode need to strip bad settings + // if we fall back to NAT mode need to strip bad settings if (m_proxySettings.has_value() && mode != m_networkMode) { FilterProxySettingsByNetworkConfiguration(m_proxySettings.value(), mode); diff --git a/src/windows/service/exe/LxssHttpProxy.h b/src/windows/service/exe/LxssHttpProxy.h index 4ef6baf..7f65bf8 100644 --- a/src/windows/service/exe/LxssHttpProxy.h +++ b/src/windows/service/exe/LxssHttpProxy.h @@ -138,7 +138,7 @@ public: /// /// If no proxy queries have completed, wait for timeout for result. - /// Otherwise return the proxy settings. + /// Otherwise, return the proxy settings. /// std::optional WaitForInitialProxySettings(); @@ -199,7 +199,7 @@ private: QueryState m_queryState{QueryState::NoQuery}; /// - /// Used to impersonate user, as it is required for the proxy queries to run as the user, otherwise the results will be incorrect. + /// Used to impersonate user, as it is required for the proxy queries to run as the user; otherwise, the results will be incorrect. /// wil::unique_handle m_userToken{}; diff --git a/src/windows/service/exe/LxssInstance.cpp b/src/windows/service/exe/LxssInstance.cpp index 2eea969..3c6cc98 100644 --- a/src/windows/service/exe/LxssInstance.cpp +++ b/src/windows/service/exe/LxssInstance.cpp @@ -442,7 +442,7 @@ void LxssInstance::_ConfigureFilesystem(_In_ ULONG Flags) // Part of this process will try to upgrade existing LxFs folders to // enable the per-directory case sensitivity flag. To allow easy detection // of already processed folders, and resumption in case the process is - // interrupted, directories are only marked case sensitive after their + // interrupted, directories are only marked case-sensitive after their // children are processed. // // Paths for LXSS instances look like so: @@ -474,7 +474,7 @@ void LxssInstance::_ConfigureFilesystem(_In_ ULONG Flags) ensureDirectoryWithAttributes(LXSS_ROOTFS_DIRECTORY, LXSS_ROOTFS_PERMISSIONS); // If this is the legacy distribution, ensure that the additional LxFs - // directories exist and have the correct attributes. Otherwise ensure that + // directories exist and have the correct attributes. Otherwise, ensure that // the rootfs/mnt directory exists for DrvFs mounts. switch (m_configuration.Version) { diff --git a/src/windows/service/exe/LxssInstance.h b/src/windows/service/exe/LxssInstance.h index b3843e4..0301d16 100644 --- a/src/windows/service/exe/LxssInstance.h +++ b/src/windows/service/exe/LxssInstance.h @@ -112,7 +112,7 @@ public: /// /// Registers connection targets with the Plan 9 Redirector for the calling user, if they're - /// not already regsistered. + /// not already registered. /// void RegisterPlan9ConnectionTarget(_In_ HANDLE userToken) override; diff --git a/src/windows/service/exe/LxssIpTables.h b/src/windows/service/exe/LxssIpTables.h index 7c97f76..fca26e3 100644 --- a/src/windows/service/exe/LxssIpTables.h +++ b/src/windows/service/exe/LxssIpTables.h @@ -118,7 +118,7 @@ class LxssNetworkingFirewallPort; class LxssNetworkingNat; /// -/// Emulate iptables functionailty. +/// Emulate iptables functionality. /// class LxssIpTables { @@ -298,7 +298,7 @@ public: LxssNetworkingFirewallPort(const std::shared_ptr& Firewall, const Microsoft::WRL::ComPtr& Existing); /// - /// Desstructor. + /// Destructor. /// ~LxssNetworkingFirewallPort(); diff --git a/src/windows/service/exe/LxssUserCallback.cpp b/src/windows/service/exe/LxssUserCallback.cpp index 06248e9..6585031 100644 --- a/src/windows/service/exe/LxssUserCallback.cpp +++ b/src/windows/service/exe/LxssUserCallback.cpp @@ -27,7 +27,7 @@ LxssUserCallback::LxssUserCallback(_In_ HANDLE Handle, _In_ LXBUS_USER_CALLBACK_ // Allocate a buffer of the requested size. m_buffer.resize(OutputBufferSize); - // Setup the threapool wait callback. + // Set up the threadpool wait callback. PTP_WAIT_CALLBACK ThreadpoolCallback; ThreadpoolCallback = reinterpret_cast(&ThreadpoolCallbackProxy); diff --git a/src/windows/service/exe/LxssUserCallback.h b/src/windows/service/exe/LxssUserCallback.h index b608ac7..0d25d66 100644 --- a/src/windows/service/exe/LxssUserCallback.h +++ b/src/windows/service/exe/LxssUserCallback.h @@ -109,7 +109,7 @@ private: // N.B. Keep this as the last member so that it is the first to be // destructed. This will ensure that if the threadpool callback // races with instance destruction, all of the fields will be valid. - // At completion of this member's destruction, any oustanding + // At completion of this member's destruction, any outstanding // threadpool thread should have completed and the callback // will have been unregistered. wil::unique_threadpool_wait m_threadpoolWait; diff --git a/src/windows/service/exe/LxssUserSession.cpp b/src/windows/service/exe/LxssUserSession.cpp index 4de6ce8..5ccb147 100644 --- a/src/windows/service/exe/LxssUserSession.cpp +++ b/src/windows/service/exe/LxssUserSession.cpp @@ -719,7 +719,7 @@ try E_INVALIDARG, ((DefaultUid == LX_UID_INVALID) || (Flags != LXSS_DISTRO_FLAGS_UNCHANGED && WI_IsAnyFlagSet(Flags, ~LXSS_DISTRO_FLAGS_ALL)))); - // If the configuration is changed, terminate the distribuiton so the new settings will take effect. + // If the configuration is changed, terminate the distribution so the new settings will take effect. bool modified = false; if (DefaultUid != distribution.Read(Property::DefaultUid)) { @@ -946,7 +946,7 @@ HRESULT LxssUserSessionImpl::MoveDistribution(_In_ LPCGUID DistroGuid, _In_ LPCW THROW_IF_WIN32_BOOL_FALSE(MoveFileEx( newVhdPath.c_str(), distro.VhdFilePath.c_str(), MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH)); - // Write the location back to the original path in case the second registry write failed. Otherwise this is a no-op. + // Write the location back to the original path in case the second registry write failed. Otherwise, this is a no-op. registration.Write(Property::BasePath, distro.BasePath.c_str()); }); @@ -1186,7 +1186,7 @@ try *Version = configuration.Version; *DefaultUid = registration.Read(Property::DefaultUid); *Flags = configuration.Flags; - const auto defaultEnvironment = registration.Read(Property::DefaultEnvironmnent); + const auto defaultEnvironment = registration.Read(Property::DefaultEnvironment); *DefaultEnvironmentCount = gsl::narrow_cast(defaultEnvironment.size()); auto environment(wil::make_unique_cotaskmem(defaultEnvironment.size())); for (size_t index = 0; index < defaultEnvironment.size(); index += 1) @@ -1379,12 +1379,12 @@ HRESULT LxssUserSessionImpl::RegisterDistribution( // Determine the filesystem version. If WslFs is not enabled, downgrade // the version. - ULONG FilesytemVersion = LXSS_DISTRO_VERSION_CURRENT; + ULONG FilesystemVersion = LXSS_DISTRO_VERSION_CURRENT; if (wsl::windows::common::registry::ReadDword(lxssKey.get(), nullptr, WSL_NEW_DISTRO_LXFS, 0) != 0) { - if (LXSS_DISTRO_USES_WSL_FS(FilesytemVersion) != FALSE) + if (LXSS_DISTRO_USES_WSL_FS(FilesystemVersion) != FALSE) { - FilesytemVersion = LXSS_DISTRO_VERSION_1; + FilesystemVersion = LXSS_DISTRO_VERSION_1; } } @@ -1452,7 +1452,7 @@ HRESULT LxssUserSessionImpl::RegisterDistribution( lxssKey.get(), DistributionId, DistributionName, - FilesytemVersion, + FilesystemVersion, distributionPath.c_str(), flags, LX_UID_ROOT, @@ -1571,7 +1571,7 @@ HRESULT LxssUserSessionImpl::RegisterDistribution( THROW_HR_IF(WSL_E_IMPORT_FAILED, exitStatus != 0); } - // Invoke the init binary with the option to export the distribuiton information via stdout. + // Invoke the init binary with the option to export the distribution information via stdout. { std::pair input; THROW_IF_WIN32_BOOL_FALSE(CreatePipe(&input.first, &input.second, nullptr, 0)); @@ -1929,7 +1929,7 @@ HRESULT LxssUserSessionImpl::SetVersion(_In_ LPCGUID DistroGuid, _In_ ULONG Vers commandLine += " -v"; } - // Run the bsdtar elf binary expand the the tar file using the socket as stdin. + // Run the bsdtar elf binary expand the tar file using the socket as stdin. commandLine += " -C " LXSS_ROOTFS_MOUNT LXSS_BSDTAR_EXTRACT_ARGS; auto elfContext = _RunElfBinary( commandLine.c_str(), @@ -2097,7 +2097,7 @@ HRESULT LxssUserSessionImpl::Shutdown(_In_ bool PreventNewInstances, bool ForceT WI_ASSERT(!PreventNewInstances || !m_disableNewInstanceCreation); // This is used when the session is being deleted. - // This is in place to prevent a CreateInstace() call from succeeding + // This is in place to prevent a CreateInstance() call from succeeding // after the session is shut down since this would mean that the destructor, // which could run on that thread (if the session already dropped its LxssUserSessionImpl reference) // would have to do all the cleanup work. @@ -2566,7 +2566,7 @@ std::shared_ptr LxssUserSessionImpl::_CreateInstance(_In_op if (instance->GetIdleTimeout() >= 0) { // Register a client termination callback with the lifetime manager. If the - // ignore client callback flag is specifed and there are no other clients, + // ignore client callback flag is specified and there are no other clients, // the timer is immediately queued. wil::unique_handle currentProcess{}; if (WI_IsFlagClear(Flags, LXSS_CREATE_INSTANCE_FLAGS_IGNORE_CLIENT)) @@ -2766,7 +2766,7 @@ void LxssUserSessionImpl::_CreateVm() m_vmId.store(vmId); - // Create the utiliy VM and register for callbacks. + // Create the utility VM and register for callbacks. m_utilityVm = WslCoreVm::Create(m_userToken, std::move(config), vmId); m_utilityVm->GetRuntimeId(); @@ -3661,8 +3661,8 @@ bool LxssUserSessionImpl::_ValidateDistro(_In_ HKEY LxssKey, _In_ LPCGUID Distro void LxssUserSessionImpl::_ValidateDistributionNameAndPathNotInUse( _In_ HKEY LxssKey, _In_opt_ LPCWSTR Path, _In_opt_ LPCWSTR Name, const std::optional& Exclude) { - // Use the cannonical path to compare distribution registration paths. - // The cannonical path allows us to compare paths regardless of symlinks. + // Use the canonical path to compare distribution registration paths. + // The canonical path allows us to compare paths regardless of symlinks. // // Even with this, it's theoretically possible to use different drive mounts to have two paths // that will point to the same underlying folder. To catch this, we'd need to use BY_HANDLE_FILE_INFORMATION and compare file & volume indexes. @@ -3939,12 +3939,12 @@ CreateLxProcessContext LxssUserSessionImpl::s_GetCreateProcessContext(_In_ const const auto registration = DistributionRegistration::Open(lxssKey.get(), DistroGuid); context.Flags = registration.Read(Property::Flags); - context.DefaultEnvironment = registration.Read(Property::DefaultEnvironmnent); + context.DefaultEnvironment = registration.Read(Property::DefaultEnvironment); } else { context.Flags = DistributionRegistration::ApplyGlobalFlagsOverride(LXSS_DISTRO_FLAGS_DEFAULT | LXSS_DISTRO_FLAGS_VM_MODE); - context.DefaultEnvironment = Property::DefaultEnvironmnent.DefaultValue; + context.DefaultEnvironment = Property::DefaultEnvironment.DefaultValue; } context.UserToken = wsl::windows::common::security::GetUserToken(TokenImpersonation); diff --git a/src/windows/service/exe/LxssUserSession.h b/src/windows/service/exe/LxssUserSession.h index e069dc3..9a08591 100644 --- a/src/windows/service/exe/LxssUserSession.h +++ b/src/windows/service/exe/LxssUserSession.h @@ -199,12 +199,12 @@ public: IFACEMETHOD(SetVersion)(_In_ LPCGUID DistroGuid, _In_ ULONG Version, _In_ HANDLE StdErrHandle, _Out_ LXSS_ERROR_INFO* Error) override; /// - /// Passtrough a disk to the utility VM. + /// Pass through a disk to the utility VM. /// IFACEMETHOD(AttachDisk)(_In_ LPCWSTR Disk, _In_ ULONG Flags, _Out_ LXSS_ERROR_INFO* Error) override; /// - /// Detach a passtrough disk from the utility VM. + /// Detach a passthrough disk from the utility VM. /// IFACEMETHOD(DetachDisk)(_In_ LPCWSTR Disk, _Out_ int* Result, _Out_ int* Step, _Out_ LXSS_ERROR_INFO* Error) override; @@ -479,12 +479,12 @@ public: SetVersion(_In_ LPCGUID DistroGuid, _In_ ULONG Version, _In_ HANDLE StdErrHandle); /// - /// Passtrough a disk to the utility VM. + /// Pass through a disk to the utility VM. /// HRESULT AttachDisk(_In_ LPCWSTR Disk, _In_ ULONG Flags); /// - /// Detach a passtrough a disk from the utility VM. + /// Detach a passthrough a disk from the utility VM. /// HRESULT DetachDisk(_In_ LPCWSTR Disk, _Out_ int* Result, _Out_ int* Step); @@ -755,7 +755,7 @@ private: static wil::unique_hkey s_OpenLxssUserKey(); /// - /// Ensures the distribuiton name is valid. + /// Ensures the distribution name is valid. /// static void s_ValidateDistroName(_In_ LPCWSTR Name); diff --git a/src/windows/service/exe/LxssUserSessionFactory.cpp b/src/windows/service/exe/LxssUserSessionFactory.cpp index a9878b9..dc8131c 100644 --- a/src/windows/service/exe/LxssUserSessionFactory.cpp +++ b/src/windows/service/exe/LxssUserSessionFactory.cpp @@ -67,7 +67,7 @@ void ClearSessionsAndBlockNewInstances() auto sessionsLock = g_sessionLock.lock_exclusive(); sessions = std::move(g_sessions); - // This is required because the moved-from std::optional isn't made empty, so this needs to be done explicitely. + // This is required because the moved-from std::optional isn't made empty, so this needs to be done explicitly. g_sessions.reset(); } diff --git a/src/windows/service/exe/NatNetworking.cpp b/src/windows/service/exe/NatNetworking.cpp index 89c1ba4..b7dd080 100644 --- a/src/windows/service/exe/NatNetworking.cpp +++ b/src/windows/service/exe/NatNetworking.cpp @@ -21,8 +21,8 @@ using wsl::windows::common::hcs::unique_hcn_endpoint; // This static list is used to keep of which endpoints are in use by other users. // It's needed because when we see an endpoint with the same ip address we want, -// we have no way to differenciate between an endpoint that we previously used -// that didn't get deleted, and an endpoint acitvely in use by another user. +// we have no way to differentiate between an endpoint that we previously used +// that didn't get deleted, and an endpoint actively in use by another user. static wil::srwlock g_endpointsInUseLock; static std::vector g_endpointsInUse; diff --git a/src/windows/service/exe/RingBuffer.cpp b/src/windows/service/exe/RingBuffer.cpp index 1723fbc..b13b058 100644 --- a/src/windows/service/exe/RingBuffer.cpp +++ b/src/windows/service/exe/RingBuffer.cpp @@ -101,7 +101,7 @@ std::vector RingBuffer::GetLastDelimitedStrings(char Delimiter, siz { if (!partial.empty()) { - // The debug CRT will fasttail if begin[size] is accessed + // The debug CRT will fastfail if begin[size] is accessed // But in this case it's not a problem because begin.size() - i would be == 0 std::string partial_begin{&begin.data()[i], begin.size() - i}; results.emplace(results.begin(), partial_begin + partial); diff --git a/src/windows/service/exe/ServiceMain.cpp b/src/windows/service/exe/ServiceMain.cpp index c5fa796..915fcd7 100644 --- a/src/windows/service/exe/ServiceMain.cpp +++ b/src/windows/service/exe/ServiceMain.cpp @@ -253,7 +253,7 @@ void WslService::ServiceStopped() // Tear down telemetry. WslTraceLoggingUninitialize(); - // unitialize COM. This must be done here because this call can cause cleanups that will be fail + // uninitialize COM. This must be done here because this call can cause cleanups that will be fail // if the CRT is shutting down. m_coInit.reset(); } @@ -285,7 +285,7 @@ CATCH_LOG() void WslService::CheckForUpdates(_Inout_ PTP_CALLBACK_INSTANCE, _Inout_ PVOID Context, _Inout_ PTP_TIMER) try { - auto [version, _] = GetLatestGithubRelease(false); + auto [version, _] = GetLatestGitHubRelease(false); if (ParseWslPackageVersion(version) > ParseWslPackageVersion(TEXT(WSL_PACKAGE_VERSION))) { WSL_LOG("WSL Package update is available", TraceLoggingLevel(WINEVENT_LEVEL_INFO)); @@ -294,7 +294,7 @@ try SetThreadpoolTimer(static_cast(Context)->m_updateCheckTimer.get(), nullptr, 0, 0); // Get current release date - std::wstring currentReleaseCreatedAtDate = GetGithubReleaseByTag(TEXT(WSL_PACKAGE_VERSION)).created_at; + std::wstring currentReleaseCreatedAtDate = GetGitHubReleaseByTag(TEXT(WSL_PACKAGE_VERSION)).created_at; std::tm tm = {}; std::wstring dateTimeFormat = L"%Y-%m-%dT%H:%M:%SZ"; diff --git a/src/windows/service/exe/WslCoreGuestNetworkService.cpp b/src/windows/service/exe/WslCoreGuestNetworkService.cpp index 01bda78..06eb678 100644 --- a/src/windows/service/exe/WslCoreGuestNetworkService.cpp +++ b/src/windows/service/exe/WslCoreGuestNetworkService.cpp @@ -109,7 +109,7 @@ std::pair wsl::core::networking::GuestNetworkService::Alloca } }); - // N.B. Use an odd number of ports to avoid Linux kernel warning about prefering different parity for start / end values. + // N.B. Use an odd number of ports to avoid Linux kernel warning about preferring different parity for start / end values. static constexpr auto c_ephemeralPortRangeSize = 4095; THROW_IF_FAILED(m_allocatePortRange.value()(m_service.get(), c_ephemeralPortRangeSize, &m_reservedPortRange, &port)); diff --git a/src/windows/service/exe/WslCoreHostDnsInfo.cpp b/src/windows/service/exe/WslCoreHostDnsInfo.cpp index bed9a94..cdc094c 100644 --- a/src/windows/service/exe/WslCoreHostDnsInfo.cpp +++ b/src/windows/service/exe/WslCoreHostDnsInfo.cpp @@ -306,7 +306,7 @@ wsl::core::networking::DnsInfo wsl::core::networking::HostDnsInfo::GetDnsSetting } } - // Give precedence to interfaces that have IPv4 DNS servers, otherwise give precedence to the lower interface index. + // Give precedence to interfaces that have IPv4 DNS servers; otherwise, give precedence to the lower interface index. return (FirstHasIpv4 ^ SecondHasIpv4) ? FirstHasIpv4 : (First->IfIndex < Second->IfIndex); }); diff --git a/src/windows/service/exe/WslCoreTcpIpStateTracking.cpp b/src/windows/service/exe/WslCoreTcpIpStateTracking.cpp index 5b4c4c2..7809ef6 100644 --- a/src/windows/service/exe/WslCoreTcpIpStateTracking.cpp +++ b/src/windows/service/exe/WslCoreTcpIpStateTracking.cpp @@ -86,7 +86,7 @@ try else { WSL_LOG( - "IpStateTracking::SyncFirewallState - FirewallTrackedIpAddresses is syncd with the preferredNetwork", + "IpStateTracking::SyncFirewallState - FirewallTrackedIpAddresses is synced with the preferredNetwork", TraceLoggingValue(FirewallTrackedIpAddresses.size(), "FirewallTrackedIpAddresses.size")); } } diff --git a/src/windows/service/exe/WslCoreVm.cpp b/src/windows/service/exe/WslCoreVm.cpp index 40f46f6..e2f47dd 100644 --- a/src/windows/service/exe/WslCoreVm.cpp +++ b/src/windows/service/exe/WslCoreVm.cpp @@ -203,7 +203,7 @@ void WslCoreVm::Initialize(const GUID& VmId, const wil::shared_handle& UserToken } CATCH_LOG(); - // If a private kernel was not speicifed, use the default. + // If a private kernel was not specified, use the default. m_defaultKernel = m_vmConfig.KernelPath.empty(); if (m_defaultKernel) { @@ -1144,7 +1144,7 @@ ULONG WslCoreVm::AttachDiskLockHeld( { if (found != m_attachedDisks.end()) { - // Prevent user from launching a distro vhd after manually mounting it, otherwise return the LUN of the mounted disk. + // Prevent user from launching a distro vhd after manually mounting it; otherwise, return the LUN of the mounted disk. THROW_HR_IF(WSL_E_USER_VHD_ALREADY_ATTACHED, found->first.User); return found->second.Lun; @@ -2521,7 +2521,7 @@ void WslCoreVm::RegisterCallbacks(_In_ const std::function& DistroE } else { - // The VM has already been terminated, invoke the callback on a seperate thread. + // The VM has already been terminated, invoke the callback on a separate thread. std::thread([terminationCallback = std::move(TerminationCallback), runtimeId = m_runtimeId]() { wsl::windows::common::wslutil::SetThreadDescription(L"TerminationCallback"); terminationCallback(runtimeId); @@ -2962,7 +2962,7 @@ void WslCoreVm::ValidateNetworkingMode() { if (!wsl::core::MirroredNetworking::IsHyperVFirewallSupported(m_vmConfig)) { - // Since hyper-V firewall is enabled by default, only show the warning if the user explicitely asked for it. + // Since hyper-V firewall is enabled by default, only show the warning if the user explicitly asked for it. if (m_vmConfig.FirewallConfigPresence == ConfigKeyPresence::Present) { EMIT_USER_WARNING(Localization::MessageHyperVFirewallNotSupported()); @@ -3001,7 +3001,7 @@ void WslCoreVm::ValidateNetworkingMode() // If DNS tunneling was requested, ensure it is supported by Windows. if (m_vmConfig.EnableDnsTunneling && !IsDnsTunnelingSupported()) { - // Since DNS tunneling is enabled by default, only show the warning if the user explicitely asked for it. + // Since DNS tunneling is enabled by default, only show the warning if the user explicitly asked for it. if (m_vmConfig.DnsTunnelingConfigPresence == ConfigKeyPresence::Present) { EMIT_USER_WARNING(Localization::MessageDnsTunnelingNotSupported()); diff --git a/src/windows/service/exe/WslMirroredNetworking.cpp b/src/windows/service/exe/WslMirroredNetworking.cpp index cf8011c..f7bd0e1 100644 --- a/src/windows/service/exe/WslMirroredNetworking.cpp +++ b/src/windows/service/exe/WslMirroredNetworking.cpp @@ -590,7 +590,7 @@ wsl::core::networking::WslMirroredNetworkManager::WslMirroredNetworkManager( // Subscribe for network change notifications. This is done before // obtaining the initial list of networks to connect to, in order to // avoid a race condition between the initial enumeration and any network - // changes that may be occuring at the same time. The subscription will + // changes that may be occurring at the same time. The subscription will // receive network change events, but will not be able to react to them // the lock is released. m_hcnCallback = windows::common::hcs::RegisterServiceCallback(HcnCallback, this); @@ -1026,7 +1026,7 @@ _Check_return_ bool wsl::core::networking::WslMirroredNetworkManager::SyncIpStat const auto makingIpInterfaceUpdate = endpoint.Network->PendingIPInterfaceUpdate; // Linux may delete routes behind us when making interface, address, and route changes // will track when to refresh v4 and v6 routes to ensure routes are still present after changes - // a few custmomers have seen this when we update temporary v6 addresses, for example + // a few customers have seen this when we update temporary v6 addresses, for example auto refreshAllRoutes = false; // First: update Linux with any interface updates @@ -1237,7 +1237,7 @@ _Check_return_ bool wsl::core::networking::WslMirroredNetworkManager::SyncIpStat { auto trackedAddress = endpoint.StateTracking->IpAddresses.emplace(TrackedIpAddress(hostAddress)).first; // detect if previously sync'd addresses need to be updated - // this addresses issues we've seen where addresses were removed from Linux without our knowlege + // this addresses issues we've seen where addresses were removed from Linux without our knowledge shouldRefreshAllAddresses |= trackedAddress->SyncStatus == PendingAdd || trackedAddress->SyncStatus == PendingUpdate; } @@ -1383,7 +1383,7 @@ _Check_return_ bool wsl::core::networking::WslMirroredNetworkManager::SyncIpStat { const auto trackedRoute = endpoint.StateTracking->Routes.emplace(TrackedRoute(hostRoute)).first; // detect if previously sync'd routes need to be updated - // this addresses issues we've seen where routes were removed from Linux without our knowlege + // this addresses issues we've seen where routes were removed from Linux without our knowledge // and routes couldn't be updated later because required routes, like the prefix route, wasn't there refreshAllRoutes |= trackedRoute->SyncStatus == PendingAdd || trackedRoute->SyncStatus == PendingUpdate; } @@ -1686,7 +1686,7 @@ try // mirroredConnectedInterfaces won't equal m_hostConnectedInterfaces when: // - there are hidden host interfaces // i.e., interfaces are in m_networkEndpoints but not in m_hostConnectedInterfaces - // - when HNS hasn't yet mirrored an connected host interface + // - when HNS hasn't yet mirrored a connected host interface // i.e. interfaces are in m_hostConnectedInterfaces but not in m_networkEndpoints // // if HNS has not yet mirrored a host interface, we should not indicate we are in sync diff --git a/src/windows/service/inc/windowsdefs.idl b/src/windows/service/inc/windowsdefs.idl index febd6aa..3cf5619 100644 --- a/src/windows/service/inc/windowsdefs.idl +++ b/src/windows/service/inc/windowsdefs.idl @@ -86,7 +86,7 @@ interface IVmFiovGuestMemoryFastNotification : IUnknown ] interface ICallingProcessInfo : IUnknown { - HRESULT OpenCallerProcessHandle(DWORD desiredAccess, [out, annotation("_Out_")] HANDLE *callerPocessHandle); + HRESULT OpenCallerProcessHandle(DWORD desiredAccess, [out, annotation("_Out_")] HANDLE *callerProcessHandle); }; [ diff --git a/src/windows/wslhost/main.cpp b/src/windows/wslhost/main.cpp index 6ddbb3b..a5ad0bc 100644 --- a/src/windows/wslhost/main.cpp +++ b/src/windows/wslhost/main.cpp @@ -220,8 +220,8 @@ try // Launch the interop server. // - // See Github #7568. There needs to be a console for interop. - // From Github #8161 we learned we can't be attached to the same + // See GitHub #7568. There needs to be a console for interop. + // From GitHub #8161 we learned we can't be attached to the same // console as wsl.exe. If we are we will be terminated and unable // to serve daemonized processes after the console is closed. wsl::windows::common::helpers::CreateConsole(nullptr); @@ -258,7 +258,7 @@ try { wsl::shared::SocketChannel channel{wil::unique_socket{reinterpret_cast(handle.release())}, "Interop-wslhost"}; - // This is required because there could have been messages beetween the process and wsl.exe, and wslhost has no way to know what the sequence numbers were. + // This is required because there could have been messages between the process and wsl.exe, and wslhost has no way to know what the sequence numbers were. channel.IgnoreSequenceNumbers(); wsl::windows::common::interop::VmModeWorkerThread(channel, vmId, true); diff --git a/src/windows/wslinstall/DllMain.cpp b/src/windows/wslinstall/DllMain.cpp index 6212387..e574606 100644 --- a/src/windows/wslinstall/DllMain.cpp +++ b/src/windows/wslinstall/DllMain.cpp @@ -479,7 +479,7 @@ extern "C" UINT __stdcall CleanMsixState(MSIHANDLE install) /* * Because of a probable bug in MSIX / Packaged COM, it's possible that an old registration is still present on the machine, - * which will break instanciations of LxssUserSessions. + * which will break instantiations of LxssUserSessions. * Because this method executes after all MSIX packages have been removed, we know that this registration shouldn't be there, * so delete it if it still happens to be there. * See: https://github.com/microsoft/WSL/issues/10782 @@ -598,7 +598,7 @@ catch (...) wsl::windows::common::filesystem::TempFile ExtractMsix(MSIHANDLE install) { // N.B. We need to open the database this way instead of calling MsiGetActiveDatabase() because - // this is defered action so we don't have access to the MSI context here. + // this is deferred action so we don't have access to the MSI context here. // The MSIX needs to be extracted like this because in the case of an upgrade this action runs before 'MoveFiles' so the WSL directory isn't available yet. const auto installTarget = GetInstallTarget(install); @@ -699,7 +699,7 @@ try catch (...) { // For convenience, automatically trust the MSIX's certificate if this is NOT an official build and - // the package installation failed because of an unstrusted certificate. + // the package installation failed because of an untrusted certificate. #ifndef WSL_OFFICIAL_BUILD auto error = wil::ResultFromCaughtException(); if (error == CERT_E_UNTRUSTEDROOT) diff --git a/src/windows/wslrelay/localhost.cpp b/src/windows/wslrelay/localhost.cpp index 888290d..d66f5c7 100644 --- a/src/windows/wslrelay/localhost.cpp +++ b/src/windows/wslrelay/localhost.cpp @@ -217,7 +217,7 @@ void wsl::windows::wslrelay::localhost::Relay::StopPortListener(_In_ unsigned sh { try { - // Search through the woker threads and terminate any that match the address family and port. + // Search through the worker threads and terminate any that match the address family and port. auto lock = m_lock.lock_exclusive(); const auto iter = m_RelayThreads.find({Family, Port}); if (iter != m_RelayThreads.end()) diff --git a/src/windows/wslsettings/Helpers/RuntimeHelper.cs b/src/windows/wslsettings/Helpers/RuntimeHelper.cs index e14f67e..5a3592a 100644 --- a/src/windows/wslsettings/Helpers/RuntimeHelper.cs +++ b/src/windows/wslsettings/Helpers/RuntimeHelper.cs @@ -37,7 +37,7 @@ public class RuntimeHelper return openPicker.PickSingleFileAsync(); } - public static void TryMoveFocusPrevousControl(Button? button) + public static void TryMoveFocusPreviousControl(Button? button) { if (button == null) { diff --git a/src/windows/wslsettings/LibWsl.cs b/src/windows/wslsettings/LibWsl.cs index 9905f98..4037772 100644 --- a/src/windows/wslsettings/LibWsl.cs +++ b/src/windows/wslsettings/LibWsl.cs @@ -31,7 +31,7 @@ namespace LibWsl AutoProxyEnabled = 11, InitialAutoProxyTimeout = 12, DNSProxyEnabled = 13, - DNSTunellingEnabled = 14, + DNSTunnelingEnabled = 14, BestEffortDNSParsingEnabled = 15, AutoMemoryReclaim = 16, GUIApplicationsEnabled = 17, diff --git a/src/windows/wslsettings/ViewModels/Settings/NetworkingViewModel.cs b/src/windows/wslsettings/ViewModels/Settings/NetworkingViewModel.cs index 4fbe80d..47df7cf 100644 --- a/src/windows/wslsettings/ViewModels/Settings/NetworkingViewModel.cs +++ b/src/windows/wslsettings/ViewModels/Settings/NetworkingViewModel.cs @@ -54,7 +54,7 @@ public partial class NetworkingViewModel : WslConfigSettingViewModel _autoProxy = wslConfigService.GetWslConfigSetting(WslConfigEntry.AutoProxyEnabled); _initialAutoProxyTimeout = wslConfigService.GetWslConfigSetting(WslConfigEntry.InitialAutoProxyTimeout); _dNSProxy = wslConfigService.GetWslConfigSetting(WslConfigEntry.DNSProxyEnabled); - _dNSTunneling = wslConfigService.GetWslConfigSetting(WslConfigEntry.DNSTunellingEnabled); + _dNSTunneling = wslConfigService.GetWslConfigSetting(WslConfigEntry.DNSTunnelingEnabled); _bestEffortDNS = wslConfigService.GetWslConfigSetting(WslConfigEntry.BestEffortDNSParsingEnabled); string defaultIgnoredPorts = wslConfigService.GetWslConfigSetting(WslConfigEntry.IgnoredPorts, true).StringValue; diff --git a/src/windows/wslsettings/ViewModels/Settings/WslConfigSettingViewModel.cs b/src/windows/wslsettings/ViewModels/Settings/WslConfigSettingViewModel.cs index 34bdb0e..be902f8 100644 --- a/src/windows/wslsettings/ViewModels/Settings/WslConfigSettingViewModel.cs +++ b/src/windows/wslsettings/ViewModels/Settings/WslConfigSettingViewModel.cs @@ -32,7 +32,7 @@ namespace WslSettings.ViewModels.Settings { if (newValue == null || !regex.IsMatch(newValue)) { - // Notify the property so it can revert back to its' previous value. + // Notify the property so it can revert back to its previous value. OnPropertyChanged(propertyName); return false; } diff --git a/src/windows/wslsettings/Views/Settings/FileSystemPage.xaml.cs b/src/windows/wslsettings/Views/Settings/FileSystemPage.xaml.cs index aef6d1f..1f93c8a 100644 --- a/src/windows/wslsettings/Views/Settings/FileSystemPage.xaml.cs +++ b/src/windows/wslsettings/Views/Settings/FileSystemPage.xaml.cs @@ -40,7 +40,7 @@ public sealed partial class FileSystemPage : Page return; } - RuntimeHelper.TryMoveFocusPrevousControl(sender as Button); + RuntimeHelper.TryMoveFocusPreviousControl(sender as Button); } private void DefaultVHDSizeTextBox_TextChanged(object sender, TextChangedEventArgs e) diff --git a/src/windows/wslsettings/Views/Settings/MemAndProcPage.xaml.cs b/src/windows/wslsettings/Views/Settings/MemAndProcPage.xaml.cs index 13ea566..c329e99 100644 --- a/src/windows/wslsettings/Views/Settings/MemAndProcPage.xaml.cs +++ b/src/windows/wslsettings/Views/Settings/MemAndProcPage.xaml.cs @@ -41,7 +41,7 @@ public sealed partial class MemAndProcPage : Page return; } - RuntimeHelper.TryMoveFocusPrevousControl(sender as Button); + RuntimeHelper.TryMoveFocusPreviousControl(sender as Button); } public async void SwapFilePath_Click(object sender, RoutedEventArgs e) diff --git a/src/windows/wslsettings/Views/Settings/NetworkingPage.xaml.cs b/src/windows/wslsettings/Views/Settings/NetworkingPage.xaml.cs index 4c84ca5..2149f14 100644 --- a/src/windows/wslsettings/Views/Settings/NetworkingPage.xaml.cs +++ b/src/windows/wslsettings/Views/Settings/NetworkingPage.xaml.cs @@ -40,7 +40,7 @@ public sealed partial class NetworkingPage : Page return; } - RuntimeHelper.TryMoveFocusPrevousControl(sender as Button); + RuntimeHelper.TryMoveFocusPreviousControl(sender as Button); } private void InitialAutoProxyTimeoutTextBox_TextChanged(object sender, TextChangedEventArgs e) diff --git a/src/windows/wslsettings/Views/Settings/OptionalFeaturesPage.xaml.cs b/src/windows/wslsettings/Views/Settings/OptionalFeaturesPage.xaml.cs index 5f25465..94a3462 100644 --- a/src/windows/wslsettings/Views/Settings/OptionalFeaturesPage.xaml.cs +++ b/src/windows/wslsettings/Views/Settings/OptionalFeaturesPage.xaml.cs @@ -40,7 +40,7 @@ public sealed partial class OptionalFeaturesPage : Page return; } - RuntimeHelper.TryMoveFocusPrevousControl(sender as Button); + RuntimeHelper.TryMoveFocusPreviousControl(sender as Button); } private void VMIdleTimeoutTextBox_TextChanged(object sender, TextChangedEventArgs e) diff --git a/test/README.md b/test/README.md index c2716fe..05b5c16 100644 --- a/test/README.md +++ b/test/README.md @@ -88,7 +88,7 @@ For example, consider the file below, named `ExampleTest.cpp`: #include "Common.h" // referring to /test/Common.h, where general utility functions for interacting with WSL in regards to testing reside - #define INLINE_TEST_METHOD_MARKUP // optional, but defined within the directory cmake build instructions. this is the practice that the pre-existing tests use + #define INLINE_TEST_METHOD_MARKUP // optional, but defined within the directory cmake build instructions. this is the practice that the preexisting tests use namespace ExampleTest { @@ -107,13 +107,13 @@ For example, consider the file below, named `ExampleTest.cpp`: } //namespace ExampleTest ``` -For more in-depth examples of writing TAEF tests, check out `/tests/MountTests.cpp` and [here](https://docs.microsoft.com/windows-hardware/drivers/taef/authoring-tests-in-c--#advanced-authoring-tests-in-c). +For more in-depth examples of writing TAEF tests, check out `/tests/MountTests.cpp` and [Advanced Authoring Tests in C++](https://docs.microsoft.com/windows-hardware/drivers/taef/authoring-tests-in-c--#advanced-authoring-tests-in-c). ## Building Tests ### CMake -For examples on how to get your test/s building within the repo, please view `/test/CMakeLists.txt` for the structure of creating add to the `wsltest.dll`. For additional information on how to use CMake, try [here](https://cmake.org/documentation/). +For examples on how to get your test/s building within the repo, please view `/test/CMakeLists.txt` for the structure of creating add to the `wsltest.dll`. For additional information on how to use CMake, try [CMake Documentation and Community](https://cmake.org/documentation/). ### Building diff --git a/test/linux/unit_tests/cgroup.c b/test/linux/unit_tests/cgroup.c index fdc9b30..b57d314 100644 --- a/test/linux/unit_tests/cgroup.c +++ b/test/linux/unit_tests/cgroup.c @@ -278,7 +278,7 @@ Return Value: // // Check that removing the first directory fails if a thread is still - // associated, otherwise it succeeds. + // associated; otherwise, it succeeds. // LxtCheckErrno(mkdir(CGROUP_TEST_MOUNT_POINT_DIR1, 0777)); @@ -390,7 +390,7 @@ ErrorExit: typedef struct _CGROUP_TEST_PROCFS_ENTRY { char Name[CGROUP_TEST_MAX_NAME_LENGTH]; - int Hierarcy; + int Hierarchy; int NumCgroups; int Enabled; } CGROUP_TEST_PROCFS_ENTRY, *PCGROUP_TEST_PROCFS_ENTRY; @@ -444,7 +444,7 @@ Return Value: Line, "%s\t%d\t%d\t%d", Data->Entries[NumCgroups].Name, - &Data->Entries[NumCgroups].Hierarcy, + &Data->Entries[NumCgroups].Hierarchy, &Data->Entries[NumCgroups].NumCgroups, &Data->Entries[NumCgroups].Enabled); @@ -464,7 +464,7 @@ ErrorExit: typedef struct _CGROUP_TEST_PROCFS_PID_ENTRY { - int Hierarcy; + int Hierarchy; char Subsystems[CGROUP_TEST_DEFAULT_BUFFER_SIZE]; char CgroupPath[CGROUP_TEST_DEFAULT_BUFFER_SIZE]; } CGROUP_TEST_PROCFS_PID_ENTRY, *PCGROUP_TEST_PROCFS_PID_ENTRY; @@ -510,7 +510,7 @@ Return Value: sscanf( Line, "%d:%[^:]:%[^:\n]", - &Data->Entries[NumCgroups].Hierarcy, + &Data->Entries[NumCgroups].Hierarchy, Data->Entries[NumCgroups].Subsystems, Data->Entries[NumCgroups].CgroupPath); @@ -580,7 +580,7 @@ Return Value: if (strcmp(ProcfsNew.Entries[Index].Name, "devices") == 0) { LxtCheckNotEqual(Found, 1, "%d"); - LxtCheckNotEqual(ProcfsNew.Entries[Index].Hierarcy, 0, "%d"); + LxtCheckNotEqual(ProcfsNew.Entries[Index].Hierarchy, 0, "%d"); Found = 1; } } @@ -598,7 +598,7 @@ Return Value: if (strstr(ProcfsPidNew.Entries[Index].Subsystems, "devices") != NULL) { LxtCheckNotEqual(Found, 1, "%d"); - LxtCheckNotEqual(ProcfsPidNew.Entries[Index].Hierarcy, 0, "%d"); + LxtCheckNotEqual(ProcfsPidNew.Entries[Index].Hierarchy, 0, "%d"); LxtCheckStringEqual(ProcfsPidNew.Entries[Index].CgroupPath, "/"); Found = 1; } @@ -933,7 +933,7 @@ Return Value: if (strcmp(ProcfsNew.Entries[Index].Name, "devices") == 0) { LxtCheckNotEqual(Found, 1, "%d"); - LxtCheckNotEqual(ProcfsNew.Entries[Index].Hierarcy, 0, "%d"); + LxtCheckNotEqual(ProcfsNew.Entries[Index].Hierarchy, 0, "%d"); Found = 1; } } diff --git a/test/linux/unit_tests/common.c b/test/linux/unit_tests/common.c index 78f0e97..7adffb2 100644 --- a/test/linux/unit_tests/common.c +++ b/test/linux/unit_tests/common.c @@ -117,7 +117,7 @@ Return Value: LxtCheckErrno(BytesRead = recv(Fd, Buffer, sizeof(Buffer), 0)); if (BytesRead != 0) { - LxtLogError("recv should return 0 bytes read, but it retured %d bytes", BytesRead); + LxtLogError("recv should return 0 bytes read, but it returned %d bytes", BytesRead); goto ErrorExit; } @@ -158,7 +158,7 @@ Return Value: LxtCheckErrno(BytesRead = recv(Fd, Buffer, 0, 0)); if (BytesRead != 0) { - LxtLogError("recv should return 0 bytes read, but it retured %d bytes", BytesRead); + LxtLogError("recv should return 0 bytes read, but it returned %d bytes", BytesRead); goto ErrorExit; } diff --git a/test/linux/unit_tests/dev_pt.c b/test/linux/unit_tests/dev_pt.c index a26db65..80beaa9 100644 --- a/test/linux/unit_tests/dev_pt.c +++ b/test/linux/unit_tests/dev_pt.c @@ -542,7 +542,7 @@ Routine Description: This routine performs a very basic check for pseudo terminal. The steps are: - Open the master. - Open the subordinate. - - Turns off ONLR to verify termios applies only to subordinate. + - Turns off ICRNL to verify termios applies only to subordinate. - Perform simple read/write check on the master-subordinate. @@ -1222,7 +1222,7 @@ Return Value: char MessageBuffer[10]; size_t MessageLength; int PtmFd; - char PtsBuffer[PTS_DEV_NAME_BUFER_SIZE]; + char PtsBuffer[PTS_DEV_NAME_BUFFER_SIZE]; int Result; pid_t SelfPid; pid_t SessionId; @@ -1352,7 +1352,7 @@ Return Value: { int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; int Result; int SerialNumber; @@ -1387,7 +1387,7 @@ Return Value: // It should fail. // - LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFER_SIZE)); + LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFFER_SIZE)); LxtLogInfo("Subordinate Device is:%s", PtsDevName); PtsFd = open(PtsDevName, O_RDWR); LxtCheckErrnoFailure(open(PtsDevName, O_RDWR), EIO); @@ -1492,7 +1492,7 @@ Return Value: { int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; int Result; int SerialNumber1; @@ -1532,7 +1532,7 @@ Return Value: LxtCheckErrno((PtmFd = open("/dev/ptmx", O_RDWR))); LxtLogInfo("Master opened at FD:%d", PtmFd); - LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFER_SIZE)); + LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFFER_SIZE)); LxtLogInfo("Subordinate Device is:%s", PtsDevName); LxtCheckErrno((SerialNumber2 = GetPtSerialNumFromDeviceString(PtsDevName))); @@ -1607,7 +1607,7 @@ int PtCheck3(PLXT_ARGS Args) Routine Description: This routine validates that the pseudo terminal driver is able to - handle muliple opens on the same subordinate device. + handle multiple opens on the same subordinate device. Arguments: @@ -1622,7 +1622,7 @@ Return Value: { int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; int PtsFd1; int PtsFd2; @@ -1727,7 +1727,7 @@ Return Value: char Message1[] = "ls -al\n"; char Message2[] = "date\n"; int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; char ReadBuffer[50]; int Result; @@ -3042,7 +3042,7 @@ Return Value: int Result; int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; // @@ -3060,7 +3060,7 @@ Return Value: LxtLogInfo("Master opened at FD:%d", PtmFd); LxtCheckErrno(grantpt(PtmFd)); LxtCheckErrno(unlockpt(PtmFd)); - LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFER_SIZE)); + LxtCheckErrno(ptsname_r(PtmFd, PtsDevName, PTS_DEV_NAME_BUFFER_SIZE)); LxtLogInfo("Subordinate Device is:%s", PtsDevName); // @@ -3111,7 +3111,7 @@ Return Value: int Result; int PtmFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int PtsFd; int SerialNumber; @@ -4445,7 +4445,7 @@ Return Value: LxtCheckErrnoFailure(BytesReadWrite = write(PtsFd, WriteBuffer, WriteBufferLen), EAGAIN); // - // Try to write a byte, which will block. Wait for the the other thread + // Try to write a byte, which will block. Wait for the other thread // to unblock this request. Do this multiple times to test different // methods of unblocking. // @@ -4601,7 +4601,7 @@ int PtMasterHangup1(PLXT_ARGS Args) Routine Description: - This routine will try to determine the the behavior when the subordinate + This routine will try to determine the behavior when the subordinate tries to write after the master has hangup. Expected Result: The write on subordinate should return with error 5:EIO. @@ -4837,7 +4837,7 @@ int PtMasterHangup3(PLXT_ARGS Args) Routine Description: - This routine will try to determine the the behavior when the master opens, + This routine will try to determine the behavior when the master opens, writes some complete messages and closes. Subordinate then tries to read. Expected Result: The read on subordinate should return 0 bytes read. @@ -5042,7 +5042,7 @@ Return Value: int Loop; int LoopCount; int NumPtToTest; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; int Result; // @@ -5681,7 +5681,7 @@ Return Value: { // - // Setup the argument for the stress I/O thread. + // Set up the argument for the stress I/O thread. // ThreadArg[Itr].PtmFd = PtFds[Itr][0]; @@ -5692,7 +5692,7 @@ Return Value: { // - // Create I/O Strss thread#ThreadItr for PT#Itr + // Create I/O Stress thread#ThreadItr for PT#Itr // LxtCheckErrno(pthread_create(&Thread[Itr][ThreadItr], NULL, PerformIoStressThread, (void*)&ThreadArg[Itr])); @@ -6564,7 +6564,7 @@ int PtUTF8Basic7(PLXT_ARGS Args) Routine Description: - This routine sends a string ending with a UTF-8 character, follwed by the + This routine sends a string ending with a UTF-8 character, followed by the delete char. This is expected to remove only a single byte from the string. Arguments: diff --git a/test/linux/unit_tests/dev_pt_2.c b/test/linux/unit_tests/dev_pt_2.c index b3c5110..5382e9f 100644 --- a/test/linux/unit_tests/dev_pt_2.c +++ b/test/linux/unit_tests/dev_pt_2.c @@ -737,7 +737,7 @@ Return Value: LxtCheckEqual(TerminalForegroundId, ForegroundId, "%d"); // - // Do a aimple IO check. + // Do a simple IO check. // LxtCheckErrno(RawInit(PtsFd)); @@ -1744,7 +1744,7 @@ int PtBufferTerminalFill(PLXT_ARGS Args) Routine Description: - This routine checks the internal implemenation of the buffer by attempting + This routine checks the internal implementation of the buffer by attempting to fill it. Arguments: @@ -2395,7 +2395,7 @@ Return Value: LxtCheckErrno(tcsetpgrp(PtsFd, GrandChildPid)); // - // Disassocate terminal. + // Disassociate terminal. // LxtCheckErrno(ioctl(PtsFd, TIOCNOTTY, (char*)NULL)); @@ -8715,7 +8715,7 @@ Return Value: tcflag_t InputFlags; int PtmFd; int PtsFd; - char PtsDevName[PTS_DEV_NAME_BUFER_SIZE]; + char PtsDevName[PTS_DEV_NAME_BUFFER_SIZE]; char ReadBuffer[20]; int Result; int SerialNumber; diff --git a/test/linux/unit_tests/dev_pt_common.c b/test/linux/unit_tests/dev_pt_common.c index dcbb516..c213e39 100644 --- a/test/linux/unit_tests/dev_pt_common.c +++ b/test/linux/unit_tests/dev_pt_common.c @@ -199,7 +199,7 @@ Return Value: int Fdm; int Fds; - char LocalBuffer[PTS_DEV_NAME_BUFER_SIZE]; + char LocalBuffer[PTS_DEV_NAME_BUFFER_SIZE]; int Result; int SubordinateSerialNumber; @@ -214,7 +214,7 @@ Return Value: LxtCheckErrno((Fdm = open("/dev/ptmx", O_RDWR))); LxtCheckErrno(grantpt(Fdm)); LxtCheckErrno(unlockpt(Fdm)); - LxtCheckErrno(ptsname_r(Fdm, LocalBuffer, PTS_DEV_NAME_BUFER_SIZE)); + LxtCheckErrno(ptsname_r(Fdm, LocalBuffer, PTS_DEV_NAME_BUFFER_SIZE)); LxtCheckErrno(Fds = open(LocalBuffer, O_RDWR)); if (PtsDevName != NULL) { diff --git a/test/linux/unit_tests/dev_pt_common.h b/test/linux/unit_tests/dev_pt_common.h index 8786294..38b1805 100644 --- a/test/linux/unit_tests/dev_pt_common.h +++ b/test/linux/unit_tests/dev_pt_common.h @@ -49,7 +49,7 @@ Abstract: #define FALSE 0 #define TRUE 1 -#define PTS_DEV_NAME_BUFER_SIZE 50 +#define PTS_DEV_NAME_BUFFER_SIZE 50 #define IS_CONTROL_CHAR_ECHO_STRING(s, c) (((s)[0] == '^') && (((s)[1] > 0x40)) && (((s)[1] - 0x40) == (c))) diff --git a/test/linux/unit_tests/drvfs.c b/test/linux/unit_tests/drvfs.c index 1c59260..bde26a9 100644 --- a/test/linux/unit_tests/drvfs.c +++ b/test/linux/unit_tests/drvfs.c @@ -270,7 +270,7 @@ static const LXT_VARIATION g_LxtFatVariations[] = { {"DrvFs - inotify with epoll", DrvFsTestInotifyEpoll}, {"DrvFs - inotify unmounting of a bind mount", DrvFsTestInotifyUnmountBind}, {"DrvFs - block count", DrvFsTestBlockCount}, - {"DrvFs - FAT32 case insensitive", DrvFsTestFatCaseInsensitive}, + {"DrvFs - FAT32 case-insensitive", DrvFsTestFatCaseInsensitive}, {"DrvFs - FAT32 unsupported features", DrvFsTestFatUnsupported}, {"DrvFs - FAT32 utimensat", DrvFsTestFatUtimensat}, {"DrvFs - FAT32 mount point junction", DrvFsTestFatJunction}, @@ -295,7 +295,7 @@ static const LXT_VARIATION g_LxtSmbVariations[] = { {"DrvFs - rename", DrvFsTestRename}, {"DrvFs - renameat", DrvFsTestRenameAt}, {"DrvFs - hard links", DrvFsTestHardLinks}, - {"DrvFs - SMB case insensitive", DrvFsTestFatCaseInsensitive}, + {"DrvFs - SMB case-insensitive", DrvFsTestFatCaseInsensitive}, {"DrvFs - SMB unsupported features", DrvFsTestSmbUnsupported}, {"DrvFs - SMB utimensat", DrvFsTestSmbUtimensat}, {"DrvFs - fstat", DrvFsTestFstat}, @@ -1650,7 +1650,7 @@ int DrvFsTestFatCaseInsensitive(PLXT_ARGS Args) Description: - This routine tests the case insensitive behavior of FAT. + This routine tests the case-insensitive behavior of FAT. Arguments: @@ -1707,7 +1707,7 @@ Return Value: // renaming on FAT. // // N.B. With SMB over Plan 9, because Linux doesn't know the file system is - // case insensitive and NTFS does let you change the case on rename, + // case-insensitive and NTFS does let you change the case on rename, // this actually does change the case. // @@ -1720,7 +1720,7 @@ Return Value: // directory entries are cached. // // N.B. This is not the case with Plan 9 because Linux doesn't know the - // file system is case insensitive. + // file system is case-insensitive. // if (g_LxtFsInfo.FsType != LxtFsTypePlan9) @@ -3651,7 +3651,7 @@ int DrvFsTestSetup(PLXT_ARGS Args, int TestMode) Description: - This routine perofrms setup for the drvfs tests. + This routine performs setup for the drvfs tests. Arguments: @@ -3779,7 +3779,7 @@ Return Value: // // Check if drvfs actually used the requested fallback mode. This guards - // against a pre-existing instance (e.g. in another mount namespace) + // against a preexisting instance (e.g. in another mount namespace) // preventing the options from changing, or file system limitations causing // drvfs to use a different fallback mode than requested. // diff --git a/test/linux/unit_tests/dup.c b/test/linux/unit_tests/dup.c index e41fee3..cf09851 100644 --- a/test/linux/unit_tests/dup.c +++ b/test/linux/unit_tests/dup.c @@ -109,7 +109,7 @@ Return Value: LxtCheckResult((DupStdOut = dup(FD_STDOUT))); // - // Since we just closed STDIN, dup'ing STDOUT should take take the position + // Since we just closed STDIN, duping STDOUT should take the position // of STDIN // diff --git a/test/linux/unit_tests/epoll.c b/test/linux/unit_tests/epoll.c index 8422bfe..2fdff01 100644 --- a/test/linux/unit_tests/epoll.c +++ b/test/linux/unit_tests/epoll.c @@ -515,7 +515,7 @@ const char* DataToWrite[] = { " ", " ", " ", - " ", + " ", "", }; @@ -1423,7 +1423,7 @@ int EpollVariation0(PLXT_ARGS Args) LxtCheckErrnoFailure(epoll_ctl(EpollFileDescriptor, EPOLL_CTL_ADD, FileDescriptor1, &EpollControlEvent), EEXIST); // - // Add the second file descriptor back in to the epoll. + // Add the second file descriptor back to the epoll. // EpollControlEvent.events = EPOLLOUT | EPOLLPRI; @@ -1481,7 +1481,7 @@ int EpollVariation0(PLXT_ARGS Args) LXT_SYNCHRONIZATION_POINT(); LXT_SYNCHRONIZATION_POINT(); - LxtLogInfo("T2: Making data avilable for read..."); + LxtLogInfo("T2: Making data available for read..."); LxtCheckErrno((BytesReadWrite = write(Master, "\n", 1))); Result = LXT_RESULT_SUCCESS; diff --git a/test/linux/unit_tests/eventfd.c b/test/linux/unit_tests/eventfd.c index 2f49d8c..88f317f 100644 --- a/test/linux/unit_tests/eventfd.c +++ b/test/linux/unit_tests/eventfd.c @@ -80,7 +80,7 @@ int EventFdVariationReadWrite(PLXT_ARGS Args) LXT_SYNCHRONIZATION_POINT_START(); // - // FIXME: Add 0 varaition + // FIXME: Add 0 variation // // diff --git a/test/linux/unit_tests/flock.c b/test/linux/unit_tests/flock.c index e48d46a..5964a19 100644 --- a/test/linux/unit_tests/flock.c +++ b/test/linux/unit_tests/flock.c @@ -152,7 +152,7 @@ Return Value: // // Ensure that the lock was correctly set before. The lock descriptor is // correctly set from before. The test expects to see the lock type be - // changed to exlusive, WRLCK, though. + // changed to exclusive, WRLCK, though. // LxtLogInfo("Fcntl child locking - Reading lock type"); diff --git a/test/linux/unit_tests/fork.c b/test/linux/unit_tests/fork.c index 45b0e26..9bb5de4 100644 --- a/test/linux/unit_tests/fork.c +++ b/test/linux/unit_tests/fork.c @@ -451,7 +451,7 @@ int RobustFutex(PLXT_ARGS Args) LxtCheckErrnoFailure(my_set_robust_list(&Head, (sizeof(struct robust_list_head) + 1)), EINVAL); // - // get_robust_list validates the buffesr. + // get_robust_list validates the buffers. // LxtCheckErrnoFailure(my_get_robust_list(0, NULL, &SizeReturned), EFAULT); @@ -711,7 +711,7 @@ int VForkTestBasic(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPoll(ChildPid, LXT_RESULT_SUCCESS)); // - // Repeat the above with the clone variaent of vfork. + // Repeat the above with the clone variant of vfork. // LxtCheckErrno(ChildPid = LxtCloneSyscall(CLONE_VM | CLONE_VFORK | SIGCHLD, NULL, NULL, NULL, NULL)); @@ -778,7 +778,7 @@ int VForkTest(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPoll(ChildPid, LXT_RESULT_SUCCESS)); // - // Repease the above with execv. + // Release the above with execv. // ChildPidFromChild = -1; @@ -866,7 +866,7 @@ int VForkTest(PLXT_ARGS Args) #if defined(__i386__) || defined(__amd64__) // - // Check that floating point context is preserved accross vfork. + // Check that floating point context is preserved across vfork. // _FPU_GETCW(OriginalControlWord); diff --git a/test/linux/unit_tests/fscommon.c b/test/linux/unit_tests/fscommon.c index ac13432..4fa9844 100644 --- a/test/linux/unit_tests/fscommon.c +++ b/test/linux/unit_tests/fscommon.c @@ -503,7 +503,7 @@ Return Value: int Result; // - // Don't set close on exec on file desciptors in the main test process; + // Don't set close on exec on file descriptors in the main test process; // this would cause later tests to fail. // @@ -1154,7 +1154,7 @@ Return Value: } // - // You cannot ressurrect a file with link count 0. + // You cannot resurrect a file with link count 0. // // N.B. On real Linux, the error code this produces is ENOENT, but since // NTFS returns STATUS_ACCESS_DENIED for this, WSL gives EACCES @@ -1979,7 +1979,7 @@ Return Value: LxtCheckErrnoFailure(unlink(FS_RMDIR_TEST_DIR "/test/."), EISDIR); // - // Non-existent paths. + // Nonexistent paths. // LxtCheckErrnoFailure(rmdir(FS_RMDIR_TEST_DIR "/test2/.."), ENOENT); @@ -2302,7 +2302,7 @@ Return Value: Fd = -1; // - // Non-existent file tests. + // Nonexistent file tests. // LxtCheckErrnoFailure(creat(FS_TRAILING_TEST_FILE "/", 0666), EISDIR); @@ -2404,7 +2404,7 @@ Return Value: LxtCheckErrnoFailure(rmdir(FS_TRAILING_TEST_FILE "/"), ENOTDIR); // - // Test a symlink to a non-existent target. + // Test a symlink to a nonexistent target. // LxtCheckErrnoZeroSuccess(unlink(FS_TRAILING_TEST_LINK)); @@ -2420,7 +2420,7 @@ Return Value: LxtCheckErrnoFailure(lstat(FS_TRAILING_TEST_LINK "/", &Stat), ENOENT); // - // Symlink to a non-existent target with trailing slash. + // Symlink to a nonexistent target with trailing slash. // LxtCheckErrnoZeroSuccess(unlink(FS_TRAILING_TEST_LINK)); @@ -3663,7 +3663,7 @@ Return Value: LxtCheckErrnoZeroSuccess(unlink(FS_MKNOD_TEST_FILE)); // - // Non-existent block device. + // Nonexistent block device. // // N.B. Currently, no block devices exist in WSL. // diff --git a/test/linux/unit_tests/fstab.c b/test/linux/unit_tests/fstab.c index 984ecb2..7983e37 100644 --- a/test/linux/unit_tests/fstab.c +++ b/test/linux/unit_tests/fstab.c @@ -100,7 +100,7 @@ Return Value: // // Check that there is only one mount for C: (or any variation therefore, like C:\ or c:), - // and that that mount uses the exact options specified in fstab. + // and that its mount uses the exact options specified in fstab. // if (strcmp(FsType, "9p") == 0) diff --git a/test/linux/unit_tests/get_set_id.c b/test/linux/unit_tests/get_set_id.c index 6a5f308..5d3d9fc 100644 --- a/test/linux/unit_tests/get_set_id.c +++ b/test/linux/unit_tests/get_set_id.c @@ -206,7 +206,7 @@ Return Value: } // - // For a signle threaded process, Thread ID == Process ID + // For a single threaded process, Thread ID == Process ID // if (Pid != Tid) diff --git a/test/linux/unit_tests/keymgmt.c b/test/linux/unit_tests/keymgmt.c index e8f4ae3..ad0d811 100644 --- a/test/linux/unit_tests/keymgmt.c +++ b/test/linux/unit_tests/keymgmt.c @@ -161,7 +161,7 @@ int KeymgmtSessionKeyringAssociation(PLXT_ARGS Args) KeyType = KEY_SPEC_SESSION_KEYRING; // - // This test checks to see where the session keyring is assocaited. The + // This test checks to see where the session keyring is associated. The // documentation is unclear if it is the threadgroup, thread, or user // namespace. The test below validates that the session keyring is // associated to the threadgroup and inherited across fork. @@ -194,7 +194,7 @@ int KeymgmtSessionKeyringAssociation(PLXT_ARGS Args) // // Create a child process and thread, checking that the session keyring id - // continues to be assocaited. + // continues to be associated. // LxtCheckErrno(ChildPid = fork()); @@ -235,7 +235,7 @@ int KeymgmtSessionKeyringAssociation(PLXT_ARGS Args) // // Create a user namespace and check that the session keyring id continues - // to be assocaited. + // to be associated. // LxtCheckErrno(ChildPid = fork()); diff --git a/test/linux/unit_tests/lxtfs.c b/test/linux/unit_tests/lxtfs.c index a219c66..c15bd40 100644 --- a/test/linux/unit_tests/lxtfs.c +++ b/test/linux/unit_tests/lxtfs.c @@ -1906,7 +1906,7 @@ Return Value: // // The following test cases deal with the old name containing a trailing slash. // - // Renaming a directory to a nonexistant directory should succeed. + // Renaming a directory to a nonexistent directory should succeed. // LxtCheckErrnoZeroSuccess(mkdir(RenameTestDirSlash, 0777)); @@ -3751,7 +3751,7 @@ Return Value: { LxtLogError( "getdents should return 0 when end of directory is reached, " - "but it retuend: %d.", + "but it returned: %d.", Size); Result = EINVAL; diff --git a/test/linux/unit_tests/lxtlog.c b/test/linux/unit_tests/lxtlog.c index fa5b7d2..fce7aa0 100644 --- a/test/linux/unit_tests/lxtlog.c +++ b/test/linux/unit_tests/lxtlog.c @@ -60,7 +60,7 @@ void LxtLog(LxtLogLevel LogLevel, const char* Message, ...) // // N.B. The signal handling code may use this function and not all of the - // functions used here are re-entrant safe, resulting in possible + // functions used here are reentrant safe, resulting in possible // deadlocks or crashes. To avoid these keep an active count and skip // functions known to be problematic in the signal case. The functions // identified at this point are: diff --git a/test/linux/unit_tests/lxtmount.c b/test/linux/unit_tests/lxtmount.c index 92afe88..9b610af 100644 --- a/test/linux/unit_tests/lxtmount.c +++ b/test/linux/unit_tests/lxtmount.c @@ -546,7 +546,7 @@ int MountGetFileSystem(const char* Path, char* FsType, int FsTypeLength, char* O Description: - This routine gets the file sytem type of the mount containing the + This routine gets the file system type of the mount containing the specified path. Arguments: @@ -678,7 +678,7 @@ int MountIsFileSystem(const char* Path, const char* FsType) Description: - This routine checks the file sytem type of the mount containing the + This routine checks the file system type of the mount containing the specified path. Arguments: diff --git a/test/linux/unit_tests/lxtutil.c b/test/linux/unit_tests/lxtutil.c index e4cdb8a..0a18245 100644 --- a/test/linux/unit_tests/lxtutil.c +++ b/test/linux/unit_tests/lxtutil.c @@ -1761,7 +1761,7 @@ Routine Description: Arguments: - SingalInfo - Supplies a pointer which receives the signal info. + SignalInfo - Supplies a pointer which receives the signal info. Return Value: diff --git a/test/linux/unit_tests/mremap.c b/test/linux/unit_tests/mremap.c index 3d1030e..287fbe7 100644 --- a/test/linux/unit_tests/mremap.c +++ b/test/linux/unit_tests/mremap.c @@ -740,7 +740,7 @@ int MremapTestEntry(int Argc, char* Argv[]) } // - // Case 19: Large region of copy-on-written pages with same protecion. + // Case 19: Large region of copy-on-written pages with same protection. // FileSize = (512 * 1024); @@ -1196,7 +1196,7 @@ int MremapTestEntry(int Argc, char* Argv[]) } // - // Case 29: Remap while spliting source VAD. + // Case 29: Remap while splitting source VAD. // SharedPrivateMemory = mmap(NULL, 10 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); diff --git a/test/linux/unit_tests/namespace.c b/test/linux/unit_tests/namespace.c index eff0b7c..ade617f 100644 --- a/test/linux/unit_tests/namespace.c +++ b/test/linux/unit_tests/namespace.c @@ -505,7 +505,7 @@ int NamespacePidCheckProcPidStatStatusFiles(char* Dir) ErrorExit: // - // Intentially do not close the files. These files are leaked to ensure + // Intentionally do not close the files. These files are leaked to ensure // the private procfs instance is cleaned up correctly when there are // file descriptors that need to be closed during thread group end. // @@ -1088,7 +1088,7 @@ int NamespacePid(PLXT_ARGS Args) LxtWaitPidPoll(ChildPid, 0); // - // Check the pid namesapce behavior for reboot. + // Check the pid namespace behavior for reboot. // LxtCheckErrno(ChildPid = fork()); diff --git a/test/linux/unit_tests/netlink.c b/test/linux/unit_tests/netlink.c index dfb078d..fedeb16 100644 --- a/test/linux/unit_tests/netlink.c +++ b/test/linux/unit_tests/netlink.c @@ -654,7 +654,7 @@ Return Value: // Test case: Bind with nl_pid = 0, kernel should assign a unique // ID. The first netlink socket of the process is // assigned the process ID as the nl_pid. It also confirms - // the the pad value is ignored. + // the pad value is ignored. // LxtCheckErrno(Socket = socket(AF_NETLINK, Type, Family)); @@ -671,7 +671,7 @@ Return Value: LxtCheckEqual(AddressLength, sizeof(BindAddress), "%d"); // - // Validate that a socket that is already bound, can not be bound again. + // Validate that a socket that is already bound, cannot be bound again. // memset(&BindAddress, 0, sizeof(BindAddress)); @@ -684,7 +684,7 @@ Return Value: // kernel assigns to the non-first sockets of the process). // Test that the kernel will skip any negative nl_pid's that // the user already specified. For example, Socket2 gets - // an auto-assigned nl_pid of -5. Socket3 is binded with + // an auto-assigned nl_pid of -5. Socket3 is bound with // the user specifying nl_pid of -4. Socket4 gets an // auto-assigned nl_pid of -3, since -4 was already taken // by the user. @@ -1745,7 +1745,7 @@ Return Value: // technically there is space in the receive buffer for the response. // The test sends a message with a unique sequence number. Later on, the // entire receive buffer will be drained and all responses checked to - // verify that this unqiue sequence number is not in any of the responses. + // verify that this unique sequence number is not in any of the responses. // Request.nlmsg_seq = 0x98765432; @@ -2188,7 +2188,7 @@ Return Value: Timeout.tv_nsec = 0; // - // Setup the receive buffers. + // Set up the receive buffers. // memset(ReceiveMessages, 0, sizeof(ReceiveMessages)); @@ -2369,7 +2369,7 @@ Return Value: struct timespec Timeout; // - // The timeout value passed to recvmmsg() is ignored. Setup the receive + // The timeout value passed to recvmmsg() is ignored. Set up the receive // buffers. // @@ -2411,7 +2411,7 @@ Return Value: { LxtLogError( "recvmmsg should return 0 messages read, " - "but it retured %d messages for flags %x", + "but it returned %d messages for flags %x", MessagesRead, Flags); @@ -5379,7 +5379,7 @@ Return Value: // Check for general set/get of the SO_PASSCRED socket option. // // N.B After this routine, the state of the 'SO_PASSCRED' socket option in - // the socket is not gauranteed. + // the socket is not guaranteed. // LxtCheckErrno(SocketGetSetBooleanSocketOption(Socket, SOL_SOCKET, SO_PASSCRED, false)); diff --git a/test/linux/unit_tests/overlayfs.c b/test/linux/unit_tests/overlayfs.c index 61cd16d..c5ef6cf 100644 --- a/test/linux/unit_tests/overlayfs.c +++ b/test/linux/unit_tests/overlayfs.c @@ -56,7 +56,7 @@ Abstract: #define OVFS_TEST_MOUNT_DEFAULT "lowerdir=" OVFS_TEST_LOWER_DIR ",upperdir=" OVFS_TEST_UPPER_DIR ",workdir=" OVFS_TEST_WORK_DIR -#define OVFS_TEST_MOUNT_MULI_LOWER \ +#define OVFS_TEST_MOUNT_MULTI_LOWER \ "lowerdir=" OVFS_TEST_LOWER_DIR ":" OVFS_TEST_LOWER2_DIR ":" OVFS_TEST_LOWER3_DIR ",upperdir=" OVFS_TEST_UPPER_DIR \ ",workdir=" OVFS_TEST_WORK_DIR @@ -238,7 +238,7 @@ Return Value: int Result; // - // Setup the directories and ensure it's not a mount point yet. + // Set up the directories and ensure it's not a mount point yet. // LxtCheckResult(OvFsTestDirsSetup()); @@ -473,7 +473,7 @@ Return Value: Mapping = NULL; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -752,7 +752,7 @@ Return Value: Mapping = NULL; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -925,7 +925,7 @@ Return Value: Fd = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -1203,7 +1203,7 @@ Return Value: Fd = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -1385,7 +1385,7 @@ Return Value: struct stat StatMergedBuffer; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -1562,7 +1562,7 @@ Return Value: Fd = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -1732,7 +1732,7 @@ Return Value: Fd = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -2060,7 +2060,7 @@ Return Value: FdWrite = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -2076,7 +2076,7 @@ Return Value: // // Open the same file for read and write. The read file will be from the // lower layer, but opening the file for write will cause the file to be - // hydated in the upper layer and the inode updated. + // hydrated in the upper layer and the inode updated. // LxtCheckErrno(Fd = open(OVFS_TEST_MOUNT_PATH "/OnlyInLowerFile", O_RDONLY, 0)); @@ -2359,7 +2359,7 @@ Return Value: LxtCheckErrno(LxtCapSet(&CapHeader, CapData)); // - // Open the file with different trunctate variations. + // Open the file with different truncate variations. // LxtCheckErrno(Fd = open(OVFS_TEST_LOWER_DIR "/OnlyInLowerFile", O_RDONLY, 0)); @@ -2423,7 +2423,7 @@ Return Value: FdLower = -1; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -2671,7 +2671,7 @@ Return Value: ssize_t ValueSize; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -2847,7 +2847,7 @@ Return Value: Mapping = NULL; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -2938,7 +2938,7 @@ Return Value: LxtCheckResult(MountCheckIsNotMount(OVFS_TEST_MOUNT_PATH)); LxtCheckResult(MountCheckIsNotMount(OVFS_TEST_MOUNT_PATH)); - LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULI_LOWER)); + LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULTI_LOWER)); // // Check that the whiteout cannot be opened but are reported through readdir @@ -3073,7 +3073,7 @@ Return Value: Mapping = NULL; // - // Setup the directories and populate some state. + // Set up the directories and populate some state. // LxtCheckResult(OvFsTestDirsSetup()); @@ -3085,7 +3085,7 @@ Return Value: // LxtCheckResult(MountCheckIsNotMount(OVFS_TEST_MOUNT_PATH)); - LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULI_LOWER)); + LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULTI_LOWER)); // // Check the behavior for VFS file object operations that support file @@ -3326,7 +3326,7 @@ Return Value: // LxtCheckResult(MountCheckIsNotMount(OVFS_TEST_MOUNT_PATH)); - LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULI_LOWER)); + LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULTI_LOWER)); LxtCheckErrno(stat(OVFS_TEST_MOUNT_PATH "/mixedType", &StatMergedBuffer)); LxtCheckTrue(S_ISDIR(StatMergedBuffer.st_mode)); @@ -3393,7 +3393,7 @@ Return Value: // LxtCheckResult(MountCheckIsNotMount(OVFS_TEST_MOUNT_PATH)); - LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULI_LOWER)); + LxtCheckErrnoZeroSuccess(mount("myovfsnew", OVFS_TEST_MOUNT_PATH, OVFS_TEST_MOUNT_NAME, 0, OVFS_TEST_MOUNT_MULTI_LOWER)); LxtCheckErrno(stat(OVFS_TEST_MOUNT_PATH "/mixedType", &StatMergedBuffer)); LxtCheckTrue(S_ISDIR(StatMergedBuffer.st_mode)); diff --git a/test/linux/unit_tests/pipe.c b/test/linux/unit_tests/pipe.c index 33e8566..5c1e5c1 100644 --- a/test/linux/unit_tests/pipe.c +++ b/test/linux/unit_tests/pipe.c @@ -112,8 +112,8 @@ int PipeZeroByteRead(PLXT_ARGS Args); static const LXT_VARIATION g_LxtVariations[] = { {"Pipe0", PipeVariation0}, {"Pipe1", PipeVariation1}, - {"Pipe reader hanup", PipeReaderHangup}, - {"Pipe writer hanup", PipeWriterHangup}, + {"Pipe reader hangup", PipeReaderHangup}, + {"Pipe writer hangup", PipeWriterHangup}, {"Pipe ioctls", PipeVariationIoctl}, {"Pipe - epoll", PipeEpoll}, {"Pipe - Fifo", PipeFifo}, @@ -1983,7 +1983,7 @@ Return Value: LxtCheckErrnoFailure(fcntl(Pipes[1], F_SETPIPE_SZ, sizeof(Buffer) - 1), EBUSY); // - // Try to increase the buffer from an unprivlided thread. + // Try to increase the buffer from an unprivileged thread. // LxtCheckErrno(ChildPid = fork()); diff --git a/test/linux/unit_tests/random.c b/test/linux/unit_tests/random.c index 26d4829..876c2c0 100644 --- a/test/linux/unit_tests/random.c +++ b/test/linux/unit_tests/random.c @@ -102,7 +102,7 @@ int GetrandomSyscall(PLXT_ARGS Args) if (Result > DEV_URANDOM_MAX_BYTES) { Result = LXT_RESULT_FAILURE; - LxtLogError("BytesRead %Iu higher than expected %Iu", Result, DEV_URANDOM_MAX_BYTES); + LxtLogError("BytesRead %Iu greater than expected %Iu", Result, DEV_URANDOM_MAX_BYTES); goto ErrorExit; } @@ -111,7 +111,7 @@ int GetrandomSyscall(PLXT_ARGS Args) if (Result > DEV_RANDOM_MAX_BYTES) { Result = LXT_RESULT_FAILURE; - LxtLogError("BytesRead %Iu higher than expected %Iu", Result, DEV_RANDOM_MAX_BYTES); + LxtLogError("BytesRead %Iu greater than expected %Iu", Result, DEV_RANDOM_MAX_BYTES); goto ErrorExit; } @@ -150,7 +150,7 @@ int DevRandomDevice(PLXT_ARGS Args) if (BytesRead > DEV_RANDOM_MAX_BYTES) { Result = LXT_RESULT_FAILURE; - LxtLogError("BytesRead %d higher than expected %d", BytesRead, DEV_RANDOM_MAX_BYTES); + LxtLogError("BytesRead %d greater than expected %d", BytesRead, DEV_RANDOM_MAX_BYTES); goto ErrorExit; } @@ -190,7 +190,7 @@ int DevUrandomDevice(PLXT_ARGS Args) if (BytesRead > DEV_URANDOM_MAX_BYTES) { Result = LXT_RESULT_FAILURE; - LxtLogError("BytesRead %d higher than expected %d", BytesRead, DEV_URANDOM_MAX_BYTES); + LxtLogError("BytesRead %d greater than expected %d", BytesRead, DEV_URANDOM_MAX_BYTES); goto ErrorExit; } diff --git a/test/linux/unit_tests/resourcelimits.c b/test/linux/unit_tests/resourcelimits.c index 69115c1..1a63500 100644 --- a/test/linux/unit_tests/resourcelimits.c +++ b/test/linux/unit_tests/resourcelimits.c @@ -221,7 +221,7 @@ int ResourceLimitNoFile(PLXT_ARGS Args) // // Determine how many file descriptors are already open and allocate an - // array large enough to open the maxiumum number of file descriptors. + // array large enough to open the maximum number of file descriptors. // LxtLogInfo("%d currently open file descriptors", InitialFileDescriptorCount); diff --git a/test/linux/unit_tests/sched.c b/test/linux/unit_tests/sched.c index 8b05afd..b59e711 100644 --- a/test/linux/unit_tests/sched.c +++ b/test/linux/unit_tests/sched.c @@ -319,7 +319,7 @@ int SetGetAffinityNp(PLXT_ARGS Args) LxtCheckErrno(LxtSched_GetAffinity(0, sizeof(Set), &Set)); // - // N.B Affinity cannot be validated because its not gauranteed for it to + // N.B Affinity cannot be validated because its not guaranteed for it to // take affect. // diff --git a/test/linux/unit_tests/select.c b/test/linux/unit_tests/select.c index 16183de..47fae5c 100644 --- a/test/linux/unit_tests/select.c +++ b/test/linux/unit_tests/select.c @@ -119,7 +119,7 @@ int SelectFdBufferSize(PLXT_ARGS Args) // // Test select with different sized buffers that have all of the bits set // and a ReadSetCount of 1. The expectation is that the write will fail if - // the buffer is less an an unsigned long. If larger, the values will be + // the buffer is less than an unsigned long. If larger, the values will be // zeroed out to an unsigned long but not more. // diff --git a/test/linux/unit_tests/sem.c b/test/linux/unit_tests/sem.c index a8784ec..85cfd5f 100644 --- a/test/linux/unit_tests/sem.c +++ b/test/linux/unit_tests/sem.c @@ -465,7 +465,7 @@ int SemGetSyscall(PLXT_ARGS Args) // N.B. There appears to be no error checking for invalid flags, only the // presence of valid flags. // - // -1 includes the IPC_EXCL flag so this shoudl return EEXIST. + // -1 includes the IPC_EXCL flag so this should return EEXIST. // LxtCheckErrnoFailure(LxtSemGet(Key, SEM_COUNT, -1), EEXIST); @@ -812,7 +812,7 @@ int SemOpFlags(PLXT_ARGS Args) LXT_SYNCHRONIZATION_POINT(); // - // Wait for child to perform second operation and set the smeaphore value + // Wait for child to perform second operation and set the semaphore value // to zero. This should remove the pending semaphore adjustment. // @@ -922,7 +922,7 @@ int SemOpFlags(PLXT_ARGS Args) LxtCheckEqual(0, LxtSemCtl(Id, 1, GETVAL, NULL), "%d"); // - // Create two threads, one sharing the sempahore adjustment structure + // Create two threads, one sharing the semaphore adjustment structure // and one not. // @@ -1237,7 +1237,7 @@ int SemOpSyscall(PLXT_ARGS Args) // // Fill the operations buffer with a combination of valid operations // and operations that the caller does not have permission to do. The - // parent will verify the the semaphore values are adjusted correctly. + // parent will verify the semaphore values are adjusted correctly. // memset(Operations, 0, sizeof(Operations)); @@ -1312,7 +1312,7 @@ int SemOpSyscall(PLXT_ARGS Args) } // - // Wait for the child to do the fisrt semop and query the values. + // Wait for the child to do the first semop and query the values. // LXT_SYNCHRONIZATION_POINT(); // (1) diff --git a/test/linux/unit_tests/shm.c b/test/linux/unit_tests/shm.c index 8c34116..a0b433f 100644 --- a/test/linux/unit_tests/shm.c +++ b/test/linux/unit_tests/shm.c @@ -575,7 +575,7 @@ int ShmAtAccess(PLXT_ARGS Args) // // Change the caller GID and attempt to map, this should still fail - // because the caller has a supplimentaty group membership. + // because the caller has a supplementary group membership. // LxtCheckErrno(setgid(SHM_ACCESS_GID)); @@ -588,7 +588,7 @@ int ShmAtAccess(PLXT_ARGS Args) } // - // Drop supplimentary group membership, finally this should succeed. + // Drop supplementary group membership, finally this should succeed. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -899,7 +899,7 @@ int ShmAtDtSyscall(PLXT_ARGS Args) LxtCheckEqual(Stat.shm_nattch, 1, "%Iu"); // - // Use detatch to clear the range. + // Use detach to clear the range. // LxtCheckErrno(LxtShmDt(Address)); @@ -1076,7 +1076,7 @@ int ShmAtDtSyscall(PLXT_ARGS Args) LxtCheckEqual(Stat.shm_nattch, 2, "%Iu"); // - // Detatch both mapped regions. + // Detach both mapped regions. // LxtCheckErrno(LxtShmDt(Address)); @@ -1136,7 +1136,7 @@ int ShmAtDtSyscall(PLXT_ARGS Args) LxtCheckEqual(Stat.shm_nattch, 2, "%Iu"); // - // Detatch the original address and validate the second region remains. + // Detach the original address and validate the second region remains. // LxtCheckErrno(LxtShmDt(Address)); @@ -1278,7 +1278,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Drop supplimentary group membership. + // Drop supplementary group membership. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -1371,7 +1371,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Drop supplimentary group membership. + // Drop supplementary group membership. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -1451,7 +1451,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Change the GID (callers still has supplimentary group membership so + // Change the GID (callers still has supplementary group membership so // this should succeed). // @@ -1465,7 +1465,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Drop supplimentary group membership. + // Drop supplementary group membership. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -1545,7 +1545,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Change the GID (callers still has supplimentary group membership so + // Change the GID (callers still has supplementary group membership so // this should succeed). // @@ -1559,7 +1559,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Drop supplimentary group membership (this should succeed). + // Drop supplementary group membership (this should succeed). // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -1647,7 +1647,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Change the GID (callers still has supplimentary group membership so + // Change the GID (callers still has supplementary group membership so // this should succeed). // @@ -1665,7 +1665,7 @@ int ShmGetAccess(PLXT_ARGS Args) LxtCheckEqual(Id, LxtShmGet(Key, PAGE_SIZE, 0000), "%Iu"); // - // Drop supplimentary group membership (this should succeed). + // Drop supplementary group membership (this should succeed). // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -1854,7 +1854,7 @@ int ShmGetSyscall(PLXT_ARGS Args) // N.B. There appears to be no error checking for invalid flags, only the // presence of valid flags. // - // -1 includes the IPC_EXCL flag so this shoudl return EEXIST. + // -1 includes the IPC_EXCL flag so this should return EEXIST. // LxtCheckErrnoFailure(LxtShmGet(Key, PAGE_SIZE, -1), EEXIST); @@ -2035,7 +2035,7 @@ int ShmCtlSyscall(PLXT_ARGS Args) LxtCheckErrno(LxtShmCtl(Id, IPC_SET, &Stat)); // - // Drop supplimentary group membership. + // Drop supplementary group membership. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -2114,7 +2114,7 @@ int ShmCtlSyscall(PLXT_ARGS Args) LxtCheckErrno(LxtShmCtl(Id, IPC_SET, &Stat)); // - // Drop supplimentary group membership. + // Drop supplementary group membership. // LxtCheckErrno(Result = setgroups(0, NULL)); @@ -2366,7 +2366,7 @@ int ShmCtlSyscall(PLXT_ARGS Args) // // Generate an ID that does not refer to a valid memory region and attempt - // operations on the non-existent region. + // operations on the nonexistent region. // do @@ -2408,7 +2408,7 @@ Routine Description: and the parent and child communicate across a unix socket connection. Each side queries the credentials of the other side via SO_PEERCRED and ancillary messages and - validates that the appriate credentials are returned. + validates that the appropriate credentials are returned. Arguments: @@ -2467,7 +2467,7 @@ Return Value: LxtLogInfo("Child's view of ChildPid %d", getpid()); // - // Attatch the shared segment. + // Attach the shared segment. // LxtCheckMapErrno(Address2 = LxtShmAt(Id, NULL, 0)); diff --git a/test/linux/unit_tests/socket.c b/test/linux/unit_tests/socket.c index 3beb945..c44a70b 100644 --- a/test/linux/unit_tests/socket.c +++ b/test/linux/unit_tests/socket.c @@ -91,7 +91,7 @@ static const LXT_VARIATION g_LxtClientVariations[] = { // // N.B. Keep the number of variations up to date with -// LXT_SOCKET_NUM_SERVER_VARAITIONS in socket/common.h +// LXT_SOCKET_NUM_SERVER_VARIATIONS in socket/common.h // static const LXT_VARIATION g_LxtServerVariations[] = { diff --git a/test/linux/unit_tests/socket_nonblock.c b/test/linux/unit_tests/socket_nonblock.c index 5929183..9f74582 100644 --- a/test/linux/unit_tests/socket_nonblock.c +++ b/test/linux/unit_tests/socket_nonblock.c @@ -424,7 +424,7 @@ const char* NonblockDataToWrite[] = { " ", " ", " ", - " ", + " ", "", }; diff --git a/test/linux/unit_tests/timer.c b/test/linux/unit_tests/timer.c index a58a87d..a3b905a 100644 --- a/test/linux/unit_tests/timer.c +++ b/test/linux/unit_tests/timer.c @@ -161,7 +161,7 @@ int ITimerPerThreadGroup(PLXT_ARGS Args) pthread_t Thread = {0}; // - // Check that the timer is per threadgroup and not preserved accross fork. + // Check that the timer is per threadgroup and not preserved across fork. // memset(&NewTimer, 0, sizeof(NewTimer)); @@ -222,7 +222,7 @@ int ITimerSignal(PLXT_ARGS Args) // // - // Default disposistion should terminate + // Default disposition should terminate // LxtCheckResult(ChildPid = fork()); @@ -238,7 +238,7 @@ int ITimerSignal(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPollOptions(ChildPid, SIGALRM, 0, LXT_SHORT_TIMER_WAIT_PID)); // - // Default disposistion should not terminate if canceled. + // Default disposition should not terminate if canceled. // LxtCheckResult(ChildPid = fork()); @@ -275,7 +275,7 @@ int ITimerSignal(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPollOptions(ChildPid, LXT_RESULT_SUCCESS, 0, LXT_SHORT_TIMER_WAIT_PID)); // - // Check that the signal handler is invoked within a resonable time + // Check that the signal handler is invoked within a reasonable time // interval. // @@ -328,7 +328,7 @@ int AlarmSyscall(PLXT_ARGS Args) // // - // Default disposistion should terminate + // Default disposition should terminate // LxtCheckResult(ChildPid = fork()); @@ -342,7 +342,7 @@ int AlarmSyscall(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPollOptions(ChildPid, SIGALRM, 0, LXT_SHORT_TIMER_WAIT_PID)); // - // Default disposistion should not terminate if canceled. + // Default disposition should not terminate if canceled. // LxtCheckResult(ChildPid = fork()); @@ -380,7 +380,7 @@ int AlarmSyscall(PLXT_ARGS Args) LxtCheckResult(LxtWaitPidPollOptions(ChildPid, LXT_RESULT_SUCCESS, 0, LXT_SHORT_TIMER_WAIT_PID)); // - // Check that the signal handler is invoked within a resonable time + // Check that the signal handler is invoked within a reasonable time // interval. // @@ -440,7 +440,7 @@ int ITimerPeriodicSignal(PLXT_ARGS Args) struct itimerval NewTimer; // - // Check that the signal handler is invoked within a resonable time + // Check that the signal handler is invoked within a reasonable time // interval. // @@ -654,7 +654,7 @@ int TimerCreateSyscall(PLXT_ARGS Args) LxtCheckResult(sigprocmask(SIG_UNBLOCK, &SigMask, NULL)); // - // Wait for the signal to be delievered. + // Wait for the signal to be delivered. // LxtCheckErrno(Signal = sigtimedwait(&SigMask, &SignalInfo, NULL)); diff --git a/test/linux/unit_tests/timerfd.c b/test/linux/unit_tests/timerfd.c index 96d2cfd..1a1694a 100644 --- a/test/linux/unit_tests/timerfd.c +++ b/test/linux/unit_tests/timerfd.c @@ -152,7 +152,7 @@ int TimerFdBasic(PLXT_ARGS Args) } // - // Set timer fd to exipre at one second interval. + // Set timer fd to expire at one second interval. // Flags = 0; @@ -196,7 +196,7 @@ int TimerFdBasic(PLXT_ARGS Args) // // Loop three times. In each iteration increase the wait time by one seconds. - // this should increase the expiration count by one in each interation. + // this should increase the expiration count by one in each iteration. // for (LoopIndex = 1; LoopIndex <= LXT_BASIC_TEST_LOOP_COUNT; LoopIndex += 1) diff --git a/test/linux/unit_tests/ttys.c b/test/linux/unit_tests/ttys.c index fdbfca4..7713c5d 100644 --- a/test/linux/unit_tests/ttys.c +++ b/test/linux/unit_tests/ttys.c @@ -725,7 +725,7 @@ int TtysWriteReadTransfer(PLXT_ARGS Args, int FdRead, int FdWrite) SendBuffer = NULL; // - // Allocate a buffer with known data to transfer and a buffer to recieve + // Allocate a buffer with known data to transfer and a buffer to receive // the data. // diff --git a/test/linux/unit_tests/vfsaccess.c b/test/linux/unit_tests/vfsaccess.c index 2c89d6f..eeee404 100644 --- a/test/linux/unit_tests/vfsaccess.c +++ b/test/linux/unit_tests/vfsaccess.c @@ -107,7 +107,7 @@ struct reuid_t int VfsAccessCheckResult(int ResultActual, int ResultExpected, int ErrnoActual, int ErrnoExpected, char* Message, int VariationIndex); -void VfsAcccessFileObjectCleanup(void); +void VfsAccessFileObjectCleanup(void); int VfsAccessFileObjectCreateFiles(void); @@ -217,7 +217,7 @@ ErrorExit: return !LXT_SUCCESS(Result); } -void VfsAcccessFileObjectCleanup(void) +void VfsAccessFileObjectCleanup(void) /*++ @@ -1027,7 +1027,7 @@ void VfsAccessChmodCapChild(void) CapData[1].effective = CapData[1].permitted; // - // Drop privlidges so the current process does not have CAP_FOWNER. + // Drop privileges so the current process does not have CAP_FOWNER. // LxtCheckErrno(prctl(PR_SET_KEEPCAPS, 1)); @@ -1108,7 +1108,7 @@ void VfsAccessOPathChild(void) Fd = -1; // - // Drop privlidges so the current process does not have VFS related + // Drop privileges so the current process does not have VFS related // capabilities. // @@ -1249,7 +1249,7 @@ void VfsAccessRenameCapChild(void) CapData[1].effective = CapData[1].permitted; // - // Drop privlidges so the current process does not have CAP_FOWNER. + // Drop privileges so the current process does not have CAP_FOWNER. // LxtCheckErrno(prctl(PR_SET_KEEPCAPS, 1)); @@ -1305,7 +1305,7 @@ void VfsAccessRmdirCapChild(void) CapData[1].effective = CapData[1].permitted; // - // Drop privlidges so the current process does not have CAP_FOWNER. + // Drop privileges so the current process does not have CAP_FOWNER. // LxtCheckErrno(prctl(PR_SET_KEEPCAPS, 1)); @@ -1651,7 +1651,7 @@ int VfsAccessSetUserGroupId(PLXT_ARGS Args) if (g_LxtFsInfo.FsType != LxtFsTypeVirtioFs) { // - // Fork and drop privlidges so the current process does not have CAP_FOWNER + // Fork and drop privileges so the current process does not have CAP_FOWNER // which is required for changing the owner of a file with the set-user-id // or set-group-id bits set. // @@ -1775,7 +1775,7 @@ void VfsAccessInodeChecksChild(void) CapHeader.version = _LINUX_CAPABILITY_VERSION_3; // - // Drop privlidges so the current process does not have VFS capabilities + // Drop privileges so the current process does not have VFS capabilities // and is in the other user\group. // @@ -1785,8 +1785,8 @@ void VfsAccessInodeChecksChild(void) LxtCheckErrno(LxtCapSet(&CapHeader, CapData)); // - // For each file, check that read, write and execute is enforced. Similiarly - // for directotries check that list, create\delete, and search is enforced. + // For each file, check that read, write and execute is enforced. Similarly + // for directories check that list, create\delete, and search is enforced. // for (Index = 0; Index < LXT_COUNT_OF(g_VfsInodeEntries); ++Index) @@ -2106,7 +2106,7 @@ ErrorExit: if (Cleanup != false) { - VfsAcccessFileObjectCleanup(); + VfsAccessFileObjectCleanup(); LxtFsTestCleanup(VFS_ACCESS_PARENT_DIR, "/vfsaccesstest", g_UseDrvFs); } @@ -2135,7 +2135,7 @@ void VfsAccessUTimeCapChild(void) CapData[1].effective = CapData[1].permitted; // - // Drop privlidges so the current process does not have CAP_FOWNER. + // Drop privileges so the current process does not have CAP_FOWNER. // LxtCheckErrno(prctl(PR_SET_KEEPCAPS, 1)); @@ -2267,7 +2267,7 @@ int VfsAccessSetFsUid(PLXT_ARGS Args) } // - // Verify tha topening a the file fails since we no longer have the correct fsuid or capabilities. + // Verify that opening the file fails since we no longer have the correct fsuid or capabilities. // LxtCheckErrnoFailure(open(VFS_ACCESS_FSUID_FILE, O_RDWR), EACCES); @@ -2469,7 +2469,7 @@ int VfsAccessSetUid(PLXT_ARGS Args) // // This test checks that unprivileged processes can Set the euid // to the ruid or suid. Need to fork and wait as privileges are - // irreversably dropped by this syscall + // irreversibly dropped by this syscall // if (fork_wait() == 0) diff --git a/test/linux/unit_tests/vnet.c b/test/linux/unit_tests/vnet.c index 75a8fa8..6d08b19 100644 --- a/test/linux/unit_tests/vnet.c +++ b/test/linux/unit_tests/vnet.c @@ -139,7 +139,7 @@ static const LXT_VARIATION g_LxtVariations[] = { //{"Virtual Ethernet Pair namespace data check", VirtualEthernetPairNamespaceData}, // - // Moving physical adpaters between namespaces is not currently supported + // Moving physical adapters between namespaces is not currently supported // //{"Physical device basic namespace check", PhysicalDeviceNamespace1}, @@ -675,7 +675,7 @@ int DeleteVirtualDeviceViaNetlink(const char* Name) Routine Description: - This routine removes a virtual device using the netlink RTM_DELLLINK + This routine removes a virtual device using the netlink RTM_DELLINK message. Arguments: diff --git a/test/windows/Common.cpp b/test/windows/Common.cpp index c8d62f2..04023e4 100644 --- a/test/windows/Common.cpp +++ b/test/windows/Common.cpp @@ -1110,7 +1110,7 @@ Arguments: String - Supplies the string to split. - Delim - The deliminiter to split the string on. + Delim - The delimiter to split the string on. Return Value: @@ -1142,7 +1142,7 @@ Return Value: return output; } -// WslKeepAlive class defintions +// WslKeepAlive class definitions WslKeepAlive::WslKeepAlive(HANDLE Token) : m_token(Token) { @@ -2141,7 +2141,7 @@ Return Value: if (!g_originalDefaultDistro.empty()) { // Edge case: If the previous default distro was the test distro, it might have been deleted during the testpass. - // Validate the the distro exists before restoring. + // Validate the distro exists before restoring. const auto userKey = wsl::windows::common::registry::OpenLxssUserKey(); diff --git a/test/windows/InstallerTests.cpp b/test/windows/InstallerTests.cpp index ff53d87..ce5b5dc 100644 --- a/test/windows/InstallerTests.cpp +++ b/test/windows/InstallerTests.cpp @@ -332,7 +332,7 @@ class InstallerTests wsl::windows::common::registry::DeleteKeyValue(msiKey.get(), L"ProductCode"); } - void InstallGitubRelease(const std::wstring& version) + void InstallGitHubRelease(const std::wstring& version) { auto arch = wsl::shared::Arm64 ? L".0.arm64" : L".0.x64"; @@ -354,8 +354,8 @@ class InstallerTests LogInfo("Downloading: %ls", version.c_str()); VERIFY_IS_TRUE(g_pipelineBuildId.empty()); // Pipeline builds should have the installers already available - auto release = wsl::windows::common::wslutil::GetGithubReleaseByTag(version); - auto asset = wsl::windows::common::wslutil::GetGithubAssetFromRelease(release); + auto release = wsl::windows::common::wslutil::GetGitHubReleaseByTag(version); + auto asset = wsl::windows::common::wslutil::GetGitHubAssetFromRelease(release); VERIFY_IS_TRUE(asset.has_value()); auto downloadPath = wsl::windows::common::wslutil::DownloadFile(asset->second.url, asset->second.name); @@ -383,9 +383,9 @@ class InstallerTests TEST_METHOD(UpgradeFromWsl130) { UninstallMsi(); - InstallGitubRelease(L"1.3.17"); + InstallGitHubRelease(L"1.3.17"); - // Note: we can't use wsl --update here because GithubUrlOverride was introduced in 2.0.0 + // Note: we can't use wsl --update here because GitHubUrlOverride was introduced in 2.0.0 InstallMsi(); ValidatePackageInstalledProperly(); } @@ -395,7 +395,7 @@ class InstallerTests UninstallMsi(); // Note: we can't use wsl --update here because wsl 2.0.0 passes REINSTALL=ALL to msiexec - InstallGitubRelease(L"2.0.0"); + InstallGitHubRelease(L"2.0.0"); InstallMsi(); ValidatePackageInstalledProperly(); } @@ -403,7 +403,7 @@ class InstallerTests TEST_METHOD(UpgradeFromWsl202) { UninstallMsi(); - InstallGitubRelease(L"2.0.2"); + InstallGitHubRelease(L"2.0.2"); CallWslUpdateViaMsi(); } @@ -651,7 +651,7 @@ class InstallerTests RegistryKeyChange change( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Lxss", wsl::windows::common::wslutil::c_githubUrlOverrideRegistryValue, endpoint); - constexpr auto GithubApiResponse = + constexpr auto GitHubApiResponse = LR"({ \"name\": \"1.0.0\", \"created_at\": \"2023-06-14T16:56:30Z\", @@ -664,7 +664,7 @@ class InstallerTests ] })"; - UniqueWebServer server(endpoint, GithubApiResponse); + UniqueWebServer server(endpoint, GitHubApiResponse); auto [out, _] = LxsstuLaunchWslAndCaptureOutput(L"--update"); VERIFY_ARE_EQUAL( @@ -899,7 +899,7 @@ class InstallerTests RegistryKeyChange change( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Lxss", wsl::windows::common::wslutil::c_githubUrlOverrideRegistryValue, endpoint); - constexpr auto GithubApiResponse = + constexpr auto GitHubApiResponse = LR"({ \"name\": \"999.0.0\", \"created_at\": \"2023-06-14T16:56:30Z\", @@ -912,7 +912,7 @@ class InstallerTests ] })"; - UniqueWebServer apiServer(endpoint, GithubApiResponse); + UniqueWebServer apiServer(endpoint, GitHubApiResponse); UniqueWebServer fileServer(L"http://127.0.0.1:12346/", std::filesystem::path(m_msiPath)); // DeleteProductCode(); @@ -946,7 +946,7 @@ class InstallerTests RegistryKeyChange change( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Lxss", wsl::windows::common::wslutil::c_githubUrlOverrideRegistryValue, endpoint); - constexpr auto GithubApiResponse = + constexpr auto GitHubApiResponse = LR"({ \"name\": \"999.0.0\", \"created_at\": \"2023-06-14T16:56:30Z\", @@ -959,7 +959,7 @@ class InstallerTests ] })"; - UniqueWebServer apiServer(endpoint, GithubApiResponse); + UniqueWebServer apiServer(endpoint, GitHubApiResponse); UniqueWebServer fileServer(L"http://127.0.0.1:12346/", std::filesystem::path(m_msixPackagePath)); UninstallMsix(); diff --git a/test/windows/MountTests.cpp b/test/windows/MountTests.cpp index ae0cf11..00447a0 100644 --- a/test/windows/MountTests.cpp +++ b/test/windows/MountTests.cpp @@ -1172,7 +1172,7 @@ class MountTests VERIFY_ARE_EQUAL(mount.value()[1], Mountpoint.value()); VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"test -d " + Mountpoint.value()), (DWORD)0); - // If specifed, validate that ExpectedOption is in the mount options + // If specified, validate that ExpectedOption is in the mount options // (We don't want to do a direct compare because the kernel might add some like rw, ...) if (ExpectedOption.has_value()) { diff --git a/test/windows/NetworkTests.cpp b/test/windows/NetworkTests.cpp index 5a980c6..c4994e2 100644 --- a/test/windows/NetworkTests.cpp +++ b/test/windows/NetworkTests.cpp @@ -2634,7 +2634,7 @@ class NetworkTests // Because the test creates a new network namespace, the resolv.conf from the root network namespace // is copied in the resolv.conf of the new network namespace. The DNS tunneling listener running in the root namespace - // needs to be accesible from the new namespace, so it can't use a 127* IP. + // needs to be accessible from the new namespace, so it can't use a 127* IP. WslConfigChange config(LxssGenerateTestConfig({ .guiApplications = true, .dnsTunneling = true, @@ -2662,7 +2662,7 @@ class NetworkTests // Because the test creates a new network namespace, the resolv.conf from the root network namespace // is copied in the resolv.conf of the new network namespace. The DNS tunneling listener running in the root namespace - // needs to be accesible from the new namespace, so it can't use a 127* IP + // needs to be accessible from the new namespace, so it can't use a 127* IP WslConfigChange config(LxssGenerateTestConfig( {.guiApplications = true, .networkingMode = wsl::core::NetworkingMode::Mirrored, .dnsTunneling = true, .dnsTunnelingIpAddress = L"10.255.255.254"})); WaitForMirroredStateInLinux(); @@ -2886,7 +2886,7 @@ class NetworkTests { // Verify that we have an initially working connection. // This also ensures that WSL is started to allow for - // valdiating the initial Hyper-V port state + // validating the initial Hyper-V port state GuestClient(L"tcp-connect:bing.com:80"); if (expectHyperVFirewallObjects == FirewallObjects::Required) @@ -2952,7 +2952,7 @@ class NetworkTests static auto AddFirewallRuleAndValidateTraffic(const FirewallRule& rule, FirewallTestConnectivity expectedConnectivityAfterRule) { LogInfo( - "Validing ruleType=[%ls] name=[%ls] and expectedConnectivity=[%ls]", + "Validating ruleType=[%ls] name=[%ls] and expectedConnectivity=[%ls]", (rule.Type == FirewallType::Host) ? L"Host" : L"HyperV", rule.Name.c_str(), expectedConnectivityAfterRule == FirewallTestConnectivity::Allowed ? L"Allowed" : L"Blocked"); diff --git a/test/windows/PluginTests.cpp b/test/windows/PluginTests.cpp index 7de1780..036efdf 100644 --- a/test/windows/PluginTests.cpp +++ b/test/windows/PluginTests.cpp @@ -168,7 +168,7 @@ class PluginTests ValidateLogFile(ExpectedOutput); } - TEST_METHOD(CustomKernelOverridenByPolicy) + TEST_METHOD(CustomKernelOverriddenByPolicy) { WSL2_TEST_ONLY(); @@ -594,7 +594,7 @@ class PluginTests LR"(Plugin loaded. TestMode=15 VM created (settings->CustomConfigurationFlags=0) Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=12 - OnDistributionRegisted: E_UNEXPECTED + OnDistributionRegistered: E_UNEXPECTED Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=12 OnDistributionUnregistered: E_UNEXPECTED VM Stopping)"; diff --git a/test/windows/PolicyTests.cpp b/test/windows/PolicyTests.cpp index c00e4fb..2fa0be7 100644 --- a/test/windows/PolicyTests.cpp +++ b/test/windows/PolicyTests.cpp @@ -281,7 +281,7 @@ class PolicyTest auto revert = SetPolicy(c_allowDebugShellUserSetting, 0); WslShutdown(); - // Only testing the negative case since the debug shell is difficult to programatically exit. + // Only testing the negative case since the debug shell is difficult to programmatically exit. WslKeepAlive keepAlive; ValidateOutput(L"--debug-shell", L"The debug shell is disabled by the computer policy.\r\n", L"", 1); @@ -378,7 +378,7 @@ class PolicyTest // Ensure the top-level disable WSL policy works. testPolicy(wsl::windows::policies::c_allowWSL, HRESULT_FROM_WIN32(ERROR_ACCESS_DISABLED_BY_POLICY), restartService); - // Verfiy the disable inbox WSL policy does not block lifted. + // Verify the disable inbox WSL policy does not block lifted. testPolicy(wsl::windows::policies::c_allowInboxWSL, S_OK, restartService); } diff --git a/test/windows/SimpleTests.cpp b/test/windows/SimpleTests.cpp index 0b2d39e..04b44fe 100644 --- a/test/windows/SimpleTests.cpp +++ b/test/windows/SimpleTests.cpp @@ -183,8 +183,8 @@ class SimpleTests {nullptr, std::nullopt}, {"", std::nullopt}, {"2", std::nullopt}, - {"tru", std::nullopt}, - {"fals", std::nullopt}, + {"true_", std::nullopt}, + {"false_", std::nullopt}, }; for (const auto& [input, expected] : boolTests) diff --git a/test/windows/UnitTests.cpp b/test/windows/UnitTests.cpp index 932cf46..400dc90 100644 --- a/test/windows/UnitTests.cpp +++ b/test/windows/UnitTests.cpp @@ -373,7 +373,7 @@ class UnitTests // Enable systemd (restarts distro). auto cleanupSystemd = EnableSystemd("protectBinfmt=false"); - // Validate that WSL's binfmt interpreter is overriden + // Validate that WSL's binfmt interpreter is overridden auto [output, _] = LxsstuLaunchWslAndCaptureOutput(L"cmd.exe /c echo ok"); VERIFY_IS_TRUE(wsl::shared::string::IsEqual(output, L"/mnt/c/Windows/system32/cmd.exe cmd.exe /c echo ok\n", true)); } @@ -788,7 +788,7 @@ class UnitTests VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"wslinfo --networking-mode | wc -l | grep 1"), 0u); VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"wslinfo --networking-mode -n | wc -l | grep 0"), 0u); - // Ensure various wslinfo functionaly works as expected. + // Ensure various wslinfo functionally works as expected. VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"wslinfo --networking-mode | grep -iF 'nat'"), 0u); WslConfigChange config(LxssGenerateTestConfig({.networkingMode = wsl::core::NetworkingMode::None})); @@ -1236,8 +1236,8 @@ class UnitTests L"Wsl/Service/DetachDisk/ERROR_FILE_NOT_FOUND"); ValidateErrorMessage( - WSL_MANAGE_ARG L" " LXSS_DISTRO_NAME_TEST L" " WSL_MANAGE_ARG_SET_SPARSE_OPTION_LONG L" fulse", - L"fulse is not a valid boolean, ", + WSL_MANAGE_ARG L" " LXSS_DISTRO_NAME_TEST L" " WSL_MANAGE_ARG_SET_SPARSE_OPTION_LONG L" false_", + L"false_ is not a valid boolean, ", L"Wsl/E_INVALIDARG"); const std::wstring wslConfigPath = wsl::windows::common::helpers::GetWslConfigPath(); @@ -1916,7 +1916,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND // This loop is here because of a race condition when starting WSL to get the warnings. // If a p9rdr distribution startup notification arrives just before wsl.exe calls CreateInstance(), - // the warnings will be 'consummed' before wsl.exe can read them. + // the warnings will be 'consumed' before wsl.exe can read them. // To work around that, loop for up to 2 minutes while we don't get any warnings const auto deadline = std::chrono::steady_clock::now() + std::chrono::minutes(2); @@ -1973,7 +1973,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND // This loop is here because of a race condition when starting WSL to get the warnings. // If a p9rdr distribution startup notification arrives just before wsl.exe calls CreateInstance(), - // the warnings will be 'consummed' before wsl.exe can read them. + // the warnings will be 'consumed' before wsl.exe can read them. // To work around that, loop for up to 2 minutes while we don't get any warnings const auto deadline = std::chrono::steady_clock::now() + std::chrono::minutes(2); @@ -2568,7 +2568,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND auto cleanup = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, [&]() { LxsstuLaunchWsl(L"--set-version test_distro " + originalVersion); }); - // Convert the test distribuiton to the target version and back to the original. + // Convert the test distribution to the target version and back to the original. VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--set-version test_distro " + targetVersion), 0u); ValidateDistributionShortcut(LXSS_DISTRO_NAME_TEST_L, nullptr); ValidateDistributionTerminalProfile(LXSS_DISTRO_NAME_TEST_L, true); @@ -2629,7 +2629,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND VERIFY_ARE_EQUAL(LxsstuLaunchWsl(command.c_str(), nullptr, nullptr, nullptr, nullptr), 0u); - // Update .wslconfig and ensure an error is displayed if non-existent kernel or modules is specified. + // Update .wslconfig and ensure an error is displayed if nonexistent kernel or modules is specified. const std::wstring wslConfigPath = wsl::windows::common::helpers::GetWslConfigPath(); const std::wstring nonExistentFile = L"DoesNotExist"; WslConfigChange configChange(LxssGenerateTestConfig({.kernel = nonExistentFile.c_str()})); @@ -3189,13 +3189,13 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND booleansToTest, }, { - {.ConfigEntry = WslConfigEntry::DNSTunellingEnabled}, + {.ConfigEntry = WslConfigEntry::DNSTunnelingEnabled}, // This setting is only enabled when NetworkingMode != Nat && NetworkingMode != Mirrored booleansToTest, }, { {.ConfigEntry = WslConfigEntry::BestEffortDNSParsingEnabled}, - // This setting is only enabled when DNSTunellingEnabled = true + // This setting is only enabled when DNSTunnelingEnabled = true booleansToTest, }, { @@ -3351,7 +3351,7 @@ autoProxy=false VERIFY_ARE_EQUAL(setWslConfigSetting(wslConfig, wslConfigSettingWriteOut), ERROR_SUCCESS); - // Write out a new setting that doesn't exist in the original config but its' section + // Write out a new setting that doesn't exist in the original config but its section // does. The new setting should be appended to that section. There are two cases here:: wslConfigSettingWriteOut.ConfigEntry = WslConfigEntry::HardwarePerformanceCountersEnabled; wslConfigSettingWriteOut.BoolValue = true; @@ -4013,7 +4013,7 @@ VERSION_ID="Invalid|Format" }; auto InstallFromTar = - [](LPCWSTR TarName, LPCWSTR ExtraArgs = L"", int ExpectedExitCode = 0, LPCWSTR ExpectedOutput = nullptr, LPCWSTR ExpextedWarnings = nullptr) { + [](LPCWSTR TarName, LPCWSTR ExtraArgs = L"", int ExpectedExitCode = 0, LPCWSTR ExpectedOutput = nullptr, LPCWSTR ExpectedWarnings = nullptr) { auto [out, err] = LxsstuLaunchWslAndCaptureOutput( std::format(L"--install --no-launch --from-file {} {}", TarName, ExtraArgs), ExpectedExitCode); @@ -4022,9 +4022,9 @@ VERSION_ID="Invalid|Format" VERIFY_ARE_EQUAL(ExpectedOutput, out); } - if (ExpextedWarnings != nullptr) + if (ExpectedWarnings != nullptr) { - VERIFY_ARE_EQUAL(ExpextedWarnings, err); + VERIFY_ARE_EQUAL(ExpectedWarnings, err); } }; @@ -4158,7 +4158,7 @@ Error code: Wsl/Service/RegisterDistro/WSL_E_DISTRIBUTION_NAME_NEEDED\r\n"; InstallFromTar(L"distro-no-default-name.tar", L"", -1, expectedOutput); - // And suceed with --name + // And succeed with --name InstallFromTar(L"distro-no-default-name.tar", L"--name test-distro-no-default-name"); ValidateDistributionStarts(L"test-distro-no-default-name"); @@ -4260,7 +4260,7 @@ Error code: Wsl/Service/RegisterDistro/WSL_E_DISTRIBUTION_NAME_NEEDED\r\n"; }; auto InstallFromVhd = - [](LPCWSTR DistroName, LPCWSTR VhdName, int ExpectedExitCode = 0, LPCWSTR ExpectedOutput = nullptr, LPCWSTR ExpextedWarnings = nullptr) { + [](LPCWSTR DistroName, LPCWSTR VhdName, int ExpectedExitCode = 0, LPCWSTR ExpectedOutput = nullptr, LPCWSTR ExpectedWarnings = nullptr) { auto [out, err] = LxsstuLaunchWslAndCaptureOutput(std::format(L"--import-in-place {} {}", DistroName, VhdName), ExpectedExitCode); @@ -4269,9 +4269,9 @@ Error code: Wsl/Service/RegisterDistro/WSL_E_DISTRIBUTION_NAME_NEEDED\r\n"; VERIFY_ARE_EQUAL(ExpectedOutput, out); } - if (ExpextedWarnings != nullptr) + if (ExpectedWarnings != nullptr) { - VERIFY_ARE_EQUAL(ExpextedWarnings, err); + VERIFY_ARE_EQUAL(ExpectedWarnings, err); } }; @@ -4309,18 +4309,18 @@ Error code: Wsl/Service/RegisterDistro/WSL_E_DISTRIBUTION_NAME_NEEDED\r\n"; VERIFY_IS_FALSE(std::filesystem::exists(shortcutPath)); } - // Distribution with overriden default location + // Distribution with overridden default location { - auto cleanup = - wil::scope_exit_log(WI_DIAGNOSTICS_INFO, []() { LxsstuLaunchWsl(L"--unregister test-overriden-default-location"); }); + auto cleanup = wil::scope_exit_log( + WI_DIAGNOSTICS_INFO, []() { LxsstuLaunchWsl(L"--unregister test-overridden-default-location"); }); auto currentPath = std::filesystem::current_path(); WslConfigChange wslconfig(std::format(L"[general]\ndistributionInstallPath = {}", EscapePath(currentPath.wstring()))); - InstallFromTar(g_testDistroPath.c_str(), L"--name test-overriden-default-location"); - ValidateDistributionStarts(L"test-overriden-default-location"); + InstallFromTar(g_testDistroPath.c_str(), L"--name test-overridden-default-location"); + ValidateDistributionStarts(L"test-overridden-default-location"); - auto distroKey = OpenDistributionKey(L"test-overriden-default-location"); + auto distroKey = OpenDistributionKey(L"test-overridden-default-location"); VERIFY_IS_TRUE(!!distroKey); auto shortcutPath = wsl::windows::common::registry::ReadString(distroKey.get(), nullptr, L"ShortcutPath", L""); @@ -4332,7 +4332,7 @@ Error code: Wsl/Service/RegisterDistro/WSL_E_DISTRIBUTION_NAME_NEEDED\r\n"; // Validate that the distribution was created in the correct path VERIFY_ARE_EQUAL(std::filesystem::path(basePath).parent_path().string(), currentPath.string()); - ValidateDistributionShortcut(L"test-overriden-default-location", nullptr); + ValidateDistributionShortcut(L"test-overridden-default-location", nullptr); cleanup.reset(); @@ -4572,7 +4572,7 @@ Error code: Wsl/Service/RegisterDistro/E_INVALIDARG\r\n"; ValidateDistributionStarts(distroName); } - // Distribution with a a pre-existing hide profile. + // Distribution with a preexisting hide profile. { constexpr auto distroName = L"custom-terminal-profile-hide"; constexpr auto tarName = L"custom-terminal-profile-hide.tar"; @@ -4808,13 +4808,13 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND\r\n"); VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--unregister debian-12"), 0L); - // Verify that name matching is not case sensitive on the version. + // Verify that name matching is not case-sensitive on the version. ValidateInstall(L"Debian-12 --no-launch --name debian-12"); ValidateDistributionStarts(L"debian-12"); VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--unregister debian-12"), 0L); - // Verify that name matching is not case sensitive on the flavor. + // Verify that name matching is not case-sensitive on the flavor. ValidateInstall(L"Debian --no-launch --name debian-12"); ValidateDistributionStarts(L"debian-12"); @@ -4961,7 +4961,7 @@ Error code: Wsl/InstallDistro/WININET_E_CANNOT_CONNECT\r\n", L"wsl: Using legacy distribution registration. Consider using a tar based distribution instead.\r\n"); } - // Validate that modern distros takes precedences, but can be overriden. + // Validate that modern distros takes precedences, but can be overridden. { auto manifest = std::format( R"({{ @@ -5005,7 +5005,7 @@ Error code: Wsl/InstallDistro/WININET_E_CANNOT_CONNECT\r\n", L"wsl: Using legacy distribution registration. Consider using a tar based distribution instead.\r\n"); } - // Validate that distribution can be overriden + // Validate that distribution can be overridden { auto manifest = std::format( R"({{ @@ -5042,7 +5042,7 @@ Error code: Wsl/InstallDistro/WININET_E_CANNOT_CONNECT\r\n", "debian": [ {{ "Name": "debian-12", - "FriendlyName": "DebianFriendlyNameOverriden", + "FriendlyName": "DebianFriendlyNameOverridden", "Amd64Url": {{ "Url": "{}", "Sha256": "{}" @@ -5925,7 +5925,7 @@ Error code: Wsl/InstallDistro/WSL_E_INVALID_JSON\r\n", "name": "wsl.2.4.12.0.x64.msi" }]})"; - auto [version, asset] = wsl::windows::common::wslutil::GetLatestGithubRelease(false, json); + auto [version, asset] = wsl::windows::common::wslutil::GetLatestGitHubRelease(false, json); VERIFY_ARE_EQUAL(version, L"2.4.12"); VERIFY_ARE_EQUAL(asset.id, 2); @@ -5959,7 +5959,7 @@ Error code: Wsl/InstallDistro/WSL_E_INVALID_JSON\r\n", "name": "2.4.13" }])"; - auto [version, asset] = wsl::windows::common::wslutil::GetLatestGithubRelease(true, json); + auto [version, asset] = wsl::windows::common::wslutil::GetLatestGitHubRelease(true, json); VERIFY_ARE_EQUAL(version, L"2.5.1"); VERIFY_ARE_EQUAL(asset.id, 2); diff --git a/test/windows/testplugin/Plugin.cpp b/test/windows/testplugin/Plugin.cpp index b5986b1..50be9e7 100644 --- a/test/windows/testplugin/Plugin.cpp +++ b/test/windows/testplugin/Plugin.cpp @@ -29,7 +29,7 @@ std::optional g_previousInitPid; std::vector ReadFromSocket(SOCKET socket) { - // Simplfied error handling for the sake of the demo. + // Simplified error handling for the sake of the demo. int result = 0; int offset = 0; @@ -96,7 +96,7 @@ HRESULT OnVmStarted(const WSLSessionInformation* Session, const WSLVmCreationSet auto output = ReadFromSocket(socket.get()); if (output != std::vector{'O', 'K'}) { - g_logfile << "Got unepected output from bash" << std::endl; + g_logfile << "Got unexpected output from bash" << std::endl; return E_ABORT; } } @@ -306,7 +306,7 @@ HRESULT OnDistroStopping(const WSLSessionInformation* Session, const WSLDistribu return S_OK; } -HRESULT OnDistributionRegisted(const WSLSessionInformation* Session, const WslOfflineDistributionInformation* Distribution) +HRESULT OnDistributionRegistered(const WSLSessionInformation* Session, const WslOfflineDistributionInformation* Distribution) { g_logfile << "Distribution registered, name=" << wsl::shared::string::WideToMultiByte(Distribution->Name) << ", package=" << wsl::shared::string::WideToMultiByte(Distribution->PackageFamilyName) @@ -315,7 +315,7 @@ HRESULT OnDistributionRegisted(const WSLSessionInformation* Session, const WslOf if (g_testType == PluginTestType::FailToRegisterUnregisterDistro) { - g_logfile << "OnDistributionRegisted: E_UNEXPECTED" << std::endl; + g_logfile << "OnDistributionRegistered: E_UNEXPECTED" << std::endl; return E_UNEXPECTED; } @@ -357,7 +357,7 @@ EXTERN_C __declspec(dllexport) HRESULT WSLPLUGINAPI_ENTRYPOINTV1(const WSLPlugin Hooks->OnVMStopping = &OnVmStopping; Hooks->OnDistributionStarted = &OnDistroStarted; Hooks->OnDistributionStopping = &OnDistroStopping; - Hooks->OnDistributionRegistered = &OnDistributionRegisted; + Hooks->OnDistributionRegistered = &OnDistributionRegistered; Hooks->OnDistributionUnregistered = &OnDistributionUnregistered; if (g_testType == PluginTestType::FailToLoad) diff --git a/tools/devops/create-change.py b/tools/devops/create-change.py index 523b692..a791206 100644 --- a/tools/devops/create-change.py +++ b/tools/devops/create-change.py @@ -3,17 +3,17 @@ import requests import json from git import Repo -COMMITER_EMAIL = 'noreply@microsoft.com' +COMMITTER_EMAIL = 'noreply@microsoft.com' REPO = 'microsoft/wsl' @click.command() @click.argument('repo_path', required=True) @click.argument('token', required=True) -@click.argument('commiter', required=True) +@click.argument('committer', required=True) @click.argument('message', required=True) @click.argument('branch', required=True) @click.option('--debug', default=False, is_flag=True) -def main(repo_path: str, token: str, commiter: str, message: str, branch: str, debug: bool): +def main(repo_path: str, token: str, committer: str, message: str, branch: str, debug: bool): try: repo = Repo(repo_path) @@ -29,8 +29,8 @@ def main(repo_path: str, token: str, commiter: str, message: str, branch: str, d repo.create_head(branch).checkout() with repo.config_writer() as config: - config.set_value("user", "email", COMMITER_EMAIL) - config.set_value("user", "name", commiter) + config.set_value("user", "email", COMMITTER_EMAIL) + config.set_value("user", "name", committer) repo.git.commit('-a', m=message) repo.git.push('origin', branch) diff --git a/tools/devops/create-release.py b/tools/devops/create-release.py index cc3a467..360495a 100644 --- a/tools/devops/create-release.py +++ b/tools/devops/create-release.py @@ -78,7 +78,7 @@ def main(version: str, previous: str, max_message_lines: int, publish: bool, ass def get_github_pr_message(token: str, message: str) -> str: match = re.search(r'\(#([0-9]+)\)', message) if match is None: - print(f'Warning: failed to extract Github PR number from message: {message}') + print(f'Warning: failed to extract GitHub PR number from message: {message}') return None, None pr_number = match.group(1) @@ -108,7 +108,7 @@ def get_previous_release(version: tuple) -> str: previous_versions = [e for e in versions if e < version] if not previous_versions: - raise RuntimeError(f'No previous found on Github. Response: {response.json()}') + raise RuntimeError(f'No previous found on GitHub. Response: {response.json()}') return '.'.join(str(e) for e in max(previous_versions)) @@ -176,7 +176,7 @@ def get_change_list(version: str, previous: str, fetch: bool) -> list: @backoff.on_exception(backoff.expo, (requests.exceptions.Timeout, requests.exceptions.ConnectionError, requests.exceptions.RequestException), max_time=600) def publish_release(version: str, changes: str, assets: list, auto_release_notes: bool, token: str): - print(f'Creating private Github release for: {version}', file=sys.stderr) + print(f'Creating private GitHub release for: {version}', file=sys.stderr) # First create the release headers = {'Accept': 'application/vnd.github+json', diff --git a/tools/test/gh-release-server.py b/tools/test/gh-release-server.py index a9499bc..8c7f0c7 100644 --- a/tools/test/gh-release-server.py +++ b/tools/test/gh-release-server.py @@ -62,7 +62,7 @@ def main(port: int, version: str, msi: str, msix: str, pre_release: bool): else: print(f'Received unexpected request: {self.path}') - SetValueEx(lxss_key, 'GithubUrlOverride', 0, REG_SZ, f'http://127.0.0.1:{port}{RELEASES_PATH}') + SetValueEx(lxss_key, 'GitHubUrlOverride', 0, REG_SZ, f'http://127.0.0.1:{port}{RELEASES_PATH}') try: @@ -70,7 +70,7 @@ def main(port: int, version: str, msi: str, msix: str, pre_release: bool): print(f'Serving on port {port}') server.serve_forever() finally: - DeleteValue(lxss_key, 'GithubUrlOverride') + DeleteValue(lxss_key, 'GitHubUrlOverride') if __name__ == '__main__': main() \ No newline at end of file diff --git a/tools/test/setup-vm-for-tests.ps1 b/tools/test/setup-vm-for-tests.ps1 index 21e471f..335d53e 100644 --- a/tools/test/setup-vm-for-tests.ps1 +++ b/tools/test/setup-vm-for-tests.ps1 @@ -22,9 +22,9 @@ .PARAMETER SkipEnableFeatures Skip enabling optional Windows features necessary for some tests. .PARAMETER RemoteFolder - Absolute Path to a folder on the the VM to copy requisite files to. Defaults to "C:\Package". + Absolute Path to a folder on the VM to copy requisite files to. Defaults to "C:\Package". .PARAMETER TaefFolder - Absolute Path to a folder on the the VM to copy taef binaries. Defaults to "C:\Taef". + Absolute Path to a folder on the VM to copy taef binaries. Defaults to "C:\Taef". .PARAMETER SkipDistro Skip copying over the distro. .PARAMETER TestDistroPath diff --git a/triage/config.yml b/triage/config.yml index d5044a7..9bf4f4a 100644 --- a/triage/config.yml +++ b/triage/config.yml @@ -5,7 +5,7 @@ logs_rules: # Logs are required for review from WSL team If this a feature request, please reply with '/feature'. If this is a question, reply with '/question'. - **Otherwise please attach logs by following the instructions below**, your issue will not be reviewed unless they are added. These logs will help us understand what is going on in your machine. + **Otherwise, please attach logs by following the instructions below**, your issue will not be reviewed unless they are added. These logs will help us understand what is going on in your machine.
@@ -21,11 +21,12 @@ logs_rules: The script will output the path of the log file once done. - If this is a networking issue, please use [collect-networking-logs.ps1](https://github.com/Microsoft/WSL/blob/master/diagnostics/collect-networking-logs.ps1), following the instructions [here](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#collect-wsl-logs-for-networking-issues) + If this is a networking issue, please use [collect-networking-logs.ps1](https://github.com/Microsoft/WSL/blob/master/diagnostics/collect-networking-logs.ps1), following the instructions in [Collect WSL logs for networking issues](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#collect-wsl-logs-for-networking-issues) - Once completed please upload the output files to this Github issue. + Once completed please upload the output files to this GitHub issue. - [Click here for more info on logging](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method) + See [Collect WSL logs (recommended method)](https://github.com/microsoft/WSL/blob/master/CONTRIBUTING.md#8-collect-wsl-logs-recommended-method). + If you choose to email these logs instead of attaching to the bug, please send them to wsl-gh-logs@microsoft.com with the number of the github issue in the subject, and in the message a link to your comment in the github issue and reply with '/emailed-logs'.
@@ -386,7 +387,7 @@ actions: defaultVhdSize = # (example: 1500GB) ``` - Otherwise if you need to increase the size of an existing distribution, you can follow [these instructions](https://learn.microsoft.com/en-us/windows/wsl/disk-space#how-to-expand-the-size-of-your-wsl-2-virtual-hard-disk). + Otherwise, if you need to increase the size of an existing distribution, you can follow [these instructions](https://learn.microsoft.com/en-us/windows/wsl/disk-space#how-to-expand-the-size-of-your-wsl-2-virtual-hard-disk). - when: condition: