July 2023 - Wine-Commits - list.winehq.org

Mohamad Al-Jaf : windows.devices.bluetooth: Add IBluetoothAdapterStatics stub interface.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 5e942086dca8bb10da209ee968fe1dc8f6f2e4d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e942086dca8bb10da209ee968fe1d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 23 03:25:55 2023 -0400 windows.devices.bluetooth: Add IBluetoothAdapterStatics stub interface. --- dlls/windows.devices.bluetooth/bluetoothadapter.c | 44 +++++++++++++++++++++++ dlls/windows.devices.bluetooth/main.c | 2 +- dlls/windows.devices.bluetooth/private.h | 40 +++++++++++++++++++++ dlls/windows.devices.bluetooth/tests/bluetooth.c | 6 ++++ 4 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index a165031293a..367cd464e42 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); struct bluetoothadapter { IActivationFactory IActivationFactory_iface; + IBluetoothAdapterStatics IBluetoothAdapterStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IBluetoothAdapterStatics )) + { + *out = &impl->IBluetoothAdapterStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,45 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( bluetoothadapter_statics, IBluetoothAdapterStatics, struct bluetoothadapter, IActivationFactory_iface ) + +static HRESULT WINAPI bluetoothadapter_statics_GetDeviceSelector( IBluetoothAdapterStatics *iface, HSTRING *result ) +{ + FIXME( "iface %p, result %p stub!\n", iface, result ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_statics_FromIdAsync( IBluetoothAdapterStatics *iface, HSTRING id, IAsyncOperation_BluetoothAdapter **operation ) +{ + FIXME( "iface %p, id %s, operation %p stub!\n", iface, debugstr_hstring(id), operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_statics_GetDefaultAsync( IBluetoothAdapterStatics *iface, IAsyncOperation_BluetoothAdapter **operation ) +{ + FIXME( "iface %p, operation %p stub!\n", iface, operation ); + return E_NOTIMPL; +} + +static const struct IBluetoothAdapterStaticsVtbl bluetoothadapter_statics_vtbl = +{ + bluetoothadapter_statics_QueryInterface, + bluetoothadapter_statics_AddRef, + bluetoothadapter_statics_Release, + /* IInspectable methods */ + bluetoothadapter_statics_GetIids, + bluetoothadapter_statics_GetRuntimeClassName, + bluetoothadapter_statics_GetTrustLevel, + /* IBluetoothAdapterStatics methods */ + bluetoothadapter_statics_GetDeviceSelector, + bluetoothadapter_statics_FromIdAsync, + bluetoothadapter_statics_GetDefaultAsync, +}; + static struct bluetoothadapter bluetoothadapter_statics = { {&factory_vtbl}, + {&bluetoothadapter_statics_vtbl}, 1, }; diff --git a/dlls/windows.devices.bluetooth/main.c b/dlls/windows.devices.bluetooth/main.c index 532c9eeee0b..810b00d90fd 100644 --- a/dlls/windows.devices.bluetooth/main.c +++ b/dlls/windows.devices.bluetooth/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); -static const char *debugstr_hstring( HSTRING hstr ) +const char *debugstr_hstring( HSTRING hstr ) { const WCHAR *str; UINT32 len; diff --git a/dlls/windows.devices.bluetooth/private.h b/dlls/windows.devices.bluetooth/private.h index d06bd6139e9..8840321443e 100644 --- a/dlls/windows.devices.bluetooth/private.h +++ b/dlls/windows.devices.bluetooth/private.h @@ -35,6 +35,46 @@ #define WIDL_using_Windows_Devices_Bluetooth #include "windows.devices.bluetooth.h" +extern const char *debugstr_hstring( HSTRING hstr ); + extern IActivationFactory *bluetoothadapter_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#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 ) + #endif diff --git a/dlls/windows.devices.bluetooth/tests/bluetooth.c b/dlls/windows.devices.bluetooth/tests/bluetooth.c index bb212ca6ac9..bf9e94dfb69 100644 --- a/dlls/windows.devices.bluetooth/tests/bluetooth.c +++ b/dlls/windows.devices.bluetooth/tests/bluetooth.c @@ -49,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_BluetoothAdapterStatics(void) { static const WCHAR *bluetoothadapter_statics_name = L"Windows.Devices.Bluetooth.BluetoothAdapter"; + IBluetoothAdapterStatics *bluetoothadapter_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_BluetoothAdapterStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IBluetoothAdapterStatics, (void **)&bluetoothadapter_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IBluetoothAdapterStatics_Release( bluetoothadapter_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Davide Beatrici : winealsa: Move create_session into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 066ac0a8f9410533cc59f4ce3bdbf5ded5d881e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/066ac0a8f9410533cc59f4ce3bdbf5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 05:52:03 2023 +0200 winealsa: Move create_session into mmdevapi. --- dlls/winealsa.drv/mmdevdrv.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 979b45b1c9f..a27916b37a5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -61,7 +61,7 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } }; static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; -static struct list g_sessions = LIST_INIT(g_sessions); +extern struct list sessions; static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; @@ -377,29 +377,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient extern void session_init_vols(AudioSession *session, UINT channels); -static AudioSession *create_session(const GUID *guid, IMMDevice *device, - UINT num_channels) -{ - AudioSession *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioSession)); - if(!ret) - return NULL; - - memcpy(&ret->guid, guid, sizeof(GUID)); - - ret->device = device; - - list_init(&ret->clients); - - list_add_head(&g_sessions, &ret->entry); - - session_init_vols(ret, num_channels); - - ret->master_vol = 1.f; - - return ret; -} +extern AudioSession *session_create(const GUID *guid, IMMDevice *device, + UINT num_channels); /* if channels == 0, then this will return or create a session with * matching dataflow and GUID. otherwise, channels must also match */ @@ -409,7 +388,7 @@ HRESULT get_audio_session(const GUID *sessionguid, AudioSession *session; if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){ - *out = create_session(&GUID_NULL, device, channels); + *out = session_create(&GUID_NULL, device, channels); if(!*out) return E_OUTOFMEMORY; @@ -417,7 +396,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } *out = NULL; - LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){ + LIST_FOR_EACH_ENTRY(session, &sessions, AudioSession, entry){ if(session->device == device && IsEqualGUID(sessionguid, &session->guid)){ session_init_vols(session, channels); @@ -427,7 +406,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } if(!*out){ - *out = create_session(sessionguid, device, channels); + *out = session_create(sessionguid, device, channels); if(!*out) return E_OUTOFMEMORY; }

1 0

Davide Beatrici : winecoreaudio: Move create_session into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: a97913587e427c81f3ca75fcc07e70ebc4501072 URL: https://gitlab.winehq.org/wine/wine/-/commit/a97913587e427c81f3ca75fcc07e70… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 05:52:29 2023 +0200 winecoreaudio: Move create_session into mmdevapi. --- dlls/winecoreaudio.drv/mmdevdrv.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 17dab958af8..ef2e5033305 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -68,7 +68,7 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } }; static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; -static struct list g_sessions = LIST_INIT(g_sessions); +extern struct list sessions; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; @@ -371,30 +371,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient extern void session_init_vols(AudioSession *session, UINT channels); -static AudioSession *create_session(const GUID *guid, IMMDevice *device, - UINT num_channels) -{ - AudioSession *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioSession)); - if(!ret) - return NULL; - - memcpy(&ret->guid, guid, sizeof(GUID)); - - ret->device = device; - - list_init(&ret->clients); - - list_add_head(&g_sessions, &ret->entry); - - session_init_vols(ret, num_channels); - - ret->master_vol = 1.f; - - return ret; -} - +extern AudioSession *session_create(const GUID *guid, IMMDevice *device, + UINT num_channels); /* if channels == 0, then this will return or create a session with * matching dataflow and GUID. otherwise, channels must also match */ HRESULT get_audio_session(const GUID *sessionguid, @@ -403,7 +381,7 @@ HRESULT get_audio_session(const GUID *sessionguid, AudioSession *session; if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){ - *out = create_session(&GUID_NULL, device, channels); + *out = session_create(&GUID_NULL, device, channels); if(!*out) return E_OUTOFMEMORY; @@ -411,7 +389,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } *out = NULL; - LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){ + LIST_FOR_EACH_ENTRY(session, &sessions, AudioSession, entry){ if(session->device == device && IsEqualGUID(sessionguid, &session->guid)){ session_init_vols(session, channels); @@ -421,7 +399,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } if(!*out){ - *out = create_session(sessionguid, device, channels); + *out = session_create(sessionguid, device, channels); if(!*out) return E_OUTOFMEMORY; }

1 0

Mohamad Al-Jaf : include: Add windows.devices.radios.idl file.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 83cb93ee6d0bf0000062b9a34ba8a0af93c9c857 URL: https://gitlab.winehq.org/wine/wine/-/commit/83cb93ee6d0bf0000062b9a34ba8a0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 23 02:48:58 2023 -0400 include: Add windows.devices.radios.idl file. Needed by IBluetoothAdapter in windows.devices.bluetooth.idl. --- include/Makefile.in | 1 + include/windows.devices.radios.idl | 125 +++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index e9f0aa8d5fb..9c135d0a6c7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -810,6 +810,7 @@ SOURCES = \ windows.devices.enumeration.idl \ windows.devices.haptics.idl \ windows.devices.power.idl \ + windows.devices.radios.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.foundation.metadata.idl \ diff --git a/include/windows.devices.radios.idl b/include/windows.devices.radios.idl new file mode 100644 index 00000000000..ff710d86ae9 --- /dev/null +++ b/include/windows.devices.radios.idl @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Devices.Radios { + typedef enum RadioAccessStatus RadioAccessStatus; + typedef enum RadioKind RadioKind; + typedef enum RadioState RadioState; + + interface IRadio; + interface IRadioStatics; + + runtimeclass Radio; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Devices.Radios.Radio *>; + interface Windows.Foundation.Collections.IIterator<Windows.Devices.Radios.Radio *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Radios.Radio *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Radios.Radio *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Radios.RadioAccessStatus>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Devices.Radios.Radio *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.Radio *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.RadioAccessStatus>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Devices.Radios.Radio *> *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Radios.Radio *, IInspectable *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum RadioAccessStatus + { + Unspecified = 0, + Allowed = 1, + DeniedByUser = 2, + DeniedBySystem = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum RadioKind + { + Other = 0, + WiFi = 1, + MobileBroadband = 2, + Bluetooth = 3, + FM = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum RadioState + { + Unknown = 0, + On = 1, + Off = 2, + Disabled = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Radios.Radio), + uuid(252118df-b33e-416a-875f-1cf38ae2d83e) + ] + interface IRadio : IInspectable + { + HRESULT SetStateAsync([in] Windows.Devices.Radios.RadioState value, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.RadioAccessStatus> **retval); + [eventadd] HRESULT StateChanged([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Radios.Radio *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT StateChanged([in] EventRegistrationToken cookie); + [propget] HRESULT State([out, retval] Windows.Devices.Radios.RadioState **value); + [propget] HRESULT Name([out, retval] HSTRING *value); + [propget] HRESULT Kind([out, retval] Windows.Devices.Radios.RadioKind *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Radios.Radio), + uuid(5fb6a12e-67cb-46ae-aae9-65919f86eff4) + ] + interface IRadioStatics : IInspectable + { + HRESULT GetRadiosAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Devices.Radios.Radio *> *> **value); + HRESULT GetDeviceSelector([out, retval] HSTRING *selector); + [overload("FromIdAsync")] HRESULT FromIdAsync([in] HSTRING id, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.Radio *> **value); + HRESULT RequestAccessAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.RadioAccessStatus> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Devices.Radios.IRadioStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass Radio + { + [default] interface Windows.Devices.Radios.IRadio; + } +}

1 0

Mohamad Al-Jaf : include: Add windows.devices.bluetooth.idl file.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 581ad52940ed036e178e1510732148f88e91b4c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/581ad52940ed036e178e1510732148… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 23 02:57:39 2023 -0400 include: Add windows.devices.bluetooth.idl file. --- include/Makefile.in | 1 + include/windows.devices.bluetooth.idl | 89 +++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9c135d0a6c7..48f43dfa372 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -807,6 +807,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.devices.bluetooth.idl \ windows.devices.enumeration.idl \ windows.devices.haptics.idl \ windows.devices.power.idl \ diff --git a/include/windows.devices.bluetooth.idl b/include/windows.devices.bluetooth.idl new file mode 100644 index 00000000000..c3b64ce058a --- /dev/null +++ b/include/windows.devices.bluetooth.idl @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +/* import "windows.devices.bluetooth.genericattributeprofile.idl"; */ +/* import "windows.devices.bluetooth.rfcomm.idl"; */ +import "windows.devices.enumeration.idl"; +import "windows.devices.radios.idl"; +/* import "windows.networking.idl"; */ +import "windows.storage.streams.idl"; + +namespace Windows.Devices.Bluetooth { + interface IBluetoothAdapter; + interface IBluetoothAdapter2; + interface IBluetoothAdapter3; + interface IBluetoothAdapterStatics; + + runtimeclass BluetoothAdapter; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Bluetooth.BluetoothAdapter *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Bluetooth.BluetoothAdapter *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Devices.Bluetooth.BluetoothAdapter), + uuid(7974f04c-5f7a-4a34-9225-a855f84b1a8b) + ] + interface IBluetoothAdapter : IInspectable + { + [propget] HRESULT DeviceId([out, retval] HSTRING *value); + [propget] HRESULT BluetoothAddress([out, retval] UINT64 *value); + [propget] HRESULT IsClassicSupported([out, retval] boolean *value); + [propget] HRESULT IsLowEnergySupported([out, retval] boolean *value); + [propget] HRESULT IsPeripheralRoleSupported([out, retval] boolean *value); + [propget] HRESULT IsCentralRoleSupported([out, retval] boolean *value); + [propget] HRESULT IsAdvertisementOffloadSupported([out, retval] boolean *value); + HRESULT GetRadioAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Radios.Radio *> **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Devices.Bluetooth.BluetoothAdapter), + uuid(8b02fb6a-ac4c-4741-8661-8eab7d17ea9f) + ] + interface IBluetoothAdapterStatics : IInspectable + { + HRESULT GetDeviceSelector([out, retval] HSTRING *result); + HRESULT FromIdAsync([in] HSTRING id, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Bluetooth.BluetoothAdapter *> **operation); + HRESULT GetDefaultAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Bluetooth.BluetoothAdapter *> **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + static(Windows.Devices.Bluetooth.IBluetoothAdapterStatics, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass BluetoothAdapter + { + [default] interface Windows.Devices.Bluetooth.IBluetoothAdapter; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter2; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter3; + } +}

1 0

Davide Beatrici : wineoss: Move create_session into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: b12e6fcc21c26336291d5d736cbca9f3776aa925 URL: https://gitlab.winehq.org/wine/wine/-/commit/b12e6fcc21c26336291d5d736cbca9… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 05:52:56 2023 +0200 wineoss: Move create_session into mmdevapi. --- dlls/wineoss.drv/mmdevdrv.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 600d8fa1ea7..e69985f70f6 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -70,7 +70,7 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } }; static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; -static struct list g_sessions = LIST_INIT(g_sessions); +extern struct list sessions; extern const IAudioClient3Vtbl AudioClient3_Vtbl; extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -361,30 +361,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, extern void session_init_vols(AudioSession *session, UINT channels); -static AudioSession *create_session(const GUID *guid, IMMDevice *device, - UINT num_channels) -{ - AudioSession *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioSession)); - if(!ret) - return NULL; - - memcpy(&ret->guid, guid, sizeof(GUID)); - - ret->device = device; - - list_init(&ret->clients); - - list_add_head(&g_sessions, &ret->entry); - - session_init_vols(ret, num_channels); - - ret->master_vol = 1.f; - - return ret; -} - +extern AudioSession *session_create(const GUID *guid, IMMDevice *device, + UINT num_channels); /* if channels == 0, then this will return or create a session with * matching dataflow and GUID. otherwise, channels must also match */ HRESULT get_audio_session(const GUID *sessionguid, @@ -393,7 +371,7 @@ HRESULT get_audio_session(const GUID *sessionguid, AudioSession *session; if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){ - *out = create_session(&GUID_NULL, device, channels); + *out = session_create(&GUID_NULL, device, channels); if(!*out) return E_OUTOFMEMORY; @@ -401,7 +379,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } *out = NULL; - LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){ + LIST_FOR_EACH_ENTRY(session, &sessions, AudioSession, entry){ if(session->device == device && IsEqualGUID(sessionguid, &session->guid)){ session_init_vols(session, channels); @@ -411,7 +389,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } if(!*out){ - *out = create_session(sessionguid, device, channels); + *out = session_create(sessionguid, device, channels); if(!*out) return E_OUTOFMEMORY; }

1 0

Davide Beatrici : winepulse: Move create_session into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 75276f010dabc27d69a40b8f7aaa8cd2c8c74f6c URL: https://gitlab.winehq.org/wine/wine/-/commit/75276f010dabc27d69a40b8f7aaa8c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 05:51:35 2023 +0200 winepulse: Move create_session into mmdevapi. --- dlls/mmdevapi/audiosessionmanager.c | 2 -- dlls/mmdevapi/session.c | 24 ++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 34 ++++++---------------------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/mmdevapi/audiosessionmanager.c b/dlls/mmdevapi/audiosessionmanager.c index dc0c5f609b7..abba0ad3a1d 100644 --- a/dlls/mmdevapi/audiosessionmanager.c +++ b/dlls/mmdevapi/audiosessionmanager.c @@ -26,8 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -static struct list g_sessions = LIST_INIT(g_sessions); - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index d8e115bca31..32718739f03 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -40,6 +40,8 @@ extern void sessions_unlock(void) DECLSPEC_HIDDEN; extern void set_stream_volumes(struct audio_client *This) DECLSPEC_HIDDEN; +struct list sessions = LIST_INIT(sessions); + static inline struct audio_session_wrapper *impl_from_IAudioSessionControl2(IAudioSessionControl2 *iface) { return CONTAINING_RECORD(iface, struct audio_session_wrapper, IAudioSessionControl2_iface); @@ -572,6 +574,28 @@ void session_init_vols(struct audio_session *session, UINT channels) } } +struct audio_session *session_create(const GUID *guid, IMMDevice *device, UINT channels) +{ + struct audio_session *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(struct audio_session)); + if (!ret) + return NULL; + + memcpy(&ret->guid, guid, sizeof(GUID)); + + ret->device = device; + + list_init(&ret->clients); + + list_add_head(&sessions, &ret->entry); + + session_init_vols(ret, channels); + + ret->master_vol = 1.f; + + return ret; +} + struct audio_session_wrapper *session_wrapper_create(struct audio_client *client) { struct audio_session_wrapper *ret; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8dbbd61a5bd..dafaf5d2590 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -56,7 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static struct list g_sessions = LIST_INIT(g_sessions); +extern struct list sessions; static struct list g_devices_cache = LIST_INIT(g_devices_cache); struct device_cache { @@ -401,30 +401,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient extern void session_init_vols(AudioSession *session, UINT channels); -static AudioSession *create_session(const GUID *guid, IMMDevice *device, - UINT num_channels) -{ - AudioSession *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioSession)); - if (!ret) - return NULL; - - memcpy(&ret->guid, guid, sizeof(GUID)); - - ret->device = device; - - list_init(&ret->clients); - - list_add_head(&g_sessions, &ret->entry); - - session_init_vols(ret, num_channels); - - ret->master_vol = 1.f; - - return ret; -} - +extern AudioSession *session_create(const GUID *guid, IMMDevice *device, + UINT num_channels); /* if channels == 0, then this will return or create a session with * matching dataflow and GUID. otherwise, channels must also match */ HRESULT get_audio_session(const GUID *sessionguid, @@ -433,7 +411,7 @@ HRESULT get_audio_session(const GUID *sessionguid, AudioSession *session; if (!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)) { - *out = create_session(&GUID_NULL, device, channels); + *out = session_create(&GUID_NULL, device, channels); if (!*out) return E_OUTOFMEMORY; @@ -441,7 +419,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } *out = NULL; - LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry) { + LIST_FOR_EACH_ENTRY(session, &sessions, AudioSession, entry) { if (session->device == device && IsEqualGUID(sessionguid, &session->guid)) { session_init_vols(session, channels); @@ -451,7 +429,7 @@ HRESULT get_audio_session(const GUID *sessionguid, } if (!*out) { - *out = create_session(sessionguid, device, channels); + *out = session_create(sessionguid, device, channels); if (!*out) return E_OUTOFMEMORY; }

1 0

Davide Beatrici : winealsa: Move session_init_vols into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: d0a3b11932b7e8ce6a8f9df6b80c7871d6344a4d URL: https://gitlab.winehq.org/wine/wine/-/commit/d0a3b11932b7e8ce6a8f9df6b80c78… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 04:37:42 2023 +0200 winealsa: Move session_init_vols into mmdevapi. --- dlls/winealsa.drv/mmdevdrv.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1f1679ef313..979b45b1c9f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -375,26 +375,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return S_OK; } -static void session_init_vols(AudioSession *session, UINT channels) -{ - if(session->channel_count < channels){ - UINT i; - - if(session->channel_vols) - session->channel_vols = HeapReAlloc(GetProcessHeap(), 0, - session->channel_vols, sizeof(float) * channels); - else - session->channel_vols = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * channels); - if(!session->channel_vols) - return; - - for(i = session->channel_count; i < channels; ++i) - session->channel_vols[i] = 1.f; - - session->channel_count = channels; - } -} +extern void session_init_vols(AudioSession *session, UINT channels); static AudioSession *create_session(const GUID *guid, IMMDevice *device, UINT num_channels)

1 0

Davide Beatrici : wineoss: Move session_init_vols into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: b61e02f7987908f058c44d88bdf7a0cbd10e0690 URL: https://gitlab.winehq.org/wine/wine/-/commit/b61e02f7987908f058c44d88bdf7a0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 04:38:04 2023 +0200 wineoss: Move session_init_vols into mmdevapi. --- dlls/wineoss.drv/mmdevdrv.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2ebced1cfca..600d8fa1ea7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -359,26 +359,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return S_OK; } -static void session_init_vols(AudioSession *session, UINT channels) -{ - if(session->channel_count < channels){ - UINT i; - - if(session->channel_vols) - session->channel_vols = HeapReAlloc(GetProcessHeap(), 0, - session->channel_vols, sizeof(float) * channels); - else - session->channel_vols = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * channels); - if(!session->channel_vols) - return; - - for(i = session->channel_count; i < channels; ++i) - session->channel_vols[i] = 1.f; - - session->channel_count = channels; - } -} +extern void session_init_vols(AudioSession *session, UINT channels); static AudioSession *create_session(const GUID *guid, IMMDevice *device, UINT num_channels)

1 0

Davide Beatrici : winecoreaudio: Move session_init_vols into mmdevapi.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: be53319da541a3413a931f0aa5e236394954a035 URL: https://gitlab.winehq.org/wine/wine/-/commit/be53319da541a3413a931f0aa5e236… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 2 04:37:51 2023 +0200 winecoreaudio: Move session_init_vols into mmdevapi. --- dlls/winecoreaudio.drv/mmdevdrv.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8683fdf5fb..17dab958af8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -369,26 +369,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return S_OK; } -static void session_init_vols(AudioSession *session, UINT channels) -{ - if(session->channel_count < channels){ - UINT i; - - if(session->channel_vols) - session->channel_vols = HeapReAlloc(GetProcessHeap(), 0, - session->channel_vols, sizeof(float) * channels); - else - session->channel_vols = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * channels); - if(!session->channel_vols) - return; - - for(i = session->channel_count; i < channels; ++i) - session->channel_vols[i] = 1.f; - - session->channel_count = channels; - } -} +extern void session_init_vols(AudioSession *session, UINT channels); static AudioSession *create_session(const GUID *guid, IMMDevice *device, UINT num_channels)

1 0