Merge pull request #564 from metacall/feature/msvc-2022

MSVC 2022 and 2025 support

Author: viferga

.github/workflows/benchmark.yml

@@ -99,7 +99,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          os: [windows-2019]
+          os: [windows-2022, windows-2025]
 
     env:
       LTTNG_UST_REGISTER_TIMEOUT: 0

.github/workflows/windows-test.yml

@@ -17,12 +17,12 @@ concurrency:
 jobs:
   windows-test:
     name: Windows MSVC Test
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022, windows-2025]
+        os: [2022, 2025]
         options: [
           {build: debug, sanitizer: without-sanitizer},
           {build: debug, sanitizer: address-sanitizer},
@@ -32,7 +32,7 @@ jobs:
           # {build: debug, sanitizer: memory-sanitizer},
 
           # TODO: https://github.com/metacall/core/issues/461
-          # {build: release, sanitizer: without-sanitizer}
+          {build: release, sanitizer: without-sanitizer}
         ]
 
     steps:

cmake/CompileOptions.cmake

@@ -319,14 +319,14 @@ if(WIN32 AND MSVC)
 		add_compile_options(/Oy)
 
 		# TODO: Disable runtime checks (not compatible with O2)
-		# foreach(FLAG_VAR
+		# foreach(COMPILER_FLAGS
 		# 	CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE
 		# 	CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
 		# 	CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE
 		# 	CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
 		# 	)
-		# 	string(REGEX REPLACE "/RTC[^ ]*" "" ${FLAG_VAR} "${${FLAG_VAR}}")
-		# endforeach(FLAG_VAR)
+		# 	string(REGEX REPLACE "/RTC[^ ]*" "" ${COMPILER_FLAGS} "${${COMPILER_FLAGS}}")
+		# endforeach(COMPILER_FLAGS)
 
 		if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 			# Enable debug symbols
@@ -348,6 +348,7 @@ if(WIN32 AND MSVC)
 		add_compile_options(/fsanitize=leak)
 		add_link_options(/INCREMENTAL:NO)
 	endif()
+
 endif()
 
 if (PROJECT_OS_FAMILY MATCHES "unix" OR PROJECT_OS_FAMILY MATCHES "macos")

cmake/FindNodeJS.cmake

@@ -453,7 +453,9 @@ if(NOT NodeJS_LIBRARY)
 				endif()
 
 				# Check for Visual Studio Version and configure the build command
-				if(MSVC_VERSION GREATER 1916)
+				if(MSVC_VERSION GREATER_EQUAL 1930)
+					set(NodeJS_MSVC_VER vs2022)
+				elseif(MSVC_VERSION GREATER_EQUAL 1920)
 					set(NodeJS_MSVC_VER vs2019)
 				elseif(MSVC_VERSION GREATER 1900)
 					set(NodeJS_MSVC_VER vs2017)

cmake/InstallGTest.cmake

@@ -35,6 +35,18 @@ if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
 		set(GTEST_DISABLE_PTHREADS OFF)
 	endif()
 
