Improve dynlink, trying to hook dlsym.

metacall · Nov 27, 2024 · 355c12f · 355c12f
1 parent 8e8fe8b
commit 355c12f
Show file tree

Hide file tree

Showing 56 changed files with 120 additions and 603 deletions.
diff --git a/source/cli/plugins/cli_core_plugin/include/cli_core_plugin/cli_core_plugin.h b/source/cli/plugins/cli_core_plugin/include/cli_core_plugin/cli_core_plugin.h
@@ -23,16 +23,12 @@
 
 #include <cli_core_plugin/cli_core_plugin_api.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CLI_CORE_PLUGIN_API int cli_core_plugin(void *loader, void *handle);
 
-DYNLINK_SYMBOL_EXPORT(cli_core_plugin);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/cli/plugins/cli_sandbox_plugin/include/cli_sandbox_plugin/cli_sandbox_plugin.h b/source/cli/plugins/cli_sandbox_plugin/include/cli_sandbox_plugin/cli_sandbox_plugin.h
@@ -23,16 +23,12 @@
 
 #include <cli_sandbox_plugin/cli_sandbox_plugin_api.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CLI_SANDBOX_PLUGIN_API int cli_sandbox_plugin(void *loader, void *handle);
 
-DYNLINK_SYMBOL_EXPORT(cli_sandbox_plugin);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/detours/funchook_detour/include/funchook_detour/funchook_detour.h b/source/detours/funchook_detour/include/funchook_detour/funchook_detour.h
@@ -27,8 +27,6 @@
 
 #include <detour/detour_interface.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,8 +43,6 @@ extern "C" {
 */
 FUNCHOOK_DETOUR_API detour_interface funchook_detour_impl_interface_singleton(void);
 
-DYNLINK_SYMBOL_EXPORT(funchook_detour_impl_interface_singleton);
-
 /**
 *  @brief
 *    Provide the module information
@@ -57,8 +53,6 @@ DYNLINK_SYMBOL_EXPORT(funchook_detour_impl_interface_singleton);
 */
 FUNCHOOK_DETOUR_API const char *funchook_detour_print_info(void);
 
-DYNLINK_SYMBOL_EXPORT(funchook_detour_print_info);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/dynlink/CMakeLists.txt b/source/dynlink/CMakeLists.txt
@@ -47,17 +47,14 @@ set(headers
 	${include_path}/dynlink.h
 	${include_path}/dynlink_flags.h
 	${include_path}/dynlink_impl.h
-	${include_path}/dynlink_impl_symbol_${DYNLINK_IMPL_INTERFACE_NAME}.h
 	${include_path}/dynlink_impl_${DYNLINK_IMPL_INTERFACE_NAME}.h
-	${include_path}/dynlink_symbol.h
 )
 
 set(sources
 	${source_path}/dynlink.c
 	${source_path}/dynlink_impl.c
 	${source_path}/dynlink_impl_${DYNLINK_IMPL_INTERFACE_NAME}.c
 	${source_path}/dynlink_interface.c
-	${source_path}/dynlink_symbol.c
 )
 
 # Group source files

diff --git a/source/dynlink/include/dynlink/dynlink.h b/source/dynlink/include/dynlink/dynlink.h
@@ -29,7 +29,6 @@
 
 #include <dynlink/dynlink_flags.h>
 #include <dynlink/dynlink_interface.h>
-#include <dynlink/dynlink_symbol.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/source/dynlink/include/dynlink/dynlink_impl.h b/source/dynlink/include/dynlink/dynlink_impl.h
@@ -33,10 +33,6 @@
 extern "C" {
 #endif
 
-/* -- Headers -- */
-
-#include <stdlib.h>
-
 /* -- Methods -- */
 
 /**

diff --git a/source/dynlink/include/dynlink/dynlink_impl_beos.h b/source/dynlink/include/dynlink/dynlink_impl_beos.h
@@ -25,8 +25,6 @@
 
 #include <dynlink/dynlink_api.h>
 
-#include <dynlink/dynlink_impl_symbol_beos.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/source/dynlink/include/dynlink/dynlink_impl_macos.h b/source/dynlink/include/dynlink/dynlink_impl_macos.h
@@ -25,8 +25,6 @@
 
 #include <dynlink/dynlink_api.h>
 
-#include <dynlink/dynlink_impl_symbol_macos.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/source/dynlink/include/dynlink/dynlink_impl_symbol_beos.h b/source/dynlink/include/dynlink/dynlink_impl_symbol_beos.h
diff --git a/source/dynlink/include/dynlink/dynlink_impl_symbol_macos.h b/source/dynlink/include/dynlink/dynlink_impl_symbol_macos.h
diff --git a/source/dynlink/include/dynlink/dynlink_impl_symbol_unix.h b/source/dynlink/include/dynlink/dynlink_impl_symbol_unix.h
diff --git a/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h b/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h
diff --git a/source/dynlink/include/dynlink/dynlink_impl_unix.h b/source/dynlink/include/dynlink/dynlink_impl_unix.h
@@ -25,8 +25,6 @@
 
 #include <dynlink/dynlink_api.h>
 
-#include <dynlink/dynlink_impl_symbol_unix.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/source/dynlink/include/dynlink/dynlink_impl_win32.h b/source/dynlink/include/dynlink/dynlink_impl_win32.h
@@ -25,8 +25,6 @@
 
 #include <dynlink/dynlink_api.h>
 
-#include <dynlink/dynlink_impl_symbol_win32.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif