Trying new implementation.

Author: viferga

CMakeLists.txt

@@ -82,15 +82,15 @@ FetchContent_MakeAvailable(PLTHook)
 set(PLTHook_INCLUDE_DIR "${PLTHook_SOURCE_DIR}")
 
 if(APPLE)
-    set(PLTHOOK_SOURCE "${PLTHook_SOURCE_DIR}/plthook_osx.c")
+    set(PLTHook_SOURCE "${PLTHook_SOURCE_DIR}/plthook_osx.c")
 elseif(WIN32 OR MINGW)
-    set(PLTHOOK_SOURCE "${PLTHook_SOURCE_DIR}/plthook_win32.c")
+    set(PLTHook_SOURCE "${PLTHook_SOURCE_DIR}/plthook_win32.c")
 else()
-    set(PLTHOOK_SOURCE "${PLTHook_SOURCE_DIR}/plthook_elf.c")
+    set(PLTHook_SOURCE "${PLTHook_SOURCE_DIR}/plthook_elf.c")
 endif()
 
 # MetaCall Library
-add_library(metacall SHARED source/metacall.c ${PLTHOOK_SOURCE})
+add_library(metacall SHARED source/metacall.c ${PLTHook_SOURCE})
 target_include_directories(metacall PRIVATE ${PLTHook_INCLUDE_DIR})
 target_link_libraries(metacall ${CMAKE_DL_LIBS})
 

source/metacall.c

@@ -93,9 +93,9 @@ int load_normal_executable() {
 }
 
 int load_node_dynamic(void) {
-#ifndef WIN32
+// #ifndef WIN32
     plthook_t *plthook_node_loader;
-#endif
+// #endif
     dyn_handle_t libnode, node_loader;
 
     printf("METACALL load from node compiled dynamically to libnode\n");
@@ -133,7 +133,7 @@ int load_node_dynamic(void) {
     // assert(dyn_sym(libnode, "string_function2", (void (**)(void))&string_fp2) == 0);
 
     // Patch the node_loader
-#ifdef WIN32
+/*#ifdef WIN32
     {
         HMODULE lib = node_loader;
         PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)lib;
@@ -166,7 +166,7 @@ int load_node_dynamic(void) {
             dload++;
         }
     }
-#else
+#else*/
     {
         if (plthook_open_by_handle(&plthook_node_loader, node_loader) != 0) {
             printf("plthook_open error: %s\n", plthook_error());
@@ -203,27 +203,27 @@ int load_node_dynamic(void) {
             // We should have a hash map of all the symbols of each library dependency of node_loader
         }
     }
-#endif
+// #endif
 
     // Execute the code
     char *str = node_loader_fp();
     printf("NODE DYNAMIC executing string_function from: %s\n", str);
     assert(strcmp(str, "node-dynamic") == 0);
 
     // Destroy everything
-#ifndef WIN32
+// #ifndef WIN32
     plthook_close(plthook_node_loader);
-#endif
+// #endif
     dyn_close(node_loader);
     dyn_close(libnode);
 
     return 0;
 }
 
 int load_node_static(char *(*string_function_static)(void)) {
-#ifndef WIN32
+// #ifndef WIN32
     plthook_t *plthook_node_loader;
-#endif
+// #endif
     dyn_handle_t current_process, node_loader;
 
     // TODO: In theory we should test linking against libmetacall.a, but I think there won't be
@@ -270,7 +270,7 @@ int load_node_static(char *(*string_function_static)(void)) {
     // assert(dyn_sym(current_process, "string_function2", (void (**)(void))&string_fp2) == 0);
 
     // Patch the node_loader
-#ifdef WIN32
+/*#ifdef WIN32
     {
         HMODULE lib = node_loader;
         PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)lib;
@@ -303,7 +303,7 @@ int load_node_static(char *(*string_function_static)(void)) {
             dload++;
         }
     }
-#else
+#else*/
     {
         if (plthook_open_by_handle(&plthook_node_loader, node_loader) != 0) {
             printf("plthook_open error: %s\n", plthook_error());
@@ -340,17 +340,17 @@ int load_node_static(char *(*string_function_static)(void)) {
             // We should have a hash map of all the symbols of each library dependency of node_loader
         }
     }
-#endif
+// #endif
 
     // Execute the code
     char *str = node_loader_fp();
     printf("NODE STATIC executing string_function from: %s\n", str);
     assert(strcmp(str, "node-static") == 0);
 
     // Destroy everything
-#ifndef WIN32
+// #ifndef WIN32
     plthook_close(plthook_node_loader);
-#endif
+// #endif
     dyn_close(node_loader);
 
     return 0;