From da3341ed425d6b4acc23ffabffe589891fce2d8a Mon Sep 17 00:00:00 2001
From: jthedering <51533355+jthedering@users.noreply.github.com>
Date: Sun, 13 Feb 2022 18:09:16 +0000
Subject: [PATCH] Improved: On Windows 8.1 and newer, installation as SFX/EFX
 is now the default. This should remove the need to use the troubleshooting
 options for most users.

---
 Configurator/Configurator.rc | Bin 23560 -> 23446 bytes
 DeviceAPOInfo.cpp            |  23 ++++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Configurator/Configurator.rc b/Configurator/Configurator.rc
index 29a552f3b3f31ef4cf01e995764d4cbe18ebad55..0f5eaec75019be9b979bf7d4f644c27ad1736977 100644
GIT binary patch
delta 273
zcmeC!!8mO@<Ay%A$ww6BHm_hSVB~dSNM$HxC}AjONM^{GoUeR(^E-}Je3N&HiA|p1
zuQNGCLSQnJ#3V5PpQpg)TM`_cXnO2fBsZU9^I}v-F^WNfL4yHRB!?l9A&((tbFMNw
z^W*}xrp@ov@|ZPI)!@{{pg9?4(d2vDJp4e{f~^Q;2xf2uOEz!r)48BDSxLfT@+SW&
YlNa%bO$NERD<F#li)zWudXcx706!>8NB{r;

delta 358
zcmbQXov~vF<Ay%A$<q|2Hm_kTVB~gZNM$Hu$Yn@m$eV1>(!6;M$0t5<1qKbEa4tgu
zLmERqLk2?*keA1xIr*ZW;baF1j>!f7T$3M&FPg02Au(A<KyLCLXMxFD0ScQ>NW9=c
zGf{GLgO(SgERr=0Ak&fgm6I1nNKgK!owfOlaud_!Aho*5*X)cY&x%~Ld6Rk%6G6QP
zC$Ec|H~9c7%j6T<eDWD!^Fx8|&15J6x;q8P4+gRl!MtLSU7P=DTPaI}oKXZ+kPP%<
iE)asem;%;-?9nMePnv){xLGS8i-VBqn-@lWWdZ=bQDmF|

diff --git a/DeviceAPOInfo.cpp b/DeviceAPOInfo.cpp
index 0606587..6a148f0 100644
--- a/DeviceAPOInfo.cpp
+++ b/DeviceAPOInfo.cpp
@@ -51,6 +51,9 @@ static const wchar_t* gfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d
 static const wchar_t* sfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},5";
 static const wchar_t* mfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},6";
 static const wchar_t* efxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},7";
+static const wchar_t* multiSfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},13";
+static const wchar_t* multiMfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},14";
+static const wchar_t* multiEfxGuidValueName = L"{d04e05a6-594b-4fb6-a80d-01af5eed7d1d},15";
 static const unsigned allGuidValueNameCount = 5;
 static const wchar_t* allGuidValueNames[] = {lfxGuidValueName, gfxGuidValueName, sfxGuidValueName, mfxGuidValueName, efxGuidValueName};
 enum GuidValueIndices
@@ -80,7 +83,7 @@ vector<shared_ptr<AbstractAPOInfo>> DeviceAPOInfo::loadAllInfos(bool input)
 	{
 		wstring deviceGuidString = *it;
 
-		shared_ptr<DeviceAPOInfo> info = make_shared<DeviceAPOInfo>();
+		shared_ptr<DeviceAPOInfo> info = make_shared<DeviceAPOInfo> ();
 		if (info->load(deviceGuidString, defaultDeviceGuid))
 		{
 			info->selectedInstallState = info->currentInstallState;
@@ -352,6 +355,24 @@ bool DeviceAPOInfo::load(const wstring& deviceGuid, wstring defaultDeviceGuid)
 				}
 			}
 		}
+		else
+		{
+			if (RegistryHelper::isWindowsVersionAtLeast(6, 3)) // Windows 8.1
+			{
+				// only use LFX/GFX if the audio driver supplied only those APOs
+				if (RegistryHelper::keyExists(keyPath + L"\\FxProperties")
+					&& (RegistryHelper::valueExists(keyPath + L"\\FxProperties", lfxGuidValueName) || RegistryHelper::valueExists(keyPath + L"\\FxProperties", gfxGuidValueName))
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", sfxGuidValueName)
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", mfxGuidValueName)
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", efxGuidValueName)
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", multiSfxGuidValueName)
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", multiMfxGuidValueName)
+					&& !RegistryHelper::valueExists(keyPath + L"\\FxProperties", multiEfxGuidValueName))
+					currentInstallState.installMode = INSTALL_LFX_GFX;
+				else
+					currentInstallState.installMode = INSTALL_SFX_EFX;
+			}
+		}
 	}
 
 	return true;