diff --git a/include/wil/com.h b/include/wil/com.h index f6ff5d1e4..60bd6a410 100644 --- a/include/wil/com.h +++ b/include/wil/com.h @@ -1126,7 +1126,7 @@ inline bool operator<=(const ::Microsoft::WRL::ComPtr& left, const com_pt // raw COM pointer support // -// Use these for convenience and to avoid unnecessary AddRef/Release cyles when using raw +// Use these for convenience and to avoid unnecessary AddRef/Release cycles when using raw // pointers to access STL containers. Specify std::less<> to benefit from operator<. // // Example: std::set, std::less<>> set; diff --git a/include/wil/common.h b/include/wil/common.h index c3333fdfc..3a08edafa 100644 --- a/include/wil/common.h +++ b/include/wil/common.h @@ -1015,7 +1015,7 @@ template , int> = 0> void doit(const T&); ~~~ If `doit` is called with a type `T` that satisfies both `condition_a` and `condition_b`, the code will fail to -compile. One way to solve this issue is to change the condiiton of the second overload to +compile. One way to solve this issue is to change the condition of the second overload to `condition_b && !condition_a`, however this can get quite complicated and verbose fast. With `priority_tag`, this could get simplified down to: ~~~ diff --git a/include/wil/resource.h b/include/wil/resource.h index c2ff77e19..8e07dbb74 100644 --- a/include/wil/resource.h +++ b/include/wil/resource.h @@ -883,7 +883,7 @@ details::out_param_ptr_t out_param_ptr(T& ptr) /** Use unique_struct to define an RAII type for a trivial struct that references resources that must be cleaned up. Unique_struct wraps a trivial struct using a custom clean up function and, optionally, custom initializer function. If no custom -initialier function is defined in the template then ZeroMemory is used. +initializer function is defined in the template then ZeroMemory is used. Unique_struct is modeled off of std::unique_ptr. However, unique_struct inherits from the defined type instead of managing the struct through a private member variable. @@ -2653,7 +2653,7 @@ namespace details }; // SetThreadpoolTimer(timer, nullptr, 0, 0) will cancel any pending callbacks, - // then CloseThreadpoolTimer will asynchronusly close the timer if a callback is running. + // then CloseThreadpoolTimer will asynchronously close the timer if a callback is running. template struct DestroyThreadPoolTimer { diff --git a/include/wil/result_macros.h b/include/wil/result_macros.h index c59ac971f..5c4700f76 100644 --- a/include/wil/result_macros.h +++ b/include/wil/result_macros.h @@ -159,7 +159,7 @@ WI_ODR_PRAGMA("WIL_FreeMemory", "0") // RESULT_DIAGNOSTICS_LEVEL // This define controls the level of diagnostic instrumentation that is built into the binary as a // byproduct of using the macros. The amount of diagnostic instrumentation that is supplied is -// a trade-off between diagnosibility of issues and code size and performance. The modes are: +// a trade-off between diagnosability of issues and code size and performance. The modes are: // 0 - No diagnostics, smallest & fastest (subject to tail-merge) // 1 - No diagnostics, unique call sites for each macro (defeat's tail-merge) // 2 - Line number @@ -4373,8 +4373,8 @@ namespace details // Returns true if a debugger should be considered to be connected. // Modules can force this on through setting g_fIsDebuggerPresent explicitly (useful for live debugging), - // they can provide a callback function by setting g_pfnIsDebuggerPresent (useful for kernel debbugging), - // and finally the user-mode check (IsDebuggerPrsent) is checked. IsDebuggerPresent is a fast call + // they can provide a callback function by setting g_pfnIsDebuggerPresent (useful for kernel debugging), + // and finally the user-mode check (IsDebuggerPresent) is checked. IsDebuggerPresent is a fast call. inline bool IsDebuggerPresent() { return g_fIsDebuggerPresent || diff --git a/include/wil/win32_helpers.h b/include/wil/win32_helpers.h index 7a58e15a9..abf417f9f 100644 --- a/include/wil/win32_helpers.h +++ b/include/wil/win32_helpers.h @@ -161,8 +161,8 @@ constexpr size_t guid_string_length = 38; #pragma region String and identifier comparisons // Using CompareStringOrdinal functions: // -// Indentifiers require a locale-less (ordinal), and often case-insensitive, comparison (filenames, registry keys, XML node names, -// etc). DO NOT use locale-sensitive (lexical) comparisons for resource identifiers (e.g.wcs*() functions in the CRT). +// Identifiers require a locale-less (ordinal), and often case-insensitive, comparison (filenames, registry keys, XML node names, +// etc). DO NOT use locale-sensitive (lexical) comparisons for resource identifiers (e.g. wcs*() functions in the CRT). #if WIL_USE_STL && (__cpp_lib_string_view >= 201606L) /// @cond @@ -1147,7 +1147,7 @@ inline std::basic_string ArgvToCommandLine(RangeT&& range, ArgvToCommandL // behavior of CommandLineToArgvW is to just preserve "interior" quotes, so we do that. // NOTE: 'CommandLineToArgvW' treats "interior" quotes as terminating quotes when the executable // path begins with a quote, even if the next character is not a space. This assert won't catch all - // of such issues as we may detect a space, and therefore the need to surroud the argument with + // of such issues as we may detect a space, and therefore the need to surround the argument with // quotes, later in the string; this is best effort. Such arguments wouldn't be valid and are not // representable anyway WI_ASSERT((pos > 0) && !WI_IsFlagSet(flags, ArgvToCommandLineFlags::ForceQuotes) && !terminateWithQuotes); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 00628c23d..a994ff21b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -91,8 +91,8 @@ set(WINRT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WinRTTests.cpp ) -# Source files that can compile on Win11+, but only on the Destkop partition -set(WIN11_DESTKTOP_SOURCES +# Source files that can compile on Win11+, but only on the Desktop partition +set(WIN11_DESKTOP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WinVerifyTrustTest.cpp ) diff --git a/tests/CppWinRTAuthoringTests.cpp b/tests/CppWinRTAuthoringTests.cpp index ec332e392..ad4ebaab4 100644 --- a/tests/CppWinRTAuthoringTests.cpp +++ b/tests/CppWinRTAuthoringTests.cpp @@ -80,7 +80,7 @@ static void WaitForWinRTModuleLock() { FAIL( "C++/WinRT module lock did not reach zero within 5 seconds. This likely signals a memory leak in a previous test. " - "If this is the case, the issue should be reproducable locally by running with '--rng-seed ' with the seed " + "If this is the case, the issue should be reproducible locally by running with '--rng-seed ' with the seed " "that was printed by Catch2 at the start of this executable's execution."); } diff --git a/tests/cpplatest/CMakeLists.txt b/tests/cpplatest/CMakeLists.txt index 81760f4fa..0d319baaf 100644 --- a/tests/cpplatest/CMakeLists.txt +++ b/tests/cpplatest/CMakeLists.txt @@ -21,7 +21,7 @@ target_sources(witest.cpplatest PRIVATE ${COMMON_SOURCES} ${DOWNLEVEL_SOURCES} ${WINRT_SOURCES} - ${WIN11_DESTKTOP_SOURCES} + ${WIN11_DESKTOP_SOURCES} ${CPP20_SOURCES} ) diff --git a/tests/mocking.h b/tests/mocking.h index c2e6a4f35..1642636cd 100644 --- a/tests/mocking.h +++ b/tests/mocking.h @@ -451,8 +451,8 @@ struct detoured_thread_function : details::detoured_thread_function_basem_next; } - // Faling this check would likely imply that this object is being destroyed on the wrong thread. No matter the reason, - // this should be considered a pretty fatal error + // Failing this check would likely imply that this object is being destroyed on the wrong thread. No matter the + // reason, this should be considered a pretty fatal error FAIL_FAST_IF_NULL(*entryPtr); *entryPtr = m_next; diff --git a/tests/noexcept/CMakeLists.txt b/tests/noexcept/CMakeLists.txt index 5261a8be1..e88fb3787 100644 --- a/tests/noexcept/CMakeLists.txt +++ b/tests/noexcept/CMakeLists.txt @@ -26,5 +26,5 @@ target_sources(witest.noexcept PRIVATE ${COMMON_SOURCES} ${DOWNLEVEL_SOURCES} ${WINRT_SOURCES} - ${WIN11_DESTKTOP_SOURCES} + ${WIN11_DESKTOP_SOURCES} ) diff --git a/tests/normal/CMakeLists.txt b/tests/normal/CMakeLists.txt index bc7d16397..5eb5b2b55 100644 --- a/tests/normal/CMakeLists.txt +++ b/tests/normal/CMakeLists.txt @@ -7,5 +7,5 @@ target_sources(witest PRIVATE ${COMMON_SOURCES} ${DOWNLEVEL_SOURCES} ${WINRT_SOURCES} - ${WIN11_DESTKTOP_SOURCES} + ${WIN11_DESKTOP_SOURCES} ) diff --git a/tests/sanitize-address/CMakeLists.txt b/tests/sanitize-address/CMakeLists.txt index 22e610c5c..2e68241dc 100644 --- a/tests/sanitize-address/CMakeLists.txt +++ b/tests/sanitize-address/CMakeLists.txt @@ -60,6 +60,6 @@ target_sources(witest.asan PUBLIC ${COMMON_SOURCES} ${DOWNLEVEL_SOURCES} ${WINRT_SOURCES} - ${WIN11_DESTKTOP_SOURCES} + ${WIN11_DESKTOP_SOURCES} ${EXTRA_SOURCES} ) diff --git a/tests/sanitize-undefined-behavior/CMakeLists.txt b/tests/sanitize-undefined-behavior/CMakeLists.txt index 688cc1a31..27a5ce046 100644 --- a/tests/sanitize-undefined-behavior/CMakeLists.txt +++ b/tests/sanitize-undefined-behavior/CMakeLists.txt @@ -20,5 +20,5 @@ target_sources(witest.ubsan PUBLIC ${COMMON_SOURCES} ${DOWNLEVEL_SOURCES} ${WINRT_SOURCES} - ${WIN11_DESTKTOP_SOURCES} + ${WIN11_DESKTOP_SOURCES} )