Some more wrapping on AtkUtils

4 files changed, 13 insertions, 4 deletions

diff --git a/src/wrapped/wrappedatk.c b/src/wrapped/wrappedatk.c
index f96beff0..f785817f 100755
--- a/src/wrapped/wrappedatk.c
+++ b/src/wrapped/wrappedatk.c
@@ -26,6 +26,7 @@ typedef size_t      (*LFv_t)  ();
 
 #define ADDED_FUNCTIONS()                   \
 GO(atk_object_get_type, LFv_t)              \
+GO(atk_util_get_type, LFv_t)                \
 
 #include "generated/wrappedatktypes.h"
 
@@ -128,7 +129,8 @@ EXPORT uint32_t my_atk_add_key_event_listener(x64emu_t* emu, void* f, void* p)
 
 #define CUSTOM_INIT \
     getMy(lib);     \
-    SetAtkObjectID(my->atk_object_get_type());                 \
+    SetAtkObjectID(my->atk_object_get_type());  \
+    SetAtkUtilID(my->atk_util_get_type());      \
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedatkbridge.c b/src/wrapped/wrappedatkbridge.c
index dfc0d199..88198faf 100755
--- a/src/wrapped/wrappedatkbridge.c
+++ b/src/wrapped/wrappedatkbridge.c
@@ -15,6 +15,11 @@
 const char* atkbridgeName = "libatk-bridge-2.0.so.0";
 #define LIBNAME atkbridge
 
+EXPORT int my_atk_bridge_adaptor_init(void* argc, void** argv)
+{
+    return 0;
+}
+
 #define PRE_INIT    \
     if(box64_nogtk) \
         return -1;
diff --git a/src/wrapped/wrappedatkbridge_private.h b/src/wrapped/wrappedatkbridge_private.h
index 4851d8e8..f77ca365 100755
--- a/src/wrapped/wrappedatkbridge_private.h
+++ b/src/wrapped/wrappedatkbridge_private.h
@@ -2,5 +2,5 @@
 #error meh!
 #endif
 
-GO(atk_bridge_adaptor_cleanup, iFpp)
-GO(atk_bridge_adaptor_init, vFv)
\ No newline at end of file
+GO(atk_bridge_adaptor_cleanup, vFv)
+GO(atk_bridge_adaptor_init, iFpp)  //%NoE
\ No newline at end of file
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index 2572f531..c4f95265 100755
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -27,7 +27,8 @@ typedef void*(*pFL_t)(size_t);
 
 #define ADDED_FUNCTIONS()           \
  GO(g_object_get_type, LFv_t)       \
- GO(g_type_name, pFL_t)
+ GO(g_type_name, pFL_t)             \
+ GO(g_type_class_peek, pFL_t)       \
 
 #include "generated/wrappedgobject2types.h"
 static void addGObject2Alternate(library_t* lib);
@@ -864,6 +865,7 @@ EXPORT void my_g_signal_override_class_handler(x64emu_t* emu, char* name, void*
     getMy(lib);                             \
     SetGObjectID(my->g_object_get_type());  \
     SetGTypeName(my->g_type_name);          \
+    SetGClassPeek(my->g_type_class_peek);   \
     setNeededLibs(lib, 1, "libglib-2.0.so.0");
 
 #define CUSTOM_FINI \