Add search paths for dependencies.

Author: viferga

source/loader/source/loader_impl.c

@@ -113,6 +113,10 @@ static int loader_impl_dependencies_self_find(loader_impl impl, const char *key_
 
 static int loader_impl_dependencies_load(loader_impl impl, const char *key_str, value *paths_array, size_t paths_size);
 
+#if defined(WIN32) || defined(_WIN32)
+static void loader_impl_dependencies_search_paths(loader_impl impl, const loader_tag tag);
+#endif
+
 static configuration loader_impl_initialize_configuration(const loader_tag tag);
 
 static int loader_impl_initialize_registered(plugin_manager manager, plugin p);
@@ -370,6 +374,39 @@ int loader_impl_dependencies_load(loader_impl impl, const char *key_str, value *
 	return 1;
 }
 
+#if defined(WIN32) || defined(_WIN32)
+void loader_impl_dependencies_search_paths(loader_impl impl, const loader_tag tag)
+{
+	/* Search paths have the following format and are only implemented for Windows:
+	{
+		"search_paths": ["C:\Program Files\ruby\bin\ruby_builtin_dlls"]
+	}
+	*/
+	value search_paths_value = configuration_value_type(impl->config, "search_paths", TYPE_ARRAY);
+
+	/* Check if the loader has search paths and initialize them */
+	if (search_paths_value != NULL)
+	{
+		size_t size = value_type_count(search_paths_value);
+		value *search_paths_array = value_to_array(search_paths_value);
+		size_t iterator;
+
+		for (iterator = 0; iterator < size; ++iterator)
+		{
+			if (value_type_id(search_paths_array[iterator]) == TYPE_STRING)
+			{
+				const char *key_str = value_to_string(search_paths_array[iterator]);
+
+				if (SetDllDirectoryA(key_str) == FALSE)
+				{
+					log_write("metacall", LOG_LEVEL_ERROR, "Failed to register the DLL directory %s in loader '%s'; dependencies with other dependant DLLs may fail to load", key_str, tag);
+				}
+			}
+		}
+	}
+}
+#endif
+
 int loader_impl_dependencies(loader_impl impl, detour d, const loader_tag tag)
 {
 	/* Dependencies have the following format:
@@ -412,6 +449,10 @@ int loader_impl_dependencies(loader_impl impl, detour d, const loader_tag tag)
 	/* Initialize the loader detour */
 	impl->d = d;
 
+#if defined(WIN32) || defined(_WIN32)
+	loader_impl_dependencies_search_paths(impl, tag);
+#endif
+
 	/* Check if the loader has dependencies and load them */
 	if (dependencies_value != NULL)
 	{

source/loaders/CMakeLists.txt

@@ -87,6 +87,22 @@ macro(loader_configuration_begin TARGET)
 	set(LOADER_CONFIGURATION_TARGET "${TARGET}")
 endmacro()
 
+# Generate configuration with search paths for a loader
+#
+#	"search_paths": [ "C:/Program Files/ruby/bin/ruby_builtin_dlls" ],
+#
+macro(loader_configuration_paths LIBRARY_PATHS_LIST)
+	if(NOT "${LIBRARY_PATHS_LIST}" STREQUAL "")
+		# Normalize the paths
+		string(REPLACE "\\" "/" LIBRARY_PATHS "${LIBRARY_PATHS_LIST}")
+
+		# Convert to JSON
+		string(REPLACE ";" "\", \"" LOADER_SEARCH_PATHS "\"${LIBRARY_PATHS}\"")
+	else()
+		set(LOADER_SEARCH_PATHS)
+	endif()
+endmacro()
+
 # Generate configuration with dependencies for a loader
 #
 #	node_loader:

source/loaders/loader.json.in

@@ -1,4 +1,5 @@
 {
+	"search_paths": [ @LOADER_SEARCH_PATHS@ ],
 	"dependencies": {
 		@LOADER_DEPENDENCIES@
 	}

source/loaders/rb_loader/CMakeLists.txt

@@ -238,16 +238,37 @@ else()
 	set(Ruby_LIBRARY_INSTALL "${Ruby_LIBRARY_NAME_PATH}")
 endif()
 
+# Define search paths
+set(Ruby_LIBRARY_SEARCH_PATHS_DEVELOPMENT "${Ruby_LIBRARY_SEARCH_PATHS}")
+
+if(Ruby_LIBRARY_SEARCH_PATHS AND WIN32)
+	set(Ruby_LIBRARY_SEARCH_PATHS_INSTALL "")
+
+	foreach(SEARCH_PATH IN LISTS Ruby_LIBRARY_SEARCH_PATHS)
+		install(DIRECTORY
+			"${SEARCH_PATH}"
+			DESTINATION ${INSTALL_LIB}
+			COMPONENT runtime
+		)
+
+		get_filename_component(SEARCH_PATH_FOLDER_NAME "${SEARCH_PATH}" NAME)
+
+		list(APPEND Ruby_LIBRARY_SEARCH_PATHS_INSTALL "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB}/${SEARCH_PATH_FOLDER_NAME}")
+	endforeach()
+endif()
+
 #
 # Configuration
 #
 
 # Development
 loader_configuration_begin(rb_loader)
+loader_configuration_paths("${Ruby_LIBRARY_SEARCH_PATHS_DEVELOPMENT}")
 loader_configuration_deps(ruby "${Ruby_LIBRARY_DEVELOPMENT}")
 loader_configuartion_end_development()
 
 # Install
 loader_configuration_begin(rb_loader)
+loader_configuration_paths("${Ruby_LIBRARY_SEARCH_PATHS_INSTALL}")
 loader_configuration_deps(ruby "${Ruby_LIBRARY_INSTALL}")
 loader_configuartion_end_install()

tools/metacall-environment.ps1

@@ -199,6 +199,7 @@ function Set-Ruby {
 	Write-Output "-DRuby_EXECUTABLE=""$RubyDir/bin/ruby.exe""" >> $EnvOpts
 	Write-Output "-DRuby_LIBRARY=""$RubyDir/lib/x64-vcruntime140-ruby350.lib""" >> $EnvOpts
 	Write-Output "-DRuby_LIBRARY_NAME=""$RubyDir/bin/x64-vcruntime140-ruby350.dll""" >> $EnvOpts
+	Write-Output "-DRuby_LIBRARY_SEARCH_PATHS=""$RubyDir/bin/ruby_builtin_dlls""" >> $EnvOpts
 }
 
 function Set-TypeScript {