diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-03-07 17:31:40 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-03-07 17:31:40 +0100 |
| commit | 7165ff7b840a7b4de13111b7d17e482d8e6cef9d (patch) | |
| tree | b7ab437b5b7736f46d81d31ee72ed40c22f13d7a /src/tools | |
| parent | 81d906fd3b6ed25a81665d839ceef2d88f4a74f9 (diff) | |
| download | box64-7165ff7b840a7b4de13111b7d17e482d8e6cef9d.tar.gz box64-7165ff7b840a7b4de13111b7d17e482d8e6cef9d.zip | |
More work on X11 wrapping, allowing gtk to run fully emulated
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bridge.c | 10 | ||||
| -rw-r--r-- | src/tools/gtkclass.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/tools/bridge.c b/src/tools/bridge.c index fd53c255..cdc0e307 100644 --- a/src/tools/bridge.c +++ b/src/tools/bridge.c @@ -141,10 +141,8 @@ uintptr_t AddCheckBridge(bridge_t* bridge, wrapper_t w, void* fnc, int N, const return ret; } -uintptr_t AddAutomaticBridge(x64emu_t* emu, bridge_t* bridge, wrapper_t w, void* fnc, int N, const char* name) +uintptr_t AddAutomaticBridge(bridge_t* bridge, wrapper_t w, void* fnc, int N, const char* name) { - (void)emu; - if(!fnc) return 0; uintptr_t ret = CheckBridged(bridge, fnc); @@ -153,11 +151,7 @@ uintptr_t AddAutomaticBridge(x64emu_t* emu, bridge_t* bridge, wrapper_t w, void* if(!hasAlternate(fnc)) { printf_log(LOG_DEBUG, "Adding AutomaticBridge for %p to %p\n", fnc, (void*)ret); addAlternate(fnc, (void*)ret); - #ifdef DYNAREC - // now, check if dynablock at native address exist - if(box64_dynarec) - DBAlternateBlock(emu, (uintptr_t)fnc, ret, 0); // function wrapping is exclusive to 64bits on box64 - #endif + } return ret; } diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c index d9700a7e..185b7326 100644 --- a/src/tools/gtkclass.c +++ b/src/tools/gtkclass.c @@ -206,7 +206,7 @@ static void autobridge_##NAME##_##A(wrapper_t W, void* fct) \ return; \ Dl_info info; \ if(dladdr(fct, &info)) \ - AddAutomaticBridge(thread_get_emu(), my_bridge, W, fct, 0, #NAME "_" #A); \ + AddAutomaticBridge(my_bridge, W, fct, 0, #NAME "_" #A); \ } #define WRAPPER(A, NAME, RET, DEF, FMT, ...) \ |