Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/wrapped/generated/functions_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4711,6 +4711,7 @@ wrappedgio2:
- g_task_new
- vFpippp:
- g_async_initable_init_async
- g_file_trash_async
- vFpuipV:
- g_dbus_method_invocation_return_error
- g_simple_async_result_set_error
Expand Down
1 change: 1 addition & 0 deletions src/wrapped/generated/wrappedgio2types.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typedef void (*vFpppppppuippp_t)(void*, void*, void*, void*, void*, void*, void*
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_file_trash_async, vFpippp_t) \
GO(g_dbus_method_invocation_return_error, vFpuipV_t) \
GO(g_simple_async_result_set_error, vFpuipV_t) \
GO(g_task_return_new_error, vFpuipV_t) \
Expand Down
4 changes: 2 additions & 2 deletions src/wrapped/wrappedcurl_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GO(curl_easy_duphandle, pFp)
GO(curl_easy_escape, pFppi)
GO(curl_easy_getinfo, uFpppppp) //vararg
GO(curl_easy_init, pFv)
//GO(curl_easy_pause,
GO(curl_easy_pause, uFpi)
GO(curl_easy_perform, uFp)
GO(curl_easy_recv, uFppLp)
GO(curl_easy_reset, vFp)
Expand Down Expand Up @@ -55,7 +55,7 @@ GO(curl_multi_remove_handle, iFpp)
GOM(curl_multi_setopt, iFEpup)
//GO(curl_multi_socket,
GO(curl_multi_socket_action, iFpiip)
//GO(curl_multi_socket_all,
GO(curl_multi_socket_all, iFpp)
GO(curl_multi_strerror, pFi)
GO(curl_multi_timeout, iFpp)
GO(curl_multi_wait, iFppuip)
Expand Down
5 changes: 5 additions & 0 deletions src/wrapped/wrappedgio2.c
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,11 @@ EXPORT void my_g_input_stream_read_async(x64emu_t* emu, void* stream, void* buff
my->g_input_stream_read_async(stream, buffer, count, io_prio, cancel, findGAsyncReadyCallbackFct(f), data);
}

EXPORT void my_g_file_trash_async(x64emu_t* emu, void* file, int io_priority, void* cancellable, void* callback, void* user_data)
{
my->g_file_trash_async(file, io_priority, cancellable, findGAsyncReadyCallbackFct(callback), user_data);
}

EXPORT void my_g_dbus_method_invocation_return_error_valist(x64emu_t* emu, void* invocation, uint32_t domain, int code, void* fmt, x64_va_list_t b)
{
#ifdef CONVERT_VALIST
Expand Down
4 changes: 2 additions & 2 deletions src/wrapped/wrappedgio2_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ GO(g_file_stop_mountable_finish, iFppp)
GO(g_file_supports_thread_contexts, iFp)
GO(g_filesystem_preview_type_get_type, LFv)
GO(g_file_trash, iFppp)
//GOM(g_file_trash_async, vFEpippp)
GOM(g_file_trash_async, vFEpippp)
GO(g_file_trash_finish, iFppp)
GO(g_file_type_get_type, LFv)
//GOM(g_file_unmount_mountable, vFEpuppp)
Expand Down Expand Up @@ -1894,4 +1894,4 @@ GO(g_zlib_decompressor_get_file_info, pFp)
GO(g_zlib_decompressor_get_type, LFv)
GO(g_zlib_decompressor_new, pFu)
//GO(_init,
GO(dummy_vFpippp, vFpippp) // needed for gtkclass wrapping of GAsyncInitable Interface
GO(dummy_vFpippp, vFpippp) // needed for gtkclass wrapping of GAsyncInitable Interface
8 changes: 4 additions & 4 deletions src/wrapped/wrappedlibresolv_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GO(__dn_comp, iFppipp)
GO(__dn_count_labels, iFp)
GOM(__dn_expand, iFEppppi)
GOM(dn_expand, iFEppppi)
GO(__dn_skipname, iFpp)
GO2(__dn_skipname, iFpp, dn_skipname)
GO(__fp_nquery, vFpiS)
GO(__fp_query, vFpS)
GO(__fp_resstat, vFpS)
Expand Down Expand Up @@ -87,18 +87,18 @@ GO(__res_nameinquery, iFpiipp)
#ifdef STATICBUILD
//GO(__res_nmkquery,
#else
GO(__res_nmkquery, iFpipiipippi)
GO2(__res_nmkquery, iFpipiipippi, res_nmkquery)

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure that will break stuffs for system using old glibc, prior to 2.34 or something like that.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use GOM instead of GO2 for processing.

#endif
GO(res_nmkquery, iFpipiipippi)
GOM(__res_nquery, iFEppiipi)
GOM(res_nquery, iFEppiipi)
GOM(__res_nquerydomain, iFEpppiipi)
GOM(res_nquerydomain, iFEpppiipi)
GO(__res_nsearch, iFppiipi)
GO2(__res_nsearch, iFppiipi, res_nsearch)
#ifdef STATICBUILD
//GO(__res_nsend,
#else
GO(__res_nsend, iFppipi)
GO2(__res_nsend, iFppipi, res_nsend)
#endif
GO(res_nsend, iFppipi)
//DATA(_res_opcodes, 4)
Expand Down
Loading