Trying to solve issue of windows dlls.

Author: viferga

source/loader/include/loader/loader_impl.h

@@ -49,6 +49,8 @@ LOADER_API int loader_impl_dependencies(loader_impl impl, detour d);
 
 LOADER_API int loader_impl_link(plugin p, loader_impl impl);
 
+LOADER_API dynlink loader_impl_dependency(loader_impl impl, const char *library);
+
 LOADER_API detour_handle loader_impl_detour(loader_impl impl, const char *library, int (*load_cb)(detour, detour_handle));
 
 LOADER_API void loader_impl_attach(loader_impl impl, plugin p);

source/loader/source/loader_impl.c

@@ -559,6 +559,13 @@ int loader_impl_link(plugin p, loader_impl impl)
 	return 0;
 }
 
+dynlink loader_impl_dependency(loader_impl impl, const char *library)
+{
+	dynlink library_handle = set_get(impl->library_map, (const set_key)library);
+
+	return library_handle;
+}
+
 detour_handle loader_impl_detour(loader_impl impl, const char *library, int (*load_cb)(detour, detour_handle))
 {
 	detour_handle handle = set_get(impl->detour_map, (const set_key)library);

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -3699,11 +3699,15 @@ void *node_loader_impl_register(void *node_impl_ptr, void *env_ptr, void *functi
 #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1200)
 	{
 		/* As the library handle is correctly resolved here, either to executable, library of the executable,
-		or the loader dependency we can directly obtain the handle of this dependency from a function pointer,
-		use any function that is contained in node runtime, in this case we are using napi_create_array */
-		if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)&napi_create_array, &node_loader_node_dll_handle))
+		or the loader dependency we can directly get the handle of this dependency */
+		dynlink node_library = loader_impl_dependency(node_impl->impl, "node");
+
+		node_loader_node_dll_handle = dynlink_get_impl(node_library);
+
+		if (node_loader_node_dll_handle == NULL)
 		{
-			napi_throw_type_error(env, nullptr, "Failed to initialize the hooking against node extensions load mechanism");
+			napi_throw_error(env, nullptr, "Failed to initialize the hooking against node extensions load mechanism");
+			return NULL;
 		}
 
 		detour d = detour_create(metacall_detour());
@@ -4032,7 +4036,7 @@ loader_impl_data node_loader_impl_initialize(loader_impl impl, configuration con
 		/* Result will never be defined properly */
 		node_impl->result = 0;
 
-		if (metacall_link_register_impl(impl, "node", "napi_register_module_v1", (void (*)(void))(&node_loader_port_initialize)) != 0)
+		if (metacall_link_register_loader(impl, "node", "napi_register_module_v1", (void (*)(void))(&node_loader_port_initialize)) != 0)
 		{
 			log_write("metacall", LOG_LEVEL_ERROR, "Node Loader failed to hook napi_register_module_v1");
 		}

source/metacall/include/metacall/metacall_link.h

@@ -92,7 +92,7 @@ METACALL_API int metacall_link_register(const char *tag, const char *library, co
 *  @return
 *    Zero if success, different from zero otherwise
 */
-METACALL_API int metacall_link_register_impl(void *loader, const char *library, const char *symbol, void (*fn)(void));
+METACALL_API int metacall_link_register_loader(void *loader, const char *library, const char *symbol, void (*fn)(void));
 
 /**
 *  @brief

source/metacall/source/metacall_link.c

@@ -187,7 +187,7 @@ int metacall_link_register(const char *tag, const char *library, const char *sym
 	return set_insert(metacall_link_table, (set_key)symbol, ptr);
 }
 
-int metacall_link_register_impl(void *loader, const char *library, const char *symbol, void (*fn)(void))
+int metacall_link_register_loader(void *loader, const char *library, const char *symbol, void (*fn)(void))
 {
 	void *ptr;
 

source/tests/metacall_node_extension_test/node_extension_test/source/node_extension_test_win32_delay_load.cpp

@@ -29,6 +29,8 @@
 #include <delayimp.h>
 #include <string.h>
 
+static const char node_library_name[] = NODEJS_LIBRARY_NAME;
+
 static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo *info)
 {
 	HMODULE m;
@@ -38,7 +40,7 @@ static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo *info)
 		return NULL;
 	}
 
-	if (_stricmp(info->szDll, NODEJS_LIBRARY_NAME) != 0)
+	if (_stricmp(info->szDll, node_library_name) != 0)
 	{
 		return NULL;
 	}