diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index ced636271f..43cbbf6931 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -881,6 +881,7 @@ #() pFiIIi #() pFipii #() pFipip +#() pFipup #() pFippi #() pFippu #() pFuiii @@ -1604,6 +1605,7 @@ #() iFEpplppi #() iFEpppiiu #() iFEpppppp +#() iFiiiiiii #() iFiiiiiip #() iFpiiiiii #() iFpiiiiip @@ -1712,6 +1714,7 @@ #() vFEppipppp #() vFEpppuipV #() vFEpppppuu +#() vFEppppppp #() vFiiiiuuip #() vFilipufip #() vFuiiiiiii @@ -3137,6 +3140,16 @@ wrappedlibncursesw: - iFpiipV: - mvwprintw wrappedlibnm: +- vFpppp: + - nm_device_disconnect_async + - nm_device_wifi_request_scan_async + - nm_remote_connection_delete_async +- vFpippp: + - nm_remote_connection_commit_changes_async +- vFppppp: + - nm_remote_connection_get_secrets_async +- vFppppppp: + - nm_client_add_and_activate_connection_async wrappedlibogg: wrappedlibpanel: wrappedlibpthread: diff --git a/src/wrapped/generated/wrappedlibnmtypes.h b/src/wrapped/generated/wrappedlibnmtypes.h index f7b1316905..d7f55c52f6 100644 --- a/src/wrapped/generated/wrappedlibnmtypes.h +++ b/src/wrapped/generated/wrappedlibnmtypes.h @@ -11,7 +11,17 @@ #define ADDED_FUNCTIONS() #endif +typedef void (*vFpppp_t)(void*, void*, void*, void*); +typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*); +typedef void (*vFppppp_t)(void*, void*, void*, void*, void*); +typedef void (*vFppppppp_t)(void*, void*, void*, void*, void*, void*, void*); -#define SUPER() ADDED_FUNCTIONS() +#define SUPER() ADDED_FUNCTIONS() \ + GO(nm_device_disconnect_async, vFpppp_t) \ + GO(nm_device_wifi_request_scan_async, vFpppp_t) \ + GO(nm_remote_connection_delete_async, vFpppp_t) \ + GO(nm_remote_connection_commit_changes_async, vFpippp_t) \ + GO(nm_remote_connection_get_secrets_async, vFppppp_t) \ + GO(nm_client_add_and_activate_connection_async, vFppppppp_t) #endif // __wrappedlibnmTYPES_H_ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 1a67ad4727..16bac0b664 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -953,6 +953,7 @@ typedef void* (*pFiipp_t)(int32_t, int32_t, void*, void*); typedef void* (*pFiIIi_t)(int32_t, int64_t, int64_t, int32_t); typedef void* (*pFipii_t)(int32_t, void*, int32_t, int32_t); typedef void* (*pFipip_t)(int32_t, void*, int32_t, void*); +typedef void* (*pFipup_t)(int32_t, void*, uint32_t, void*); typedef void* (*pFippi_t)(int32_t, void*, void*, int32_t); typedef void* (*pFippu_t)(int32_t, void*, void*, uint32_t); typedef void* (*pFuiii_t)(uint32_t, int32_t, int32_t, int32_t); @@ -1676,6 +1677,7 @@ typedef int32_t (*iFEppuppp_t)(x86emu_t*, void*, void*, uint32_t, void*, void*, typedef int32_t (*iFEpplppi_t)(x86emu_t*, void*, void*, intptr_t, void*, void*, int32_t); typedef int32_t (*iFEpppiiu_t)(x86emu_t*, void*, void*, void*, int32_t, int32_t, uint32_t); typedef int32_t (*iFEpppppp_t)(x86emu_t*, void*, void*, void*, void*, void*, void*); +typedef int32_t (*iFiiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); typedef int32_t (*iFiiiiiip_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*); typedef int32_t (*iFpiiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); typedef int32_t (*iFpiiiiip_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*); @@ -1784,6 +1786,7 @@ typedef void (*vFEuuuuppp_t)(x86emu_t*, uint32_t, uint32_t, uint32_t, uint32_t, typedef void (*vFEppipppp_t)(x86emu_t*, void*, void*, int32_t, void*, void*, void*, void*); typedef void (*vFEpppuipV_t)(x86emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*); typedef void (*vFEpppppuu_t)(x86emu_t*, void*, void*, void*, void*, void*, uint32_t, uint32_t); +typedef void (*vFEppppppp_t)(x86emu_t*, void*, void*, void*, void*, void*, void*, void*); typedef void (*vFiiiiuuip_t)(int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, void*); typedef void (*vFilipufip_t)(int32_t, intptr_t, int32_t, void*, uint32_t, float, int32_t, void*); typedef void (*vFuiiiiiii_t)(uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); @@ -3105,6 +3108,7 @@ void pFiipp(x86emu_t *emu, uintptr_t fcn) { pFiipp_t fn = (pFiipp_t)fcn; R_EAX=( void pFiIIi(x86emu_t *emu, uintptr_t fcn) { pFiIIi_t fn = (pFiIIi_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(int64_t*)(R_ESP + 8), *(int64_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 24)); } void pFipii(x86emu_t *emu, uintptr_t fcn) { pFipii_t fn = (pFipii_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16)); } void pFipip(x86emu_t *emu, uintptr_t fcn) { pFipip_t fn = (pFipip_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16)); } +void pFipup(x86emu_t *emu, uintptr_t fcn) { pFipup_t fn = (pFipup_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(void**)(R_ESP + 8), *(uint32_t*)(R_ESP + 12), *(void**)(R_ESP + 16)); } void pFippi(x86emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(int32_t*)(R_ESP + 16)); } void pFippu(x86emu_t *emu, uintptr_t fcn) { pFippu_t fn = (pFippu_t)fcn; R_EAX=(uintptr_t)fn(*(int32_t*)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(uint32_t*)(R_ESP + 16)); } void pFuiii(x86emu_t *emu, uintptr_t fcn) { pFuiii_t fn = (pFuiii_t)fcn; R_EAX=(uintptr_t)fn(*(uint32_t*)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16)); } @@ -3828,6 +3832,7 @@ void iFEppuppp(x86emu_t *emu, uintptr_t fcn) { iFEppuppp_t fn = (iFEppuppp_t)fcn void iFEpplppi(x86emu_t *emu, uintptr_t fcn) { iFEpplppi_t fn = (iFEpplppi_t)fcn; R_EAX=fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(intptr_t*)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), *(int32_t*)(R_ESP + 24)); } void iFEpppiiu(x86emu_t *emu, uintptr_t fcn) { iFEpppiiu_t fn = (iFEpppiiu_t)fcn; R_EAX=fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(uint32_t*)(R_ESP + 24)); } void iFEpppppp(x86emu_t *emu, uintptr_t fcn) { iFEpppppp_t fn = (iFEpppppp_t)fcn; R_EAX=fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), *(void**)(R_ESP + 24)); } +void iFiiiiiii(x86emu_t *emu, uintptr_t fcn) { iFiiiiiii_t fn = (iFiiiiiii_t)fcn; R_EAX=fn(*(int32_t*)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(int32_t*)(R_ESP + 24), *(int32_t*)(R_ESP + 28)); } void iFiiiiiip(x86emu_t *emu, uintptr_t fcn) { iFiiiiiip_t fn = (iFiiiiiip_t)fcn; R_EAX=fn(*(int32_t*)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(int32_t*)(R_ESP + 24), *(void**)(R_ESP + 28)); } void iFpiiiiii(x86emu_t *emu, uintptr_t fcn) { iFpiiiiii_t fn = (iFpiiiiii_t)fcn; R_EAX=fn(*(void**)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(int32_t*)(R_ESP + 24), *(int32_t*)(R_ESP + 28)); } void iFpiiiiip(x86emu_t *emu, uintptr_t fcn) { iFpiiiiip_t fn = (iFpiiiiip_t)fcn; R_EAX=fn(*(void**)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(int32_t*)(R_ESP + 24), *(void**)(R_ESP + 28)); } @@ -3936,6 +3941,7 @@ void vFEuuuuppp(x86emu_t *emu, uintptr_t fcn) { vFEuuuuppp_t fn = (vFEuuuuppp_t) void vFEppipppp(x86emu_t *emu, uintptr_t fcn) { vFEppipppp_t fn = (vFEppipppp_t)fcn; fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), *(void**)(R_ESP + 24), *(void**)(R_ESP + 28)); } void vFEpppuipV(x86emu_t *emu, uintptr_t fcn) { vFEpppuipV_t fn = (vFEpppuipV_t)fcn; fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(uint32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(void**)(R_ESP + 24), (void*)(R_ESP + 28)); } void vFEpppppuu(x86emu_t *emu, uintptr_t fcn) { vFEpppppuu_t fn = (vFEpppppuu_t)fcn; fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), *(uint32_t*)(R_ESP + 24), *(uint32_t*)(R_ESP + 28)); } +void vFEppppppp(x86emu_t *emu, uintptr_t fcn) { vFEppppppp_t fn = (vFEppppppp_t)fcn; fn(emu, *(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), *(void**)(R_ESP + 24), *(void**)(R_ESP + 28)); } void vFiiiiuuip(x86emu_t *emu, uintptr_t fcn) { vFiiiiuuip_t fn = (vFiiiiuuip_t)fcn; fn(*(int32_t*)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(uint32_t*)(R_ESP + 20), *(uint32_t*)(R_ESP + 24), *(int32_t*)(R_ESP + 28), *(void**)(R_ESP + 32)); } void vFilipufip(x86emu_t *emu, uintptr_t fcn) { vFilipufip_t fn = (vFilipufip_t)fcn; fn(*(int32_t*)(R_ESP + 4), *(intptr_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16), *(uint32_t*)(R_ESP + 20), *(float*)(R_ESP + 24), *(int32_t*)(R_ESP + 28), *(void**)(R_ESP + 32)); } void vFuiiiiiii(x86emu_t *emu, uintptr_t fcn) { vFuiiiiiii_t fn = (vFuiiiiiii_t)fcn; fn(*(uint32_t*)(R_ESP + 4), *(int32_t*)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(int32_t*)(R_ESP + 16), *(int32_t*)(R_ESP + 20), *(int32_t*)(R_ESP + 24), *(int32_t*)(R_ESP + 28), *(int32_t*)(R_ESP + 32)); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index a52574d659..3d1712fae0 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -913,6 +913,7 @@ void pFiipp(x86emu_t *emu, uintptr_t fnc); void pFiIIi(x86emu_t *emu, uintptr_t fnc); void pFipii(x86emu_t *emu, uintptr_t fnc); void pFipip(x86emu_t *emu, uintptr_t fnc); +void pFipup(x86emu_t *emu, uintptr_t fnc); void pFippi(x86emu_t *emu, uintptr_t fnc); void pFippu(x86emu_t *emu, uintptr_t fnc); void pFuiii(x86emu_t *emu, uintptr_t fnc); @@ -1636,6 +1637,7 @@ void iFEppuppp(x86emu_t *emu, uintptr_t fnc); void iFEpplppi(x86emu_t *emu, uintptr_t fnc); void iFEpppiiu(x86emu_t *emu, uintptr_t fnc); void iFEpppppp(x86emu_t *emu, uintptr_t fnc); +void iFiiiiiii(x86emu_t *emu, uintptr_t fnc); void iFiiiiiip(x86emu_t *emu, uintptr_t fnc); void iFpiiiiii(x86emu_t *emu, uintptr_t fnc); void iFpiiiiip(x86emu_t *emu, uintptr_t fnc); @@ -1744,6 +1746,7 @@ void vFEuuuuppp(x86emu_t *emu, uintptr_t fnc); void vFEppipppp(x86emu_t *emu, uintptr_t fnc); void vFEpppuipV(x86emu_t *emu, uintptr_t fnc); void vFEpppppuu(x86emu_t *emu, uintptr_t fnc); +void vFEppppppp(x86emu_t *emu, uintptr_t fnc); void vFiiiiuuip(x86emu_t *emu, uintptr_t fnc); void vFilipufip(x86emu_t *emu, uintptr_t fnc); void vFuiiiiiii(x86emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h index 4cf306d139..2a4d6b2e87 100755 --- a/src/wrapped/wrappedgio2_private.h +++ b/src/wrapped/wrappedgio2_private.h @@ -341,7 +341,7 @@ GO(g_dbus_connection_unregister_subtree, iFpu) //GO(g_dbus_error_get_type, //GO(g_dbus_error_is_remote_error, //GO(g_dbus_error_new_for_dbus_error, -//GO(g_dbus_error_quark, +GO(g_dbus_error_quark, uFv) //GO(g_dbus_error_register_error, //GO(g_dbus_error_register_error_domain, //GO(g_dbus_error_set_dbus_error, @@ -352,7 +352,7 @@ GO(g_dbus_generate_guid, pFv) GO(g_dbus_gvalue_to_gvariant, pFpp) GO(g_dbus_gvariant_to_gvalue, vFpp) //GO(g_dbus_interface_dup_object, -//GO(g_dbus_interface_get_info, +GO(g_dbus_interface_get_info, pFp) //GO(g_dbus_interface_get_object, //GO(g_dbus_interface_get_type, GO(g_dbus_interface_info_cache_build, vFp) @@ -365,7 +365,7 @@ GO(g_dbus_interface_info_lookup_signal, pFpp) GO(g_dbus_interface_info_ref, pFp) GO(g_dbus_interface_info_unref, vFp) //GO(g_dbus_interface_set_object, -//GO(g_dbus_interface_skeleton_export, +GO(g_dbus_interface_skeleton_export, iFpppp) //GO(g_dbus_interface_skeleton_flags_get_type, //GO(g_dbus_interface_skeleton_flush, //GO(g_dbus_interface_skeleton_get_connection, @@ -374,7 +374,7 @@ GO(g_dbus_interface_info_unref, vFp) //GO(g_dbus_interface_skeleton_get_info, //GO(g_dbus_interface_skeleton_get_object_path, //GO(g_dbus_interface_skeleton_get_properties, -//GO(g_dbus_interface_skeleton_get_type, +GO(g_dbus_interface_skeleton_get_type, pFv) //GO(g_dbus_interface_skeleton_get_vtable, //GO(g_dbus_interface_skeleton_has_connection, //GO(g_dbus_interface_skeleton_set_flags, @@ -491,7 +491,7 @@ GOM(g_dbus_object_manager_client_new_for_bus_sync, pFEiippppppp) GO(g_dbus_object_manager_get_object, pFpp) GO(g_dbus_object_manager_get_object_path, pFp) GO(g_dbus_object_manager_get_objects, pFp) -//GO(g_dbus_object_manager_get_type, +GO(g_dbus_object_manager_get_type, pFv) //GO(g_dbus_object_manager_server_export, //GO(g_dbus_object_manager_server_export_uniquely, //GO(g_dbus_object_manager_server_get_connection, @@ -501,7 +501,7 @@ GO(g_dbus_object_manager_get_objects, pFp) //GO(g_dbus_object_manager_server_set_connection, //GO(g_dbus_object_manager_server_unexport, //GO(g_dbus_object_proxy_get_connection, -//GO(g_dbus_object_proxy_get_type, +GO(g_dbus_object_proxy_get_type, pFv) //GO(g_dbus_object_proxy_new, //GO(g_dbus_object_skeleton_add_interface, //GO(g_dbus_object_skeleton_flush, diff --git a/src/wrapped/wrappedlibnm.c b/src/wrapped/wrappedlibnm.c index 3ab6a9a6d5..de860e75e7 100755 --- a/src/wrapped/wrappedlibnm.c +++ b/src/wrapped/wrappedlibnm.c @@ -11,10 +11,81 @@ #include "bridge.h" #include "librarian/library_private.h" #include "x86emu.h" +#include "callback.h" const char* libnmName = "libnm.so.0"; #define LIBNAME libnm +#define ADDED_FUNCTIONS() \ + +#include "generated/wrappedlibnmtypes.h" + +#include "wrappercallback.h" + +// utility functions +#define SUPER() \ +GO(0) \ +GO(1) \ +GO(2) \ +GO(3) \ +GO(4) + +// GAsyncReadyCallback +#define GO(A) \ +static uintptr_t my_GAsyncReadyCallback_fct_##A = 0; \ +static void my_GAsyncReadyCallback_##A(void* a, void* b, void* c) \ +{ \ + RunFunction(my_context, my_GAsyncReadyCallback_fct_##A, 3, a, b, c);\ +} +SUPER() +#undef GO +static void* findGAsyncReadyCallbackFct(void* fct) +{ + if(!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my_GAsyncReadyCallback_fct_##A == (uintptr_t)fct) return my_GAsyncReadyCallback_##A; + SUPER() + #undef GO + #define GO(A) if(my_GAsyncReadyCallback_fct_##A == 0) {my_GAsyncReadyCallback_fct_##A = (uintptr_t)fct; return my_GAsyncReadyCallback_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libnm GAsyncReadyCallback callback\n"); + return NULL; +} + +#undef SUPER + +EXPORT void my_nm_remote_connection_commit_changes_async(x86emu_t* emu, void* connection, int save, void* cancellable, void* cb, void* data) +{ + my->nm_remote_connection_commit_changes_async(connection, save, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_nm_remote_connection_get_secrets_async(x86emu_t* emu, void* connection, void* name, void* cancellable, void* cb, void* data) +{ + my->nm_remote_connection_get_secrets_async(connection, name, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_nm_remote_connection_delete_async(x86emu_t* emu, void* connection, void* cancellable, void* cb, void* data) +{ + my->nm_remote_connection_delete_async(connection, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_nm_client_add_and_activate_connection_async(x86emu_t* emu, void* client, void* partial, void* device, void* spec, void* cancellable, void* cb, void* data) +{ + my->nm_client_add_and_activate_connection_async(client, partial, device, spec, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_nm_device_disconnect_async(x86emu_t* emu, void* device, void* cancellable, void* cb, void* data) +{ + my->nm_device_disconnect_async(device, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + +EXPORT void my_nm_device_wifi_request_scan_async(x86emu_t* emu, void* device, void* cancellable, void* cb, void* data) +{ + my->nm_device_wifi_request_scan_async(device, cancellable, findGAsyncReadyCallbackFct(cb), data); +} + #define PRE_INIT \ if(box86_nogtk) \ return -1; diff --git a/src/wrapped/wrappedlibnm_private.h b/src/wrapped/wrappedlibnm_private.h index 8a4c824d60..989cb01318 100755 --- a/src/wrapped/wrappedlibnm_private.h +++ b/src/wrapped/wrappedlibnm_private.h @@ -21,8 +21,8 @@ GO(nm_access_point_get_wpa_flags, iFp) GO(nm_activation_state_flags_get_type, iFv) //GO(nm_active_connection_get_connection, //GO(nm_active_connection_get_connection_type, -//GO(nm_active_connection_get_default, -//GO(nm_active_connection_get_default6, +GO(nm_active_connection_get_default, iFp) +GO(nm_active_connection_get_default6, iFp) //GO(nm_active_connection_get_devices, //GO(nm_active_connection_get_dhcp4_config, //GO(nm_active_connection_get_dhcp6_config, @@ -31,10 +31,10 @@ GO(nm_activation_state_flags_get_type, iFv) //GO(nm_active_connection_get_ip6_config, //GO(nm_active_connection_get_master, //GO(nm_active_connection_get_specific_object_path, -//GO(nm_active_connection_get_state, -//GO(nm_active_connection_get_state_flags, -//GO(nm_active_connection_get_state_reason, -//GO(nm_active_connection_get_type, +GO(nm_active_connection_get_state, iFp) +GO(nm_active_connection_get_state_flags, iFp) +GO(nm_active_connection_get_state_reason, iFp) +GO(nm_active_connection_get_type, pFv) //GO(nm_active_connection_get_uuid, //GO(nm_active_connection_get_vpn, //GO(nm_active_connection_state_get_type, @@ -50,7 +50,7 @@ GO(nm_activation_state_flags_get_type, iFv) GO(nm_checkpoint_get_type, iFv) //GOM(nm_client_activate_connection_async, vFEpppppBp) GO(nm_client_activate_connection_finish, pFppp) -//GOM(nm_client_add_and_activate_connection_async, vFEpppppBp) +GOM(nm_client_add_and_activate_connection_async, vFEppppppp) GO(nm_client_add_and_activate_connection_finish, pFppp) //GOM(nm_client_add_connection_async, vFEppBp) GO(nm_client_add_connection_finish, iFppp) @@ -220,18 +220,18 @@ GO(nm_device_delete, iFppp) GO(nm_device_delete_finish, iFppp) GO(nm_device_disambiguate_names, pFpi) GO(nm_device_disconnect, iFppp) -//GOM(nm_device_disconnect_async, vFEppBp) +GOM(nm_device_disconnect_async, vFEpppp) GO(nm_device_disconnect_finish, iFppp) //GO(nm_device_dummy_get_hw_address, //GO(nm_device_dummy_get_type, //GO(nm_device_error_get_type, //GO(nm_device_error_quark, -//GO(nm_device_ethernet_get_carrier, +GO(nm_device_ethernet_get_carrier, iFp) //GO(nm_device_ethernet_get_hw_address, -//GO(nm_device_ethernet_get_permanent_hw_address, +GO(nm_device_ethernet_get_permanent_hw_address, pFp) //GO(nm_device_ethernet_get_s390_subchannels, -//GO(nm_device_ethernet_get_speed, -//GO(nm_device_ethernet_get_type, +GO(nm_device_ethernet_get_speed, uFp) +GO(nm_device_ethernet_get_type, pFv) GO(nm_device_filter_connections, pFpp) //GO(nm_device_generic_get_hw_address, GO(nm_device_generic_get_type, iFv) @@ -376,7 +376,7 @@ GO(nm_device_wifi_get_mode, iFp) GO(nm_device_wifi_get_permanent_hw_address, pFp) GO(nm_device_wifi_get_type, iFv) GO(nm_device_wifi_request_scan, iFppp) -//GOM(nm_device_wifi_request_scan_async, vFEppBp) +GOM(nm_device_wifi_request_scan_async, vFEpppp) GO(nm_device_wifi_request_scan_finish, iFppp) GO(nm_device_wifi_request_scan_options, iFpppp) //GOM(nm_device_wifi_request_scan_options_async, vFEpppBp) @@ -407,26 +407,26 @@ GO(nm_dns_entry_get_type, iFv) GO(nm_dns_entry_get_vpn, iFp) GO(nm_dns_entry_unref, vFp) //GO(nm_ip_address_equal, -//GO(nm_ip_address_get_address, -//GO(nm_ip_address_get_address_binary, +GO(nm_ip_address_get_address, pFp) +GO(nm_ip_address_get_address_binary, vFpp) //GO(nm_ip_address_get_attribute, //GO(nm_ip_address_get_attribute_names, //GO(nm_ip_address_get_family, -//GO(nm_ip_address_get_prefix, +GO(nm_ip_address_get_prefix, uFp) //GO(nm_ip_address_get_type, -//GO(nm_ip_address_new, +GO(nm_ip_address_new, pFipup) //GO(nm_ip_address_new_binary, -//GO(nm_ip_address_ref, +GO(nm_ip_address_ref, vFp) //GO(nm_ip_address_set_address, //GO(nm_ip_address_set_address_binary, //GO(nm_ip_address_set_attribute, //GO(nm_ip_address_set_prefix, -//GO(nm_ip_address_unref, -//GO(nm_ip_config_get_addresses, +GO(nm_ip_address_unref, vFp) +GO(nm_ip_config_get_addresses, pFp) //GO(nm_ip_config_get_domains, //GO(nm_ip_config_get_family, -//GO(nm_ip_config_get_gateway, -//GO(nm_ip_config_get_nameservers, +GO(nm_ip_config_get_gateway, pFp) +GO(nm_ip_config_get_nameservers, pFp) //GO(nm_ip_config_get_routes, //GO(nm_ip_config_get_searches, //GO(nm_ip_config_get_type, @@ -471,18 +471,18 @@ GO(nm_manager_error_quark, uFv) GO(nm_metered_get_type, iFv) //GO(nm_object_get_path, GO(nm_object_get_type, iFv) -//GO(nm_remote_connection_commit_changes, -//GO(nm_remote_connection_commit_changes_async, -//GO(nm_remote_connection_commit_changes_finish, +GO(nm_remote_connection_commit_changes, iFpipp) +GOM(nm_remote_connection_commit_changes_async, vFEpippp) +GO(nm_remote_connection_commit_changes_finish, iFppp) //GO(nm_remote_connection_delete, -//GO(nm_remote_connection_delete_async, -//GO(nm_remote_connection_delete_finish, +GOM(nm_remote_connection_delete_async, vFEpppp) +GO(nm_remote_connection_delete_finish, iFppp) //GO(nm_remote_connection_get_filename, //GO(nm_remote_connection_get_flags, //GO(nm_remote_connection_get_secrets, -//GO(nm_remote_connection_get_secrets_async, -//GO(nm_remote_connection_get_secrets_finish, -//GO(nm_remote_connection_get_type, +GOM(nm_remote_connection_get_secrets_async, vFEppppp) +GO(nm_remote_connection_get_secrets_finish, pFppp) +GO(nm_remote_connection_get_type, pFv) //GO(nm_remote_connection_get_unsaved, //GO(nm_remote_connection_get_visible, //GO(nm_remote_connection_save, @@ -507,7 +507,7 @@ GO(nm_object_get_type, iFv) //GO(nm_secret_agent_old_unregister_finish, //GO(nm_setting_6lowpan_get_type, //GO(nm_setting_802_1x_add_altsubject_match, -//GO(nm_setting_802_1x_add_eap_method, +GO(nm_setting_802_1x_add_eap_method, iFpp) //GO(nm_setting_802_1x_add_phase2_altsubject_match, //GO(nm_setting_802_1x_auth_flags_get_type, //GO(nm_setting_802_1x_check_cert_scheme, @@ -584,7 +584,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_802_1x_get_subject_match, //GO(nm_setting_802_1x_get_system_ca_certs, //GO(nm_setting_802_1x_get_type, -//GO(nm_setting_802_1x_new, +GO(nm_setting_802_1x_new, pFv) //GO(nm_setting_802_1x_remove_altsubject_match, //GO(nm_setting_802_1x_remove_altsubject_match_by_value, //GO(nm_setting_802_1x_remove_eap_method, @@ -649,13 +649,13 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_connection_add_secondary, //GO(nm_setting_connection_autoconnect_slaves_get_type, //GO(nm_setting_connection_get_auth_retries, -//GO(nm_setting_connection_get_autoconnect, +GO(nm_setting_connection_get_autoconnect, iFp) //GO(nm_setting_connection_get_autoconnect_priority, //GO(nm_setting_connection_get_autoconnect_retries, //GO(nm_setting_connection_get_autoconnect_slaves, //GO(nm_setting_connection_get_connection_type, //GO(nm_setting_connection_get_gateway_ping_timeout, -//GO(nm_setting_connection_get_id, +GO(nm_setting_connection_get_id, pFp) //GO(nm_setting_connection_get_interface_name, //GO(nm_setting_connection_get_lldp, //GO(nm_setting_connection_get_llmnr, @@ -678,7 +678,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_connection_lldp_get_type, //GO(nm_setting_connection_llmnr_get_type, //GO(nm_setting_connection_mdns_get_type, -//GO(nm_setting_connection_new, +GO(nm_setting_connection_new, pFv) //GO(nm_setting_connection_permissions_user_allowed, //GO(nm_setting_connection_remove_permission, //GO(nm_setting_connection_remove_permission_by_value, @@ -724,7 +724,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_get_dbus_property_type, //GO(nm_setting_get_name, //GO(nm_setting_get_secret_flags, -//GO(nm_setting_get_type, +GO(nm_setting_get_type, pFv) //GO(nm_setting_gsm_get_apn, //GO(nm_setting_gsm_get_device_id, //GO(nm_setting_gsm_get_home_only, @@ -751,17 +751,17 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_ip4_config_get_dhcp_client_id, //GO(nm_setting_ip4_config_get_dhcp_fqdn, //GO(nm_setting_ip4_config_get_type, -//GO(nm_setting_ip4_config_new, +GO(nm_setting_ip4_config_new, pFv) //GO(nm_setting_ip6_config_addr_gen_mode_get_type, //GO(nm_setting_ip6_config_get_addr_gen_mode, //GO(nm_setting_ip6_config_get_dhcp_duid, //GO(nm_setting_ip6_config_get_ip6_privacy, //GO(nm_setting_ip6_config_get_token, //GO(nm_setting_ip6_config_get_type, -//GO(nm_setting_ip6_config_new, +GO(nm_setting_ip6_config_new, pFv) //GO(nm_setting_ip6_config_privacy_get_type, -//GO(nm_setting_ip_config_add_address, -//GO(nm_setting_ip_config_add_dns, +GO(nm_setting_ip_config_add_address, iFpp) +GO(nm_setting_ip_config_add_dns, iFpp) //GO(nm_setting_ip_config_add_dns_option, //GO(nm_setting_ip_config_add_dns_search, //GO(nm_setting_ip_config_add_route, @@ -793,7 +793,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_ip_config_get_route, //GO(nm_setting_ip_config_get_route_metric, //GO(nm_setting_ip_config_get_route_table, -//GO(nm_setting_ip_config_get_type, +GO(nm_setting_ip_config_get_type, pFv) //GO(nm_setting_ip_config_has_dns_options, //GO(nm_setting_ip_config_remove_address, //GO(nm_setting_ip_config_remove_address_by_value, @@ -1080,7 +1080,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_wired_get_valid_s390_options, //GO(nm_setting_wired_get_wake_on_lan, //GO(nm_setting_wired_get_wake_on_lan_password, -//GO(nm_setting_wired_new, +GO(nm_setting_wired_new, pFv) //GO(nm_setting_wired_remove_mac_blacklist_item, //GO(nm_setting_wired_remove_mac_blacklist_item_by_value, //GO(nm_setting_wired_remove_s390_option, @@ -1110,7 +1110,7 @@ GO(nm_object_get_type, iFv) //GO(nm_setting_wireless_get_tx_power, //GO(nm_setting_wireless_get_type, //GO(nm_setting_wireless_get_wake_on_wlan, -//GO(nm_setting_wireless_new, +GO(nm_setting_wireless_new, pFv) //GO(nm_setting_wireless_powersave_get_type, //GO(nm_setting_wireless_remove_mac_blacklist_item, //GO(nm_setting_wireless_remove_mac_blacklist_item_by_value, @@ -1155,7 +1155,7 @@ GO(nm_setting_wireless_security_set_wep_key, vFpup) //GO(nm_setting_wireless_wake_on_wlan_get_type, //GO(nm_setting_wpan_get_type, //GO(nm_simple_connection_get_type, -//GO(nm_simple_connection_new, +GO(nm_simple_connection_new, pFv) //GO(nm_simple_connection_new_clone, //GO(nm_simple_connection_new_from_dbus, //GO(nm_sriov_vf_add_vlan, @@ -1275,17 +1275,17 @@ GO(nm_setting_wireless_security_set_wep_key, vFpup) //GO(nm_utils_parse_variant_attributes, //GO(nm_utils_same_ssid, //GO(nm_utils_security_type_get_type, -//GO(nm_utils_security_valid, +GO(nm_utils_security_valid, iFiiiiiii) //GO(nm_utils_sriov_vf_from_str, //GO(nm_utils_sriov_vf_to_str, -//GO(nm_utils_ssid_to_utf8, +GO(nm_utils_ssid_to_utf8, pFpL) //GO(nm_utils_tc_action_from_str, //GO(nm_utils_tc_action_to_str, //GO(nm_utils_tc_qdisc_from_str, //GO(nm_utils_tc_qdisc_to_str, //GO(nm_utils_tc_tfilter_from_str, //GO(nm_utils_tc_tfilter_to_str, -//GO(nm_utils_uuid_generate, +GO(nm_utils_uuid_generate, pFv) //GO(nm_utils_version, //GO(nm_utils_wep_key_valid, //GO(nm_utils_wifi_2ghz_freqs,