More wrapped functions on libs harfbuzz and fontconfig

7 files changed, 39 insertions, 6 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index a0540feb..915205ef 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -3314,8 +3314,10 @@ wrappedflac:
 wrappedfontconfig:
 - pFpV:
   - FcObjectSetBuild
+  - FcPatternBuild
 - pFpA:
   - FcObjectSetVaBuild
+  - FcPatternVaBuild
 wrappedfreebl3:
 wrappedfreetype:
 - iFpp:
@@ -4401,6 +4403,8 @@ wrappedlibharfbuzz:
   - hb_font_funcs_destroy
 - pFp:
   - hb_unicode_funcs_reference
+- pFpp:
+  - hb_ft_face_create
 - vFppp:
   - hb_font_set_funcs_data
 - pFppp:
diff --git a/src/wrapped/generated/wrappedfontconfigtypes.h b/src/wrapped/generated/wrappedfontconfigtypes.h
index a4f8a2d0..f3e8d29d 100644
--- a/src/wrapped/generated/wrappedfontconfigtypes.h
+++ b/src/wrapped/generated/wrappedfontconfigtypes.h
@@ -16,6 +16,8 @@ typedef void* (*pFpA_t)(void*, va_list);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(FcObjectSetBuild, pFpV_t) \
-	GO(FcObjectSetVaBuild, pFpA_t)
+	GO(FcPatternBuild, pFpV_t) \
+	GO(FcObjectSetVaBuild, pFpA_t) \
+	GO(FcPatternVaBuild, pFpA_t)
 
 #endif // __wrappedfontconfigTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibharfbuzztypes.h b/src/wrapped/generated/wrappedlibharfbuzztypes.h
index 34fc30b3..b6ccb205 100644
--- a/src/wrapped/generated/wrappedlibharfbuzztypes.h
+++ b/src/wrapped/generated/wrappedlibharfbuzztypes.h
@@ -13,6 +13,7 @@
 
 typedef void (*vFp_t)(void*);
 typedef void* (*pFp_t)(void*);
+typedef void* (*pFpp_t)(void*, void*);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
@@ -23,6 +24,7 @@ typedef void* (*pFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 	GO(hb_draw_funcs_destroy, vFp_t) \
 	GO(hb_font_funcs_destroy, vFp_t) \
 	GO(hb_unicode_funcs_reference, pFp_t) \
+	GO(hb_ft_face_create, pFpp_t) \
 	GO(hb_font_set_funcs_data, vFppp_t) \
 	GO(hb_face_create_for_tables, pFppp_t) \
 	GO(hb_buffer_set_message_func, vFpppp_t) \
diff --git a/src/wrapped/wrappedfontconfig.c b/src/wrapped/wrappedfontconfig.c
index a1561c7b..41ef3507 100644
--- a/src/wrapped/wrappedfontconfig.c
+++ b/src/wrapped/wrappedfontconfig.c
@@ -1,7 +1,7 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#define _GNU_SOURCE         /* See feature_test_macros(7) */
 #include <dlfcn.h>
 
 #include "wrappedlibs.h"
@@ -49,6 +49,23 @@ EXPORT void* my_FcObjectSetBuild(x64emu_t* emu, void* first, uint64_t* b)
     return my->FcObjectSetVaBuild(first, VARARGS);
 }
 
+EXPORT void* my_FcPatternVaBuild(x64emu_t* emu, void* pattern, x64_va_list_t V)
+{
+    #ifdef CONVERT_VALIST
+    CONVERT_VALIST(V);
+    #else
+    CREATE_VALIST_FROM_VALIST(V, emu->scratch);
+    #endif
+    return my->FcPatternVaBuild(pattern, VARARGS);
+}
+EXPORT void* my_FcPatternBuild(x64emu_t* emu, void* pattern, uint64_t* b)
+{
+    if(!pattern)    
+        return my->FcPatternBuild(pattern, NULL);
+    CREATE_VALIST_FROM_VAARG(b, emu->scratch, 1);
+    return my->FcPatternVaBuild(pattern, VARARGS);
+}
+
 #define NEEDED_LIBS "libexpat.so.1", "libfreetype.so.6"
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedfontconfig_private.h b/src/wrapped/wrappedfontconfig_private.h
index 5a61c63c..5403f0db 100644
--- a/src/wrapped/wrappedfontconfig_private.h
+++ b/src/wrapped/wrappedfontconfig_private.h
@@ -89,7 +89,7 @@ GO(FcFontSetPrint, vFp)
 GO(FcFontSetSort, pFppipipp)
 GO(FcFontSetSortDestroy, vFp)
 GO(FcFontSort, pFppipp)
