Try fixing some Windows issues

mpfaff · mpfaff · commit aa004efb2e91 · 2025-03-30T14:40:39.000-04:00
diff --git a/build.zig b/build.zig
@@ -23,10 +23,7 @@ pub fn build(b: *std.Build) !void {
     }
 
     var c_source_files = std.ArrayListUnmanaged([]const u8){};
-    try c_source_files.appendSlice(b.allocator, &.{
-        "bootstrap.c",
-        "runtimes/globals.c",
-    });
+    try c_source_files.append(b.allocator, "bootstrap.c");
 
     const lib = b.addLibrary(.{
         .linkage = .dynamic,
@@ -57,6 +54,7 @@ pub fn build(b: *std.Build) !void {
     lib_mod.addCSourceFiles(.{
         .root = b.path("src"),
         .files = c_source_files.items,
+        .flags = &.{ "-Wall", "-Werror" },
     });
 
     lib_mod.addIncludePath(b.path("src"));
diff --git a/src/bootstrap.c b/src/bootstrap.c
@@ -56,16 +56,16 @@ void mono_doorstop_bootstrap(void *mono_domain) {
     free(norm_assembly_dir);
 
     LOG("Opening assembly: %s", config.target_assembly);
-    void *file = fopen(config.target_assembly, "r");
+    void *file = fopen_custom(config.target_assembly, TSTR("r"));
     if (!file) {
         log_err("Failed to open assembly: %s", config.target_assembly);
         return;
     }
 
     size_t size = get_file_size(file);
     void *data = malloc(size);
-    fread(data, size, 1, file);
-    fclose(file);
+    fread_custom(data, size, 1, file);
+    fclose_custom(file);
 
     LOG("Opened Assembly DLL (%d bytes); opening its main image", size);
 
@@ -83,7 +83,7 @@ void mono_doorstop_bootstrap(void *mono_domain) {
     LOG("Image opened; loading included assembly");
 
     s = MONO_IMAGE_OK;
-    void *assembly = mono.assembly_load_from_full(image, dll_path, &s, FALSE);
+    mono.assembly_load_from_full(image, dll_path, &s, FALSE);
     free(dll_path);
     if (s != MONO_IMAGE_OK) {
         log_err("Failed to load assembly: %s. Got result: %d",
@@ -262,7 +262,6 @@ void il2cpp_doorstop_bootstrap() {
     char *app_path_n = narrow(app_path);
 
     char_t *target_dir = get_folder_name(config.target_assembly);
-    char *target_dir_n = narrow(target_dir);
     char_t *target_name = get_file_name(config.target_assembly, FALSE);
     char *target_name_n = narrow(target_name);
 
@@ -338,7 +337,7 @@ void hook_mono_jit_parse_options(int argc, char **argv) {
 
         const char_t *mono_debug_address = config.mono_debug_address;
         if (!mono_debug_address) {
-            mono_debug_address = "127.0.0.1:10000";
+            mono_debug_address = TSTR("127.0.0.1:10000");
         }
         size_t debug_args_len =
             STR_LEN(MONO_DEBUG_ARG_START) + strlen(mono_debug_address);
@@ -398,11 +397,11 @@ void *hook_mono_image_open_from_data_with_name(void *data,
         strcat(new_full_path, name_file);
 
         if (file_exists(new_full_path)) {
-            void *file = fopen(new_full_path, "r");
+            void *file = fopen_custom(new_full_path, TSTR("r"));
             size_t size = get_file_size(file);
             void *buf = malloc(size);
-            fread(buf, 1, size, file);
-            fclose(file);
+            fread_custom(buf, 1, size, file);
+            fclose_custom(file);
             result = mono.image_open_from_data_with_name(buf, size, need_copy,
                                                          status, refonly, name);
             if (need_copy)
diff --git a/src/crt.h b/src/crt.h
@@ -13,6 +13,12 @@
 #define ENV32
 #endif
 
+#define TSTR(t) L##t
+
+void *fopen_custom(const char_t *filename, const char_t *mode);
+size_t fread_custom(void *ptr, size_t size, size_t count, void *stream);
+int fclose_custom(void *stream);
+
 #elif defined(__APPLE__) || defined(__linux__)
 #define _GNU_SOURCE
 #include <dlfcn.h>
@@ -24,6 +30,21 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#define TSTR(t) t
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused"
+static void *fopen_custom(const char *filename, const char *mode) {
+    return fopen(filename, mode);
+}
+
+static size_t fread_custom(void *ptr, size_t size, size_t count, void *stream) {
+    return fread(ptr, size, count, stream);
+}
+
+static int fclose_custom(void *stream) { return fclose(stream); }
+#pragma clang diagnostic pop
+
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
 #endif
diff --git a/src/nix/entrypoint.c b/src/nix/entrypoint.c
@@ -50,7 +50,7 @@ int fclose_hook(FILE *stream) {
     // to console
     if (stream == stdout)
         return F_OK;
-    return fclose(stream);
+    return fclose_custom(stream);
 }
 
 char_t *default_boot_config_path = NULL;
@@ -69,8 +69,8 @@ FILE *fopen64_hook(const char *filename, const char *mode) {
 }
 #endif
 
-FILE *fopen_hook(char *filename, char *mode) {
-    char *actual_file_name = filename;
+FILE *fopen_hook(const char *filename, const char *mode) {
+    const char *actual_file_name = filename;
 
     if (strcmp(filename, default_boot_config_path) == 0) {
         actual_file_name = config.boot_config_override;
diff --git a/src/nix/util.c b/src/nix/util.c
@@ -109,7 +109,7 @@ char *normalize_path(char *pwd, const char *src, char *res) {
     return res;
 }
 
-char_t *get_full_path(char_t *path) {
+char_t *get_full_path(const char_t *path) {
     char_t *full_path = (char_t *)calloc(MAX_PATH + 1, sizeof(char_t));
     char_t *cwd_str = getcwd(NULL, MAX_PATH);
     normalize_path(cwd_str, path, full_path);
@@ -121,7 +121,7 @@ char_t *get_full_path(char_t *path) {
     return full_path;
 }
 
-char_t *get_folder_name(char_t *path) {
+char_t *get_folder_name(const char_t *path) {
     char_t *path_copy = (char_t *)calloc(MAX_PATH + 1, sizeof(char_t));
     strcpy(path_copy, path);
     char_t *folder = dirname(path_copy);
@@ -131,7 +131,7 @@ char_t *get_folder_name(char_t *path) {
     return result;
 }
 
-char_t *get_file_name(char_t *path, bool_t with_ext) {
+char_t *get_file_name(const char_t *path, bool_t with_ext) {
     char_t *path_copy = (char_t *)calloc(MAX_PATH + 1, sizeof(char_t));
     strcpy(path_copy, path);
     char_t *file = basename(path_copy);
diff --git a/src/root.zig b/src/root.zig
@@ -14,6 +14,7 @@ pub const std_options = std.Options{
 comptime {
     _ = @import("config.zig");
     _ = logging;
+    _ = @import("runtimes/globals.zig");
     if (builtin.os.tag == .windows) {
         _ = @import("windows/proxy/proxy.zig");
     }
diff --git a/src/runtimes/func_import.h b/src/runtimes/func_import.h
@@ -32,11 +32,14 @@ typedef struct {
 
 extern S(IMPORT_PREFIX) IMPORT_PREFIX;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused"
 static void LOADER_FUNC_NAME(void *lib) {
 #define DEF_CALL(retType, name, ...)                                           \
     IMPORT_PREFIX.name = (name##_t)dlsym(lib, STR(CAT(IMPORT_PREFIX, _, name)));
 #include IMPORT_LIB
 #undef DEF_CALL
 }
+#pragma clang diagnostic pop
 
-#undef DEFINE_CALLS
+#undef DEFINE_CALLS
diff --git a/src/runtimes/globals.c b/src/runtimes/globals.c
diff --git a/src/runtimes/globals.zig b/src/runtimes/globals.zig
@@ -0,0 +1,15 @@
+const builtin = @import("builtin");
+
+const coreclr = @cImport(@cInclude("runtimes/coreclr.h"));
+const il2cpp = @cImport(@cInclude("runtimes/il2cpp.h"));
+const mono = @cImport(@cInclude("runtimes/mono.h"));
+
+var coreclr_addrs: coreclr.coreclr_struct = .{};
+var il2cpp_addrs: il2cpp.il2cpp_struct = .{};
+var mono_addrs: mono.mono_struct = .{};
+
+comptime {
+    @export(&coreclr_addrs, .{ .name = "coreclr" });
+    @export(&il2cpp_addrs, .{ .name = "il2cpp" });
+    @export(&mono_addrs, .{ .name = "mono" });
+}
diff --git a/src/util/util.h b/src/util/util.h
@@ -81,7 +81,7 @@ size_t get_module_path(void *module, char_t **result, size_t *size,
  * @param path Path to resolve relative path for.
  * @return char_t* Absolute path to the given path.
  */
-char_t *get_full_path(char_t *path);
+char_t *get_full_path(const char_t *path);
 
 /**
  * @brief Get the directory name of the given path.
@@ -94,7 +94,7 @@ char_t *get_full_path(char_t *path);
  * @param path Full path to get directory name of.
  * @return char_t* Directory part of the path (part before last path separator).
  */
-char_t *get_folder_name(char_t *path);
+char_t *get_folder_name(const char_t *path);
 
 /**
  * @brief Get the file name from the full path
@@ -105,7 +105,7 @@ char_t *get_folder_name(char_t *path);
  * @param with_ext Whether to include file extension or not.
  * @return char_t* File name part of the path.
  */
-char_t *get_file_name(char_t *path, bool_t with_ext);
+char_t *get_file_name(const char_t *path, bool_t with_ext);
 
 /**
  * @brief Check if a file exists.
diff --git a/src/windows/util.c b/src/windows/util.c
@@ -49,7 +49,7 @@ size_t get_module_path(void *module, char_t **result, size_t *size,
     return len;
 }
 
-char_t *get_full_path(char_t *path) {
+char_t *get_full_path(const char_t *path) {
     const DWORD needed = GetFullPathName(path, 0, NULL, NULL);
     char_t *res = malloc(sizeof(char_t) * needed);
     GetFullPathName(path, needed, res, NULL);
@@ -80,7 +80,7 @@ typedef struct {
     size_t len;
 } PathParts;
 
-PathParts split_path(char_t *path) {
+static PathParts split_path(const char_t *path) {
     size_t len = strlen(path);
     size_t ext = len;
     size_t i;
@@ -94,15 +94,15 @@ PathParts split_path(char_t *path) {
     return (PathParts){.ext = ext, .parent = i, .len = len};
 }
 
-char_t *get_folder_name(char_t *path) {
+char_t *get_folder_name(const char_t *path) {
     PathParts parts = split_path(path);
     char_t *result = malloc((parts.parent + 1) * sizeof(char_t));
     strncpy(result, path, parts.parent);
     result[parts.parent] = TEXT('\0');
     return result;
 }
 
-char_t *get_file_name(char_t *path, bool_t with_ext) {
+char_t *get_file_name(const char_t *path, bool_t with_ext) {
     PathParts parts = split_path(path);
     size_t result_len = (with_ext ? parts.len : parts.ext) - parts.parent;
     char_t *result = malloc(result_len * sizeof(char_t));
diff --git a/src/windows/wincrt.c b/src/windows/wincrt.c
@@ -4,15 +4,13 @@ static HANDLE h_heap;
 
 void init_crt() { h_heap = GetProcessHeap(); }
 
-#pragma function(memset)
 void *memset(void *dst, int c, size_t n) {
     char *d = dst;
     while (n--)
         *d++ = (char)c;
     return dst;
 }
 
-#pragma function(memcpy)
 void *memcpy(void *dst, const void *src, size_t n) {
     char *d = dst;
     const char *s = src;
@@ -80,18 +78,18 @@ char_t *getenv_wide(const char_t *name) {
     return buf;
 }
 
-// void *fopen(char_t *filename, const char_t *mode) {
-//     return CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-//                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-// }
+void *fopen_custom(const char_t *filename, const char_t *mode) {
+    return CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+                      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+}
 
-// size_t fread(void *ptr, size_t size, size_t count, void *stream) {
-//     size_t read_size = 0;
-//     ReadFile(stream, ptr, size * count, &read_size, NULL);
-//     return read_size;
-// }
+size_t fread_custom(void *ptr, size_t size, size_t count, void *stream) {
+    DWORD read_size = 0;
+    ReadFile(stream, ptr, size * count, &read_size, NULL);
+    return read_size;
+}
 
-// int fclose(void *stream) { CloseHandle(stream); }
+int fclose_custom(void *stream) { return CloseHandle(stream); }
 
 #ifndef UNICODE
 LPSTR *CommandLineToArgvA(LPCSTR cmd_line, int *argc) {
diff --git a/src/windows/wincrt.h b/src/windows/wincrt.h
@@ -7,7 +7,6 @@
 #define WIN_CRT_H
 
 #include "../util/util.h"
-#include <stdio.h>
 #include <windows.h>
 
 // Fix for MinGW's headers
@@ -24,10 +23,8 @@ extern void init_crt();
 #define STR_LEN(str) (sizeof(str) / sizeof((str)[0]))
 
 extern void *memset(void *dst, int c, size_t n);
-#pragma intrinsic(memset)
 
 extern void *memcpy(void *dst, const void *src, size_t n);
-#pragma intrinsic(memcpy)
 
 extern size_t strlen_wide(const char_t *str);
 #define strlen strlen_wide

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ pub const std_options = std.Options{`
`14`	`14`	`comptime {`
`15`	`15`	`_ = @import("config.zig");`
`16`	`16`	`_ = logging;`
	`17`	`+ _ = @import("runtimes/globals.zig");`
`17`	`18`	`if (builtin.os.tag == .windows) {`
`18`	`19`	`_ = @import("windows/proxy/proxy.zig");`
`19`	`20`	`}`