From 10a699b7743638ddc175645544c3e3967fa94223 Mon Sep 17 00:00:00 2001 From: jthedering <51533355+jthedering@users.noreply.github.com> Date: Thu, 19 May 2022 20:21:35 +0000 Subject: [PATCH] Fixed: Bluetooth devices on Windows 11 often did not work when multiple devices were combined (headphones and hands-free). In this case, installation as SFX/MFX is now used by default as EFX does not work. --- DeviceAPOInfo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DeviceAPOInfo.cpp b/DeviceAPOInfo.cpp index 6a148f0..180c802 100644 --- a/DeviceAPOInfo.cpp +++ b/DeviceAPOInfo.cpp @@ -44,6 +44,7 @@ static const wchar_t* allowSilentBufferValueName = L"AllowSilentBufferModificati static const wchar_t* versionValueName = L"Version"; static const wchar_t* connectionValueName = L"{a45c254e-df1c-4efd-8020-67d146a850e0},2"; static const wchar_t* deviceValueName = L"{b3f8fa53-0004-438e-9003-51a46e139bfc},6"; +static const wchar_t* combinedDeviceValueName = L"{b3f8fa53-0004-438e-9003-51a46e139bfc},41"; static const wchar_t* formatValueName = L"{f19f064d-082c-4e27-bc73-6882a1bb8e4c},0"; static const wchar_t* channelMaskValueName = L"{1da5d803-d492-4edd-8c23-e0c0ffee7f0e},3"; static const wchar_t* lfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},1"; @@ -369,6 +370,9 @@ bool DeviceAPOInfo::load(const wstring& deviceGuid, wstring defaultDeviceGuid) && !RegistryHelper::valueExists(keyPath + L"\\FxProperties", multiMfxGuidValueName) && !RegistryHelper::valueExists(keyPath + L"\\FxProperties", multiEfxGuidValueName)) currentInstallState.installMode = INSTALL_LFX_GFX; + // bluetooth devices may be combined in Windows 11, EFX will not work then + else if (RegistryHelper::valueExists(keyPath + L"\\Properties", combinedDeviceValueName)) + currentInstallState.installMode = INSTALL_SFX_MFX; else currentInstallState.installMode = INSTALL_SFX_EFX; }