[WRAPPER] Fix some erros reported in #4214

src/wrapped/wrappedcrypto3_private.h

@@ -1565,7 +1565,7 @@ GO(ENGINE_get_ECDSA, pFp)
 //GO(ENGINE_get_ex_data, 
 //GO(ENGINE_get_ex_new_index, 
 //GOM(ENGINE_get_finish_function, pFEp)
-GO(ENGINE_get_first, iFp)
+GO(ENGINE_get_first, pFv)
 GO(ENGINE_get_flags, iFp)
 GO(ENGINE_get_id, pFp)
 //GOM(ENGINE_get_init_function, pFEp)

src/wrapped/wrappedcrypto_private.h

@@ -1555,7 +1555,7 @@ GO(ENGINE_get_ECDSA, pFp)
 //GO(ENGINE_get_ex_data, 
 //GO(ENGINE_get_ex_new_index, 
 //GOM(ENGINE_get_finish_function, pFEp)
-GO(ENGINE_get_first, iFp)
+GO(ENGINE_get_first, pFv)
 GO(ENGINE_get_flags, iFp)
 GO(ENGINE_get_id, pFp)
 //GOM(ENGINE_get_init_function, pFEp)

src/wrapped/wrappedgstreamer.c

@@ -1390,7 +1390,7 @@ EXPORT void* my_gst_task_new(x64emu_t* emu, void* f, void* data, void* d)
 
 EXPORT int my_gst_type_find_register(x64emu_t* emu, void* plugin, void* name, uint32_t rank, void* f, void* ext, void* caps, void* data, void* d)
 {
-    return my->gst_type_find_register(plugin, name, rank, findGstTypeFindFunctionFct(f), ext, caps, data, findDestroyFct(f));
+    return my->gst_type_find_register(plugin, name, rank, findGstTypeFindFunctionFct(f), ext, caps, data, findDestroyFct(d));
 }
 
 EXPORT void my_gst_pad_set_iterate_internal_links_function_full(x64emu_t* emu, void* pad, void* f, void* data, void* d)

src/wrapped/wrappedlibglxnvidia.c

@@ -173,7 +173,7 @@ static void* find_get_blob_func_Fct(void* fct)
     return NULL;
 }
 #undef SUPER
-#define ALTMY mynv
+#define ALTMY mynv_
 #include "wrappedlib_init.h"
 
 // glDebugMessageCallback

src/wrapped/wrappedlibssh2.c

@@ -109,9 +109,9 @@ static void* find_free_Fct(void* fct)
 // paaswd_changereq
 #define GO(A)   \
 static uintptr_t my_paaswd_changereq_fct_##A = 0;                                               \
