zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fixed Hungarian notation and corrected scanned registry docs

Browse source
This commit is contained in:
Notselwyn 2023-07-18 15:20:10 +02:00
parent 5173bf3d6e
commit 9b0bfa291e
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs
View file

@ -47,8 +47,9 @@ namespace SafeExamBrowser.SystemComponents
public bool IsVirtualMachine() public bool IsVirtualMachine()
{ {
var biosInfo = systemInfo.BiosInfo;
var isVirtualMachine = false; var isVirtualMachine = false;
var biosInfo = systemInfo.BiosInfo;
var macAddress = systemInfo.MacAddress; var macAddress = systemInfo.MacAddress;
var manufacturer = systemInfo.Manufacturer; var manufacturer = systemInfo.Manufacturer;
var model = systemInfo.Model; var model = systemInfo.Model;
@ -117,26 +118,30 @@ namespace SafeExamBrowser.SystemComponents
/** /**
* scanned registry format: * scanned registry format:
* *
* HKLM\SYSTEM\HardwareConfig\{configId=uuid}\ComputerIds * HKLM\SYSTEM\HardwareConfig\{configId=uuid}
* - {computerId=uuid}: {computerSummary=hardwareInfo} * - BIOSVendor
* - SystemManufacturer
* - ...
* \ComputerIds
* - {computerId=uuid}: {computerSummary=hardwareInfo}
* *
*/ */
const string hwConfigParentKey = "HKEY_LOCAL_MACHINE\\SYSTEM\\HardwareConfig"; const string hardwareRootKey = "HKEY_LOCAL_MACHINE\\SYSTEM\\HardwareConfig";
if (!registry.TryGetSubKeys(hwConfigParentKey, out var hardwareConfigSubkeys)) if (!registry.TryGetSubKeys(hardwareRootKey, out var hardwareConfigSubkeys))
{ {
return false; return false;
} }
foreach (var configId in hardwareConfigSubkeys) foreach (var configId in hardwareConfigSubkeys)
{ {
var hwConfigKey = $"{hwConfigParentKey}\\{configId}"; var hardwareConfigKey = $"{hardwareRootKey}\\{configId}";
var didReadKeys = true; var didReadKeys = true;
// collect system values for IsVirtualSystemInfo() // collect system values for IsVirtualSystemInfo()
didReadKeys &= registry.TryRead(hwConfigKey, "BIOSVendor", out var biosVendor); didReadKeys &= registry.TryRead(hardwareConfigKey, "BIOSVendor", out var biosVendor);
didReadKeys &= registry.TryRead(hwConfigKey, "BIOSVersion", out var biosVersion); didReadKeys &= registry.TryRead(hardwareConfigKey, "BIOSVersion", out var biosVersion);
didReadKeys &= registry.TryRead(hwConfigKey, "SystemManufacturer", out var systemManufacturer); didReadKeys &= registry.TryRead(hardwareConfigKey, "SystemManufacturer", out var systemManufacturer);
didReadKeys &= registry.TryRead(hwConfigKey, "SystemProductName", out var systemProductName); didReadKeys &= registry.TryRead(hardwareConfigKey, "SystemProductName", out var systemProductName);
if (!didReadKeys) if (!didReadKeys)
{ {
continue; continue;
@ -148,7 +153,7 @@ namespace SafeExamBrowser.SystemComponents
isVirtualMachine |= IsVirtualSystemInfo(biosInfo, (string) systemManufacturer, (string) systemProductName); isVirtualMachine |= IsVirtualSystemInfo(biosInfo, (string) systemManufacturer, (string) systemProductName);
// check even more hardware information // check even more hardware information
var computerIdsKey = $"{hwConfigKey}\\ComputerIds"; var computerIdsKey = $"{hardwareConfigKey}\\ComputerIds";
if (!registry.TryGetNames(computerIdsKey, out var computerIdNames)) if (!registry.TryGetNames(computerIdsKey, out var computerIdNames))
{ {
continue; continue;
@ -169,9 +174,6 @@ namespace SafeExamBrowser.SystemComponents
return isVirtualMachine; return isVirtualMachine;
} }
/// <summary>
/// Scans (synced) device cache for hardware info of the current device.
/// </summary>
private bool HasLocalVirtualMachineDeviceCache() private bool HasLocalVirtualMachineDeviceCache()
{ {
var isVirtualMachine = false; var isVirtualMachine = false;