Changed ViGEm Bus Driver check

Related to issue #667
This commit is contained in:
Travis Nickles 2019-04-22 18:51:21 -05:00
parent 38e6b0e2e1
commit ee5ff50e79

View File

@ -301,6 +301,27 @@ namespace DS4Windows
return principal.IsInRole(WindowsBuiltInRole.Administrator); return principal.IsInRole(WindowsBuiltInRole.Administrator);
} }
public static bool CheckForDevice(string guid)
{
bool result = false;
Guid deviceGuid = Guid.Parse(guid);
NativeMethods.SP_DEVINFO_DATA deviceInfoData =
new NativeMethods.SP_DEVINFO_DATA();
deviceInfoData.cbSize =
System.Runtime.InteropServices.Marshal.SizeOf(deviceInfoData);
IntPtr deviceInfoSet = NativeMethods.SetupDiGetClassDevs(ref deviceGuid, null, 0,
NativeMethods.DIGCF_DEVICEINTERFACE);
result = NativeMethods.SetupDiEnumDeviceInfo(deviceInfoSet, 0, ref deviceInfoData);
if (deviceInfoSet.ToInt64() != NativeMethods.INVALID_HANDLE_VALUE)
{
NativeMethods.SetupDiDestroyDeviceInfoList(deviceInfoSet);
}
return result;
}
private static bool CheckForSysDevice(string searchHardwareId) private static bool CheckForSysDevice(string searchHardwareId)
{ {
bool result = false; bool result = false;
@ -342,8 +363,7 @@ namespace DS4Windows
public static bool IsViGEmBusInstalled() public static bool IsViGEmBusInstalled()
{ {
return CheckForSysDevice(@"Root\ViGEmBus") || return CheckForDevice("{96E42B22-F5E9-42F8-B043-ED0F932F014F}");
CheckForSysDevice(@"Nefarius\ViGEmBus\Gen1");
} }
public static void FindConfigLocation() public static void FindConfigLocation()