Forgot a bunch of other box_ malloc/realloc/calloc/free use

4 files changed, 27 insertions, 26 deletions

diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c
index 0c5663bc..b481963d 100755
--- a/src/wrapped/wrappedglib2.c
+++ b/src/wrapped/wrappedglib2.c
@@ -1067,12 +1067,12 @@ EXPORT void* my_g_build_path(x64emu_t *emu, void* sep, void* first, uintptr_t* d
         p = (void*)getVArgs(emu, 2, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc((n+1) *sizeof(void*));
+    void** args = (void**)box_malloc((n+1) *sizeof(void*));
     args[0] = first;
     for(int i=0; i<n; ++i)
         args[i+1] = (void*)getVArgs(emu, 2, data, i);
     p = my->g_build_pathv(sep, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
@@ -1236,11 +1236,11 @@ EXPORT void* my_g_strjoin(x64emu_t* emu, void* sep, uintptr_t* data)
         p = (void*)getVArgs(emu, 1, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc(n *sizeof(void*));
+    void** args = (void**)box_malloc(n *sizeof(void*));
     for(int i=0; i<n; ++i)
         args[i] = (void*)getVArgs(emu, 1, data, i);
     p = my->g_strjoinv(sep, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
@@ -1291,12 +1291,12 @@ EXPORT void* my_g_strconcat(x64emu_t* emu, void* first, uintptr_t* data)
         p = (void*)getVArgs(emu, 1, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc((n+1) *sizeof(void*));
+    void** args = (void**)box_malloc((n+1) *sizeof(void*));
     args[0] = first;
     for(int i=0; i<n; ++i)
         args[i+1] = (void*)getVArgs(emu, 1, data, i);
     p = my->g_strjoinv(NULL, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
diff --git a/src/wrapped/wrappedlib_init.h b/src/wrapped/wrappedlib_init.h
index 2b34acab..f6b52668 100755
--- a/src/wrapped/wrappedlib_init.h
+++ b/src/wrapped/wrappedlib_init.h
@@ -2,6 +2,7 @@
 #error Meh
 #endif
 
+#include "debug.h"
 #include "librarian/library_inner.h"
 
 #define FUNC3(M,N) wrapped##M##N
@@ -136,10 +137,10 @@ int FUNC(_init)(library_t* lib, box64context_t* box64)
 #endif
                 return -1;
 #ifdef ALTNAME2
-                else lib->path = strdup(ALTNAME2);
-            } else lib->path = strdup(ALTNAME);
+                else lib->path = box_strdup(ALTNAME2);
+            } else lib->path = box_strdup(ALTNAME);
 #endif
-        } else lib->path = strdup(MAPNAME(Name));
+        } else lib->path = box_strdup(MAPNAME(Name));
     }
     WrappedLib_CommonInit(lib);
 
diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c
index fa12a53c..2545cbd2 100755
--- a/src/wrapped/wrappedlibx11.c
+++ b/src/wrapped/wrappedlibx11.c
@@ -622,8 +622,8 @@ if (new_va[i] && strcmp((char*)new_va[i], A) == 0) {    \
 EXPORT void* my_XVaCreateNestedList(x64emu_t* emu, int unused, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2 ;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -633,16 +633,16 @@ EXPORT void* my_XVaCreateNestedList(x64emu_t* emu, int unused, uintptr_t* va) {
 
     void* res = NULL;
     VA_CALL(my->XVaCreateNestedList, unused, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 
 EXPORT void* my_XCreateIC(x64emu_t* emu, void* xim, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -652,16 +652,16 @@ EXPORT void* my_XCreateIC(x64emu_t* emu, void* xim, uintptr_t* va) {
 
     void* res = NULL;
     VA_CALL(my->XCreateIC, xim, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 
 EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -671,8 +671,8 @@ EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
 
     void* res = NULL; 
     VA_CALL(my->XSetICValues, xic, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 #undef GO
@@ -680,8 +680,8 @@ EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
 EXPORT void* my_XSetIMValues(x64emu_t* emu, void* xim, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XIMCallback* callbacks = (XIMCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XIMCallback* callbacks = (XIMCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     #define GO(A)                                           \
     if (new_va[i] && strcmp((char*)new_va[i], A) == 0) {    \
@@ -701,8 +701,8 @@ EXPORT void* my_XSetIMValues(x64emu_t* emu, void* xim, uintptr_t* va) {
     
     void* res = NULL;
     VA_CALL(my->XSetIMValues, xim, new_va, n, res)
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 #undef VA_CALL
diff --git a/src/wrapped/wrappedvulkan.c b/src/wrapped/wrappedvulkan.c
index 21d9ea8c..20310452 100755
--- a/src/wrapped/wrappedvulkan.c
+++ b/src/wrapped/wrappedvulkan.c
@@ -325,7 +325,7 @@ static void* find_DebugReportCallbackEXT_Fct(void* fct)
 
 #undef SUPER
 
-//#define PRE_INIT if(libGL) {lib->w.lib = dlopen(libGL, RTLD_LAZY | RTLD_GLOBAL); lib->path = strdup(libGL);} else
+//#define PRE_INIT if(libGL) {lib->w.lib = dlopen(libGL, RTLD_LAZY | RTLD_GLOBAL); lib->path = box_strdup(libGL);} else
 
 #define PRE_INIT        \
     if(box64_novulkan)  \