[PATCH v2 0/4] MR10922: winebth.sys: Refactor code for initial enumeration of BlueZ objects.
The current code maintains separate data structures and lists for initial device enumeration. This is unnecessary as the main watcher loop ultimately pushes initial devices onto the main event list anyway. To that end, this MR: * Removes the `bluez_init_entry` struct and the `initial_{radio, device, gatt_{service, chars}}_list` lists in `bluez_watcher_ctx`. Newly detected objects are now directly pushed to the event list. * Factors the new object handling logic in `bluez_signal_handler` and `bluez_build_initial_device_lists` (now `bluez_enumerate_objects`) into a common function, `bluez_handle_new_object`. * Use libdbus' async callback methods to automatically perform initial device enumeration, instead of checking the status of the `GetManagedObjects` call on every iteration of the main loop. -- v2: winebth.sys: Perform initial device enumeration inside a DBusPendingCall callback. winebth.sys: Factor code for handling new BlueZ objects into bluez_handle_new_object. https://gitlab.winehq.org/wine/wine/-/merge_requests/10922
From: Vibhav Pant <vibhavp@gmail.com> --- dlls/winebth.sys/dbus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index 4431f527f73..ccefe30c631 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -1059,8 +1059,11 @@ void bluez_gatt_characteristic_value_free( void *val ) { struct bluez_gatt_characteristic_value *value = val; - p_dbus_message_unref( value->message ); - free( value ); + if (value) + { + p_dbus_message_unref( value->message ); + free( value ); + } } void bluez_gatt_characteristic_value_move( struct winebluetooth_gatt_characteristic_value *value, BYTE *dest ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10922
From: Vibhav Pant <vibhavp@gmail.com> Instead of keeping separating lists of bluez_init_entry for enumerated objects, use the event watcher queue to push BLUETOOTH_WATCHER events for enumerated objects we're interested in. --- dlls/winebth.sys/dbus.c | 254 ++++++++++++---------------------------- 1 file changed, 73 insertions(+), 181 deletions(-) diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index ccefe30c631..2e80391bbe5 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -1178,15 +1178,6 @@ struct bluez_watcher_ctx char *bluez_dbus_unique_name; DBusPendingCall *init_device_list_call; - /* struct bluez_init_entry */ - struct list initial_radio_list; - /* struct bluez_init_entry */ - struct list initial_device_list; - /* struct bluez_init_entry */ - struct list initial_gatt_service_list; - /* struct bluez_init_entry */ - struct list initial_gatt_chars_list; - /* struct bluez_watcher_event */ struct list event_list; }; @@ -1225,17 +1216,6 @@ static void bluez_gatt_characteristic_read_callback( DBusPendingCall *pending, v p_dbus_message_unref( reply ); } -struct bluez_init_entry -{ - union { - struct winebluetooth_watcher_event_radio_added radio; - struct winebluetooth_watcher_event_device_added device; - struct winebluetooth_watcher_event_gatt_service_added service; - struct winebluetooth_watcher_event_gatt_characteristic_added characteristic; - } object; - struct list entry; -}; - /* The status of a pairing session initiated by BlueZ. */ enum bluez_pairing_session_status { @@ -2478,7 +2458,6 @@ static const char *BLUEZ_MATCH_RULES[] = { BLUEZ_MATCH_OBJECTMANAGER, BLUEZ_MATC static void bluez_watcher_free( struct bluez_watcher_ctx *watcher ) { struct bluez_watcher_event *event1, *event2; - struct bluez_init_entry *entry1, *entry2; if (watcher->init_device_list_call) { @@ -2486,13 +2465,6 @@ static void bluez_watcher_free( struct bluez_watcher_ctx *watcher ) p_dbus_pending_call_unref( watcher->init_device_list_call ); } - LIST_FOR_EACH_ENTRY_SAFE( entry1, entry2, &watcher->initial_radio_list, struct bluez_init_entry, entry ) - { - list_remove( &entry1->entry ); - unix_name_free( (struct unix_name *)entry1->object.radio.radio.handle ); - free( entry1 ); - } - LIST_FOR_EACH_ENTRY_SAFE( event1, event2, &watcher->event_list, struct bluez_watcher_event, entry ) { list_remove( &event1->entry ); @@ -2565,10 +2537,6 @@ NTSTATUS bluez_watcher_init( void *connection, void **ctx ) if (!(watcher_ctx = calloc( 1, sizeof( struct bluez_watcher_ctx ) ))) return STATUS_NO_MEMORY; watcher_ctx->connection = p_dbus_connection_ref( connection ); - list_init( &watcher_ctx->initial_radio_list ); - list_init( &watcher_ctx->initial_device_list ); - list_init( &watcher_ctx->initial_gatt_service_list ); - list_init( &watcher_ctx->initial_gatt_chars_list ); list_init( &watcher_ctx->event_list ); /* The bluez_dbus_loop thread will free up the watcher when the disconnect message is processed (i.e, @@ -2640,13 +2608,13 @@ void bluez_watcher_close( void *connection, void *ctx ) p_dbus_connection_remove_filter( connection, bluez_filter, ctx ); } -static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct list *adapter_list, - struct list *device_list, struct list *gatt_service_list, - struct list *gatt_chars_list ) +/* Enuerate through the list of BlueZ objects contained in reply (from GetManagedObjects) and queue the associated + * BLUETOOTH_WATCHER_ event for objects we're interested in onto event_list. */ +static NTSTATUS bluez_enumerate_objects( DBusMessage *reply, struct list *event_list ) { DBusMessageIter dict, paths_iter, iface_iter, prop_iter; - const char *path; NTSTATUS status = STATUS_SUCCESS; + const char *path; if (!p_dbus_message_has_signature( reply, DBUS_OBJECTMANAGER_METHOD_GETMANAGEDOBJECTS_RETURN_SIGNATURE )) @@ -2660,62 +2628,48 @@ static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct lis p_dbus_message_iter_recurse( &dict, &paths_iter ); while((path = bluez_next_dict_entry( &paths_iter, &iface_iter ))) { - const char *iface; + union winebluetooth_watcher_event_data event = {0}; + const char *prop_name, *iface; + DBusMessageIter variant; + while ((iface = bluez_next_dict_entry ( &iface_iter, &prop_iter ))) { if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER )) { - const char *prop_name; - DBusMessageIter variant; - struct bluez_init_entry *init_device = calloc( 1, sizeof( *init_device ) ); struct unix_name *radio_name; - if (!init_device) - { - status = STATUS_NO_MEMORY; - goto done; - } radio_name = unix_name_get_or_create( path ); if (!radio_name) { - free( init_device ); status = STATUS_NO_MEMORY; goto done; } while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) { - bluez_radio_prop_from_dict_entry( - prop_name, &variant, &init_device->object.radio.props, - &init_device->object.radio.props_mask, WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); + bluez_radio_prop_from_dict_entry( prop_name, &variant, &event.radio_added.props, + &event.radio_added.props_mask, + WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); } - init_device->object.radio.radio.handle = (UINT_PTR)radio_name; - list_add_tail( adapter_list, &init_device->entry ); - TRACE( "Found BlueZ org.bluez.Adapter1 object %s: %p\n", - debugstr_a( radio_name->str ), radio_name ); + event.radio_added.radio.handle = (UINT_PTR)radio_name; + if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED, event )) + unix_name_free( radio_name ); + else + TRACE( "Found BlueZ org.bluez.Adapter1 object %s: %p\n", debugstr_a( radio_name->str ), + radio_name ); break; } else if (!strcmp( iface, BLUEZ_INTERFACE_DEVICE )) { - const char *prop_name; - DBusMessageIter variant; - struct bluez_init_entry *init_device; struct unix_name *device_name, *radio_name = NULL; - init_device = calloc( 1, sizeof( *init_device ) ); - if (!init_device) - { - status = STATUS_NO_MEMORY; - goto done; - } device_name = unix_name_get_or_create( path ); if (!device_name) { - free( init_device ); status = STATUS_NO_MEMORY; goto done; } - init_device->object.device.device.handle = (UINT_PTR)device_name; - init_device->object.device.init_entry = TRUE; + event.device_added.device.handle = (UINT_PTR)device_name; + event.device_added.init_entry = TRUE; while((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) { @@ -2728,86 +2682,72 @@ static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct lis if (!radio_name) { unix_name_free( device_name ); - free( init_device ); status = STATUS_NO_MEMORY; goto done; } - init_device->object.device.radio.handle = (UINT_PTR)radio_name; + event.device_added.radio.handle = (UINT_PTR)radio_name; } else - bluez_device_prop_from_dict_entry( prop_name, &variant, &init_device->object.device.props, - &init_device->object.device.known_props_mask, + bluez_device_prop_from_dict_entry( prop_name, &variant, &event.device_added.props, + &event.device_added.known_props_mask, WINEBLUETOOTH_DEVICE_ALL_PROPERTIES ); } - if (!init_device->object.device.radio.handle) + if (!radio_name) { unix_name_free( device_name ); - free( init_device ); ERR( "Could not find the associated adapter for device %s\n", debugstr_a( path ) ); break; } - list_add_tail( device_list, &init_device->entry ); - TRACE( "Found BlueZ org.bluez.Device1 object %s: %p\n", debugstr_a( path ), device_name ); + if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED, event )) + { + unix_name_free( device_name ); + unix_name_free( radio_name ); + } + else + TRACE( "Found BlueZ org.bluez.Device1 object %s: %p\n", debugstr_a( path ), device_name ); break; } else if (!strcmp( iface, BLUEZ_INTERFACE_GATT_SERVICE )) { - struct bluez_init_entry *init_device; struct unix_name *service_name; - DBusMessageIter variant; - const char *prop_name; - - init_device = calloc( 1, sizeof( *init_device ) ); - if (!init_device) - { - status = STATUS_NO_MEMORY; - goto done; - } service_name = unix_name_get_or_create( path ); if (!service_name) { ERR( "Failed to allocate memory for service path %s\n", debugstr_a( path ) ); - free( init_device ); break; } - init_device->object.service.service.handle = (UINT_PTR)service_name; + event.gatt_service_added.service.handle = (UINT_PTR)service_name; while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) - bluez_gatt_service_props_from_dict_entry( prop_name, &variant, &init_device->object.service ); - if (!init_device->object.service.device.handle) + bluez_gatt_service_props_from_dict_entry( prop_name, &variant, &event.gatt_service_added ); + if (!event.gatt_service_added.device.handle) { unix_name_free( service_name ); - free( init_device ); ERR( "Could not find the associated device for the GATT service %s\n", debugstr_a( path ) ); break; } - list_add_tail( gatt_service_list, &init_device->entry ); - TRACE( "Found BlueZ org.bluez.GattService1 object %s %p\n", debugstr_a( path ), service_name ); + if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED, event )) + { + unix_name_free( service_name ); + unix_name_free( (struct unix_name *)event.gatt_service_added.device.handle ); + } + else + TRACE( "Found BlueZ org.bluez.GattService1 object %s %p\n", debugstr_a( path ), service_name ); break; } else if (!strcmp( iface, BLUEZ_INTERFACE_GATT_CHARACTERISTICS )) { - struct unix_name *char_name; - struct bluez_init_entry *init_entry; - DBusMessageIter variant; - const char *prop_name; + struct unix_name *chrc_name; - init_entry = calloc( 1, sizeof( *init_entry ) ); - if (!init_entry) - { - status = STATUS_NO_MEMORY; - goto done; - } - char_name = unix_name_get_or_create( path ); - if (!char_name) + chrc_name = unix_name_get_or_create( path ); + if (!chrc_name) { ERR("Failed to allocate memory for characteristic path %s\n", debugstr_a( path )); - free( init_entry ); goto done; } - init_entry->object.characteristic.characteristic.handle = (UINT_PTR)char_name; + event.gatt_characteristic_added.characteristic.handle = (UINT_PTR)chrc_name; while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) { if (!strcmp( prop_name, "Value" ) @@ -2815,104 +2755,58 @@ static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct lis && p_dbus_message_iter_get_element_type( &variant ) == DBUS_TYPE_BYTE) { if (!bluez_gatt_characteristic_value_new_from_iter( reply, &variant, - &init_entry->object.characteristic.value )) + &event.gatt_characteristic_added.value )) { - unix_name_free( char_name ); - free( init_entry ); + unix_name_free( chrc_name ); status = STATUS_NO_MEMORY; goto done; } } else bluez_gatt_characteristic_props_from_dict_entry( prop_name, &variant, - &init_entry->object.characteristic ); + &event.gatt_characteristic_added ); } - if (!init_entry->object.characteristic.service.handle) + if (!event.gatt_characteristic_added.service.handle) { + unix_name_free( chrc_name ); bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)init_entry->object.characteristic.value.handle ); - unix_name_free( char_name ); - free( init_entry ); + (struct bluez_gatt_characteristic_value *)event.gatt_characteristic_added.value.handle ); ERR( "Could not find the associated service for the GATT charcteristic %s\n", debugstr_a( path ) ); break; } - list_add_tail( gatt_chars_list, &init_entry->entry ); - TRACE( "Found Bluez org.bluez.GattCharacteristic1 object %s %p\n", debugstr_a( path ), char_name ); + if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED, event )) + { + unix_name_free( chrc_name ); + bluez_gatt_characteristic_value_free( + (struct bluez_gatt_characteristic_value *)event.gatt_characteristic_added.value.handle ); + } + else + TRACE( "Found Bluez org.bluez.GattCharacteristic1 object %s %p\n", debugstr_a( path ), chrc_name ); break; } } } - TRACE( "Initial device list: radios: %d, devices: %d, GATT services: %d, characteristics: %d \n", - list_count( adapter_list ), list_count( device_list ), list_count( gatt_service_list ), - list_count( gatt_chars_list ) ); - done: +done: return status; } -static BOOL bluez_watcher_event_queue_ready( struct bluez_watcher_ctx *ctx, struct winebluetooth_watcher_event *event ) +static BOOL bluez_watcher_event_queue_pop( struct bluez_watcher_ctx *ctx, struct winebluetooth_watcher_event *event ) { - if (!list_empty( &ctx->initial_radio_list )) - { - struct bluez_init_entry *radio; - - radio = LIST_ENTRY( list_head( &ctx->initial_radio_list ), struct bluez_init_entry, entry ); - event->event_type = BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED; - event->event_data.radio_added = radio->object.radio; - list_remove( &radio->entry ); - free( radio ); - return TRUE; - } - if (!list_empty( &ctx->initial_device_list )) - { - struct bluez_init_entry *device; - - device = LIST_ENTRY( list_head( &ctx->initial_device_list ), struct bluez_init_entry, entry ); - event->event_type = BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED; - event->event_data.device_added = device->object.device; - list_remove( &device->entry ); - free( device ); - return TRUE; - } - if (!list_empty( &ctx->initial_gatt_service_list )) - { - struct bluez_init_entry *service; + struct bluez_watcher_event *head; - service = LIST_ENTRY( list_head( &ctx->initial_gatt_service_list ), struct bluez_init_entry, entry ); - event->event_type = BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED; - event->event_data.gatt_service_added = service->object.service; - list_remove( &service->entry ); - free( service ); - return TRUE; - } - if (!list_empty( &ctx->initial_gatt_chars_list )) - { - struct bluez_init_entry *characteristic; - characteristic = LIST_ENTRY( list_head( &ctx->initial_gatt_chars_list ), struct bluez_init_entry, entry ); - event->event_type = BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED; - event->event_data.gatt_characteristic_added = characteristic->object.characteristic; - list_remove( &characteristic->entry ); - free( characteristic ); - return TRUE; - } - if (!list_empty( &ctx->event_list )) - { - struct bluez_watcher_event *watcher_event = - LIST_ENTRY( list_head( &ctx->event_list ), struct bluez_watcher_event, entry ); + if (list_empty( &ctx->event_list )) return FALSE; - if (watcher_event->pending_call && !p_dbus_pending_call_get_completed( watcher_event->pending_call )) - return FALSE; + head = LIST_ENTRY( list_head( &ctx->event_list ), struct bluez_watcher_event, entry ); + if (head->pending_call && !p_dbus_pending_call_get_completed( head->pending_call )) return FALSE; - event->event_type = watcher_event->event_type; - event->event_data = watcher_event->event; - list_remove( &watcher_event->entry ); - if (watcher_event->pending_call) - p_dbus_pending_call_unref( watcher_event->pending_call ); - free( watcher_event ); - return TRUE; - } - return FALSE; + event->event_type = head->event_type; + event->event_data = head->event; + list_remove( &head->entry ); + if (head->pending_call) p_dbus_pending_call_unref( head->pending_call ); + free( head ); + return TRUE; } static BOOL bluez_auth_agent_ctx_have_event( struct bluez_auth_agent_ctx *ctx, @@ -2947,7 +2841,7 @@ NTSTATUS bluez_dbus_loop( void *c, void *watcher, void *auth_agent, while (TRUE) { - if (bluez_watcher_event_queue_ready( watcher_ctx, &result->data.watcher_event )) + if (bluez_watcher_event_queue_pop( watcher_ctx, &result->data.watcher_event )) { result->status = WINEBLUETOOTH_EVENT_WATCHER_EVENT; p_dbus_connection_unref( connection ); @@ -2990,10 +2884,8 @@ NTSTATUS bluez_dbus_loop( void *c, void *watcher, void *auth_agent, bluez_auth_agent_ctx_decref( auth_agent ); return STATUS_NO_MEMORY; } - status = bluez_build_initial_device_lists( reply, &watcher_ctx->initial_radio_list, - &watcher_ctx->initial_device_list, - &watcher_ctx->initial_gatt_service_list, - &watcher_ctx->initial_gatt_chars_list ); + p_dbus_error_free( &error ); + status = bluez_enumerate_objects( reply, &watcher_ctx->event_list ); p_dbus_message_unref( reply ); if (status != STATUS_SUCCESS) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10922
From: Vibhav Pant <vibhavp@gmail.com> --- dlls/winebth.sys/dbus.c | 627 +++++++++++++++------------------------- 1 file changed, 238 insertions(+), 389 deletions(-) diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index 2e80391bbe5..2c117dcd87c 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -32,6 +32,7 @@ #include <semaphore.h> #include <errno.h> #include <string.h> +#include <inttypes.h> #ifdef SONAME_LIBDBUS_1 #include <dbus/dbus.h> @@ -918,8 +919,10 @@ static int named_flag_cmp( const void *flag1, const void *flag2 ) return strcmp( f1->name, f2->name ); } -static void -bluez_gatt_characteristic_props_from_dict_entry( const char *prop_name, DBusMessageIter *variant, +static BOOL bluez_gatt_characteristic_value_new_from_iter( DBusMessage *message, DBusMessageIter *array_iter, + struct winebluetooth_gatt_characteristic_value *value ); +static BOOL +bluez_gatt_characteristic_props_from_dict_entry( DBusMessage *msg, const char *prop_name, DBusMessageIter *variant, struct winebluetooth_watcher_event_gatt_characteristic_added *chrc ) { TRACE_( dbus )( "(%s, %s, %p)\n", debugstr_a( prop_name ), dbgstr_dbus_iter( variant ), chrc ); @@ -959,10 +962,9 @@ bluez_gatt_characteristic_props_from_dict_entry( const char *prop_name, DBusMess && p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_OBJECT_PATH) { const char *path; - struct unix_name *service_name; + p_dbus_message_iter_get_basic( variant, &path ); - service_name = unix_name_get_or_create( path ); - chrc->service.handle = (UINT_PTR)service_name; + return !(chrc->service.handle = (UINT_PTR)unix_name_get_or_create( path )); } else if (!strcmp( prop_name, "UUID" ) && p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_STRING) @@ -979,6 +981,10 @@ bluez_gatt_characteristic_props_from_dict_entry( const char *prop_name, DBusMess else if (!strcmp( prop_name, "Handle" ) && p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_UINT16) p_dbus_message_iter_get_basic( variant, &chrc->props.AttributeHandle ); + else if (!strcmp( prop_name, "Value" ) && p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_ARRAY + && p_dbus_message_iter_get_element_type( variant ) == DBUS_TYPE_BYTE) + return bluez_gatt_characteristic_value_new_from_iter( msg, variant, &chrc->value ); + return TRUE; } static NTSTATUS bluez_adapter_get_props_async( void *connection, const char *radio_object_path, @@ -1861,6 +1867,223 @@ static UINT16 bluez_dbus_get_invalidated_properties_from_iter( return mask; } +static void winebluetooth_watcher_event_free( enum winebluetooth_watcher_event_type event_type, + union winebluetooth_watcher_event_data *event ) +{ + switch (event_type) + { + case BLUETOOTH_WATCHER_EVENT_TYPE_SERVICE_DOWN: + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED: + if (event->radio_added.radio.handle) unix_name_free( (struct unix_name *)event->radio_added.radio.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_REMOVED: + if (event->radio_removed.handle) unix_name_free( (struct unix_name *)event->radio_removed.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_PROPERTIES_CHANGED: + if (event->radio_props_changed.radio.handle) + unix_name_free( (struct unix_name *)event->radio_props_changed.radio.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED: + if (event->device_added.radio.handle) unix_name_free( (struct unix_name *)event->device_added.radio.handle ); + if (event->device_added.device.handle) unix_name_free( (struct unix_name *)event->device_added.device.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_REMOVED: + if (event->device_removed.device.handle) + unix_name_free( (struct unix_name *)event->device_removed.device.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_PROPERTIES_CHANGED: + if (event->device_props_changed.device.handle) + unix_name_free( (struct unix_name *)event->device_props_changed.device.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_PAIRING_FINISHED: + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED: + if (event->gatt_service_added.device.handle) + unix_name_free( (struct unix_name *)event->gatt_service_added.device.handle ); + if (event->gatt_service_added.service.handle) + unix_name_free( (struct unix_name *)event->gatt_service_added.service.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_REMOVED: + if (event->gatt_service_removed.handle) + unix_name_free( (struct unix_name *)event->gatt_service_removed.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED: + if (event->gatt_characteristic_added.characteristic.handle) + unix_name_free( (struct unix_name *)event->gatt_characteristic_added.characteristic.handle ); + if (event->gatt_characteristic_added.service.handle) + unix_name_free( (struct unix_name *)event->gatt_characteristic_added.service.handle ); + bluez_gatt_characteristic_value_free( + (struct bluez_gatt_characteristic_value *)event->gatt_characteristic_added.value.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_REMOVED: + if (event->gatt_characterisic_removed.handle) + unix_name_free( (struct unix_name *)event->gatt_characterisic_removed.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_VALUE_CHANGED: + if (event->gatt_characteristic_value_changed.characteristic.handle) + unix_name_free( (struct unix_name *)event->gatt_characteristic_value_changed.characteristic.handle ); + bluez_gatt_characteristic_value_free( + (struct bluez_gatt_characteristic_value *)event->gatt_characteristic_added.value.handle ); + break; + case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_VALUE_READ: + bluez_gatt_characteristic_value_free( + (struct bluez_gatt_characteristic_value *)event->gatt_characteristic_value_read.value.handle ); + break; + } +} + +/* Examine a new BlueZ DBus object available at path and queue a BLUETOOTH_WATCHER_* event if it is an object we + * are interested in. + * ifaces_iter should point to the start of the interfaces + properties dict. + * init_entry should be TRUE if this object has been discovered through initial device discovery in + * bluez_enumerate_objects. + */ +static BOOL bluez_handle_new_object( DBusMessage *msg, const char *path, DBusMessageIter *ifaces_iter, BOOL init_entry, + struct list *event_list, BOOL *ret_oom ) +{ + enum winebluetooth_watcher_event_type event_type = 0; + union winebluetooth_watcher_event_data event = {0}; + BOOL new_object = FALSE, oom = FALSE; + DBusMessageIter props_iter; + const char *iface; + + TRACE_( dbus )( "(%s, %s, %d, %p, %p)\n", debugstr_a( path ), dbgstr_dbus_iter( ifaces_iter ), init_entry, + event_list, ret_oom ); + + while ((iface = bluez_next_dict_entry ( ifaces_iter, &props_iter ))) + { + DBusMessageIter variant; + const char *prop_name; + + if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER )) + { + if (!(event.radio_added.radio.handle = (UINT_PTR)unix_name_get_or_create( path ))) + { + oom = TRUE; + break; + } + while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) + { + bluez_radio_prop_from_dict_entry( prop_name, &variant, &event.radio_added.props, + &event.radio_added.props_mask, + WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); + } + event_type = BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED; + new_object = TRUE; + TRACE( "New BlueZ org.bluez.Adapter1 object %s: %#" PRIxPTR "\n", debugstr_a( path ), + event.radio_added.radio.handle ); + } + else if (!strcmp( iface, BLUEZ_INTERFACE_DEVICE )) + { + if (!(event.device_added.device.handle = (UINT_PTR)unix_name_get_or_create( path ))) + { + oom = TRUE; + break; + } + event.device_added.init_entry = init_entry; + + while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) + { + if (!strcmp( prop_name, "Adapter" ) && + p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_OBJECT_PATH) + { + const char *path; + p_dbus_message_iter_get_basic( &variant, &path ); + if (!(event.device_added.radio.handle = (UINT_PTR)unix_name_get_or_create( path ))) + { + oom = TRUE; + break; + } + } + else + bluez_device_prop_from_dict_entry( prop_name, &variant, &event.device_added.props, + &event.device_added.known_props_mask, + WINEBLUETOOTH_DEVICE_ALL_PROPERTIES ); + } + if (!event.device_added.radio.handle) + { + unix_name_free( (struct unix_name *)event.device_added.device.handle ); + ERR( "Could not find the associated adapter for device %s\n", debugstr_a( path ) ); + } + else + { + TRACE( "New org.bluez.Device1 object %s: %#" PRIxPTR "\n", debugstr_a( path ), + event.device_added.device.handle ); + event_type = BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED; + new_object = TRUE; + } + } + else if (!strcmp( iface ,BLUEZ_INTERFACE_GATT_SERVICE )) + { + if (!(event.gatt_service_added.service.handle = (UINT_PTR)unix_name_get_or_create( path ))) + { + oom = TRUE; + break; + } + + while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) + bluez_gatt_service_props_from_dict_entry( prop_name, &variant, &event.gatt_service_added ); + if (!event.gatt_service_added.device.handle) + { + unix_name_free( (struct unix_name *)event.gatt_service_added.service.handle ); + ERR( "Could not find the associated device for the GATT service %s\n", debugstr_a( path ) ); + } + else + { + TRACE( "New org.bluez.GattService1 object %s: %#" PRIxPTR "\n", debugstr_a( path ), + event.gatt_service_added.service.handle ); + event_type = BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED; + new_object = TRUE; + } + } + else if (!strcmp( iface, BLUEZ_INTERFACE_GATT_CHARACTERISTICS )) + { + if (!(event.gatt_characteristic_added.characteristic.handle = (UINT_PTR)unix_name_get_or_create( path ))) + { + oom = TRUE; + break; + } + + while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) + { + if (!bluez_gatt_characteristic_props_from_dict_entry( msg, prop_name, &variant, + &event.gatt_characteristic_added )) + { + oom = TRUE; + goto done; + } + } + if (!event.gatt_characteristic_added.service.handle) + { + unix_name_free( (struct unix_name *)event.gatt_characteristic_added.characteristic.handle ); + bluez_gatt_characteristic_value_free( + (struct bluez_gatt_characteristic_value *)event.gatt_characteristic_added.value.handle ); + ERR( "Could not find the associated service for the GATT charcteristic %s\n", debugstr_a( path ) ); + } + else + { + TRACE( "New org.bluez.GattCharacteristic1 object %s: %#" PRIxPTR "\n", debugstr_a( path ), + event.gatt_characteristic_added.characteristic.handle ); + event_type = BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED; + new_object = TRUE; + } + } + + if (new_object) break; + } + +done: + if (oom || (new_object && !bluez_event_list_queue_new_event( event_list, event_type, event ))) + { + winebluetooth_watcher_event_free( event_type, &event ); + if (ret_oom) *ret_oom = TRUE; + return FALSE; + } + if (ret_oom) *ret_oom = FALSE; + return new_object; +} + static void bluez_signal_handler( DBusConnection *conn, DBusMessage *msg, const char *signal_iface, const char *signal_name, const char *signal_sig, struct bluez_watcher_ctx *ctx ) { @@ -1913,179 +2136,8 @@ static void bluez_signal_handler( DBusConnection *conn, DBusMessage *msg, const p_dbus_message_iter_get_basic( &iter, &object_path ); p_dbus_message_iter_next( &iter ); p_dbus_message_iter_recurse( &iter, &ifaces_iter ); - while (p_dbus_message_iter_has_next( &ifaces_iter )) - { - DBusMessageIter iface_entry; - const char *iface_name; - p_dbus_message_iter_recurse( &ifaces_iter, &iface_entry ); - p_dbus_message_iter_get_basic( &iface_entry, &iface_name ); - if (!strcmp( iface_name, BLUEZ_INTERFACE_ADAPTER )) - { - struct winebluetooth_watcher_event_radio_added radio_added = {0}; - struct unix_name *radio; - DBusMessageIter props_iter, variant; - const char *prop_name; - - p_dbus_message_iter_next( &iface_entry ); - p_dbus_message_iter_recurse( &iface_entry, &props_iter ); - - while((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) - { - bluez_radio_prop_from_dict_entry( prop_name, &variant, &radio_added.props, - &radio_added.props_mask, - WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); - } - - radio = unix_name_get_or_create( object_path ); - radio_added.radio.handle = (UINT_PTR)radio; - if (!radio_added.radio.handle) - { - ERR( "failed to allocate memory for adapter path %s\n", debugstr_a( object_path ) ); - break; - } - else - { - union winebluetooth_watcher_event_data event = { .radio_added = radio_added }; - TRACE( "New BlueZ org.bluez.Adapter1 object added at %s: %p\n", - debugstr_a( object_path ), radio ); - if (!bluez_event_list_queue_new_event( - event_list, BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED, event )) - unix_name_free( radio ); - } - } - else if (!strcmp( iface_name, BLUEZ_INTERFACE_DEVICE )) - { - struct winebluetooth_watcher_event_device_added device_added = {0}; - struct unix_name *device_name, *radio_name = NULL; - DBusMessageIter props_iter, variant; - const char *prop_name; - - device_name = unix_name_get_or_create( object_path ); - device_added.device.handle = (UINT_PTR)device_name; - if (!device_name) - { - ERR("Failed to allocate memory for device path %s\n", debugstr_a( object_path )); - break; - } - p_dbus_message_iter_next( &iface_entry ); - p_dbus_message_iter_recurse( &iface_entry, &props_iter ); - - while((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) - { - if (!strcmp( prop_name, "Adapter" ) && - p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_OBJECT_PATH) - { - const char *path; - - p_dbus_message_iter_get_basic( &variant, &path ); - radio_name = unix_name_get_or_create( path ); - if (!radio_name) - { - unix_name_free( device_name ); - ERR("Failed to allocate memory for radio path %s\n", debugstr_a( path )); - break; - } - device_added.radio.handle = (UINT_PTR)radio_name; - } - else - bluez_device_prop_from_dict_entry( prop_name, &variant, &device_added.props, - &device_added.known_props_mask, - WINEBLUETOOTH_DEVICE_ALL_PROPERTIES ); - } - - if (!radio_name) - { - unix_name_free( device_name ); - ERR( "Could not find the associated adapter for device %s\n", debugstr_a( object_path ) ); - break; - } - else - { - union winebluetooth_watcher_event_data event = { .device_added = device_added }; - TRACE( "New BlueZ org.bluez.Device1 object added at %s: %p\n", debugstr_a( object_path ), - device_name ); - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED, event )) - { - unix_name_free( device_name ); - unix_name_free( radio_name ); - } - } - } - else if (!strcmp( iface_name, BLUEZ_INTERFACE_GATT_SERVICE )) - { - union winebluetooth_watcher_event_data event = {0}; - DBusMessageIter props_iter, variant; - struct unix_name *service_name; - const char *prop_name; - - if (!(service_name = unix_name_get_or_create( object_path ))) - { - ERR( "Failed to allocate memory for GATT service path %s\n", debugstr_a( object_path ) ); - break; - } - event.gatt_service_added.service.handle = (UINT_PTR)service_name; - p_dbus_message_iter_next( &iface_entry ); - p_dbus_message_iter_recurse( &iface_entry, &props_iter ); - - while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) - bluez_gatt_service_props_from_dict_entry( prop_name, &variant, &event.gatt_service_added ); - - if (!event.gatt_service_added.device.handle) - { - unix_name_free( service_name ); - ERR( "Could not find the associated device for the GATT service %s\n", debugstr_a( object_path ) ); - break; - } - - TRACE( "New Bluez org.bluez.GattService1 object added at %s: %p\n", debugstr_a( object_path ), - service_name ); - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED, - event )) - { - unix_name_free( service_name ); - unix_name_free( (struct unix_name *)event.gatt_service_added.device.handle ); - } - } - else if (!strcmp( iface_name, BLUEZ_INTERFACE_GATT_CHARACTERISTICS )) - { - struct winebluetooth_watcher_event_gatt_characteristic_added chrc_added = {0}; - union winebluetooth_watcher_event_data event = {0}; - struct unix_name *chrc_name; - DBusMessageIter props_iter, variant; - const char *prop_name; - - chrc_name = unix_name_get_or_create( object_path ); - chrc_added.characteristic.handle = (UINT_PTR)chrc_name; - if (!chrc_name) - { - ERR( "Failed to allocate memory for GATT characteristic path %s\n", debugstr_a( object_path ) ); - break; - } - p_dbus_message_iter_next( &iface_entry ); - p_dbus_message_iter_recurse( &iface_entry, &props_iter ); - - while ((prop_name = bluez_next_dict_entry( &props_iter, &variant ))) - bluez_gatt_characteristic_props_from_dict_entry( prop_name, &variant, &chrc_added ); - if (!chrc_added.service.handle) - { - unix_name_free( chrc_name ); - ERR( "Could not find the associated service for the GATT characteristic %s\n", - debugstr_a( object_path ) ); - break; - } - event.gatt_characteristic_added = chrc_added; - TRACE( "New BlueZ org.bluez.GattCharacterisic1 object added at %s: %p\n", debugstr_a( object_path ), - object_path ); - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED, - event )) - { - unix_name_free( chrc_name ); - unix_name_free( (struct unix_name *)chrc_added.service.handle ); - } - } - p_dbus_message_iter_next( &ifaces_iter ); - } + bluez_handle_new_object( msg, object_path, &ifaces_iter, FALSE, event_list, NULL ); } else if (!strcmp( signal_iface, DBUS_INTERFACE_OBJECTMANAGER ) && !strcmp( signal_name, DBUS_OBJECTMANAGER_SIGNAL_INTERFACESREMOVED ) && @@ -2468,56 +2520,11 @@ static void bluez_watcher_free( struct bluez_watcher_ctx *watcher ) LIST_FOR_EACH_ENTRY_SAFE( event1, event2, &watcher->event_list, struct bluez_watcher_event, entry ) { list_remove( &event1->entry ); - switch (event1->event_type) + winebluetooth_watcher_event_free( event1->event_type, &event1->event ); + if (event1->pending_call) { - case BLUETOOTH_WATCHER_EVENT_TYPE_SERVICE_DOWN: - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED: - unix_name_free( (struct unix_name *)event1->event.radio_added.radio.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_REMOVED: - unix_name_free( (struct unix_name *)event1->event.radio_removed.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_PROPERTIES_CHANGED: - unix_name_free( (struct unix_name *)event1->event.radio_props_changed.radio.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED: - unix_name_free( (struct unix_name *)event1->event.device_added.radio.handle ); - unix_name_free( (struct unix_name *)event1->event.device_added.device.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_REMOVED: - unix_name_free( (struct unix_name *)event1->event.device_removed.device.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_PROPERTIES_CHANGED: - unix_name_free( (struct unix_name *)event1->event.device_props_changed.device.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_PAIRING_FINISHED: - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED: - unix_name_free( (struct unix_name *)event1->event.gatt_service_added.device.handle ); - unix_name_free( (struct unix_name *)event1->event.gatt_service_added.service.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_REMOVED: - unix_name_free( (struct unix_name *)event1->event.gatt_service_removed.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED: - unix_name_free( (struct unix_name *)event1->event.gatt_characteristic_added.characteristic.handle ); - unix_name_free( (struct unix_name *)event1->event.gatt_characteristic_added.service.handle ); - bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)event1->event.gatt_characteristic_added.value.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_REMOVED: - unix_name_free( (struct unix_name *)event1->event.gatt_characterisic_removed.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_VALUE_CHANGED: - unix_name_free( (struct unix_name *)event1->event.gatt_characteristic_value_changed.characteristic.handle ); - bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)event1->event.gatt_characteristic_added.value.handle ); - break; - case BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_VALUE_READ: - bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)event1->event.gatt_characteristic_value_read.value.handle ); - break; + p_dbus_pending_call_cancel( event1->pending_call ); + p_dbus_pending_call_unref( event1->pending_call ); } free( event1 ); } @@ -2612,8 +2619,7 @@ void bluez_watcher_close( void *connection, void *ctx ) * BLUETOOTH_WATCHER_ event for objects we're interested in onto event_list. */ static NTSTATUS bluez_enumerate_objects( DBusMessage *reply, struct list *event_list ) { - DBusMessageIter dict, paths_iter, iface_iter, prop_iter; - NTSTATUS status = STATUS_SUCCESS; + DBusMessageIter dict, paths_iter, iface_iter; const char *path; if (!p_dbus_message_has_signature( reply, @@ -2628,168 +2634,11 @@ static NTSTATUS bluez_enumerate_objects( DBusMessage *reply, struct list *event_ p_dbus_message_iter_recurse( &dict, &paths_iter ); while((path = bluez_next_dict_entry( &paths_iter, &iface_iter ))) { - union winebluetooth_watcher_event_data event = {0}; - const char *prop_name, *iface; - DBusMessageIter variant; - - while ((iface = bluez_next_dict_entry ( &iface_iter, &prop_iter ))) - { - if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER )) - { - struct unix_name *radio_name; - - radio_name = unix_name_get_or_create( path ); - if (!radio_name) - { - status = STATUS_NO_MEMORY; - goto done; - } - while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) - { - bluez_radio_prop_from_dict_entry( prop_name, &variant, &event.radio_added.props, - &event.radio_added.props_mask, - WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); - } - event.radio_added.radio.handle = (UINT_PTR)radio_name; - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_RADIO_ADDED, event )) - unix_name_free( radio_name ); - else - TRACE( "Found BlueZ org.bluez.Adapter1 object %s: %p\n", debugstr_a( radio_name->str ), - radio_name ); - break; - } - else if (!strcmp( iface, BLUEZ_INTERFACE_DEVICE )) - { - struct unix_name *device_name, *radio_name = NULL; - - device_name = unix_name_get_or_create( path ); - if (!device_name) - { - status = STATUS_NO_MEMORY; - goto done; - } - event.device_added.device.handle = (UINT_PTR)device_name; - event.device_added.init_entry = TRUE; - - while((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) - { - if (!strcmp( prop_name, "Adapter" ) && - p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_OBJECT_PATH) - { - const char *path; - p_dbus_message_iter_get_basic( &variant, &path ); - radio_name = unix_name_get_or_create( path ); - if (!radio_name) - { - unix_name_free( device_name ); - status = STATUS_NO_MEMORY; - goto done; - } - event.device_added.radio.handle = (UINT_PTR)radio_name; - } - else - bluez_device_prop_from_dict_entry( prop_name, &variant, &event.device_added.props, - &event.device_added.known_props_mask, - WINEBLUETOOTH_DEVICE_ALL_PROPERTIES ); - } - if (!radio_name) - { - unix_name_free( device_name ); - ERR( "Could not find the associated adapter for device %s\n", debugstr_a( path ) ); - break; - } - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_ADDED, event )) - { - unix_name_free( device_name ); - unix_name_free( radio_name ); - } - else - TRACE( "Found BlueZ org.bluez.Device1 object %s: %p\n", debugstr_a( path ), device_name ); - break; - } - else if (!strcmp( iface, BLUEZ_INTERFACE_GATT_SERVICE )) - { - struct unix_name *service_name; - - service_name = unix_name_get_or_create( path ); - if (!service_name) - { - ERR( "Failed to allocate memory for service path %s\n", debugstr_a( path ) ); - break; - } - event.gatt_service_added.service.handle = (UINT_PTR)service_name; - - while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) - bluez_gatt_service_props_from_dict_entry( prop_name, &variant, &event.gatt_service_added ); - if (!event.gatt_service_added.device.handle) - { - unix_name_free( service_name ); - ERR( "Could not find the associated device for the GATT service %s\n", debugstr_a( path ) ); - break; - } - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_DEVICE_GATT_SERVICE_ADDED, event )) - { - unix_name_free( service_name ); - unix_name_free( (struct unix_name *)event.gatt_service_added.device.handle ); - } - else - TRACE( "Found BlueZ org.bluez.GattService1 object %s %p\n", debugstr_a( path ), service_name ); - break; - } - else if (!strcmp( iface, BLUEZ_INTERFACE_GATT_CHARACTERISTICS )) - { - struct unix_name *chrc_name; - - chrc_name = unix_name_get_or_create( path ); - if (!chrc_name) - { - ERR("Failed to allocate memory for characteristic path %s\n", debugstr_a( path )); - goto done; - } - - event.gatt_characteristic_added.characteristic.handle = (UINT_PTR)chrc_name; - while ((prop_name = bluez_next_dict_entry( &prop_iter, &variant ))) - { - if (!strcmp( prop_name, "Value" ) - && p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_ARRAY - && p_dbus_message_iter_get_element_type( &variant ) == DBUS_TYPE_BYTE) - { - if (!bluez_gatt_characteristic_value_new_from_iter( reply, &variant, - &event.gatt_characteristic_added.value )) - { - unix_name_free( chrc_name ); - status = STATUS_NO_MEMORY; - goto done; - } - } - else - bluez_gatt_characteristic_props_from_dict_entry( prop_name, &variant, - &event.gatt_characteristic_added ); - } - if (!event.gatt_characteristic_added.service.handle) - { - unix_name_free( chrc_name ); - bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)event.gatt_characteristic_added.value.handle ); - ERR( "Could not find the associated service for the GATT charcteristic %s\n", debugstr_a( path ) ); - break; - } - - if (!bluez_event_list_queue_new_event( event_list, BLUETOOTH_WATCHER_EVENT_TYPE_GATT_CHARACTERISTIC_ADDED, event )) - { - unix_name_free( chrc_name ); - bluez_gatt_characteristic_value_free( - (struct bluez_gatt_characteristic_value *)event.gatt_characteristic_added.value.handle ); - } - else - TRACE( "Found Bluez org.bluez.GattCharacteristic1 object %s %p\n", debugstr_a( path ), chrc_name ); - break; - } - } + BOOL oom; + if (!bluez_handle_new_object( reply, path, &iface_iter, TRUE, event_list, &oom ) && oom) + return STATUS_NO_MEMORY; } - -done: - return status; + return STATUS_SUCCESS; } static BOOL bluez_watcher_event_queue_pop( struct bluez_watcher_ctx *ctx, struct winebluetooth_watcher_event *event ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10922
From: Vibhav Pant <vibhavp@gmail.com> Instead of checking the status of the GetManagedObjects call on every main loop iteration, use the notification callback functionality of DBusPendingCall to perform enumeration. --- dlls/winebth.sys/dbus.c | 71 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index 2c117dcd87c..a1438331095 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -1182,7 +1182,6 @@ struct bluez_watcher_ctx { DBusConnection *connection; char *bluez_dbus_unique_name; - DBusPendingCall *init_device_list_call; /* struct bluez_watcher_event */ struct list event_list; @@ -1296,17 +1295,42 @@ static NTSTATUS bluez_dbus_get_unique_name_async( DBusConnection *connection, DB return success ? (*call ? STATUS_SUCCESS : STATUS_INTERNAL_ERROR) : STATUS_NO_MEMORY; } +static NTSTATUS bluez_enumerate_objects( DBusMessage *reply, struct list *event_list ); + +static void bluez_get_managed_objects_callback( DBusPendingCall *call, void *data ) +{ + DBusMessage *reply = p_dbus_pending_call_steal_reply( call ); + struct bluez_watcher_ctx *ctx = data; + DBusError error; + NTSTATUS status; + + p_dbus_error_init( &error ); + if (p_dbus_set_error_from_message( &error, reply )) + ERR( "Error getting object list from BlueZ: %s\n", dbgstr_dbus_error( &error ) ); + else if ((status = bluez_enumerate_objects( reply, &ctx->event_list ))) + ERR( "Error enumerating BlueZ objects: %x\n", status ); + p_dbus_error_free( &error ); + p_dbus_message_unref( reply ); +} + /* Called once the BlueZ service has been activated by the system. */ static void bluez_on_service_available( struct bluez_watcher_ctx *ctx ) { + DBusPendingCall *call; NTSTATUS status; TRACE_(dbus)( "org.bluez available on %s, initializing bluetooth.\n", debugstr_a( ctx->bluez_dbus_unique_name ) ); if ((status = bluez_register_auth_agent_async( ctx->connection ))) ERR_(dbus)( "Failed to create async RegisterAgent call: %#x\n", status ); - if ((status = bluez_get_objects_async( ctx->connection, &ctx->init_device_list_call ))) + if ((status = bluez_get_objects_async( ctx->connection, &call ))) ERR_(dbus)( "Failed to create async GetManagedObjects call: %#x\n", status ); + else + { + if (!p_dbus_pending_call_set_notify( call, bluez_get_managed_objects_callback, ctx, NULL )) + p_dbus_pending_call_cancel( call ); + p_dbus_pending_call_unref( call ); + } } static void bluez_dbus_get_name_owner_callback( DBusPendingCall *call, void *data ) @@ -2511,12 +2535,6 @@ static void bluez_watcher_free( struct bluez_watcher_ctx *watcher ) { struct bluez_watcher_event *event1, *event2; - if (watcher->init_device_list_call) - { - p_dbus_pending_call_cancel( watcher->init_device_list_call ); - p_dbus_pending_call_unref( watcher->init_device_list_call ); - } - LIST_FOR_EACH_ENTRY_SAFE( event1, event2, &watcher->event_list, struct bluez_watcher_event, entry ) { list_remove( &event1->entry ); @@ -2582,11 +2600,6 @@ done: p_dbus_error_free( &err ); if (status) { - if (watcher_ctx->init_device_list_call) - { - p_dbus_pending_call_cancel( watcher_ctx->init_device_list_call ); - p_dbus_pending_call_unref( watcher_ctx->init_device_list_call ); - } p_dbus_connection_unref( watcher_ctx->connection ); free( watcher_ctx->bluez_dbus_unique_name ); free( watcher_ctx ); @@ -2712,38 +2725,6 @@ NTSTATUS bluez_dbus_loop( void *c, void *watcher, void *auth_agent, TRACE( "Disconnected from DBus\n" ); return STATUS_SUCCESS; } - - if (watcher_ctx->init_device_list_call != NULL - && p_dbus_pending_call_get_completed( watcher_ctx->init_device_list_call )) - { - DBusMessage *reply = p_dbus_pending_call_steal_reply( watcher_ctx->init_device_list_call ); - DBusError error; - NTSTATUS status; - - p_dbus_pending_call_unref( watcher_ctx->init_device_list_call ); - watcher_ctx->init_device_list_call = NULL; - - p_dbus_error_init( &error ); - if (p_dbus_set_error_from_message( &error, reply )) - { - WARN( "Error getting object list from BlueZ: %s\n", dbgstr_dbus_error( &error ) ); - p_dbus_error_free( &error ); - p_dbus_message_unref( reply ); - p_dbus_connection_unref( connection ); - bluez_auth_agent_ctx_decref( auth_agent ); - return STATUS_NO_MEMORY; - } - p_dbus_error_free( &error ); - status = bluez_enumerate_objects( reply, &watcher_ctx->event_list ); - p_dbus_message_unref( reply ); - if (status != STATUS_SUCCESS) - { - WARN( "Error building initial bluetooth devices list: %#x\n", status ); - p_dbus_connection_unref( connection ); - bluez_auth_agent_ctx_decref( auth_agent ); - return status; - } - } } } #else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10922
participants (2)
-
Vibhav Pant -
Vibhav Pant (＠vibhavp)