Merge pull request #274 from mhavu/main

Added new wrappings for libx11

6 files changed, 70 insertions, 65 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 3134cb48..d9d29413 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -642,6 +642,7 @@
 #() vFpUpp
 #() vFpfff
 #() vFpdii
+#() vFpdip
 #() vFpddi
 #() vFpddd
 #() vFpLLL
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index f1aab732..09316222 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -676,6 +676,7 @@ typedef void (*vFpUUp_t)(void*, uint64_t, uint64_t, void*);
 typedef void (*vFpUpp_t)(void*, uint64_t, void*, void*);
 typedef void (*vFpfff_t)(void*, float, float, float);
 typedef void (*vFpdii_t)(void*, double, int64_t, int64_t);
+typedef void (*vFpdip_t)(void*, double, int64_t, void*);
 typedef void (*vFpddi_t)(void*, double, double, int64_t);
 typedef void (*vFpddd_t)(void*, double, double, double);
 typedef void (*vFpLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t);
@@ -2744,6 +2745,7 @@ void vFpUUp(x64emu_t *emu, uintptr_t fcn) { vFpUUp_t fn = (vFpUUp_t)fcn; fn((voi
 void vFpUpp(x64emu_t *emu, uintptr_t fcn) { vFpUpp_t fn = (vFpUpp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpfff(x64emu_t *emu, uintptr_t fcn) { vFpfff_t fn = (vFpfff_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void vFpdii(x64emu_t *emu, uintptr_t fcn) { vFpdii_t fn = (vFpdii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int64_t)R_RSI, (int64_t)R_RDX); }
+void vFpdip(x64emu_t *emu, uintptr_t fcn) { vFpdip_t fn = (vFpdip_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int64_t)R_RSI, (void*)R_RDX); }
 void vFpddi(x64emu_t *emu, uintptr_t fcn) { vFpddi_t fn = (vFpddi_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int64_t)R_RSI); }
 void vFpddd(x64emu_t *emu, uintptr_t fcn) { vFpddd_t fn = (vFpddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void vFpLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLL_t fn = (vFpLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
@@ -4731,6 +4733,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUpp) return 1;
 	if (fun == &vFpfff) return 4;
 	if (fun == &vFpdii) return 2;
+	if (fun == &vFpdip) return 2;
 	if (fun == &vFpddi) return 3;
 	if (fun == &vFpddd) return 4;
 	if (fun == &vFpLLL) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 8a2636bd..b8a2b9c8 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -675,6 +675,7 @@ void vFpUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpUpp(x64emu_t *emu, uintptr_t fnc);
 void vFpfff(x64emu_t *emu, uintptr_t fnc);
 void vFpdii(x64emu_t *emu, uintptr_t fnc);
+void vFpdip(x64emu_t *emu, uintptr_t fnc);
 void vFpddi(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
 void vFpLLL(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgdkpixbuf2_private.h b/src/wrapped/wrappedgdkpixbuf2_private.h
index 3429a16e..6a498595 100755
--- a/src/wrapped/wrappedgdkpixbuf2_private.h
+++ b/src/wrapped/wrappedgdkpixbuf2_private.h
@@ -6,24 +6,24 @@ GO(gdk_colorspace_get_type, iFv)
 GO(gdk_interp_type_get_type, iFv)
 GO(gdk_pixbuf_add_alpha, pFpiCCC)
 GO(gdk_pixbuf_alpha_mode_get_type, iFv)
-//GO(gdk_pixbuf_animation_get_height, 
-//GO(gdk_pixbuf_animation_get_iter, 
-//GO(gdk_pixbuf_animation_get_static_image, 
+GO(gdk_pixbuf_animation_get_height, iFp)
+GO(gdk_pixbuf_animation_get_iter, pFpp)
+GO(gdk_pixbuf_animation_get_static_image, pFp)
 //GO(gdk_pixbuf_animation_get_type, 
-//GO(gdk_pixbuf_animation_get_width, 
-//GO(gdk_pixbuf_animation_is_static_image, 
-//GO(gdk_pixbuf_animation_iter_advance, 
-//GO(gdk_pixbuf_animation_iter_get_delay_time, 
-//GO(gdk_pixbuf_animation_iter_get_pixbuf, 
+GO(gdk_pixbuf_animation_get_width, iFp)
+GO(gdk_pixbuf_animation_is_static_image, iFp)
+GO(gdk_pixbuf_animation_iter_advance, iFpp)
+GO(gdk_pixbuf_animation_iter_get_delay_time, iFp)
+GO(gdk_pixbuf_animation_iter_get_pixbuf, pFp)
 //GO(gdk_pixbuf_animation_iter_get_type, 
-//GO(gdk_pixbuf_animation_iter_on_currently_loading_frame, 
-//GO(gdk_pixbuf_animation_new_from_file, 
+GO(gdk_pixbuf_animation_iter_on_currently_loading_frame, iFp)
+GO(gdk_pixbuf_animation_new_from_file, pFpp)
 //GO(gdk_pixbuf_animation_new_from_resource, 
 //GO(gdk_pixbuf_animation_new_from_stream, 
 //GO(gdk_pixbuf_animation_new_from_stream_async, 
 //GO(gdk_pixbuf_animation_new_from_stream_finish, 
-//GO(gdk_pixbuf_animation_ref, 
-//GO(gdk_pixbuf_animation_unref, 
+GO(gdk_pixbuf_animation_ref, pFp)
+GO(gdk_pixbuf_animation_unref, vFp)
 GO(gdk_pixbuf_apply_embedded_orientation, pFp)
 GO(gdk_pixbuf_composite, vFppiiiiddddii)
 GO(gdk_pixbuf_composite_color, vFppiiiiddddiiiiiuu)
diff --git a/src/wrapped/wrappedgtkx112_private.h b/src/wrapped/wrappedgtkx112_private.h
index b896ea16..30f2089e 100755
--- a/src/wrapped/wrappedgtkx112_private.h
+++ b/src/wrapped/wrappedgtkx112_private.h
@@ -290,8 +290,8 @@ GO(gtk_button_box_set_child_secondary, vFppi)
 GO(gtk_button_box_set_child_size, vFpii)
 GO(gtk_button_box_set_layout, vFpi)
 GO(gtk_button_box_style_get_type, LFv)
-//GO(gtk_button_clicked, 
-//GO(gtk_button_enter, 
+GO(gtk_button_clicked, vFp)
+GO(gtk_button_enter, vFp)
 GO(gtk_button_get_alignment, vFppp)
 GO(gtk_button_get_event_window, pFp)
 GO(gtk_button_get_focus_on_click, iFp)
@@ -1515,19 +1515,19 @@ GO(gtk_label_set_track_visited_links, vFpi)
 GO(gtk_label_set_use_markup, vFpi)
 GO(gtk_label_set_use_underline, vFpi)
 GO(gtk_label_set_width_chars, vFpi)
-//GO(gtk_layout_freeze, 
-//GO(gtk_layout_get_bin_window, 
-//GO(gtk_layout_get_hadjustment, 
-//GO(gtk_layout_get_size, 
+GO(gtk_layout_freeze, vFp)
+GO(gtk_layout_get_bin_window, pFp)
+GO(gtk_layout_get_hadjustment, pFp)
+GO(gtk_layout_get_size, vFppp)
 GO(gtk_layout_get_type, LFv)
-//GO(gtk_layout_get_vadjustment, 
-//GO(gtk_layout_move, 
+GO(gtk_layout_get_vadjustment, pFp)
+GO(gtk_layout_move, vFppii)
 GO(gtk_layout_new, pFpp)
-//GO(gtk_layout_put, 
-//GO(gtk_layout_set_hadjustment, 
-//GO(gtk_layout_set_size, 
-//GO(gtk_layout_set_vadjustment, 
-//GO(gtk_layout_thaw, 
+GO(gtk_layout_put, vFppii)
+GO(gtk_layout_set_hadjustment, vFpp)
+GO(gtk_layout_set_size, vFpii)
+GO(gtk_layout_set_vadjustment, vFpp)
+GO(gtk_layout_thaw, vFp)
 GO(gtk_link_button_get_type, LFv)
 GO(gtk_link_button_get_uri, pFp)
 GO(gtk_link_button_get_visited, iFp)
@@ -2447,7 +2447,7 @@ GO(gtk_response_type_get_type, LFv)
 GO(gtk_ruler_get_type, LFv)
 //GO(gtk_ruler_set_metric, 
 //GO(gtk_ruler_set_range, 
-//GO(gtk_scale_add_mark, 
+GO(gtk_scale_add_mark, vFpdip)
 //GO(gtk_scale_button_get_adjustment, 
 //GO(gtk_scale_button_get_minus_button, 
 //GO(gtk_scale_button_get_orientation, 
@@ -2460,16 +2460,16 @@ GO(gtk_scale_button_get_type, LFv)
 //GO(gtk_scale_button_set_icons, 
 //GO(gtk_scale_button_set_orientation, 
 //GO(gtk_scale_button_set_value, 
-//GO(gtk_scale_clear_marks, 
-//GO(gtk_scale_get_digits, 
-//GO(gtk_scale_get_draw_value, 
-//GO(gtk_scale_get_layout, 
-//GO(gtk_scale_get_layout_offsets, 
+GO(gtk_scale_clear_marks, vFp)
+GO(gtk_scale_get_digits, iFp)
+GO(gtk_scale_get_draw_value, iFp)
+GO(gtk_scale_get_layout, pFp)
+GO(gtk_scale_get_layout_offsets, vFppp)
 GO(gtk_scale_get_type, LFv)
-//GO(gtk_scale_get_value_pos, 
-//GO(gtk_scale_set_digits, 
-//GO(gtk_scale_set_draw_value, 
-//GO(gtk_scale_set_value_pos, 
+GO(gtk_scale_get_value_pos, iFp)
+GO(gtk_scale_set_digits, vFpi)
+GO(gtk_scale_set_draw_value, vFpi)
+GO(gtk_scale_set_value_pos, vFpi)
 GO(gtk_scrollbar_get_type, LFv)
 GO(gtk_scrolled_window_add_with_viewport, vFpp)
 GO(gtk_scrolled_window_get_hadjustment, pFp)
@@ -2554,16 +2554,16 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_new, 
 //GO(gtk_signal_newv, 
 GO(gtk_signal_run_type_get_type, LFv)
-//GO(gtk_size_group_add_widget, 
-//GO(gtk_size_group_get_ignore_hidden, 
-//GO(gtk_size_group_get_mode, 
+GO(gtk_size_group_add_widget, vFpp)
+GO(gtk_size_group_get_ignore_hidden, iFp)
+GO(gtk_size_group_get_mode, iFp)
 GO(gtk_size_group_get_type, LFv)
-//GO(gtk_size_group_get_widgets, 
+GO(gtk_size_group_get_widgets, pFp)
 GO(gtk_size_group_mode_get_type, LFv)
-//GO(gtk_size_group_new, 
-//GO(gtk_size_group_remove_widget, 
-//GO(gtk_size_group_set_ignore_hidden, 
-//GO(gtk_size_group_set_mode, 
+GO(gtk_size_group_new, pFi)
+GO(gtk_size_group_remove_widget, vFpp)
+GO(gtk_size_group_set_ignore_hidden, vFpi)
+GO(gtk_size_group_set_mode, vFpi)
 GO(gtk_socket_add_id, vFpp)
 GO(gtk_socket_get_id, pFp)
 GO(gtk_socket_get_plug_window, pFp)
@@ -3603,12 +3603,12 @@ GO(gtk_unit_get_type, LFv)
 GO(gtk_update_type_get_type, LFv)
 GO(gtk_vbox_get_type, LFv)
 GO(gtk_vbox_new, pFii)
-//GO(gtk_vbutton_box_get_layout_default, 
-//GO(gtk_vbutton_box_get_spacing_default, 
+GO(gtk_vbutton_box_get_layout_default, iFv)
+GO(gtk_vbutton_box_get_spacing_default, iFv)
 GO(gtk_vbutton_box_get_type, LFv)
-//GO(gtk_vbutton_box_new, 
-//GO(gtk_vbutton_box_set_layout_default, 
-//GO(gtk_vbutton_box_set_spacing_default, 
+GO(gtk_vbutton_box_new, pFv)
+GO(gtk_vbutton_box_set_layout_default, vFi)
+GO(gtk_vbutton_box_set_spacing_default, vFi)
 GO(gtk_viewport_get_bin_window, pFp)
 GO(gtk_viewport_get_hadjustment, pFp)
 GO(gtk_viewport_get_shadow_type, iFp)
@@ -3933,4 +3933,4 @@ GO(gtk_wrap_mode_get_type, LFv)
 GOM(gtk_signal_connect, LFEpppp)
 GO2(gtk_type_is_a, iFii, g_type_is_a)
 GOM(gtk_type_check_object_cast, pFEpi)
-GOM(gtk_spin_button_get_value_as_float, fFEp)
\ No newline at end of file
+GOM(gtk_spin_button_get_value_as_float, fFEp)
diff --git a/src/wrapped/wrappedlibx11_private.h b/src/wrapped/wrappedlibx11_private.h
index d12189de..3b6b7ed7 100755
--- a/src/wrapped/wrappedlibx11_private.h
+++ b/src/wrapped/wrappedlibx11_private.h
@@ -21,10 +21,10 @@ DATAB(_qfree, 4)
 //GO(XActivateScreenSaver
 GOM(XAddConnectionWatch, iFEppp)
 GO(XAddExtension, pFp)
-//GO(XAddHost
-//GO(XAddHosts
-//GO(XAddPixel
-//GO(XAddToExtensionList
+GO(XAddHost, vFpp)
+GO(XAddHosts, vFppi)
+GO(XAddPixel, vFpl)
+GO(XAddToExtensionList, vFpp)
 //GO(XAddToSaveSet
 GO(XAllocClassHint, pFv)
 GO(XAllocColor, iFppp)
@@ -46,9 +46,9 @@ GO(XAutoRepeatOff, iFp)
 GO(XAutoRepeatOn, iFp)
 GO(XBaseFontNameListOfFontSet, pFp)
 GO(XBell, iFpi)
-//GO(XBitmapBitOrder
-//GO(XBitmapPad
-//GO(XBitmapUnit
+GO(XBitmapBitOrder, iFp)
+GO(XBitmapPad, iFp)
+GO(XBitmapUnit, iFp)
 GO(XBlackPixel, LFpi)
 //GO(XBlackPixelOfScreen
 //GO(XCellsOfScreen
@@ -248,9 +248,9 @@ GO(_XDefaultIOError, iFp)
 // _XDefaultOpenIM
 // _XDefaultOpenOM
 GO(XDefaultRootWindow, pFp)
-GO(XDefaultScreen, pFp)
+GO(XDefaultScreen, iFp)
 GO(XDefaultScreenOfDisplay, pFp)
-//GO(XDefaultString
+GO(XDefaultString, pFv)
 GO(XDefaultVisual, pFpi)
 GO(XDefaultVisualOfScreen, pFp)
 // _XDefaultWireError
@@ -267,8 +267,8 @@ GO(XDestroyRegion, iFp)
 GO(XDestroySubwindows, iFpp)
 GO(XDestroyWindow, iFpp)
 //GO(XDirectionalDependentDrawing
-//GO(XDisableAccessControl
-//GO(XDisplayCells
+GO(XDisableAccessControl, vFp)
+GO(XDisplayCells, iFpi)
 GO(XDisplayHeight, iFpi)
 GO(XDisplayHeightMM, iFpi)
 GO(XDisplayKeycodes, iFppp)
@@ -302,7 +302,7 @@ GO(_XEatData, vFpL)
 GO(_XEatDataWords, vFpL)
 //GO(XEHeadOfExtensionList
 GO(XEmptyRegion, iFp)
-//GO(XEnableAccessControl
+GO(XEnableAccessControl, vFp)
 // _XEnq
 GO(XEqualRegion, iFpp)
 // _XError
@@ -753,7 +753,7 @@ GO(XListDepths, pFpip)
 GO(XListExtensions, pFpp)
 GO(XListFonts, pFppip)
 GO(XListFontsWithInfo, pFppipp)
-//GO(XListHosts
+GO(XListHosts, pFppp)
 //GO(XListInstalledColormaps
 GO(XListPixmapFormats, pFpp)
 GO(XListProperties, pFppp)
@@ -864,8 +864,8 @@ GOM(XRegisterIMInstantiateCallback, iFEpppppp)
 // _XRegisterInternalConnection
 GOM(XRemoveConnectionWatch, iFEppp)
 //GO(XRemoveFromSaveSet
-//GO(XRemoveHost
-//GO(XRemoveHosts
+GO(XRemoveHost, vFpp)
+GO(XRemoveHosts, vFppi)
 GO(XReparentWindow, iFpppii)
 GO(_XReply, iFppii)
 GO(XResetScreenSaver, iFp)
@@ -918,7 +918,7 @@ GO(XSelectInput, iFppi)
 GO(_XSend, vFppi)
 GO(XSendEvent, uFppiip)
 GO(XServerVendor, pFp)
-GO(XSetAccessControl, iFpi)
+GO(XSetAccessControl, vFpi)
 GOM(XSetAfterFunction, pFEpp)
 GO(XSetArcMode, iFppi)
 //GO(XSetAuthorization