+	if(MSVC AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		if(OPTION_BUILD_THREAD_SANITIZER)
+			set(SANITIZER_FLAGS -DCMAKE_CXX_FLAGS=/fsanitize=thread -DCMAKE_C_FLAGS=/fsanitize=thread)
+		endif()
+		if(OPTION_BUILD_ADDRESS_SANITIZER)
+			set(SANITIZER_FLAGS -DCMAKE_CXX_FLAGS=/fsanitize=address -DCMAKE_C_FLAGS=/fsanitize=address)
+		endif()
+		if(OPTION_BUILD_MEMORY_SANITIZER)
+			set(SANITIZER_FLAGS -DCMAKE_CXX_FLAGS="/fsanitize=memory /fsanitize=leak" -DCMAKE_C_FLAGS="/fsanitize=memory /fsanitize=leak")
+		endif()
+	endif()
+
 	# Import Google Test Framework
 	ExternalProject_Add(google-test-depends
 		GIT_REPOSITORY https://github.com/google/googletest.git
@@ -48,6 +60,7 @@ if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
 			-DINSTALL_GTEST=OFF
 			-DBUILD_GMOCK=ON
 			-Dgmock_build_tests=OFF
+			${SANITIZER_FLAGS}
 		PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
 		UPDATE_COMMAND ""
 		INSTALL_COMMAND ""

docs/README.md

@@ -862,7 +862,8 @@ Where `script.js` is a script contained in host folder `$HOME/metacall` that wil
 | :-----------------: | :--------------------------------------------------: |
 | **`ubuntu-latest`** | https://metacall.github.io/core/bench/ubuntu-latest/ |
 | **`macos-latest`**  | https://metacall.github.io/core/bench/macos-latest/  |
-| **`windows-2019`**  | https://metacall.github.io/core/bench/windows-2019/  |
+| **`windows-2022`**  | https://metacall.github.io/core/bench/windows-2022/  |
+| **`windows-2025`**  | https://metacall.github.io/core/bench/windows-2025/  |
 
 ## 9. License
 

source/cli/metacallcli/source/application.cpp

@@ -134,14 +134,19 @@ bool application::cmd(std::vector<std::string> &arguments)
 	/* Initialize CMD descriptors */
 	std::string plugin_path(metacall_plugin_path());
 
-	void *args[] = {
+	void *command_initialize_args[] = {
 		metacall_value_create_string(plugin_path.c_str(), plugin_path.length())
 	};
 
-	void *command_initialize_ret = metacallhv_s(plugin_cli_handle, "command_initialize", args, sizeof(args) / sizeof(args[0]));
+	void *command_initialize_ret = metacallhv_s(plugin_cli_handle, "command_initialize", command_initialize_args, sizeof(command_initialize_args) / sizeof(command_initialize_args[0]));
 
 	check_for_exception(command_initialize_ret);
 
+	for (void *arg : command_initialize_args)
+	{
+		metacall_value_destroy(arg);
+	}
+
 	/* Convert all arguments into metacall value strings */
 	std::vector<void *> arguments_values;
 	arguments_values.reserve(arguments.size());
@@ -179,11 +184,11 @@ bool application::cmd(std::vector<std::string> &arguments)
 	{
 		void **command_pair = metacall_value_to_array(command_map[iterator]);
 
-		void *args[] = {
+		void *command_args[] = {
 			command_pair[0]
 		};
 
-		void *command_func = metacallfv_s(command_function_func, args, sizeof(args) / sizeof(args[0]));
+		void *command_func = metacallfv_s(command_function_func, command_args, sizeof(command_args) / sizeof(command_args[0]));
 
 		if (metacall_value_id(command_func) == METACALL_FUNCTION)
 		{

source/extensions/plugin_extension/source/plugin_extension.cpp

@@ -40,7 +40,7 @@ namespace fs = std::experimental::filesystem;
 
 static void *extension_loader = NULL;
 
-void *plugin_load_from_path(size_t argc, void *args[], void *data)
+static void *plugin_load_from_path(size_t argc, void *args[], void *data)
 {
 	/* TODO: Improve return values with throwable in the future */
 	(void)data;

source/loader/include/loader/loader_impl.h

@@ -45,7 +45,7 @@ LOADER_API loader_impl loader_impl_create(const loader_tag tag);
 
 LOADER_API loader_impl loader_impl_create_host(const loader_tag tag);
 
-LOADER_API int loader_impl_dependencies(loader_impl impl, detour d);
+LOADER_API int loader_impl_dependencies(loader_impl impl, detour d, const loader_tag tag);
 
 LOADER_API int loader_impl_link(plugin p, loader_impl impl);
 

source/loader/source/loader.c

@@ -250,7 +250,7 @@ plugin loader_get_impl_plugin_options(const loader_tag tag, value options)
 	loader_impl_set_options(impl, options);
 
 	/* Dynamic link loader dependencies if it is not host */
-	if (loader_impl_dependencies(impl, plugin_manager_impl_type(&loader_manager, loader_manager_impl)->d) != 0)
+	if (loader_impl_dependencies(impl, plugin_manager_impl_type(&loader_manager, loader_manager_impl)->d, tag) != 0)
 	{
 		goto plugin_manager_create_error;
 	}