Solved warnings, trying to mto make windows work.

viferga · viferga · commit cb8429fc559e · 2025-04-25T17:21:31.000+02:00
diff --git a/cmake/Warnings.cmake b/cmake/Warnings.cmake
@@ -46,6 +46,7 @@ if(WARNINGS_ENABLED)
 
 	# Define C compiler warning flags
 	if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
+		# TODO: Uncomment the rest of the warnings, enable Weverything for clang
 		add_compile_options(-Wall)
 		add_compile_options(-Wextra)
 		add_compile_options(-Wunused)
@@ -85,7 +86,7 @@ if(WARNINGS_ENABLED)
 		string(REPLACE "/W1" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 		string(REPLACE "/W2" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 		string(REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /Wall")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") # /Wall
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CTR_NONSTDC_NO_WARNINGS=1")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CTR_SECURE_NO_WARNINGS=1")
 		set(WARNINGS_C_AVAILABLE 1)
@@ -105,7 +106,7 @@ if(WARNINGS_ENABLED)
 		string(REPLACE "/W1" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 		string(REPLACE "/W2" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 		string(REPLACE "/W3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /Wall")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") # /Wall
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_NONSTDC_NO_WARNINGS=1")
diff --git a/source/adt/source/adt_map.c b/source/adt/source/adt_map.c
@@ -239,9 +239,9 @@ vector map_get(map m, map_key key)
 {
 	if (m != NULL && key != NULL)
 	{
-		map_hash hash = m->hash_cb(key);
+		map_hash h = m->hash_cb(key);
 
-		size_t index = hash % m->capacity;
+		size_t index = h % m->capacity;
 
 		bucket b = &m->buckets[index];
 
@@ -255,9 +255,9 @@ int map_contains(map m, map_key key)
 {
 	if (m != NULL && key != NULL)
 	{
-		map_hash hash = m->hash_cb(key);
+		map_hash h = m->hash_cb(key);
 
-		size_t index = hash % m->capacity;
+		size_t index = h % m->capacity;
 
 		bucket b = &m->buckets[index];
 
diff --git a/source/adt/source/adt_set.c b/source/adt/source/adt_set.c
@@ -256,9 +256,9 @@ set_value set_get(set s, set_key key)
 {
 	if (s != NULL && key != NULL)
 	{
-		set_hash hash = s->hash_cb(key);
+		set_hash h = s->hash_cb(key);
 
-		size_t index = hash % s->capacity;
+		size_t index = h % s->capacity;
 
 		bucket b = &s->buckets[index];
 
@@ -277,9 +277,9 @@ int set_contains(set s, set_key key)
 {
 	if (s != NULL && key != NULL)
 	{
-		set_hash hash = s->hash_cb(key);
+		set_hash h = s->hash_cb(key);
 
-		size_t index = hash % s->capacity;
+		size_t index = h % s->capacity;
 
 		bucket b = &s->buckets[index];
 
diff --git a/source/dynlink/source/dynlink.c b/source/dynlink/source/dynlink.c
@@ -240,7 +240,7 @@ int dynlink_library_path(const char *name, dynlink_path path, size_t *length)
 
 	dynlink_impl_get_name(name, name_impl, PORTABILITY_PATH_SIZE);
 
-	if (portability_library_path(name_impl, path, length) != 0)
+	if (portability_library_path_find(name_impl, path, length) != 0)
 	{
 		return 1;
 	}
diff --git a/source/loader/source/loader_host.c b/source/loader/source/loader_host.c
@@ -44,7 +44,7 @@ union loader_host_invoke_cast
 
 static value function_host_interface_invoke(function func, function_impl func_impl, function_args args, size_t size);
 
-static function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *context);
+static function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *ctx);
 
 static function_interface function_host_singleton(void);
 
@@ -64,7 +64,7 @@ function_return function_host_interface_invoke(function func, function_impl func
 	return invoke_cast.fn(size, args, data);
 }
 
-function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *context)
+function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *ctx)
 {
 	/* TODO */
 
@@ -74,7 +74,7 @@ function_return function_host_interface_await(function func, function_impl impl,
 	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
-	(void)context;
+	(void)ctx;
 
 	return NULL;
 }
diff --git a/source/loader/source/loader_impl.c b/source/loader/source/loader_impl.c
@@ -36,7 +36,7 @@
 
 #include <configuration/configuration.h>
 
-#include <portability/portability_dependency.h>
+#include <portability/portability_library_path.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -457,7 +457,7 @@ int loader_impl_dependencies(loader_impl impl, detour d)
 				return 1;
 			}
 
-			if (portability_dependendency_iterate(&loader_impl_dependencies_self_list, (void *)dependencies_self) != 0)
+			if (portability_library_path_list(&loader_impl_dependencies_self_list, (void *)dependencies_self) != 0)
 			{
 				vector_destroy(dependencies_self);
 				return 1;
diff --git a/source/loaders/node_loader/CMakeLists.txt b/source/loaders/node_loader/CMakeLists.txt
@@ -178,9 +178,9 @@ target_link_libraries(${target}
 	PRIVATE
 	${META_PROJECT_NAME}::metacall # MetaCall library
 
-    # Delay load for MSVC
-    $<$<CXX_COMPILER_ID:MSVC>:libnode2>
-    $<$<CXX_COMPILER_ID:MSVC>:delayimp>
+	# Delay load for MSVC
+	$<$<CXX_COMPILER_ID:MSVC>:${NodeJS_LIBRARY}> # NodeJS library
+	$<$<CXX_COMPILER_ID:MSVC>:delayimp>
 
 	PUBLIC
 	${DEFAULT_LIBRARIES}
diff --git a/source/loaders/node_loader/source/node_loader_impl.cpp b/source/loaders/node_loader/source/node_loader_impl.cpp
@@ -49,7 +49,7 @@ extern char **environ;
 #include <node_loader/node_loader_trampoline.h>
 
 #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1200)
-	#include <node_loader/node_loader_win32_delay_load.h>
+	#include <detour/detour.h>
 
 	/* Required for the DelayLoad hook interposition, solves bug of NodeJS extensions requiring node.exe instead of node.dll*/
 	#include <intrin.h>
@@ -3701,7 +3701,7 @@ void *node_loader_impl_register(void *node_impl_ptr, void *env_ptr, void *functi
 		/* 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, &napi_create_array, &node_loader_node_dll_handle))
+		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))
 		{
 			napi_throw_type_error(env, nullptr, "Failed to initialize the hooking against node extensions load mechanism");
 		}
diff --git a/source/plugin/source/plugin_manager.c b/source/plugin/source/plugin_manager.c
@@ -105,9 +105,9 @@ int plugin_manager_initialize(plugin_manager manager, const char *name, const ch
 	/* Initialize the library path */
 	if (manager->library_path == NULL)
 	{
-		const char name[] = "metacall"
+		const char library_name[] = "metacall"
 #if (!defined(NDEBUG) || defined(DEBUG) || defined(_DEBUG) || defined(__DEBUG) || defined(__DEBUG__))
-							"d"
+									"d"
 #endif
 			;
 
@@ -119,7 +119,7 @@ int plugin_manager_initialize(plugin_manager manager, const char *name, const ch
 		* 2) Dynamic link library path of the host library
 		* 3) Default compile time path
 		*/
-		if (dynlink_library_path(name, path, &length) == 0)
+		if (dynlink_library_path(library_name, path, &length) == 0)
 		{
 			default_library_path = path;
 		}
diff --git a/source/portability/CMakeLists.txt b/source/portability/CMakeLists.txt
@@ -41,7 +41,6 @@ set(headers
 	${include_path}/portability_working_path.h
 	${include_path}/portability_path.h
 	${include_path}/portability_atexit.h
-	${include_path}/portability_dependency.h
 )
 
 set(sources
@@ -51,7 +50,6 @@ set(sources
 	${source_path}/portability_working_path.c
 	${source_path}/portability_path.c
 	${source_path}/portability_atexit.c
-	${source_path}/portability_dependency.c
 )
 
 # Group source files
diff --git a/source/portability/include/portability/portability_dependency.h b/source/portability/include/portability/portability_dependency.h
diff --git a/source/portability/include/portability/portability_library_path.h b/source/portability/include/portability/portability_library_path.h
@@ -27,13 +27,15 @@
 
 #include <portability/portability_path.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* -- Type Definitions -- */
 
 typedef char portability_library_path_str[PORTABILITY_PATH_SIZE];
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+typedef int (*portability_library_path_list_cb)(const char *library, void *data);
 
 /* -- Methods -- */
 
@@ -53,7 +55,22 @@ extern "C" {
 *  @return
 *    Returns zero if it could find the path, different from zero if not found
 */
-PORTABILITY_API int portability_library_path(const char name[], portability_library_path_str path, size_t *length);
+PORTABILITY_API int portability_library_path_find(const char name[], portability_library_path_str path, size_t *length);
+
+/**
+*  @brief
+*    List all the libraries loaded in the current process
+*
+*  @param[in] callback
+*    Function pointer that will be called for each library loaded in the process
+*
+*  @param[inout] data
+*    User defined data to pass to the callback
+*
+*  @return
+*    Returns zero if it there is no error, different from zero on error
+*/
+PORTABILITY_API int portability_library_path_list(portability_library_path_list_cb callback, void *data);
 
 #ifdef __cplusplus
 }
diff --git a/source/portability/source/portability_dependency.c b/source/portability/source/portability_dependency.c
diff --git a/source/portability/source/portability_library_path.c b/source/portability/source/portability_library_path.c
diff --git a/source/reflect/source/reflect_scope.c b/source/reflect/source/reflect_scope.c

Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,9 @@ vector map_get(map m, map_key key)`
`239`	`239`	`{`
`240`	`240`	`if (m != NULL && key != NULL)`
`241`	`241`	`{`
`242`		`- map_hash hash = m->hash_cb(key);`
	`242`	`+ map_hash h = m->hash_cb(key);`
`243`	`243`
`244`		`- size_t index = hash % m->capacity;`
	`244`	`+ size_t index = h % m->capacity;`
`245`	`245`
`246`	`246`	`bucket b = &m->buckets[index];`
`247`	`247`
`@@ -255,9 +255,9 @@ int map_contains(map m, map_key key)`
`255`	`255`	`{`
`256`	`256`	`if (m != NULL && key != NULL)`
`257`	`257`	`{`
`258`		`- map_hash hash = m->hash_cb(key);`
	`258`	`+ map_hash h = m->hash_cb(key);`
`259`	`259`
`260`		`- size_t index = hash % m->capacity;`
	`260`	`+ size_t index = h % m->capacity;`
`261`	`261`
`262`	`262`	`bucket b = &m->buckets[index];`
`263`	`263`
Original file line number	Diff line number	Diff line change
`@@ -256,9 +256,9 @@ set_value set_get(set s, set_key key)`
`256`	`256`	`{`
`257`	`257`	`if (s != NULL && key != NULL)`
`258`	`258`	`{`
`259`		`- set_hash hash = s->hash_cb(key);`
	`259`	`+ set_hash h = s->hash_cb(key);`
`260`	`260`
`261`		`- size_t index = hash % s->capacity;`
	`261`	`+ size_t index = h % s->capacity;`
`262`	`262`
`263`	`263`	`bucket b = &s->buckets[index];`
`264`	`264`
`@@ -277,9 +277,9 @@ int set_contains(set s, set_key key)`
`277`	`277`	`{`
`278`	`278`	`if (s != NULL && key != NULL)`
`279`	`279`	`{`
`280`		`- set_hash hash = s->hash_cb(key);`
	`280`	`+ set_hash h = s->hash_cb(key);`
`281`	`281`
`282`		`- size_t index = hash % s->capacity;`
	`282`	`+ size_t index = h % s->capacity;`
`283`	`283`
`284`	`284`	`bucket b = &s->buckets[index];`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ int dynlink_library_path(const char name, dynlink_path path, size_t length)`
`240`	`240`
`241`	`241`	`dynlink_impl_get_name(name, name_impl, PORTABILITY_PATH_SIZE);`
`242`	`242`
`243`		`- if (portability_library_path(name_impl, path, length) != 0)`
	`243`	`+ if (portability_library_path_find(name_impl, path, length) != 0)`
`244`	`244`	`{`
`245`	`245`	`return 1;`
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ union loader_host_invoke_cast`
`44`	`44`
`45`	`45`	`static value function_host_interface_invoke(function func, function_impl func_impl, function_args args, size_t size);`
`46`	`46`
`47`		`-static function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *context);`
	`47`	`+static function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *ctx);`
`48`	`48`
`49`	`49`	`static function_interface function_host_singleton(void);`
`50`	`50`
`@@ -64,7 +64,7 @@ function_return function_host_interface_invoke(function func, function_impl func`
`64`	`64`	`return invoke_cast.fn(size, args, data);`
`65`	`65`	`}`
`66`	`66`
`67`		`-function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *context)`
	`67`	`+function_return function_host_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void *ctx)`
`68`	`68`	`{`
`69`	`69`	`/* TODO */`
`70`	`70`
`@@ -74,7 +74,7 @@ function_return function_host_interface_await(function func, function_impl impl,`
`74`	`74`	`(void)size;`
`75`	`75`	`(void)resolve_callback;`
`76`	`76`	`(void)reject_callback;`
`77`		`- (void)context;`
	`77`	`+ (void)ctx;`
`78`	`78`
`79`	`79`	`return NULL;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`
`37`	`37`	`#include <configuration/configuration.h>`
`38`	`38`
`39`		`-#include <portability/portability_dependency.h>`
	`39`	`+#include <portability/portability_library_path.h>`
`40`	`40`
`41`	`41`	`#include <stdlib.h>`
`42`	`42`	`#include <string.h>`
`@@ -457,7 +457,7 @@ int loader_impl_dependencies(loader_impl impl, detour d)`
`457`	`457`	`return 1;`
`458`	`458`	`}`
`459`	`459`
`460`		`- if (portability_dependendency_iterate(&loader_impl_dependencies_self_list, (void *)dependencies_self) != 0)`
	`460`	`+ if (portability_library_path_list(&loader_impl_dependencies_self_list, (void *)dependencies_self) != 0)`
`461`	`461`	`{`
`462`	`462`	`vector_destroy(dependencies_self);`
`463`	`463`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,9 @@ int plugin_manager_initialize(plugin_manager manager, const char *name, const ch`
`105`	`105`	`/* Initialize the library path */`
`106`	`106`	`if (manager->library_path == NULL)`
`107`	`107`	`{`
`108`		`- const char name[] = "metacall"`
	`108`	`+ const char library_name[] = "metacall"`
`109`	`109`	`#if (!defined(NDEBUG) \|\| defined(DEBUG) \|\| defined(_DEBUG) \|\| defined(__DEBUG) \|\| defined(__DEBUG__))`
`110`		`- "d"`
	`110`	`+ "d"`
`111`	`111`	`#endif`
`112`	`112`	`;`
`113`	`113`
`@@ -119,7 +119,7 @@ int plugin_manager_initialize(plugin_manager manager, const char *name, const ch`
`119`	`119`	`* 2) Dynamic link library path of the host library`
`120`	`120`	`* 3) Default compile time path`
`121`	`121`	`*/`
`122`		`- if (dynlink_library_path(name, path, &length) == 0)`
	`122`	`+ if (dynlink_library_path(library_name, path, &length) == 0)`
`123`	`123`	`{`
`124`	`124`	`default_library_path = path;`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ set(headers`
`41`	`41`	`${include_path}/portability_working_path.h`
`42`	`42`	`${include_path}/portability_path.h`
`43`	`43`	`${include_path}/portability_atexit.h`
`44`		`- ${include_path}/portability_dependency.h`
`45`	`44`	`)`
`46`	`45`
`47`	`46`	`set(sources`
`@@ -51,7 +50,6 @@ set(sources`
`51`	`50`	`${source_path}/portability_working_path.c`
`52`	`51`	`${source_path}/portability_path.c`
`53`	`52`	`${source_path}/portability_atexit.c`
`54`		`- ${source_path}/portability_dependency.c`
`55`	`53`	`)`
`56`	`54`
`57`	`55`	`# Group source files`