From: Vibhav Pant vibhavp@gmail.com
--- dlls/winebth.sys/dbus.c | 30 ++++++++++++++++++++++++++++++ dlls/winebth.sys/winebth.c | 16 ++++++++++++++-- dlls/winebth.sys/winebth_priv.h | 16 ++++++++++++---- 3 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index d8a4247d453..690a2bd1ccc 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -524,6 +524,36 @@ static void bluez_device_prop_from_dict_entry( const char *prop_name, DBusMessag parse_mac_address( addr_str, props->address.rgBytes ); *props_mask |= WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS; } + else if (wanted_props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED && + !strcmp( prop_name, "Connected" ) && + p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_BOOLEAN) + { + dbus_bool_t connected; + + p_dbus_message_iter_get_basic( variant, &connected ); + props->connected = !!connected; + *props_mask |= WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED; + } + else if (wanted_props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED && + !strcmp( prop_name, "Paired" ) && + p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_BOOLEAN) + { + dbus_bool_t paired; + + p_dbus_message_iter_get_basic( variant, &paired ); + props->paired = !!paired; + *props_mask |= WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED; + } + else if (wanted_props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING && + !strcmp( prop_name, "LegacyPairing" ) && + p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_BOOLEAN) + { + dbus_bool_t legacy; + + p_dbus_message_iter_get_basic( variant, &legacy ); + props->legacy_pairing = !!legacy; + *props_mask |= WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING; + } }
static NTSTATUS bluez_adapter_get_props_async( void *connection, const char *radio_object_path, diff --git a/dlls/winebth.sys/winebth.c b/dlls/winebth.sys/winebth.c index 5d1f128c491..6a66bedd8a4 100644 --- a/dlls/winebth.sys/winebth.c +++ b/dlls/winebth.sys/winebth.c @@ -154,8 +154,6 @@ static NTSTATUS WINAPI dispatch_bluetooth( DEVICE_OBJECT *device, IRP *irp ) struct bluetooth_remote_device *device; SIZE_T rem_devices;
- FIXME("IOCTL_BTH_GET_DEVICE_INFO: semi-stub!\n"); - if (!list) { status = STATUS_INVALID_PARAMETER; @@ -193,6 +191,20 @@ static NTSTATUS WINAPI dispatch_bluetooth( DEVICE_OBJECT *device, IRP *irp ) info->flags |= BDIF_ADDRESS; info->address = RtlUlonglongByteSwap( device->props.address.ullLong ); } + if (device->props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED && + device->props.connected) + info->flags |= BDIF_CONNECTED; + if (device->props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED && + device->props.paired) + info->flags |= (BDIF_PAIRED | BDIF_PERSONAL); + if (device->props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING && + !device->props.legacy_pairing) + { + info->flags |= BDIF_SSP_SUPPORTED; + if (device->props_mask & WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED && + device->props.paired) + info->flags |= BDIF_SSP_PAIRED; + } LeaveCriticalSection( &device->props_cs );
irp->IoStatus.Information += sizeof( *info ); diff --git a/dlls/winebth.sys/winebth_priv.h b/dlls/winebth.sys/winebth_priv.h index cdedea7bab1..ed920990a93 100644 --- a/dlls/winebth.sys/winebth_priv.h +++ b/dlls/winebth.sys/winebth_priv.h @@ -140,11 +140,16 @@ typedef struct
typedef UINT16 winebluetooth_device_props_mask_t;
-#define WINEBLUETOOTH_DEVICE_PROPERTY_NAME (1) -#define WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS (1 << 1) +#define WINEBLUETOOTH_DEVICE_PROPERTY_NAME (1) +#define WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS (1 << 1) +#define WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED (1 << 2) +#define WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED (1 << 3) +#define WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING (1 << 4)
-#define WINEBLUETOOTH_DEVICE_ALL_PROPERTIES \ - (WINEBLUETOOTH_DEVICE_PROPERTY_NAME | WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS) +#define WINEBLUETOOTH_DEVICE_ALL_PROPERTIES \ + (WINEBLUETOOTH_DEVICE_PROPERTY_NAME | WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS | \ + WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED | WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED | \ + WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING)
union winebluetooth_property { @@ -171,6 +176,9 @@ struct winebluetooth_device_properties { BLUETOOTH_ADDRESS address; CHAR name[BLUETOOTH_MAX_NAME_SIZE]; + BOOL connected; + BOOL paired; + BOOL legacy_pairing; };
NTSTATUS winebluetooth_radio_get_unique_name( winebluetooth_radio_t radio, char *name,