[PATCH 0/8] MR7659: windows.devices.bluetooth: Add implementation for IBluetoothStatics::GetDefaultAsync(), BluetoothAdapter.
This MR adds a basic implementation for the BluetoothAdapter interface in Windows.Devices.Bluetooth, including winebth.sys support for getting properties associated with the radio's Low Energy capabilities.
From: Vibhav Pant vibhavp@gmail.com
Add an initial implementation of IBluetoothAdapter, returned by GetDefaultAsync(). --- dlls/windows.devices.bluetooth/Makefile.in | 4 +- dlls/windows.devices.bluetooth/async.c | 503 ++++++++++++++++++ dlls/windows.devices.bluetooth/async.idl | 44 ++ .../bluetoothadapter.c | 227 +++++++- dlls/windows.devices.bluetooth/private.h | 14 +- 5 files changed, 779 insertions(+), 13 deletions(-) create mode 100644 dlls/windows.devices.bluetooth/async.c create mode 100644 dlls/windows.devices.bluetooth/async.idl
diff --git a/dlls/windows.devices.bluetooth/Makefile.in b/dlls/windows.devices.bluetooth/Makefile.in index 216c1f7ae9b..d0d1cd846c7 100644 --- a/dlls/windows.devices.bluetooth/Makefile.in +++ b/dlls/windows.devices.bluetooth/Makefile.in @@ -1,7 +1,9 @@ MODULE = windows.devices.bluetooth.dll -IMPORTS = combase +IMPORTS = combase setupapi
SOURCES = \ + async.c \ + async.idl \ bluetoothadapter.c \ classes.idl \ main.c diff --git a/dlls/windows.devices.bluetooth/async.c b/dlls/windows.devices.bluetooth/async.c new file mode 100644 index 00000000000..b30269f1e47 --- /dev/null +++ b/dlls/windows.devices.bluetooth/async.c @@ -0,0 +1,503 @@ +/* Copyright 2022 Bernhard Kölbl for CodeWeavers + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(enumeration); + +#define Closed 4 +#define HANDLER_NOT_SET ((void *)~(ULONG_PTR)0) + +struct async_info +{ + IWineAsyncInfoImpl IWineAsyncInfoImpl_iface; + IAsyncInfo IAsyncInfo_iface; + IInspectable *IInspectable_outer; + LONG ref; + + async_operation_callback callback; + TP_WORK *async_run_work; + IUnknown *invoker; + IUnknown *param; + + CRITICAL_SECTION cs; + IWineAsyncOperationCompletedHandler *handler; + PROPVARIANT result; + AsyncStatus status; + HRESULT hr; +}; + +static inline struct async_info *impl_from_IWineAsyncInfoImpl( IWineAsyncInfoImpl *iface ) +{ + return CONTAINING_RECORD( iface, struct async_info, IWineAsyncInfoImpl_iface ); +} + +static HRESULT WINAPI async_impl_QueryInterface( IWineAsyncInfoImpl *iface, REFIID iid, void **out ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IWineAsyncInfoImpl )) + { + IInspectable_AddRef( (*out = &impl->IWineAsyncInfoImpl_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IAsyncInfo )) + { + IInspectable_AddRef( (*out = &impl->IAsyncInfo_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_impl_AddRef( IWineAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI async_impl_Release( IWineAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) + { + if (impl->handler && impl->handler != HANDLER_NOT_SET) IWineAsyncOperationCompletedHandler_Release( impl->handler ); + IAsyncInfo_Close( &impl->IAsyncInfo_iface ); + if (impl->param) IUnknown_Release( impl->param ); + if (impl->invoker) IUnknown_Release( impl->invoker ); + impl->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &impl->cs ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI async_impl_put_Completed( IWineAsyncInfoImpl *iface, IWineAsyncOperationCompletedHandler *handler ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, handler %p.\n", iface, handler ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->handler != HANDLER_NOT_SET) hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; + else if ((impl->handler = handler)) + { + IWineAsyncOperationCompletedHandler_AddRef( impl->handler ); + + if (impl->status > Started) + { + IInspectable *operation = impl->IInspectable_outer; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IWineAsyncOperationCompletedHandler_Invoke( handler, operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); + + return S_OK; + } + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_impl_get_Completed( IWineAsyncInfoImpl *iface, IWineAsyncOperationCompletedHandler **handler ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, handler %p.\n", iface, handler ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + if (impl->handler == NULL || impl->handler == HANDLER_NOT_SET) *handler = NULL; + else IWineAsyncOperationCompletedHandler_AddRef( (*handler = impl->handler) ); + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_impl_get_Result( IWineAsyncInfoImpl *iface, PROPVARIANT *result ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + HRESULT hr = E_ILLEGAL_METHOD_CALL; + + TRACE( "iface %p, result %p.\n", iface, result ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Completed || impl->status == Error) + { + PropVariantCopy( result, &impl->result ); + hr = impl->hr; + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_impl_Start( IWineAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + + TRACE( "iface %p.\n", iface ); + + /* keep the async alive in the callback */ + IInspectable_AddRef( impl->IInspectable_outer ); + SubmitThreadpoolWork( impl->async_run_work ); + + return S_OK; +} + +static const struct IWineAsyncInfoImplVtbl async_impl_vtbl = +{ + /* IUnknown methods */ + async_impl_QueryInterface, + async_impl_AddRef, + async_impl_Release, + /* IWineAsyncInfoImpl */ + async_impl_put_Completed, + async_impl_get_Completed, + async_impl_get_Result, + async_impl_Start, +}; + +DEFINE_IINSPECTABLE_OUTER( async_info, IAsyncInfo, struct async_info, IInspectable_outer ) + +static HRESULT WINAPI async_info_get_Id( IAsyncInfo *iface, UINT32 *id ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, id %p.\n", iface, id ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + *id = 1; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, status %p.\n", iface, status ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + *status = impl->status; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, error_code %p.\n", iface, error_code ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) *error_code = hr = E_ILLEGAL_METHOD_CALL; + else *error_code = impl->hr; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_Cancel( IAsyncInfo *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->status == Started) impl->status = Canceled; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_Close( IAsyncInfo *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Started) + hr = E_ILLEGAL_STATE_CHANGE; + else if (impl->status != Closed) + { + CloseThreadpoolWork( impl->async_run_work ); + impl->async_run_work = NULL; + impl->status = Closed; + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static const struct IAsyncInfoVtbl async_info_vtbl = +{ + /* IUnknown methods */ + async_info_QueryInterface, + async_info_AddRef, + async_info_Release, + /* IInspectable methods */ + async_info_GetIids, + async_info_GetRuntimeClassName, + async_info_GetTrustLevel, + /* IAsyncInfo */ + async_info_get_Id, + async_info_get_Status, + async_info_get_ErrorCode, + async_info_Cancel, + async_info_Close, +}; + +static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) +{ + struct async_info *impl = impl_from_IWineAsyncInfoImpl( iface ); + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result ); + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IWineAsyncOperationCompletedHandler *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IWineAsyncOperationCompletedHandler_Invoke( handler, operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); +} + +static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, + IInspectable *outer, IWineAsyncInfoImpl **out ) +{ + struct async_info *impl; + HRESULT hr; + + if (!(impl = calloc( 1, sizeof(struct async_info) ))) return E_OUTOFMEMORY; + impl->IWineAsyncInfoImpl_iface.lpVtbl = &async_impl_vtbl; + impl->IAsyncInfo_iface.lpVtbl = &async_info_vtbl; + impl->IInspectable_outer = outer; + impl->ref = 1; + + impl->callback = callback; + impl->handler = HANDLER_NOT_SET; + impl->status = Started; + if (!(impl->async_run_work = CreateThreadpoolWork( async_info_callback, &impl->IWineAsyncInfoImpl_iface, NULL ))) + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + free( impl ); + return hr; + } + + if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); + if ((impl->param = param)) IUnknown_AddRef( impl->param ); + + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); + + *out = &impl->IWineAsyncInfoImpl_iface; + return S_OK; +} + +struct async_result_BluetoothAdapter +{ + IAsyncOperation_BluetoothAdapter IAsyncOperation_BluetoothAdapter_iface; + IWineAsyncInfoImpl *IWineAsyncInfoImpl_inner; + LONG ref; +}; + +static inline struct async_result_BluetoothAdapter *impl_from_IAsyncOperation_BluetoothAdapter( IAsyncOperation_BluetoothAdapter *iface ) +{ + return CONTAINING_RECORD( iface, struct async_result_BluetoothAdapter, IAsyncOperation_BluetoothAdapter_iface ); +} + +static HRESULT WINAPI async_result_QueryInterface( IAsyncOperation_BluetoothAdapter *iface, REFIID iid, void **out ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IAsyncOperation_BluetoothAdapter )) + { + IInspectable_AddRef( (*out = &impl->IAsyncOperation_BluetoothAdapter_iface) ); + return S_OK; + } + + return IWineAsyncInfoImpl_QueryInterface( impl->IWineAsyncInfoImpl_inner, iid, out ); +} + +static ULONG WINAPI async_result_AddRef( IAsyncOperation_BluetoothAdapter *iface ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI async_result_Release( IAsyncOperation_BluetoothAdapter *iface ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) + { + /* guard against re-entry if inner releases an outer iface */ + InterlockedIncrement( &impl->ref ); + IWineAsyncInfoImpl_Release( impl->IWineAsyncInfoImpl_inner ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI async_result_GetIids( IAsyncOperation_BluetoothAdapter *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_result_GetRuntimeClassName( IAsyncOperation_BluetoothAdapter *iface, HSTRING *class_name ) +{ + static const WCHAR class[] = L"Windows.Foundation.IAsyncOperation`1<Windows.Devices.Bluetooth.BluetoothAdapter>"; + TRACE( "iface %p, class_name %p\n", iface, class_name ); + return WindowsCreateString( class, ARRAY_SIZE( class ) - 1, class_name ); +} + +static HRESULT WINAPI async_result_GetTrustLevel( IAsyncOperation_BluetoothAdapter *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_result_put_Completed( IAsyncOperation_BluetoothAdapter *iface, IAsyncOperationCompletedHandler_BluetoothAdapter *handler ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + TRACE( "iface %p, handler %p.\n", iface, handler ); + return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler *)handler ); +} + +static HRESULT WINAPI async_result_get_Completed( IAsyncOperation_BluetoothAdapter *iface, IAsyncOperationCompletedHandler_BluetoothAdapter **handler ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + TRACE( "iface %p, handler %p.\n", iface, handler ); + return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler **)handler ); +} + +static HRESULT WINAPI async_result_GetResults( IAsyncOperation_BluetoothAdapter *iface, IBluetoothAdapter **results ) +{ + struct async_result_BluetoothAdapter *impl = impl_from_IAsyncOperation_BluetoothAdapter( iface ); + PROPVARIANT result = {.vt = VT_UNKNOWN}; + HRESULT hr; + + TRACE( "iface %p, results %p.\n", iface, results ); + + hr = IWineAsyncInfoImpl_get_Result( impl->IWineAsyncInfoImpl_inner, &result ); + if (SUCCEEDED( hr )) + hr = IUnknown_QueryInterface( result.punkVal, &IID_IBluetoothAdapter, (void **)results ); + PropVariantClear( &result ); + return hr; +} + +static const struct IAsyncOperation_BluetoothAdapterVtbl async_result_BluetoothAdapter_vtbl = { + /* IUnknown methods */ + async_result_QueryInterface, + async_result_AddRef, + async_result_Release, + /* IInspectable methods */ + async_result_GetIids, + async_result_GetRuntimeClassName, + async_result_GetTrustLevel, + /* IAsyncOperation<BluetoothAdapter> */ + async_result_put_Completed, + async_result_get_Completed, + async_result_GetResults, +}; + +HRESULT async_operation_bluetooth_adapter_create( IUnknown *invoker, IUnknown *param, + async_operation_callback callback, + IAsyncOperation_BluetoothAdapter **out ) +{ + struct async_result_BluetoothAdapter *impl; + HRESULT hr; + + *out = NULL; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + impl->IAsyncOperation_BluetoothAdapter_iface.lpVtbl = &async_result_BluetoothAdapter_vtbl; + impl->ref = 1; + + if (FAILED(hr = async_info_create( invoker, param, callback, (IInspectable *)&impl->IAsyncOperation_BluetoothAdapter_iface, &impl->IWineAsyncInfoImpl_inner )) || + FAILED(hr = IWineAsyncInfoImpl_Start( impl->IWineAsyncInfoImpl_inner ))) + { + if (impl->IWineAsyncInfoImpl_inner) IWineAsyncInfoImpl_Release( impl->IWineAsyncInfoImpl_inner ); + free( impl ); + return hr; + } + + *out = &impl->IAsyncOperation_BluetoothAdapter_iface; + return S_OK; +} diff --git a/dlls/windows.devices.bluetooth/async.idl b/dlls/windows.devices.bluetooth/async.idl new file mode 100644 index 00000000000..951d813714b --- /dev/null +++ b/dlls/windows.devices.bluetooth/async.idl @@ -0,0 +1,44 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "propidl.idl"; +import "inspectable.idl"; +import "asyncinfo.idl"; +import "windowscontracts.idl"; + +namespace Windows.Devices.Bluetooth { + /* type-pruning version of AsyncOperationCompletedHandler<T> */ + delegate HRESULT WineAsyncOperationCompletedHandler([in] IInspectable *async, [in] AsyncStatus status); + + [ + uuid(d81ab70d-82e0-481c-983d-401225d98a2c) + ] + interface IWineAsyncInfoImpl : IUnknown + { + [propput] HRESULT Completed([in] WineAsyncOperationCompletedHandler *handler); + [propget] HRESULT Completed([out, retval] WineAsyncOperationCompletedHandler **handler); + [propget] HRESULT Result([out, retval] PROPVARIANT *result); + HRESULT Start(); + } +} diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index bc8e04a9d33..db9bce95e0a 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -1,6 +1,7 @@ /* WinRT Windows.Devices.Bluetooth BluetoothAdapter Implementation * * Copyright (C) 2023 Mohamad Al-Jaf + * Copyright (C) 2025 Vibhav Pant * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,25 +19,26 @@ */
#include "private.h" +#include "setupapi.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(bluetooth);
-struct bluetoothadapter +struct bluetoothadapter_statics { IActivationFactory IActivationFactory_iface; IBluetoothAdapterStatics IBluetoothAdapterStatics_iface; LONG ref; };
-static inline struct bluetoothadapter *impl_from_IActivationFactory( IActivationFactory *iface ) +static inline struct bluetoothadapter_statics *impl_from_IActivationFactory( IActivationFactory *iface ) { - return CONTAINING_RECORD( iface, struct bluetoothadapter, IActivationFactory_iface ); + return CONTAINING_RECORD( iface, struct bluetoothadapter_statics, IActivationFactory_iface ); }
static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) { - struct bluetoothadapter *impl = impl_from_IActivationFactory( iface ); + struct bluetoothadapter_statics *impl = impl_from_IActivationFactory( iface );
TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out );
@@ -64,7 +66,7 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID
static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) { - struct bluetoothadapter *impl = impl_from_IActivationFactory( iface ); + struct bluetoothadapter_statics *impl = impl_from_IActivationFactory( iface ); ULONG ref = InterlockedIncrement( &impl->ref ); TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); return ref; @@ -72,7 +74,7 @@ static ULONG WINAPI factory_AddRef( IActivationFactory *iface )
static ULONG WINAPI factory_Release( IActivationFactory *iface ) { - struct bluetoothadapter *impl = impl_from_IActivationFactory( iface ); + struct bluetoothadapter_statics *impl = impl_from_IActivationFactory( iface ); ULONG ref = InterlockedDecrement( &impl->ref ); TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); return ref; @@ -115,7 +117,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, };
-DEFINE_IINSPECTABLE( bluetoothadapter_statics, IBluetoothAdapterStatics, struct bluetoothadapter, IActivationFactory_iface ) +DEFINE_IINSPECTABLE( bluetoothadapter_statics, IBluetoothAdapterStatics, struct bluetoothadapter_statics, IActivationFactory_iface )
static HRESULT WINAPI bluetoothadapter_statics_GetDeviceSelector( IBluetoothAdapterStatics *iface, HSTRING *result ) { @@ -134,10 +136,47 @@ static HRESULT WINAPI bluetoothadapter_statics_FromIdAsync( IBluetoothAdapterSta return E_NOTIMPL; }
+static HRESULT bluetoothadapter_create( const WCHAR *device_path, IBluetoothAdapter **adapter ); + +static HRESULT WINAPI bluetoothadapter_get_default_async( IUnknown *invoker, IUnknown *params, PROPVARIANT *result ) +{ + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof( WCHAR )]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; + SP_DEVICE_INTERFACE_DATA iface_data; + DWORD idx = 0; + HDEVINFO devinfo; + + iface_detail->cbSize = sizeof( *iface_detail ); + iface_data.cbSize = sizeof( iface_data ); + + /* Windows.Devices.Bluetooth uses the GUID_BLUETOOTH_RADIO_INTERFACE interface class guid for radio devices, + * which is why we don't use BluetoothFindFirstRadio, which uses GUID_BTHPORT_DEVICE_INTERFACE. */ + devinfo = SetupDiGetClassDevsW( &GUID_BLUETOOTH_RADIO_INTERFACE, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE ); + if (devinfo == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32( GetLastError() ); + + while (SetupDiEnumDeviceInterfaces( devinfo, NULL, &GUID_BLUETOOTH_RADIO_INTERFACE, idx++, &iface_data )) + { + HRESULT hr; + IBluetoothAdapter *adapter = NULL; + + if (!SetupDiGetDeviceInterfaceDetailW( devinfo, &iface_data, iface_detail, sizeof( buffer ), NULL, NULL )) + continue; + + if (FAILED(hr = bluetoothadapter_create( iface_detail->DevicePath, &adapter ))) + return hr; + result->vt = VT_UNKNOWN; + result->punkVal = (IUnknown *)adapter; + break; + } + + return S_OK; +} + static HRESULT WINAPI bluetoothadapter_statics_GetDefaultAsync( IBluetoothAdapterStatics *iface, IAsyncOperation_BluetoothAdapter **operation ) { - FIXME( "iface %p, operation %p stub!\n", iface, operation ); - return E_NOTIMPL; + TRACE( "iface %p, operation %p\n", iface, operation ); + return async_operation_bluetooth_adapter_create( NULL, NULL, bluetoothadapter_get_default_async, operation ); }
static const struct IBluetoothAdapterStaticsVtbl bluetoothadapter_statics_vtbl = @@ -155,11 +194,177 @@ static const struct IBluetoothAdapterStaticsVtbl bluetoothadapter_statics_vtbl = bluetoothadapter_statics_GetDefaultAsync, };
-static struct bluetoothadapter bluetoothadapter_statics = +static struct bluetoothadapter_statics bluetoothadapter_statics_impl = { {&factory_vtbl}, {&bluetoothadapter_statics_vtbl}, 1, };
-IActivationFactory *bluetoothadapter_factory = &bluetoothadapter_statics.IActivationFactory_iface; +IActivationFactory *bluetoothadapter_factory = &bluetoothadapter_statics_impl.IActivationFactory_iface; + +struct bluetoothadapter +{ + IBluetoothAdapter IBluetoothAdapter_iface; + HSTRING id; + LONG ref; +}; + +static inline struct bluetoothadapter *impl_from_IBluetoothAdapter( IBluetoothAdapter *iface ) +{ + return CONTAINING_RECORD( iface, struct bluetoothadapter, IBluetoothAdapter_iface ); +} + +static HRESULT WINAPI bluetoothadapter_QueryInterface( IBluetoothAdapter *iface, REFIID iid, void **out ) +{ + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IBluetoothAdapter )) + { + *out = &impl->IBluetoothAdapter_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI bluetoothadapter_AddRef( IBluetoothAdapter *iface ) +{ + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI bluetoothadapter_Release( IBluetoothAdapter *iface ) +{ + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + WindowsDeleteString( impl->id ); + free( impl ); + } + return ref; +} + +static HRESULT WINAPI bluetoothadapter_GetIids( IBluetoothAdapter *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_GetRuntimeClassName( IBluetoothAdapter *iface, HSTRING *class_name ) +{ + TRACE( "iface %p, class_name %p\n", iface, class_name ); + return WindowsCreateString( RuntimeClass_Windows_Devices_Bluetooth_BluetoothAdapter, + ARRAY_SIZE( RuntimeClass_Windows_Devices_Bluetooth_BluetoothAdapter ) - 1, + class_name ); +} + +static HRESULT WINAPI bluetoothadapter_GetTrustLevel( IBluetoothAdapter *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_DeviceId( IBluetoothAdapter *iface, HSTRING *device_id ) +{ + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + TRACE( "iface %p, device_id %p\n", iface, device_id ); + return WindowsDuplicateString( impl->id, device_id ); +} + +static HRESULT WINAPI bluetoothadapter_get_BluetoothAddress( IBluetoothAdapter *iface, UINT64 *addr ) +{ + FIXME( "iface %p, addr %p stub!\n", iface, addr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_IsClassicSupported( IBluetoothAdapter *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_IsLowEnergySupported( IBluetoothAdapter *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_IsPeripheralRoleSupported( IBluetoothAdapter *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_IsCentralRoleSupported( IBluetoothAdapter *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_get_IsAdvertisementOffloadSupported( IBluetoothAdapter *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_GetRadioAsync( IBluetoothAdapter *iface, IAsyncOperation_Radio **op ) +{ + FIXME( "iface %p, op %p stub!\n", iface, op ); + return E_NOTIMPL; +} + +static const IBluetoothAdapterVtbl bluetooth_adapter_vtbl = +{ + /* QueryInterface methods */ + bluetoothadapter_QueryInterface, + bluetoothadapter_AddRef, + bluetoothadapter_Release, + /* IInspectable methods */ + bluetoothadapter_GetIids, + bluetoothadapter_GetRuntimeClassName, + bluetoothadapter_GetTrustLevel, + /* IBluetoothAdapter methods */ + bluetoothadapter_get_DeviceId, + bluetoothadapter_get_BluetoothAddress, + bluetoothadapter_get_IsClassicSupported, + bluetoothadapter_get_IsLowEnergySupported, + bluetoothadapter_get_IsPeripheralRoleSupported, + bluetoothadapter_get_IsCentralRoleSupported, + bluetoothadapter_get_IsAdvertisementOffloadSupported, + bluetoothadapter_GetRadioAsync +}; + +static HRESULT bluetoothadapter_create( const WCHAR *device_path, IBluetoothAdapter **adapter ) +{ + HRESULT ret; + struct bluetoothadapter *impl; + + impl = calloc( 1, sizeof( *impl ) ); + if (!impl) + return E_OUTOFMEMORY; + + ret = WindowsCreateString( device_path, wcslen( device_path ), &impl->id ); + if (FAILED( ret )) + { + free( impl ); + return ret; + } + + impl->IBluetoothAdapter_iface.lpVtbl = &bluetooth_adapter_vtbl; + impl->ref = 1; + *adapter = &impl->IBluetoothAdapter_iface; + return S_OK; +} diff --git a/dlls/windows.devices.bluetooth/private.h b/dlls/windows.devices.bluetooth/private.h index 746aa1e66ee..8160d9401c4 100644 --- a/dlls/windows.devices.bluetooth/private.h +++ b/dlls/windows.devices.bluetooth/private.h @@ -28,13 +28,24 @@ #include "winstring.h"
#include "activation.h" +#include "bthsdpdef.h" +#include "bluetoothapis.h" +#include "bthdef.h"
#define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Radios +#include "windows.devices.radios.h" #define WIDL_using_Windows_Devices_Bluetooth #include "windows.devices.bluetooth.h"
+#include "async.h" +typedef HRESULT (WINAPI *async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); +HRESULT async_operation_bluetooth_adapter_create( IUnknown *invoker, IUnknown *param, + async_operation_callback callback, + IAsyncOperation_BluetoothAdapter **out ); + extern IActivationFactory *bluetoothadapter_factory;
#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ @@ -74,5 +85,6 @@ extern IActivationFactory *bluetoothadapter_factory; } #define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) - +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) #endif
From: Vibhav Pant vibhavp@gmail.com
--- dlls/windows.devices.bluetooth/Makefile.in | 2 +- .../bluetoothadapter.c | 28 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dlls/windows.devices.bluetooth/Makefile.in b/dlls/windows.devices.bluetooth/Makefile.in index d0d1cd846c7..524b90f87f2 100644 --- a/dlls/windows.devices.bluetooth/Makefile.in +++ b/dlls/windows.devices.bluetooth/Makefile.in @@ -1,5 +1,5 @@ MODULE = windows.devices.bluetooth.dll -IMPORTS = combase setupapi +IMPORTS = combase setupapi bluetoothapis
SOURCES = \ async.c \ diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index db9bce95e0a..5a9633b9639 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -20,6 +20,8 @@
#include "private.h" #include "setupapi.h" +#include "bthsdpdef.h" +#include "bluetoothapis.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); @@ -207,6 +209,7 @@ struct bluetoothadapter { IBluetoothAdapter IBluetoothAdapter_iface; HSTRING id; + HANDLE radio; LONG ref; };
@@ -252,6 +255,7 @@ static ULONG WINAPI bluetoothadapter_Release( IBluetoothAdapter *iface ) if (!ref) { WindowsDeleteString( impl->id ); + CloseHandle( impl->radio ); free( impl ); } return ref; @@ -286,8 +290,19 @@ static HRESULT WINAPI bluetoothadapter_get_DeviceId( IBluetoothAdapter *iface, H
static HRESULT WINAPI bluetoothadapter_get_BluetoothAddress( IBluetoothAdapter *iface, UINT64 *addr ) { - FIXME( "iface %p, addr %p stub!\n", iface, addr ); - return E_NOTIMPL; + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + BLUETOOTH_RADIO_INFO info = {0}; + DWORD err; + + TRACE( "iface %p, addr %p\n", iface, addr ); + + info.dwSize = sizeof( info ); + err = BluetoothGetRadioInfo( impl->radio, &info ); + if (err) + return HRESULT_FROM_WIN32( GetLastError() ); + + *addr = info.address.ullLong; + return S_OK; }
static HRESULT WINAPI bluetoothadapter_get_IsClassicSupported( IBluetoothAdapter *iface, boolean *value ) @@ -363,6 +378,15 @@ static HRESULT bluetoothadapter_create( const WCHAR *device_path, IBluetoothAdap return ret; }
+ impl->radio = CreateFileW( device_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (impl->radio == INVALID_HANDLE_VALUE) + { + WindowsDeleteString( impl->id ); + free( impl ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + impl->IBluetoothAdapter_iface.lpVtbl = &bluetooth_adapter_vtbl; impl->ref = 1; *adapter = &impl->IBluetoothAdapter_iface;
From: Vibhav Pant vibhavp@gmail.com
--- dlls/winebth.sys/dbus.c | 127 ++++++++++++++++++++++++++++---- dlls/winebth.sys/winebth_priv.h | 20 ++++- 2 files changed, 132 insertions(+), 15 deletions(-)
diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c index 383fd74187d..9b3820df8f2 100644 --- a/dlls/winebth.sys/dbus.c +++ b/dlls/winebth.sys/dbus.c @@ -114,8 +114,9 @@ const int bluez_timeout = -1; DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING
#define BLUEZ_DEST "org.bluez" -#define BLUEZ_INTERFACE_ADAPTER "org.bluez.Adapter1" -#define BLUEZ_INTERFACE_DEVICE "org.bluez.Device1" +#define BLUEZ_INTERFACE_ADAPTER "org.bluez.Adapter1" +#define BLUEZ_INTERFACE_DEVICE "org.bluez.Device1" +#define BLUEZ_INTERFACE_LE_ADVERTISING_MANAGER "org.bluez.LEAdvertisingManager1"
#define DO_FUNC( f ) typeof( f ) (*p_##f) DBUS_FUNCS; @@ -571,6 +572,21 @@ NTSTATUS bluez_adapter_set_prop( void *connection, struct bluetooth_adapter_set_ return STATUS_SUCCESS; }
+static BOOL bluez_str_arr_iter_find( DBusMessageIter *arr_iter, const char *str ) +{ + while (p_dbus_message_iter_has_next( arr_iter )) + { + const char *elem; + p_dbus_message_iter_get_basic( arr_iter, &elem ); + if (!strcmp( str, elem )) + return TRUE; + + p_dbus_message_iter_next( arr_iter ); + } + + return FALSE; +} + static void bluez_radio_prop_from_dict_entry( const char *prop_name, DBusMessageIter *variant, struct winebluetooth_radio_properties *props, winebluetooth_radio_props_mask_t *props_mask, @@ -661,6 +677,28 @@ static void bluez_radio_prop_from_dict_entry( const char *prop_name, DBusMessage p_dbus_message_iter_get_basic( variant, &props->version ); *props_mask |= WINEBLUETOOTH_RADIO_PROPERTY_VERSION; } + else if (wanted_props_mask & WINEBLUETOOTH_RADIO_PROPERTY_LE && + !strcmp( prop_name, "Roles" ) && + p_dbus_message_iter_get_arg_type( variant ) == DBUS_TYPE_ARRAY) + { + DBusMessageIter roles_iter; + int type; + + type = p_dbus_message_iter_get_element_type( variant ); + if (type != DBUS_TYPE_STRING) + { + ERR( "Unexpected element type for property "Roles": %c\n", type ); + return; + } + p_dbus_message_iter_recurse( variant, &roles_iter ); + + if (bluez_str_arr_iter_find( &roles_iter, "central" )) + props->le.roles |= WINEBLUETOOTH_LE_RADIO_ROLE_CENTRAL; + if (bluez_str_arr_iter_find( &roles_iter, "peripheral" )) + props->le.roles |= WINEBLUETOOTH_LE_RADIO_ROLE_PERIPHERAL; + if (props->le.roles) + *props_mask |= WINEBLUETOOTH_RADIO_PROPERTY_LE; + } }
static void bluez_device_prop_from_dict_entry( const char *prop_name, DBusMessageIter *variant, @@ -1488,6 +1526,73 @@ void bluez_watcher_close( void *connection, void *ctx ) p_dbus_connection_remove_filter( connection, bluez_filter, ctx ); }
+static void bluez_get_adapter_properties( const char *path, const char *iface, + DBusMessageIter *ifaces_iter, DBusMessageIter *props_iter, + struct winebluetooth_radio_properties *props, + winebluetooth_radio_props_mask_t *mask) +{ + + do { + if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER )) + { + DBusMessageIter variant; + const char *prop_name; + + while ((prop_name = bluez_next_dict_entry( props_iter, &variant ))) + bluez_radio_prop_from_dict_entry( prop_name, &variant, props, mask, + WINEBLUETOOTH_RADIO_ALL_PROPERTIES ); + } + else if (!strcmp( iface, BLUEZ_INTERFACE_LE_ADVERTISING_MANAGER )) + { + DBusMessageIter variant; + const char *prop_name; + *mask |= WINEBLUETOOTH_RADIO_PROPERTY_LE; + + while ((prop_name = bluez_next_dict_entry( props_iter, &variant ))) + { + if ((!strcmp( prop_name, "SupportedSecondaryChannels" ) || !strcmp( prop_name, "SupportedFeatures" )) + && p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_ARRAY) + { + DBusMessageIter arr_iter; + int type; + + type = p_dbus_message_iter_get_element_type( &variant ); + if (type != DBUS_TYPE_STRING) + { + ERR( "Unexpected element type for property %s: %c\n", debugstr_a( prop_name ), type ); + continue; + } + p_dbus_message_iter_recurse( &variant, &arr_iter ); + if (!strcmp( prop_name, "SupportedSecondaryChannels")) + { + props->le.adv_phy_2M_uncoded = bluez_str_arr_iter_find( &arr_iter, "2M" ); + props->le.adv_phy_coded = bluez_str_arr_iter_find( &arr_iter, "Coded" ); + } + else + props->le.adv_offload = bluez_str_arr_iter_find( &arr_iter, "HardwareOffload" ); + } + else if (!strcmp( prop_name, "SupportedCapabilities" ) + && p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_DICT_ENTRY) + { + DBusMessageIter cap_val; + const char *cap_name; + + while ((cap_name = bluez_next_dict_entry( &variant, &cap_val ))) + { + if (!strcmp( cap_name, "MaxAdvLen" ) + && p_dbus_message_iter_get_arg_type( &cap_val ) == DBUS_TYPE_BYTE ) + { + unsigned char len; + p_dbus_message_iter_get_basic( &cap_val, &len ); + props->le.adv_max_len = len; + } + } + } + } + } + } while ((iface = bluez_next_dict_entry ( ifaces_iter, props_iter ))); +} + static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct list *adapter_list, struct list *device_list ) { @@ -1510,10 +1615,8 @@ static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct lis const char *iface; while ((iface = bluez_next_dict_entry ( &iface_iter, &prop_iter ))) { - if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER )) + if (!strcmp( iface, BLUEZ_INTERFACE_ADAPTER ) || !strcmp( iface, BLUEZ_INTERFACE_LE_ADVERTISING_MANAGER )) { - const char *prop_name; - DBusMessageIter variant; struct bluez_init_entry *init_device = calloc( 1, sizeof( *init_device ) ); struct unix_name *radio_name;
@@ -1529,17 +1632,13 @@ static NTSTATUS bluez_build_initial_device_lists( DBusMessage *reply, struct lis 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_get_adapter_properties( path, iface, &iface_iter, &prop_iter, &init_device->object.radio.props, + &init_device->object.radio.props_mask ); 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 ); - break; + TRACE( "Found BlueZ org.bluez.Adapter1 object %s (LE: %d): %p\n", + debugstr_a( radio_name->str ), + !!(init_device->object.radio.props_mask & WINEBLUETOOTH_RADIO_PROPERTY_LE), radio_name ); } else if (!strcmp( iface, BLUEZ_INTERFACE_DEVICE )) { diff --git a/dlls/winebth.sys/winebth_priv.h b/dlls/winebth.sys/winebth_priv.h index e664043eb63..d4c357201c7 100644 --- a/dlls/winebth.sys/winebth_priv.h +++ b/dlls/winebth.sys/winebth_priv.h @@ -125,6 +125,7 @@ typedef UINT16 winebluetooth_radio_props_mask_t; #define WINEBLUETOOTH_RADIO_PROPERTY_VERSION (1 << 7) #define WINEBLUETOOTH_RADIO_PROPERTY_DISCOVERING (1 << 8) #define WINEBLUETOOTH_RADIO_PROPERTY_PAIRABLE (1 << 9) +#define WINEBLUETOOTH_RADIO_PROPERTY_LE (1 << 10)
#define WINEBLUETOOTH_RADIO_ALL_PROPERTIES \ (WINEBLUETOOTH_RADIO_PROPERTY_NAME | WINEBLUETOOTH_RADIO_PROPERTY_ADDRESS | \ @@ -152,7 +153,7 @@ typedef UINT16 winebluetooth_device_props_mask_t; (WINEBLUETOOTH_DEVICE_PROPERTY_NAME | WINEBLUETOOTH_DEVICE_PROPERTY_ADDRESS | \ WINEBLUETOOTH_DEVICE_PROPERTY_CONNECTED | WINEBLUETOOTH_DEVICE_PROPERTY_PAIRED | \ WINEBLUETOOTH_DEVICE_PROPERTY_LEGACY_PAIRING | WINEBLUETOOTH_DEVICE_PROPERTY_TRUSTED | \ - WINEBLUETOOTH_DEVICE_PROPERTY_CLASS) + WINEBLUETOOTH_DEVICE_PROPERTY_CLASS | WINEBLUETOOTH_RADIO_PROPERTY_LE)
union winebluetooth_property { @@ -162,6 +163,22 @@ union winebluetooth_property WCHAR name[BLUETOOTH_MAX_NAME_SIZE]; };
+#define WINEBLUETOOTH_LE_RADIO_ROLE_CENTRAL (1) +#define WINEBLUETOOTH_LE_RADIO_ROLE_PERIPHERAL (1 << 1) + +#define WINEBLUETOOTH_LE_RADIO_ADV_CHANNEL_1M (1) +#define WINEBLUETOOTH_LE_RADIO_ADV_CHANNEL_2M (1 << 2) +#define WINEBLUETOOTH_LE_RADIO_ADV_CHANNEL_CODED (1 << 3) + +struct winebluetooth_radio_le_properties +{ + UINT8 roles; + BOOL adv_phy_2M_uncoded; + BOOL adv_phy_coded; + BOOL adv_offload; + UINT32 adv_max_len; +}; + struct winebluetooth_radio_properties { BOOL discoverable; @@ -173,6 +190,7 @@ struct winebluetooth_radio_properties ULONG class; USHORT manufacturer; BYTE version; + struct winebluetooth_radio_le_properties le; };
struct winebluetooth_device_properties
From: Vibhav Pant vibhavp@gmail.com
--- dlls/winebth.sys/winebth.c | 32 ++++++++++++++++++++++++++++++++ include/wine/winebth.h | 17 ++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/dlls/winebth.sys/winebth.c b/dlls/winebth.sys/winebth.c index 94aa2869b72..591779b13e5 100644 --- a/dlls/winebth.sys/winebth.c +++ b/dlls/winebth.sys/winebth.c @@ -257,6 +257,38 @@ static NTSTATUS WINAPI dispatch_bluetooth( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_WINEBTH_RADIO_STOP_DISCOVERY: status = winebluetooth_radio_stop_discovery( ext->radio ); break; + case IOCTL_WINEBTH_RADIO_GET_LE_INFO: + { + struct winebth_radio_le_info_params *params = irp->AssociatedIrp.SystemBuffer; + + if (!params) + { + status = STATUS_INVALID_PARAMETER; + break; + } + if (outsize < sizeof( *params )) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + memset( params, 0, sizeof( *params ) ); + + EnterCriticalSection( &ext->props_cs ); + if ((params->le_supported = !!(ext->props_mask & WINEBLUETOOTH_RADIO_PROPERTY_LE))) + { + params->role_central = !!(ext->props.le.roles & WINEBLUETOOTH_LE_RADIO_ROLE_CENTRAL); + params->role_peripheral = !!(ext->props.le.roles & WINEBLUETOOTH_LE_RADIO_ROLE_PERIPHERAL); + params->phy_coded = ext->props.le.adv_phy_coded; + params->phy_2M_uncoded = ext->props.le.adv_phy_2M_uncoded; + params->adv_offload = ext->props.le.adv_offload; + params->adv_max_len = ext->props.le.adv_max_len; + } + LeaveCriticalSection( &ext->props_cs ); + irp->IoStatus.Information = sizeof( *params ); + status = STATUS_SUCCESS; + break; + } default: FIXME( "Unimplemented IOCTL code: %#lx\n", code ); break; diff --git a/include/wine/winebth.h b/include/wine/winebth.h index d05e4cad529..71ee1d367de 100644 --- a/include/wine/winebth.h +++ b/include/wine/winebth.h @@ -24,11 +24,13 @@
/* Set the discoverability or connectable flag for a local radio. Enabling discoverability will also enable incoming * connections, while disabling incoming connections disables discoverability as well. */ -#define IOCTL_WINEBTH_RADIO_SET_FLAG CTL_CODE(FILE_DEVICE_BLUETOOTH, 0xa3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINEBTH_RADIO_SET_FLAG CTL_CODE(FILE_DEVICE_BLUETOOTH, 0xa3, METHOD_BUFFERED, FILE_ANY_ACCESS) /* Start device inquiry for a local radio. */ #define IOCTL_WINEBTH_RADIO_START_DISCOVERY CTL_CODE(FILE_DEVICE_BLUETOOTH, 0xa6, METHOD_BUFFERED, FILE_ANY_ACCESS) /* Stop device inquiry for a local radio. */ #define IOCTL_WINEBTH_RADIO_STOP_DISCOVERY CTL_CODE(FILE_DEVICE_BLUETOOTH, 0xa7, METHOD_BUFFERED, FILE_ANY_ACCESS) +/* Get information about the LE capabilities for a local radio. */ +#define IOCTL_WINEBTH_RADIO_GET_LE_INFO CTL_CODE(FILE_DEVICE_BLUETOOTH, 0xa8, METHOD_BUFFERED, FILE_ANY_ACCESS)
#include <pshpack1.h>
@@ -41,6 +43,19 @@ struct winebth_radio_set_flag_params unsigned int enable : 1; };
+struct winebth_radio_le_info_params +{ + unsigned int le_supported : 1; + unsigned int role_central : 1; + unsigned int role_peripheral: 1; + + unsigned int phy_coded : 1; + unsigned int phy_2M_uncoded: 1; + + unsigned int adv_offload: 1; + UINT32 adv_max_len; +}; + #include <poppack.h>
#endif /* __WINEBTH_H__ */
From: Vibhav Pant vibhavp@gmail.com
--- .../bluetoothadapter.c | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index 5a9633b9639..cf3358e35be 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -22,6 +22,9 @@ #include "setupapi.h" #include "bthsdpdef.h" #include "bluetoothapis.h" +#include "bthdef.h" +#include "winioctl.h" +#include "wine/winebth.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); @@ -311,10 +314,33 @@ static HRESULT WINAPI bluetoothadapter_get_IsClassicSupported( IBluetoothAdapter return E_NOTIMPL; }
+static HRESULT bluetoothadapter_get_le_info( IBluetoothAdapter *iface, struct winebth_radio_le_info_params *info ) +{ + struct bluetoothadapter *impl = impl_from_IBluetoothAdapter( iface ); + DWORD bytes; + + if (!DeviceIoControl( impl->radio, IOCTL_WINEBTH_RADIO_GET_LE_INFO, info, sizeof( *info), info, + sizeof( *info ), &bytes, NULL )) + { + DWORD err = GetLastError(); + ERR("DeviceIoControl failed: %lu\n", err ); + return HRESULT_FROM_WIN32( err ); + } + return S_OK; +} + static HRESULT WINAPI bluetoothadapter_get_IsLowEnergySupported( IBluetoothAdapter *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct winebth_radio_le_info_params info = {0}; + HRESULT hr; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + if (FAILED((hr = bluetoothadapter_get_le_info( iface, &info )))) + return hr; + *value = !!info.le_supported; + return S_OK; }
static HRESULT WINAPI bluetoothadapter_get_IsPeripheralRoleSupported( IBluetoothAdapter *iface, boolean *value )
From: Vibhav Pant vibhavp@gmail.com
--- dlls/windows.devices.bluetooth/bluetoothadapter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index cf3358e35be..fb5ab0c2435 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -345,8 +345,16 @@ static HRESULT WINAPI bluetoothadapter_get_IsLowEnergySupported( IBluetoothAdapt
static HRESULT WINAPI bluetoothadapter_get_IsPeripheralRoleSupported( IBluetoothAdapter *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct winebth_radio_le_info_params info = {0}; + HRESULT hr; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + if (FAILED((hr = bluetoothadapter_get_le_info( iface, &info )))) + return hr; + *value = !!info.role_peripheral; + return S_OK; }
static HRESULT WINAPI bluetoothadapter_get_IsCentralRoleSupported( IBluetoothAdapter *iface, boolean *value )
From: Vibhav Pant vibhavp@gmail.com
--- dlls/windows.devices.bluetooth/bluetoothadapter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index fb5ab0c2435..94d2148f8f5 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -359,8 +359,16 @@ static HRESULT WINAPI bluetoothadapter_get_IsPeripheralRoleSupported( IBluetooth
static HRESULT WINAPI bluetoothadapter_get_IsCentralRoleSupported( IBluetoothAdapter *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct winebth_radio_le_info_params info = {0}; + HRESULT hr; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + if (FAILED((hr = bluetoothadapter_get_le_info( iface, &info )))) + return hr; + *value = !!info.role_central; + return S_OK; }
static HRESULT WINAPI bluetoothadapter_get_IsAdvertisementOffloadSupported( IBluetoothAdapter *iface, boolean *value )
From: Vibhav Pant vibhavp@gmail.com
--- dlls/windows.devices.bluetooth/bluetoothadapter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index 94d2148f8f5..f9ce2df0657 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -373,8 +373,16 @@ static HRESULT WINAPI bluetoothadapter_get_IsCentralRoleSupported( IBluetoothAda
static HRESULT WINAPI bluetoothadapter_get_IsAdvertisementOffloadSupported( IBluetoothAdapter *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct winebth_radio_le_info_params info = {0}; + HRESULT hr; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + if (FAILED((hr = bluetoothadapter_get_le_info( iface, &info )))) + return hr; + *value = !!info.adv_offload; + return S_OK; }
static HRESULT WINAPI bluetoothadapter_GetRadioAsync( IBluetoothAdapter *iface, IAsyncOperation_Radio **op )
-
Vibhav Pant -
Vibhav Pant (＠vibhavp)