-//GO(FcFreeTypeCharIndex, 
+GO(FcFreeTypeCharIndex, uFpu)
 //GO(FcFreeTypeCharSet, 
 //GO(FcFreeTypeCharSetAndSpacing, 
 GO(FcFreeTypeQuery, pFpupp)
@@ -142,7 +142,7 @@ GO(FcPatternAddLangSet, iFppp)
 GO(FcPatternAddMatrix, iFppp)
 GO(FcPatternAddString, iFppp)
 GO(FcPatternAddWeak, iFppiLi)
-//GO2(FcPatternBuild, pFpV, FcPatternVaBuild)
+GOM(FcPatternBuild, pFEpV)
 GO(FcPatternCreate, pFv)
 GO(FcPatternDel, iFpp)
 GO(FcPatternDestroy, vFp)
@@ -164,7 +164,7 @@ GO(FcPatternHash, uFp)
 GO(FcPatternPrint, vFp)
 GO(FcPatternReference, vFp)
 GO(FcPatternRemove, iFppi)
-GO(FcPatternVaBuild, pFpp)
+GOM(FcPatternVaBuild, pFEpA)
 GO(FcStrBasename, pFp)
 GO(FcStrCmp, iFpp)
 GO(FcStrCmpIgnoreCase, iFpp)
@@ -196,5 +196,7 @@ GO(FcUtf8ToUcs4, iFppi)
 //GO(FcValueEqual, 
 //GO(FcValuePrint, 
 //GO(FcValueSave, 
+GO(FcWeightFromOpenTypeDouble, dFd)
+GO(FcWeightToOpenTypeDouble, dFd)
 //GO(_fini, 
 //GO(_init, 
diff --git a/src/wrapped/wrappedlibharfbuzz.c b/src/wrapped/wrappedlibharfbuzz.c
index e90eae0b..c300a335 100644
--- a/src/wrapped/wrappedlibharfbuzz.c
+++ b/src/wrapped/wrappedlibharfbuzz.c
@@ -1208,4 +1208,10 @@ EXPORT int my_hb_font_set_user_data(x64emu_t* emu, void* font, void* key, void*
     return (int)my->hb_font_set_user_data(font, key, data, find_destroy_Fct(destroy), replace);
 }
 
+EXPORT void* my_hb_ft_face_create(x64emu_t* emu, void* face, void* destroy)
+{
+    (void)emu;
+    return my->hb_ft_face_create(face, find_destroy_Fct(destroy));
+}
+
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibharfbuzz_private.h b/src/wrapped/wrappedlibharfbuzz_private.h
index 2637f842..464d8273 100644
--- a/src/wrapped/wrappedlibharfbuzz_private.h
+++ b/src/wrapped/wrappedlibharfbuzz_private.h
@@ -220,7 +220,7 @@ GO(hb_font_set_var_coords_normalized, vFppu)
 GO(hb_font_set_variations, vFppu)
 GO(hb_font_set_var_named_instance, vFpu)
 GO(hb_font_subtract_glyph_origin_for_direction, vFpuupp)
-//GO(hb_ft_face_create, 
+GOM(hb_ft_face_create, pFEpp)
 GO(hb_ft_face_create_cached, pFp)
 GO(hb_ft_face_create_referenced, pFp)
 GO(hb_ft_font_changed, vFp)