-static void my_paaswd_changereq_##A(void* a, int b, void* c, int d, void* e, int f, void* g)    \
+static int my_paaswd_changereq_##A(void* a, void* b, void* c, void* d)                          \
 {                                                                                               \
-    RunFunctionFmt(my_paaswd_changereq_fct_##A, "pipipip", a, b, c, d, e, f, g);                \
+    return RunFunctionFmt(my_paaswd_changereq_fct_##A, "pppp", a, b, c, d);                     \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedlibssl3.c

@@ -672,10 +672,10 @@ EXPORT void my3_SSL_set_verify(x64emu_t* emu, void* ctx, int mode, void* f)
     my->SSL_set_verify(ctx, mode, find_verify_Fct(f));
 }
 
-EXPORT void my3_SSL_get_ex_new_index(x64emu_t* emu, long argl, void* argp, void* new_func, void* dup_func, void* free_func)
+EXPORT int my3_SSL_get_ex_new_index(x64emu_t* emu, long argl, void* argp, void* new_func, void* dup_func, void* free_func)
 {
     (void)emu;
-    my->SSL_get_ex_new_index(argl, argp, find_ex_new_Fct(new_func), find_ex_dup_Fct(dup_func), find_ex_free_Fct(free_func));
+    return my->SSL_get_ex_new_index(argl, argp, find_ex_new_Fct(new_func), find_ex_dup_Fct(dup_func), find_ex_free_Fct(free_func));
 }
 
 EXPORT void my3_SSL_set_psk_client_callback(x64emu_t* emu, void* ctx, void* cb)

src/wrapped/wrappedselinux_private.h

@@ -36,7 +36,7 @@ GO(context_range_set, iFpp)
 //GO(context_role_get, 
 GO(context_role_set, iFpp)
 GO(context_str, pFp)
-GO(context_type_get, iFpp)
+GO(context_type_get, pFp)
 GO(context_type_set, iFpp)
 //GO(context_user_get, 
 GO(context_user_set, iFpp)

src/wrapped32/wrappedfreetype.c

@@ -2462,7 +2462,7 @@ EXPORT int my32_FT_Request_Size(x64emu_t* emu, void* face, FT_Size_RequestRec_32
     convert_FT_Size_RequestRec_to_64(&req_l, req);
     inplace_FT_FaceRec_enlarge(face);
     int ret = my->FT_Request_Size(face, &req_l);
-    inplace_FT_FaceRec_enlarge(face);
+    inplace_FT_FaceRec_shrink(face);
     return ret;
 }
 

src/wrapped32/wrappedlibc.c

@@ -460,9 +460,9 @@ static void* findfilter_dirFct(void* fct)
 static uintptr_t my32_compare_dir_fct_##A = 0;                                      \
 static int my32_compare_dir_##A(const struct dirent* a, const struct dirent* b)     \
 {                                                                                   \
-    static struct i386_dirent d1, d2;                                               \
+    struct i386_dirent d1, d2;                                               \
     UnalignDirent_32(a, &d1);                                                       \
-    UnalignDirent_32(a, &d2);                                                       \
+    UnalignDirent_32(b, &d2);                                                       \
     return (int)RunFunctionFmt(my32_compare_dir_fct_##A, "pp", &d1, &d2);           \
 }
 SUPER()
@@ -2357,9 +2357,13 @@ EXPORT int my32_setrlimit(x64emu_t* emu, int what, uint32_t* pr)
 
 EXPORT void* my32___localtime64(x64emu_t* emu, void* t)
 {
-    static struct tm l = {};
-    l = *localtime(t);
-    return &l;
+    static struct_iiiiiiiiilt_t res_ = {0};
+    void* ret = localtime(t);
+    if(ret) {
+        to_struct_iiiiiiiiilt(to_ptrv(&res_), ret);
+        return &res_;
+    }
+    return NULL;
 }
 
 EXPORT void* my32_localtime(x64emu_t* emu, void* t)

src/wrapped32/wrappedlibglxnvidia.c

@@ -410,7 +410,7 @@ EXPORT void my32nv_glBindBuffersRange(x64emu_t* emu, uint32_t target, uint32_t f
         offsets_l[i] = from_long(offsets[i]);
         sizes_l[i] = from_long(sizes[i]);
     }
-    fnc(target, first, count, buffers, offsets_l, sizes);
+    fnc(target, first, count, buffers, offsets_l, sizes_l);
 }
 // glBindVertexBuffers ...
 EXPORT void my32nv_glBindVertexBuffers(x64emu_t* emu, uint32_t first, int count, void* buffers, ptr_t* offsets, void* strides)

src/wrapped32/wrappedlibx11.c

@@ -2652,15 +2652,15 @@ EXPORT int my32_XTextWidth(x64emu_t* emu, void* font, void* string, int count)
 {
     inplace_XFontStruct_enlarge(font);
     int ret = my->XTextWidth(font, string, count);
-    inplace_XFontProp_shrink(font);
+    inplace_XFontStruct_shrink(font);
     return ret;
 }
 
 EXPORT int my32_XTextWidth16(x64emu_t* emu, void* font, void* string, int count)
 {
     inplace_XFontStruct_enlarge(font);
     int ret = my->XTextWidth16(font, string, count);
-    inplace_XFontProp_shrink(font);
+    inplace_XFontStruct_shrink(font);
     return ret;
 }