about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2023-02-14 20:11:31 +0100
committerptitSeb <sebastien.chev@gmail.com>2023-02-14 20:11:31 +0100
commit920edce73e9cd5d59fe8f4403df53c6362636acd (patch)
tree11c97b981a7a01a4fbbbdfa49a0bde20af402785
parent7dc7b002c5e1cdf97e863c3cbd6474e86fe498a4 (diff)
downloadbox64-920edce73e9cd5d59fe8f4403df53c6362636acd.tar.gz
box64-920edce73e9cd5d59fe8f4403df53c6362636acd.zip
Some improvment to wrapped gtk3 and friends
-rwxr-xr-xsrc/tools/gtkclass.c7
-rwxr-xr-xsrc/wrapped/wrappedgio2_private.h2
-rwxr-xr-xsrc/wrapped/wrappedgobject2.c2
-rwxr-xr-xsrc/wrapped/wrappedgtk3.c2
4 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c
index 34ee00e6..8359294a 100755
--- a/src/tools/gtkclass.c
+++ b/src/tools/gtkclass.c
@@ -51,7 +51,12 @@ GO(3)   \
 GO(4)   \
 GO(5)   \
 GO(6)   \
-GO(7)
+GO(7)	\
+GO(8)	\
+GO(9)	\
+GO(10)	\
+GO(11)	\
+GO(12)
 
 #define WRAPPED(A, NAME, RET, DEF, N, ...)  \
 static uintptr_t my_##NAME##_fct_##A = 0;   \
diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h
index 0e309862..c65d69db 100755
--- a/src/wrapped/wrappedgio2_private.h
+++ b/src/wrapped/wrappedgio2_private.h
@@ -343,7 +343,7 @@ GO(g_dbus_connection_unregister_subtree, iFpu)
 //GO(g_dbus_error_new_for_dbus_error, 
 //GO(g_dbus_error_quark, 
 //GO(g_dbus_error_register_error, 
-//GO(g_dbus_error_register_error_domain, 
+GO(g_dbus_error_register_error_domain, vFpppu)
 //GO(g_dbus_error_set_dbus_error, 
 //GO(g_dbus_error_set_dbus_error_valist, 
 //GO(g_dbus_error_strip_remote_error, 
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index 95ca5eaf..f9fc35b9 100755
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -27,6 +27,7 @@ typedef void*(*pFL_t)(size_t);
 
 #define ADDED_FUNCTIONS()           \
  GO(g_object_get_type, LFv_t)       \
+ GO(g_initially_unowned_get_type, LFv_t)    \
  GO(g_type_name, pFL_t)             \
  GO(g_type_class_peek, pFL_t)       \
 
@@ -902,6 +903,7 @@ EXPORT void* my_g_type_value_table_peek(x64emu_t* emu, size_t type)
     InitGTKClass(lib->w.bridge);       \
     getMy(lib);                             \
     SetGObjectID(my->g_object_get_type());  \
+    SetGInitiallyUnownedID(my->g_initially_unowned_get_type()); \
     SetGTypeName(my->g_type_name);          \
     SetGClassPeek(my->g_type_class_peek);   \
     setNeededLibs(lib, 1, "libglib-2.0.so.0");
diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c
index 3855dcda..46adf789 100755
--- a/src/wrapped/wrappedgtk3.c
+++ b/src/wrapped/wrappedgtk3.c
@@ -38,7 +38,6 @@ typedef void          (*vFpipV_t)(void*, int, void*, ...);
 #define ADDED_FUNCTIONS()                   \
 GO(g_type_class_ref, pFL_t)                 \
 GO(g_type_class_unref, vFp_t)               \
-GO(g_initially_unowned_get_type, LFv_t)     \
 GO(gtk_bin_get_type, LFv_t)                 \
 GO(gtk_widget_get_type, LFv_t)              \
 GO(gtk_button_get_type, LFv_t)              \
@@ -723,7 +722,6 @@ EXPORT void my3_gtk_container_foreach(x64emu_t* emu, void* container, void* cb,
     libname = lib->name;                                        \
     getMy(lib);                                                 \
     SETALT(my3_);                                               \
-    SetGInitiallyUnownedID(my->g_initially_unowned_get_type()); \
     SetGtkWidget3ID(my->gtk_widget_get_type());                 \
     SetGtkContainer3ID(my->gtk_container_get_type());           \
     SetGtkTextView3ID(my->gtk_text_view_get_type());            \