about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-01-16 10:19:44 +0100
committerptitSeb <sebastien.chev@gmail.com>2024-01-16 10:19:44 +0100
commitd22e6f28a1a155737b57e7c6a3c1c29136bdb66d (patch)
tree9c896cd72ceb2ae1991cad665dc78c2dd2197f9d /src
parent307acee9d32f421616c8b1cc97536848c00a53bc (diff)
downloadbox64-d22e6f28a1a155737b57e7c6a3c1c29136bdb66d.tar.gz
box64-d22e6f28a1a155737b57e7c6a3c1c29136bdb66d.zip
Used AddCheckBridge were the check could make sense
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/wrappedd3dadapter9.c6
-rw-r--r--src/wrapped/wrappedlibgl.c2
-rw-r--r--src/wrapped/wrappedopenal.c4
-rw-r--r--src/wrapped/wrappedsdl1.c4
-rw-r--r--src/wrapped/wrappedvulkan.c2
-rw-r--r--src/wrapped/wrappedxml2.c16
6 files changed, 17 insertions, 17 deletions
diff --git a/src/wrapped/wrappedd3dadapter9.c b/src/wrapped/wrappedd3dadapter9.c
index 3701bbaa..de962ee1 100644
--- a/src/wrapped/wrappedd3dadapter9.c
+++ b/src/wrapped/wrappedd3dadapter9.c
@@ -79,15 +79,15 @@ static int my_GetDirect3D(x64emu_t* emu, void* This, void*** ppD3D9);
 #define UNPACK(...) __VA_ARGS__
 
 #define GO(name, type) \
