Update dependencies and build jobs (#25)

* Update dependencies
* Update build jobs
* Updates for most recent toolchain

Author: mbeckh

.github/dependabot.yml

@@ -3,4 +3,4 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: monthly
+      interval: weekly

.github/workflows/build.yml

@@ -5,11 +5,15 @@ on:
     branches: [ master, 'feature**' ]
   pull_request:
     branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
+
+permissions: {}
 
 jobs:
   build:
+    name: Build
     uses: mbeckh/cmake-utils/.github/workflows/run-build.yml@v1
     secrets: inherit
+    permissions:
+      actions: write
+      contents: read
+      packages: write

.github/workflows/codeql-analysis.yml .github/workflows/codeql.yml.github/workflows/codeql-analysis.yml renamed to .github/workflows/codeql.yml

@@ -5,13 +5,17 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-  schedule:
-    - cron: '21 8 4 * *'
+  workflow_dispatch:
+
+permissions: {}
 
 jobs:
-  build:
+  codeql:
+    name: CodeQL
     uses: mbeckh/cmake-utils/.github/workflows/run-codeql.yml@v1
     secrets: inherit
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+      security-events: write

.github/workflows/msvc-analysis.yml

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 project("common-cpp" VERSION 0.1.3
     DESCRIPTION "Common C++ library"

CMakeLists.txt

@@ -2,7 +2,7 @@
 A collection of common classes for C++ programming, particularly for targeting Windows API and COM.
 
 [![Release](https://img.shields.io/github/v/release/mbeckh/common-cpp?display_name=tag&sort=semver&label=Release&style=flat-square)](https://github.com/mbeckh/common-cpp/releases/)
-[![Tests](https://img.shields.io/github/workflow/status/mbeckh/common-cpp/Build/master?label=Tests&logo=GitHub&style=flat-square)](https://github.com/mbeckh/common-cpp/actions)
+[![Tests](https://img.shields.io/github/actions/workflow/status/mbeckh/common-cpp/build.yml?branch=master&label=Tests&logo=GitHub&style=flat-square)](https://github.com/mbeckh/common-cpp/actions)
 [![Coverage](https://img.shields.io/codecov/c/gh/mbeckh/common-cpp/master?label=Coverage&logo=codecov&style=flat-square)](https://codecov.io/gh/mbeckh/common-cpp)
 [![Codacy Grade](https://img.shields.io/codacy/grade/d1c1975989c642f2817ffc7160ff6f92?label=Code%20Quality&logo=codacy&style=flat-square)](https://www.codacy.com/manual/mbeckh/common-cpp?utm_source=github.com&utm_medium=referral&utm_content=mbeckh/SystemTools&utm_campaign=Badge_Grade)
 [![License](https://img.shields.io/github/license/mbeckh/common-cpp?label=License&style=flat-square)](https://github.com/mbeckh/common-cpp/blob/master/LICENSE)

README.md

@@ -123,14 +123,6 @@ function(common_cpp_target_events target events #[[ [ DESTINATION <path> ] [ LEV
         install(FILES "${man_file}" TYPE DATA)
     endif()
 
-    if(NOT TARGET "generated-sources")
-        add_custom_target("generated-sources")
-    endif()
-    if(NOT TARGET "${target}-generated-sources")
-        add_custom_target("${target}-generated-sources" DEPENDS "${man_file}" "${cpp_file}" "${rc_file}" "${h_file}")
-        add_dependencies("generated-sources" "${target}-generated-sources")
-    endif()
-
     target_include_directories("${target}" SYSTEM PRIVATE "${bin_dir}")
     string(TOUPPER "${arg_LEVEL}" arg_LEVEL)
     if(arg_LEVEL STREQUAL "CRITICAL")

cmake/EventLog.cmake

@@ -38,7 +38,7 @@ template <std::derived_from<IUnknown> T>
 class com_ptr;
 
 template <typename T, std::derived_from<internal::AbstractComObject> C, typename... Args>
-com_ptr<T> make_com(Args&&... args);
+[[nodiscard]] com_ptr<T> make_com(Args&&... args);
 
 
 namespace internal {

include/m3c/ComObject.h

@@ -34,6 +34,9 @@ limitations under the License.
 
 namespace m3c {
 
+template <typename T, std::derived_from<internal::AbstractComObject> C, typename... Args>
+[[nodiscard]] com_ptr<T> make_com(Args&&... args);
+
 namespace internal {
 
 /// @brief Base class with common static helper methods.
@@ -56,6 +59,21 @@ class com_ptr_base {
 	static void QueryInterface(_In_ IUnknown* pUnknown, const IID& iid, _Outptr_ void** p);
 };
 
+/// @brief Marker class for restricting access to private constructor of com_ptr.
+struct com_ptr_private {
+private:
+	constexpr com_ptr_private() noexcept = default;
+	com_ptr_private(const com_ptr_private&) = delete;
+	com_ptr_private(com_ptr_private&&) = delete;
+	constexpr ~com_ptr_private() noexcept = default;
+
+	com_ptr_private operator=(const com_ptr_private&) = delete;
+	com_ptr_private operator=(com_ptr_private&&) = delete;
+
+	template <typename T, std::derived_from<internal::AbstractComObject> C, typename... Args>
+	friend com_ptr<T> m3c::make_com(Args&&... args);
+};
+
 }  // namespace internal
 
 
@@ -99,11 +117,10 @@ class com_ptr final : private internal::com_ptr_base {
 		com_add_ref();
 	}
 
-private:
 	/// @brief Assigns an interface pointer without increasing the reference count.
 	/// This constructor is required for `make_com`.
 	/// @param p The native pointer.
-	[[nodiscard]] explicit com_ptr(_In_ internal::AbstractComObject* const p)
+	[[nodiscard]] explicit com_ptr(const internal::com_ptr_private /* unused*/, _In_ internal::AbstractComObject* const p)
 	    : m_ptr(p->QueryInterface<T>()) {
 		// empty
 	}
@@ -282,9 +299,6 @@ class com_ptr final : private internal::com_ptr_base {
 private:
 	T* m_ptr = nullptr;  ///< @brief The native pointer wrapped by this class.
 
-	template <typename P, std::derived_from<internal::AbstractComObject> C, typename... Args>
-	friend com_ptr<P> make_com(Args&&...);
-
 	template <typename P>
 	friend void operator>>(const com_ptr<P>&, _Inout_ LogFormatArgs&);
 
@@ -417,7 +431,7 @@ template <typename T, std::derived_from<internal::AbstractComObject> C, typename
 	});
 	// constructor calls QueryInterface internally so that the correct COM pointer is stored.
 	// Please note: COM interface inheritance is somewhat different from usual OO inheritance.
-	return com_ptr<T>(pObject);
+	return com_ptr<T>({}, pObject);
 }
 
 

include/m3c/com_ptr.h

@@ -44,32 +44,6 @@ limitations under the License.
 
 namespace m3c {
 
-#ifdef __clang_analyzer__
-
-namespace internal {
-
-template <typename... Args>
-inline auto IwyuFormatWorkaround(const char* pattern, Args&&... args) {
-	return fmt::format(fmt::runtime(pattern), std::forward<Args>(args)...);
-}
-
-template <typename T, typename... Args>
-inline auto IwyuFormatWorkaround(T&& pattern, Args&&... args) {
-	return fmt::format(std::forward<T>(pattern), std::forward<Args>(args)...);
-}
-
-}  // namespace internal
-
-/// @brief Replace literal format strings for fmt compile with runtime strings.
-/// @details clang-tidy and include-what-you-use have problems parsing and diagnose false positives or hang/crash.
-#define FMT_FORMAT(...) m3c::internal::IwyuFormatWorkaround(__VA_ARGS__)
-#else
-/// @brief Replace literal format strings for fmt compile with runtime strings.
-/// @details clang-tidy and include-what-you-use have problems parsing and diagnose false positives or hang/crash.
-#define FMT_FORMAT(...) fmt::format(__VA_ARGS__)
-#endif
-
-
 //
 // String encoding
 //
@@ -573,7 +547,7 @@ struct fmt::formatter<m3c::fmt_ptr<IUnknown>, CharT> {
 		// AddRef to get the ref count
 		const ULONG ref = ptr ? (ptr->AddRef(), ptr->Release()) : 0;
 		if (std::holds_alternative<fmt::formatter<std::basic_string<CharT>, CharT>>(m_formatter)) {
-			std::basic_string<CharT> value = FMT_FORMAT(
+			const std::basic_string<CharT> value = fmt::format(
 			    m3c::SelectString<CharT>(M3C_SELECT_STRING("(ptr={}, ref={})")),
 			    fmt::ptr(ptr), ref);
 			return std::get<fmt::formatter<std::basic_string<CharT>, CharT>>(m_formatter).format(value, ctx);
@@ -652,7 +626,7 @@ struct fmt::formatter<m3c::fmt_ptr<IStream>, CharT> : fmt::formatter<m3c::fmt_pt
 
 			// AddRef to get the ref count
 			const ULONG ref = ptr ? (ptr->AddRef(), ptr->Release()) : 0;
-			std::basic_string<CharT> value = FMT_FORMAT(
+			const std::basic_string<CharT> value = fmt::format(
 			    m3c::SelectString<CharT>(M3C_SELECT_STRING("({}, ptr={}, ref={})")),
 			    m3c::fmt_encode(name), fmt::ptr(ptr), ref);
 			return std::get<fmt::formatter<std::basic_string<CharT>, CharT>>(m_formatter).format(value, ctx);
@@ -895,7 +869,8 @@ struct ConvertibleToCStrTraits {
 	/// @brief Calculate the length for objects having a `length()` method.
 	/// @param arg The object.
 	/// @return The number of characters excluding the terminating null character.
-	static constexpr auto length(const T& arg) noexcept(noexcept(arg.length())) requires requires {
+	static constexpr auto length(const T& arg) noexcept(noexcept(arg.length()))
+	requires requires {
 		{ arg.length() } -> StringLength;
 	}
 	{
@@ -905,7 +880,8 @@ struct ConvertibleToCStrTraits {
 	/// @brief Calculate the length for objects having no `length()` but a `size()` method.
 	/// @param arg The object.
 	/// @return The number of characters excluding the terminating null character.
-	static constexpr auto length(const T& arg) noexcept(noexcept(arg.size())) requires requires {
+	static constexpr auto length(const T& arg) noexcept(noexcept(arg.size()))
+	requires requires {
 		{ arg.size() } -> StringLength;
 		requires !requires {
 			{ arg.length() } -> StringLength;
@@ -919,7 +895,8 @@ struct ConvertibleToCStrTraits {
 	/// @details The string length is calculated using `std::char_traits`.
 	/// @param arg The object.
 	/// @return The number of characters excluding the terminating null character.
-	static constexpr auto length(const T& arg) noexcept(noexcept(std::char_traits<CharT>::length(arg))) requires requires {
+	static constexpr auto length(const T& arg) noexcept(noexcept(std::char_traits<CharT>::length(arg)))
+	requires requires {
 		requires !requires {
 			{ arg.length() } -> StringLength;
 		};