Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/wil/com.h
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ inline bool operator<=(const ::Microsoft::WRL::ComPtr<TLeft>& 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<wil::com_ptr<IUnknown>, std::less<>> set;
Expand Down
2 changes: 1 addition & 1 deletion include/wil/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ template <typename T, std::enable_if_t<condition_b<T>, int> = 0>
void doit(const T&);
~~~
If `doit` is called with a type `T` that satisfies both `condition_a<T>` and `condition_b<T>`, 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<T> && !condition_a<T>`, however this can get quite complicated and verbose fast. With `priority_tag`, this
could get simplified down to:
~~~
Expand Down
4 changes: 2 additions & 2 deletions include/wil/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ details::out_param_ptr_t<Tcast, 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.

Expand Down Expand Up @@ -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 <typename threadpool_t, PendingCallbackCancellationBehavior cancellationBehavior>
struct DestroyThreadPoolTimer
{
Expand Down
6 changes: 3 additions & 3 deletions include/wil/result_macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ||
Expand Down
6 changes: 3 additions & 3 deletions include/wil/win32_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1147,7 +1147,7 @@ inline std::basic_string<CharT> 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);
Expand Down
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion tests/CppWinRTAuthoringTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <seed>' with the seed "
"If this is the case, the issue should be reproducible locally by running with '--rng-seed <seed>' with the seed "
"that was printed by Catch2 at the start of this executable's execution.");
}

Expand Down
2 changes: 1 addition & 1 deletion tests/cpplatest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ target_sources(witest.cpplatest PRIVATE
${COMMON_SOURCES}
${DOWNLEVEL_SOURCES}
${WINRT_SOURCES}
${WIN11_DESTKTOP_SOURCES}
${WIN11_DESKTOP_SOURCES}
${CPP20_SOURCES}
)

Expand Down
4 changes: 2 additions & 2 deletions tests/mocking.h
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ struct detoured_thread_function : details::detoured_thread_function_base<detoure
entryPtr = &(*entryPtr)->m_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;

Expand Down
2 changes: 1 addition & 1 deletion tests/noexcept/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ target_sources(witest.noexcept PRIVATE
${COMMON_SOURCES}
${DOWNLEVEL_SOURCES}
${WINRT_SOURCES}
${WIN11_DESTKTOP_SOURCES}
${WIN11_DESKTOP_SOURCES}
)
2 changes: 1 addition & 1 deletion tests/normal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ target_sources(witest PRIVATE
${COMMON_SOURCES}
${DOWNLEVEL_SOURCES}
${WINRT_SOURCES}
${WIN11_DESTKTOP_SOURCES}
${WIN11_DESKTOP_SOURCES}
)
2 changes: 1 addition & 1 deletion tests/sanitize-address/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ target_sources(witest.asan PUBLIC
${COMMON_SOURCES}
${DOWNLEVEL_SOURCES}
${WINRT_SOURCES}
${WIN11_DESTKTOP_SOURCES}
${WIN11_DESKTOP_SOURCES}
${EXTRA_SOURCES}
)
2 changes: 1 addition & 1 deletion tests/sanitize-undefined-behavior/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ target_sources(witest.ubsan PUBLIC
${COMMON_SOURCES}
${DOWNLEVEL_SOURCES}
${WINRT_SOURCES}
${WIN11_DESTKTOP_SOURCES}
${WIN11_DESKTOP_SOURCES}
)