-    new->name = (void*)AddBridge(emu->context->system, type, real->name, 0, #name)
+    new->name = (void*)AddCheckBridge(emu->context->system, type, real->name, 0, #name)
 
 #define GOM(name, type) \
     my_##name##_real = (void*)real->name; \
-    new->name = (void*)AddBridge(emu->context->system, type, my_##name, 0, "my_" #name)
+    new->name = (void*)AddCheckBridge(emu->context->system, type, my_##name, 0, "my_" #name)
 
 #define GO2(name, type) \
     my_##name##_real2 = (void*)real->name; \
-    new->name = (void*)AddBridge(emu->context->system, type, my_##name2, 0, "my_" #name)
+    new->name = (void*)AddCheckBridge(emu->context->system, type, my_##name2, 0, "my_" #name)
 
 #include "wrappedd3dadapter9_gen.h"
 
diff --git a/src/wrapped/wrappedlibgl.c b/src/wrapped/wrappedlibgl.c
index 513bd777..32780acb 100644
--- a/src/wrapped/wrappedlibgl.c
+++ b/src/wrapped/wrappedlibgl.c
@@ -456,7 +456,7 @@ void* getGLProcAddress(x64emu_t* emu, glprocaddress_t procaddr, const char* rnam
     if(!s->resolved) {
         const char* constname = kh_key(wrappers->glwrappers, k);
         AddOffsetSymbol(emu->context->maplib, symbol, rname);
-        s->addr = AddBridge(emu->context->system, s->w, symbol, 0, constname);
+        s->addr = AddCheckBridge(emu->context->system, s->w, symbol, 0, constname);
         s->resolved = 1;
     }
     ret = s->addr;
diff --git a/src/wrapped/wrappedopenal.c b/src/wrapped/wrappedopenal.c
index 1d063f88..80f58c46 100644
--- a/src/wrapped/wrappedopenal.c
+++ b/src/wrapped/wrappedopenal.c
@@ -146,7 +146,7 @@ EXPORT void* my_alGetProcAddress(x64emu_t* emu, void* name)
     symbol1_t *s = &kh_value(emu->context->alwrappers, k);
     if(!s->resolved) {
         const char* constname = kh_key(emu->context->alwrappers, k);
-        s->addr = AddBridge(emu->context->system, s->w, symbol, 0, constname);
+        s->addr = AddCheckBridge(emu->context->system, s->w, symbol, 0, constname);
         s->resolved = 1;
     }
     return (void*)s->addr;
@@ -182,7 +182,7 @@ EXPORT void* my_alcGetProcAddress(x64emu_t* emu, void* device, void* name)
     symbol1_t *s = &kh_value(emu->context->alwrappers, k);
     if(!s->resolved) {
         const char* constname = kh_key(emu->context->alwrappers, k);
-        s->addr = AddBridge(emu->context->system, s->w, symbol, 0, constname);
+        s->addr = AddCheckBridge(emu->context->system, s->w, symbol, 0, constname);
         s->resolved = 1;
     }
     return (void*)s->addr;
diff --git a/src/wrapped/wrappedsdl1.c b/src/wrapped/wrappedsdl1.c
index b38a3fd9..b8e5bc31 100644
--- a/src/wrapped/wrappedsdl1.c
+++ b/src/wrapped/wrappedsdl1.c
@@ -402,9 +402,9 @@ EXPORT int32_t my_SDL_GetWMInfo(x64emu_t* emu, void* p)
     int ret = my->SDL_GetWMInfo(p);
     my_SDL_SysWMinfo *info = (my_SDL_SysWMinfo*)p;
     if(info->info.x11.lock_func)
-        info->info.x11.lock_func = (void*)AddBridge(emu->context->system, vFv, info->info.x11.lock_func, 0, NULL);
+        info->info.x11.lock_func = (void*)AddCheckBridge(emu->context->system, vFv, info->info.x11.lock_func, 0, NULL);
     if(info->info.x11.unlock_func)
-        info->info.x11.unlock_func = (void*)AddBridge(emu->context->system, vFv, info->info.x11.unlock_func, 0, NULL);
+        info->info.x11.unlock_func = (void*)AddCheckBridge(emu->context->system, vFv, info->info.x11.unlock_func, 0, NULL);
     return ret;
 }
 
diff --git a/src/wrapped/wrappedvulkan.c b/src/wrapped/wrappedvulkan.c
index 56cf36b1..34154b37 100644
--- a/src/wrapped/wrappedvulkan.c
+++ b/src/wrapped/wrappedvulkan.c
@@ -74,7 +74,7 @@ static void* resolveSymbol(x64emu_t* emu, void* symbol, const char* rname)
     if(!s->resolved) {
         khint_t k = kh_get(symbolmap, emu->context->vkwrappers, rname);
         const char* constname = kh_key(emu->context->vkwrappers, k);
-        s->addr = AddBridge(emu->context->system, s->w, symbol, 0, constname);
+        s->addr = AddCheckBridge(emu->context->system, s->w, symbol, 0, constname);
         s->resolved = 1;
     }
     void* ret = (void*)s->addr;
diff --git a/src/wrapped/wrappedxml2.c b/src/wrapped/wrappedxml2.c
index cb7aef39..7261165c 100644
--- a/src/wrapped/wrappedxml2.c
+++ b/src/wrapped/wrappedxml2.c
@@ -69,17 +69,17 @@ void* my_wrap_xmlMemStrdup(void* p)
 
 #define ADDED_INIT() \
     void** p;                                                                                               \
-    p=dlsym(lib->w.lib, "xmlFree");                                                                    \
-        my_xmlFree = (p && *p)?AddBridge(lib->w.bridge, vFp, *p, 0, "my_wrap_xmlFree"):0;              \
+    p=dlsym(lib->w.lib, "xmlFree");                                                                         \
+        my_xmlFree = (p && *p)?AddCheckBridge(lib->w.bridge, vFp, *p, 0, "my_wrap_xmlFree"):0;              \
         if(p) *p = my_wrap_xmlFree;                                                                         \
-    p=dlsym(lib->w.lib, "xmlMalloc");                                                                  \
-        my_xmlMalloc = (p && *p)?AddBridge(lib->w.bridge, pFL, *p, 0, "my_wrap_xmlMalloc"):0;          \
+    p=dlsym(lib->w.lib, "xmlMalloc");                                                                       \
+        my_xmlMalloc = (p && *p)?AddCheckBridge(lib->w.bridge, pFL, *p, 0, "my_wrap_xmlMalloc"):0;          \
         if(p) *p = my_wrap_xmlMalloc;                                                                       \
-    p=dlsym(lib->w.lib, "xmlRealloc");                                                                 \
-        my_xmlRealloc = (p && *p)?AddBridge(lib->w.bridge, pFpL, *p, 0, "my_wrap_xmlRealloc"):0;       \
+    p=dlsym(lib->w.lib, "xmlRealloc");                                                                      \
+        my_xmlRealloc = (p && *p)?AddCheckBridge(lib->w.bridge, pFpL, *p, 0, "my_wrap_xmlRealloc"):0;       \
         if(p) *p = my_wrap_xmlRealloc;                                                                      \
-    p=dlsym(lib->w.lib, "xmlMemStrdup");                                                               \
-        my_xmlMemStrdup = (p && *p)?AddBridge(lib->w.bridge, pFp, *p, 0, "my_wrap_xmlMemStrdup"):0;    \
+    p=dlsym(lib->w.lib, "xmlMemStrdup");                                                                    \
+        my_xmlMemStrdup = (p && *p)?AddCheckBridge(lib->w.bridge, pFp, *p, 0, "my_wrap_xmlMemStrdup"):0;    \
         if(p) *p = my_wrap_xmlMemStrdup;
 
 #include "wrappercallback.h"