diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 10 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedgio2types.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedgobject2types.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedgtk3types.h | 1 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 6 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 3 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgdk3_private.h | 7 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgio2.c | 18 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgio2_private.h | 12 | ||||
| -rwxr-xr-x | src/wrapped/wrappedglib2_private.h | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgobject2.c | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgobject2_private.h | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgtk3.c | 29 | ||||
| -rwxr-xr-x | src/wrapped/wrappedgtk3_private.h | 11 |
14 files changed, 93 insertions, 18 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 6b30bd2f..40d1bb89 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -1677,6 +1677,7 @@ #() vFEpiLpp #() vFEpippp #() vFEpuipp +#() vFEpuipV #() vFEpupup #() vFEpuppp #() vFEpLLpp @@ -2427,7 +2428,7 @@ #() uFppuuuppu #() uFppuppppp #() uFpppppupp -#() LFELpLpLpi +#() LFELpupupu #() LFEpiupppp #() LFpLpuuLLu #() pFEiplllpp @@ -3092,6 +3093,7 @@ wrappedgdkx112: wrappedgio2: - vFppp: - g_simple_async_result_set_op_res_gpointer + - g_task_return_pointer - vFippp: - g_bus_get - vFppip: @@ -3109,8 +3111,11 @@ wrappedgio2: - g_simple_async_result_new - g_simple_async_result_new_from_error - g_simple_async_result_new_take_error + - g_task_new - vFpippp: - g_async_initable_init_async +- vFpuipV: + - g_task_return_new_error - vFppipV: - g_simple_async_result_set_error - vFppipA: @@ -3386,7 +3391,7 @@ wrappedgobject2: - g_signal_handlers_block_matched - g_signal_handlers_disconnect_matched - g_signal_handlers_unblock_matched -- LFLpLpLpi: +- LFLpupupu: - g_type_register_static_simple - LFpiupppp: - g_signal_handler_find @@ -3458,6 +3463,7 @@ wrappedgtk3: - gtk_style_context_get_valist - vFppp: - gtk_builder_connect_signals_full + - gtk_clipboard_request_text - gtk_container_forall - gtk_container_foreach - gtk_menu_attach_to_widget diff --git a/src/wrapped/generated/wrappedgio2types.h b/src/wrapped/generated/wrappedgio2types.h index 991e2b73..8e2674d8 100644 --- a/src/wrapped/generated/wrappedgio2types.h +++ b/src/wrapped/generated/wrappedgio2types.h @@ -19,6 +19,7 @@ typedef uint32_t (*uFpppp_t)(void*, void*, void*, void*); typedef uintptr_t (*LFpppp_t)(void*, void*, void*, void*); typedef void* (*pFpppp_t)(void*, void*, void*, void*); typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*); +typedef void (*vFpuipV_t)(void*, uint32_t, int32_t, void*, ...); typedef void (*vFppipV_t)(void*, void*, int32_t, void*, ...); typedef void (*vFppipA_t)(void*, void*, int32_t, void*, va_list); typedef void* (*pFppppV_t)(void*, void*, void*, void*, ...); @@ -45,6 +46,7 @@ typedef void (*vFpppppppiippp_t)(void*, void*, void*, void*, void*, void*, void* #define SUPER() ADDED_FUNCTIONS() \ GO(g_simple_async_result_set_op_res_gpointer, vFppp_t) \ + GO(g_task_return_pointer, vFppp_t) \ GO(g_bus_get, vFippp_t) \ GO(g_simple_async_result_run_in_thread, vFppip_t) \ GO(g_dbus_connection_close, vFpppp_t) \ @@ -56,7 +58,9 @@ typedef void (*vFpppppppiippp_t)(void*, void*, void*, void*, void*, void*, void* GO(g_simple_async_result_new, pFpppp_t) \ GO(g_simple_async_result_new_from_error, pFpppp_t) \ GO(g_simple_async_result_new_take_error, pFpppp_t) \ + GO(g_task_new, pFpppp_t) \ GO(g_async_initable_init_async, vFpippp_t) \ + GO(g_task_return_new_error, vFpuipV_t) \ GO(g_simple_async_result_set_error, vFppipV_t) \ GO(g_simple_async_result_set_error_va, vFppipA_t) \ GO(g_initable_new, pFppppV_t) \ diff --git a/src/wrapped/generated/wrappedgobject2types.h b/src/wrapped/generated/wrappedgobject2types.h index 42b93dbf..61b8aec6 100644 --- a/src/wrapped/generated/wrappedgobject2types.h +++ b/src/wrapped/generated/wrappedgobject2types.h @@ -37,7 +37,7 @@ typedef uintptr_t (*LFLpppi_t)(uintptr_t, void*, void*, void*, int32_t); typedef uintptr_t (*LFppppi_t)(void*, void*, void*, void*, int32_t); typedef uintptr_t (*LFpppppu_t)(void*, void*, void*, void*, void*, uint32_t); typedef uint32_t (*uFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*); -typedef uintptr_t (*LFLpLpLpi_t)(uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, int32_t); +typedef uintptr_t (*LFLpupupu_t)(uintptr_t, void*, uint32_t, void*, uint32_t, void*, uint32_t); typedef uintptr_t (*LFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*); typedef uint32_t (*uFpLiupppLuV_t)(void*, uintptr_t, int32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, ...); typedef uint32_t (*uFpLippppLup_t)(void*, uintptr_t, int32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*); @@ -77,7 +77,7 @@ typedef uint32_t (*uFpLippppLuA_t)(void*, uintptr_t, int32_t, void*, void*, void GO(g_signal_handlers_block_matched, uFpiupppp_t) \ GO(g_signal_handlers_disconnect_matched, uFpiupppp_t) \ GO(g_signal_handlers_unblock_matched, uFpiupppp_t) \ - GO(g_type_register_static_simple, LFLpLpLpi_t) \ + GO(g_type_register_static_simple, LFLpupupu_t) \ GO(g_signal_handler_find, LFpiupppp_t) \ GO(g_signal_new, uFpLiupppLuV_t) \ GO(g_signal_newv, uFpLippppLup_t) \ diff --git a/src/wrapped/generated/wrappedgtk3types.h b/src/wrapped/generated/wrappedgtk3types.h index ac89b747..8700d1b3 100644 --- a/src/wrapped/generated/wrappedgtk3types.h +++ b/src/wrapped/generated/wrappedgtk3types.h @@ -46,6 +46,7 @@ typedef void* (*pFpipppppppi_t)(void*, int32_t, void*, void*, void*, void*, void GO(gtk_tree_store_new, pFuV_t) \ GO(gtk_style_context_get_valist, vFpiA_t) \ GO(gtk_builder_connect_signals_full, vFppp_t) \ + GO(gtk_clipboard_request_text, vFppp_t) \ GO(gtk_container_forall, vFppp_t) \ GO(gtk_container_foreach, vFppp_t) \ GO(gtk_menu_attach_to_widget, vFppp_t) \ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 3c6b4210..6e853fe7 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -1713,6 +1713,7 @@ typedef void (*vFEiiipp_t)(x64emu_t*, int32_t, int32_t, int32_t, void*, void*); typedef void (*vFEpiLpp_t)(x64emu_t*, void*, int32_t, uintptr_t, void*, void*); typedef void (*vFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*); typedef void (*vFEpuipp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*); +typedef void (*vFEpuipV_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*); typedef void (*vFEpupup_t)(x64emu_t*, void*, uint32_t, void*, uint32_t, void*); typedef void (*vFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*); typedef void (*vFEpLLpp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*, void*); @@ -2463,7 +2464,7 @@ typedef uint32_t (*uFppuuuupp_t)(void*, void*, uint32_t, uint32_t, uint32_t, uin typedef uint32_t (*uFppuuuppu_t)(void*, void*, uint32_t, uint32_t, uint32_t, void*, void*, uint32_t); typedef uint32_t (*uFppuppppp_t)(void*, void*, uint32_t, void*, void*, void*, void*, void*); typedef uint32_t (*uFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, void*, void*); -typedef uintptr_t (*LFELpLpLpi_t)(x64emu_t*, uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, int32_t); +typedef uintptr_t (*LFELpupupu_t)(x64emu_t*, uintptr_t, void*, uint32_t, void*, uint32_t, void*, uint32_t); typedef uintptr_t (*LFEpiupppp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*, void*, void*); typedef uintptr_t (*LFpLpuuLLu_t)(void*, uintptr_t, void*, uint32_t, uint32_t, uintptr_t, uintptr_t, uint32_t); typedef void* (*pFEiplllpp_t)(x64emu_t*, int32_t, void*, intptr_t, intptr_t, intptr_t, void*, void*); @@ -4535,6 +4536,7 @@ void vFEiiipp(x64emu_t *emu, uintptr_t fcn) { vFEiiipp_t fn = (vFEiiipp_t)fcn; f void vFEpiLpp(x64emu_t *emu, uintptr_t fcn) { vFEpiLpp_t fn = (vFEpiLpp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); } void vFEpippp(x64emu_t *emu, uintptr_t fcn) { vFEpippp_t fn = (vFEpippp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void vFEpuipp(x64emu_t *emu, uintptr_t fcn) { vFEpuipp_t fn = (vFEpuipp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); } +void vFEpuipV(x64emu_t *emu, uintptr_t fcn) { vFEpuipV_t fn = (vFEpuipV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } void vFEpupup(x64emu_t *emu, uintptr_t fcn) { vFEpupup_t fn = (vFEpupup_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); } void vFEpuppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppp_t fn = (vFEpuppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void vFEpLLpp(x64emu_t *emu, uintptr_t fcn) { vFEpLLpp_t fn = (vFEpLLpp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); } @@ -5285,7 +5287,7 @@ void uFppuuuupp(x64emu_t *emu, uintptr_t fcn) { uFppuuuupp_t fn = (uFppuuuupp_t) void uFppuuuppu(x64emu_t *emu, uintptr_t fcn) { uFppuuuppu_t fn = (uFppuuuppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); } void uFppuppppp(x64emu_t *emu, uintptr_t fcn) { uFppuppppp_t fn = (uFppuppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void uFpppppupp(x64emu_t *emu, uintptr_t fcn) { uFpppppupp_t fn = (uFpppppupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } -void LFELpLpLpi(x64emu_t *emu, uintptr_t fcn) { LFELpLpLpi_t fn = (LFELpLpLpi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); } +void LFELpupupu(x64emu_t *emu, uintptr_t fcn) { LFELpupupu_t fn = (LFELpupupu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); } void LFEpiupppp(x64emu_t *emu, uintptr_t fcn) { LFEpiupppp_t fn = (LFEpiupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void LFpLpuuLLu(x64emu_t *emu, uintptr_t fcn) { LFpLpuuLLu_t fn = (LFpLpuuLLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); } void pFEiplllpp(x64emu_t *emu, uintptr_t fcn) { pFEiplllpp_t fn = (pFEiplllpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 24fdb036..66934c98 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -1714,6 +1714,7 @@ void vFEiiipp(x64emu_t *emu, uintptr_t fnc); void vFEpiLpp(x64emu_t *emu, uintptr_t fnc); void vFEpippp(x64emu_t *emu, uintptr_t fnc); void vFEpuipp(x64emu_t *emu, uintptr_t fnc); +void vFEpuipV(x64emu_t *emu, uintptr_t fnc); void vFEpupup(x64emu_t *emu, uintptr_t fnc); void vFEpuppp(x64emu_t *emu, uintptr_t fnc); void vFEpLLpp(x64emu_t *emu, uintptr_t fnc); @@ -2464,7 +2465,7 @@ void uFppuuuupp(x64emu_t *emu, uintptr_t fnc); void uFppuuuppu(x64emu_t *emu, uintptr_t fnc); void uFppuppppp(x64emu_t *emu, uintptr_t fnc); void uFpppppupp(x64emu_t *emu, uintptr_t fnc); -void LFELpLpLpi(x64emu_t *emu, uintptr_t fnc); +void LFELpupupu(x64emu_t *emu, uintptr_t fnc); void LFEpiupppp(x64emu_t *emu, uintptr_t fnc); void LFpLpuuLLu(x64emu_t *emu, uintptr_t fnc); void pFEiplllpp(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedgdk3_private.h b/src/wrapped/wrappedgdk3_private.h index 020c51e9..97455ee0 100755 --- a/src/wrapped/wrappedgdk3_private.h +++ b/src/wrapped/wrappedgdk3_private.h @@ -227,6 +227,7 @@ GO(gdk_event_get_modifier_state, iFp) GO(gdk_event_get_root_coords, iFppp) GO(gdk_event_get_screen, pFp) GO(gdk_event_get_state, iFpp) +GO(gdk_event_get_source_device, pFp) GO(gdk_event_get_surface, pFp) GO(gdk_event_get_time, uFp) GO(gdk_event_get_type, iFv) @@ -304,6 +305,11 @@ GO(gdk_get_display_arg_name, pFv) GO(gdk_get_program_class, pFv) GO(gdk_get_show_events, iFv) GO(gdk_get_use_xshm, iFv) +GO(gdk_gl_context_get_type, LFv) +GO(gdk_gl_context_clear_current, vFv) +GO(gdk_gl_context_get_current, pFv) +GO(gdk_gl_context_make_current, vFp) +GO(gdk_gl_context_realize, iFpp) GO(gdk_grab_status_get_type, iFv) GO(gdk_gravity_get_type, iFv) GO(gdk_image_get, pFpiiii) @@ -611,6 +617,7 @@ GO(gdk_window_configure_finished, vFp) GO(gdk_window_constrain_size, vFpuiipp) GO(gdk_window_coords_from_parent, vFpddpp) GO(gdk_window_coords_to_parent, vFpddpp) +GO(gdk_window_create_gl_context, pFpp) GO(gdk_window_create_similar_image_surface, pFpiiii) GO(gdk_window_create_similar_surface, pFpuii) GO(gdk_window_deiconify, vFp) diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c index ec9e6fc6..fd7380fb 100755 --- a/src/wrapped/wrappedgio2.c +++ b/src/wrapped/wrappedgio2.c @@ -368,6 +368,16 @@ static my_GDBusInterfaceVTable_t* findFreeGDBusInterfaceVTable(my_GDBusInterface } #undef SUPER +EXPORT void* my_g_task_new(x64emu_t* emu, void* source_object, void* cancellable, void* cb, void* data) +{ + return my->g_task_new(source_object, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_g_task_return_pointer(x64emu_t* emu, void* task, void* result, void* destroy) +{ + my->g_task_return_pointer(task, result, findGDestroyNotifyFct(destroy)); +} + EXPORT void my_g_dbus_proxy_new(x64emu_t* emu, void* connection, int flags, void* info, void* name, void* path, void* interface, void* cancellable, void* cb, void* data) { my->g_dbus_proxy_new(connection, flags, info, name, path, interface, cancellable, findGAsyncReadyCallbackFct(cb), data); @@ -582,6 +592,14 @@ EXPORT void* my_g_initable_new_valist(x64emu_t* emu, void* type, void* first, x6 return my->g_initable_new_valist(type, first, VARARGS, cancel, err); } +EXPORT void my_g_task_return_new_error(x64emu_t* emu, void* task, uint32_t domain, int code, void *fmt, va_list b) +{ + char* tmp; + int dummy = vasprintf(&tmp, fmt, b); + (void)dummy; + my->g_task_return_new_error(task, domain, code, tmp); + free(tmp); +} #define PRE_INIT \ if(box64_nogtk) \ diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h index 1454cad5..560b2518 100755 --- a/src/wrapped/wrappedgio2_private.h +++ b/src/wrapped/wrappedgio2_private.h @@ -135,7 +135,7 @@ GO(g_async_initable_new_finish, pFppp) GOM(g_async_initable_new_valist_async, vFEipAippp) GOM(g_async_initable_newv_async, vFEiupippp) GO(g_async_result_get_source_object, pFp) -//GO(g_async_result_get_type, +GO(g_async_result_get_type, LFv) GO(g_async_result_get_user_data, pFp) GO(g_async_result_is_tagged, iFpp) //GO(g_async_result_legacy_propagate_error, @@ -341,7 +341,7 @@ GO(g_dbus_error_encode_gerror, pFp) //GO(g_dbus_error_get_type, GO(g_dbus_error_is_remote_error, iFp) GO(g_dbus_error_new_for_dbus_error, pFpp) -//GO(g_dbus_error_quark, +GO(g_dbus_error_quark, uFv) //GO(g_dbus_error_register_error, GO(g_dbus_error_register_error_domain, vFpppu) //GO(g_dbus_error_set_dbus_error, @@ -1623,10 +1623,10 @@ GO(g_task_get_priority, iFp) //GO(g_task_get_source_object, GO(g_task_get_source_tag, pFp) //GO(g_task_get_task_data, -//GO(g_task_get_type, +GO(g_task_get_type, LFv) //GO(g_task_had_error, GO(g_task_is_valid, iFpp) -//GO(g_task_new, +GOM(g_task_new, pFEpppp) GO(g_task_propagate_boolean, iFpp) GO(g_task_propagate_int, lFpp) GO(g_task_propagate_pointer, pFpp) @@ -1636,8 +1636,8 @@ GO(g_task_return_boolean, vFpi) GO(g_task_return_error, vFpp) //GO(g_task_return_error_if_cancelled, GO(g_task_return_int, vFpl) -//GO(g_task_return_new_error, -//GO(g_task_return_pointer, +GOM(g_task_return_new_error, vFEpuipV) +GOM(g_task_return_pointer, vFEppp) //GO(g_task_run_in_thread, //GO(g_task_run_in_thread_sync, //GO(g_task_set_check_cancellable, diff --git a/src/wrapped/wrappedglib2_private.h b/src/wrapped/wrappedglib2_private.h index 1a834875..0102e01d 100755 --- a/src/wrapped/wrappedglib2_private.h +++ b/src/wrapped/wrappedglib2_private.h @@ -754,7 +754,7 @@ GO(g_nullify_pointer, vFp) //GO(g_once_impl, GO(g_once_init_enter, iFp) GO(g_once_init_enter_impl, iFp) -GO(g_once_init_leave, vFpL) +GO(g_once_init_leave, vFpi) GO(g_on_error_query, vFp) GO(g_on_error_stack_trace, vFp) GO(g_open, iFpii) diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c index 1295cedd..d1d6cd1c 100755 --- a/src/wrapped/wrappedgobject2.c +++ b/src/wrapped/wrappedgobject2.c @@ -745,7 +745,7 @@ EXPORT unsigned long my_g_signal_add_emission_hook(x64emu_t* emu, uint32_t signa return my->g_signal_add_emission_hook(signal, detail, my_signal_emission_hook, sig, my_signal_delete); } -EXPORT size_t my_g_type_register_static_simple(x64emu_t* emu, size_t parent, void* name, size_t class_size, void* class_init, size_t instance_size, void* instance_init, int flags) +EXPORT size_t my_g_type_register_static_simple(x64emu_t* emu, size_t parent, void* name, uint32_t class_size, void* class_init, uint32_t instance_size, void* instance_init, uint32_t flags) { //gobject2_my_t *my = (gobject2_my_t*)my_lib->w.p2; diff --git a/src/wrapped/wrappedgobject2_private.h b/src/wrapped/wrappedgobject2_private.h index 76f0b2f6..b81d036d 100755 --- a/src/wrapped/wrappedgobject2_private.h +++ b/src/wrapped/wrappedgobject2_private.h @@ -338,7 +338,7 @@ GO(g_type_query, vFLp) //GOM(type_register_dynamic, iFEpippi) GOM(g_type_register_fundamental, LFELpppi) GOM(g_type_register_static, LFELppi) -GOM(g_type_register_static_simple, LFELpLpLpi) +GOM(g_type_register_static_simple, LFELpupupu) //GOM(g_type_remove_class_cache_func, vFEpB) //GOM(g_type_remove_interface_check, vFEpB) GO(g_type_set_qdata, vFLup) diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c index f8493e84..3fdfaf79 100755 --- a/src/wrapped/wrappedgtk3.c +++ b/src/wrapped/wrappedgtk3.c @@ -441,6 +441,30 @@ static void* findGtkPrintJobCompleteHuncFct(void* fct) return NULL; } + +// GtkClipboardTextReceivedFunc +#define GO(A) \ +static uintptr_t my_GtkClipboardTextReceivedFunc_fct_##A = 0; \ +static void my_GtkClipboardTextReceivedFunc_##A(void* clipboard, void* text, void* data) \ +{ \ + RunFunctionFmt(my_context, my_GtkClipboardTextReceivedFunc_fct_##A, "ppp", clipboard, text, data); \ +} +SUPER() +#undef GO +static void* findGtkClipboardTextReceivedFuncFct(void* fct) +{ + if(!fct) return fct; + if(GetNativeFnc((uintptr_t)fct)) return GetNativeFnc((uintptr_t)fct); + #define GO(A) if(my_GtkClipboardTextReceivedFunc_fct_##A == (uintptr_t)fct) return my_GtkClipboardTextReceivedFunc_##A; + SUPER() + #undef GO + #define GO(A) if(my_GtkClipboardTextReceivedFunc_fct_##A == 0) {my_GtkClipboardTextReceivedFunc_fct_##A = (uintptr_t)fct; return my_GtkClipboardTextReceivedFunc_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkClipboardTextReceivedFunc callback\n"); + return NULL; +} + #undef SUPER /* EXPORT void my3_gtk_dialog_add_buttons(x64emu_t* emu, void* dialog, void* first, uintptr_t* b) @@ -723,6 +747,11 @@ EXPORT void my3_gtk_container_foreach(x64emu_t* emu, void* container, void* cb, my->gtk_container_foreach(container, findGtkCallbackFct(cb), data); } +EXPORT void my3_gtk_clipboard_request_text(x64emu_t* emu, void* clipboard, void* f, void* data) +{ + my->gtk_clipboard_request_text(clipboard, findGtkClipboardTextReceivedFuncFct(f), data); +} + #define PRE_INIT \ if(box64_nogtk) \ return -1; diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h index 3c914c19..3ed19f21 100755 --- a/src/wrapped/wrappedgtk3_private.h +++ b/src/wrapped/wrappedgtk3_private.h @@ -193,7 +193,7 @@ GO(gtk_alternative_dialog_button_order, iFp) GO(gtk_anchor_type_get_type, pFv) GO(gtk_application_add_window, vFpp) GO(gtk_application_get_new, pFpi) -GO(gtk_application_get_type, pFv) +GO(gtk_application_get_type, LFv) GO(gtk_application_new, pFpu) GO(gtk_application_set_accels_for_action, vFppp) GO(gtk_application_window_new, pFp) @@ -446,6 +446,7 @@ GO(gtk_check_menu_item_toggled, vFp) GO(gtk_check_version, pFuuu) GO(gtk_clipboard_clear, vFp) GO(gtk_clipboard_get, pFp) +GO(gtk_clipboard_get_default, pFp) GO(gtk_clipboard_get_display, pFp) GO(gtk_clipboard_get_for_display, pFpp) GO(gtk_clipboard_get_owner, pFp) @@ -454,7 +455,7 @@ GO(gtk_clipboard_get_type, pFv) //GOM(gtk_clipboard_request_image, vFEppp) //GOM(gtk_clipboard_request_rich_text, vFEpppp) //GOM(gtk_clipboard_request_targets, vFEppp) -//GOM(gtk_clipboard_request_text, vFEppp) +GOM(gtk_clipboard_request_text, vFEppp) //GOM(gtk_clipboard_request_uris, vFEppp) GO(gtk_clipboard_set_can_store, vFppi) GO(gtk_clipboard_set_image, vFpp) @@ -650,6 +651,7 @@ GO(gtk_combo_set_popdown_strings, vFpp) GO(gtk_combo_set_use_arrows, vFpi) GO(gtk_combo_set_use_arrows_always, vFpi) GO(gtk_combo_set_value_in_list, vFpii) +GO(gtk_container_accessible_get_type, LFv) GO(gtk_container_add, vFpp) GO(gtk_container_add_with_properties, vFpppppppppppp) //vaarg GO(gtk_container_check_resize, vFp) @@ -3824,6 +3826,8 @@ GO(gtk_widget_class_install_style_property, vFpp) //GOM(gtk_widget_class_install_style_property_parser, vFEppB) GO(gtk_widget_class_list_style_properties, pFpp) GO(gtk_widget_class_path, vFpppp) +GO(gtk_widget_class_set_accessible_role, vFpu) +GO(gtk_widget_class_set_accessible_type, vFpL) //GOM(gtk_widget_class_set_connect_func, vFEpBpB) GO(gtk_widget_compute_expand, iFpu) GO(gtk_widget_create_pango_context, pFp) @@ -4000,6 +4004,7 @@ GO(gtk_widget_queue_resize_no_redraw, vFp) GO(gtk_widget_realize, vFp) GO(gtk_widget_ref, pFp) GO(gtk_widget_region_intersect, pFpp) +GO(gtk_widget_register_window, vFpp) GO(gtk_widget_remove_accelerator, iFppuu) GO(gtk_widget_remove_mnemonic_label, vFpp) GO(gtk_widget_render_icon, pFppup) @@ -4202,6 +4207,8 @@ GO(gtk_wrap_mode_get_type, pFv) GO(gtk_gesture_long_press_get_type, LFv) GO(gtk_gesture_single_get_type, LFv) GO(gtk_gesture_get_type, LFv) +GO(gtk_gesture_rotate_new, pFp) +GO(gtk_gesture_zoom_new, pFp) GO(gtk_event_controller_get_type, LFv) GO(gtk_stack_set_visible_child_name, vFpp) GO(gtk_stack_get_visible_child_name, pFp) |