More Fixing

SoraTenshi · Dec 5, 2023 · b8d5ae4 · b8d5ae4
1 parent a138753
commit b8d5ae4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/zig-bait/detour.zig b/zig-bait/detour.zig
@@ -73,7 +73,7 @@ fn restore(opt: *option.detour.Option) void {
 pub fn init(alloc: Allocator, target_ptr: anytype, victim_address: usize, comptime total_size: usize) interface.Hook {
     tools.checkIsFnPtr(target_ptr);
 
-    const opt = option.detour.Option.init(alloc, target_ptr, victim_address, total_size);
-    const self = interface.Hook.init(&hook, &restore, option.Option{ .detour = opt });
+    const opt = option.detour.Option.init(alloc, target_ptr, victim_address, total_size, &hook, &restore);
+    const self = interface.Hook.init(option.Option{ .detour = opt });
     return self;
 }
diff --git a/zig-bait/option/detour.zig b/zig-bait/option/detour.zig
@@ -48,9 +48,9 @@ pub const Option = struct {
         alloc: Allocator,
         target_ptr: anytype,
         victim_address: usize,
+        comptime total_size: usize,
         hook: HookFunc,
         restore: RestoreFunc,
-        comptime total_size: usize,
     ) Option {
         return Option{
             .ops = null,

diff --git a/zig-bait/safe_vmt.zig b/zig-bait/safe_vmt.zig
@@ -94,6 +94,6 @@ fn restore(opt: *option.safe_vmt.Option) void {
 
 pub fn init(alloc: Allocator, base_class: tools.AbstractClass, comptime positions: []const usize, targets: []const usize) !interface.Hook {
     const opt = try option.safe_vmt.Option.init(alloc, base_class, positions, targets, &hook, &restore);
-    const self = interface.Hook.init(opt);
+    const self = interface.Hook.init(option.Option{ .safe_vmt = opt });
     return self;
 }
diff --git a/zig-bait/vmt.zig b/zig-bait/vmt.zig
@@ -30,6 +30,6 @@ fn restore(opt: *option.vmt.Option) void {
 
 pub fn init(alloc: Allocator, base_class: tools.AbstractClass, comptime positions: []const usize, targets: []const usize) !interface.Hook {
     const opt = try option.vmt.VmtOption.init(alloc, base_class, positions, targets, &hook, &restore);
-    const self = interface.Hook.init(opt);
+    const self = interface.Hook.init(option.Option{ .vmt = opt });
     return self;
 }