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

chore: fix style issue (out var x)

Browse source
This commit is contained in:
Notselwyn 2023-07-18 14:21:49 +02:00
parent a21c9007ab
commit bc30e56e38
2 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SafeExamBrowser.SystemComponents/Registry/Registry.cs
View file

@ -93,8 +93,7 @@ namespace SafeExamBrowser.SystemComponents.Registry
{ {
names = default; names = default;
RegistryKey keyObj; if (!TryOpenKey(key, out var keyObj))
if (!TryOpenKey(key, out keyObj))
return false; return false;
bool success = true; bool success = true;
@ -119,9 +118,8 @@ namespace SafeExamBrowser.SystemComponents.Registry
public bool TryGetSubKeys(string key, out IEnumerable<string> subKeys) public bool TryGetSubKeys(string key, out IEnumerable<string> subKeys)
{ {
subKeys = default; subKeys = default;
RegistryKey keyObj; if (!TryOpenKey(key, out var keyObj))
if (!TryOpenKey(key, out keyObj))
return false; return false;
bool success = true; bool success = true;
@ -240,11 +238,9 @@ namespace SafeExamBrowser.SystemComponents.Registry
{ {
keyObj = default; keyObj = default;
string subHiveKey;
try try
{ {
RegistryKey hiveObj; if (!GetBaseKeyFromKeyName(key, out var hiveObj, out var subHiveKey))
if (!GetBaseKeyFromKeyName(key, out hiveObj, out subHiveKey))
return false; return false;
keyObj = hiveObj.OpenSubKey(subHiveKey); keyObj = hiveObj.OpenSubKey(subHiveKey);

34
SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs
View file

@ -128,9 +128,8 @@ namespace SafeExamBrowser.SystemComponents
* - {computerId=uuid}: {computerSummary=hardwareInfo} * - {computerId=uuid}: {computerSummary=hardwareInfo}
* *
*/ */
IEnumerable<string> hardwareConfigSubkeys;
const string hwConfigParentKey = "HKEY_LOCAL_MACHINE\\SYSTEM\\HardwareConfig"; const string hwConfigParentKey = "HKEY_LOCAL_MACHINE\\SYSTEM\\HardwareConfig";
if (!registry.TryGetSubKeys(hwConfigParentKey, out hardwareConfigSubkeys)) if (!registry.TryGetSubKeys(hwConfigParentKey, out var hardwareConfigSubkeys))
return false; return false;
foreach (string configId in hardwareConfigSubkeys) foreach (string configId in hardwareConfigSubkeys)
@ -138,16 +137,11 @@ namespace SafeExamBrowser.SystemComponents
var hwConfigKey = $"{hwConfigParentKey}\\{configId}"; var hwConfigKey = $"{hwConfigParentKey}\\{configId}";
// collect system values for IsVirtualSystemInfo() // collect system values for IsVirtualSystemInfo()
object biosVendor;
object biosVersion;
object systemManufacturer;
object systemProductName;
bool success = true; bool success = true;
success &= registry.TryRead(hwConfigKey, "BIOSVendor", out biosVendor); success &= registry.TryRead(hwConfigKey, "BIOSVendor", out var biosVendor);
success &= registry.TryRead(hwConfigKey, "BIOSVersion", out biosVersion); success &= registry.TryRead(hwConfigKey, "BIOSVersion", out var biosVersion);
success &= registry.TryRead(hwConfigKey, "SystemManufacturer", out systemManufacturer); success &= registry.TryRead(hwConfigKey, "SystemManufacturer", out var systemManufacturer);
success &= registry.TryRead(hwConfigKey, "SystemProductName", out systemProductName); success &= registry.TryRead(hwConfigKey, "SystemProductName", out var systemProductName);
if (!success) if (!success)
continue; continue;
@ -158,16 +152,14 @@ 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
IEnumerable<string> computerIdNames;
var computerIdsKey = $"{hwConfigKey}\\ComputerIds"; var computerIdsKey = $"{hwConfigKey}\\ComputerIds";
if (!registry.TryGetNames(computerIdsKey, out computerIdNames)) if (!registry.TryGetNames(computerIdsKey, out var computerIdNames))
continue; continue;
foreach (var computerIdName in computerIdNames) foreach (var computerIdName in computerIdNames)
{ {
// collect computer hardware summary (e.g. manufacturer&version&sku&...) // collect computer hardware summary (e.g. manufacturer&version&sku&...)
object computerSummary; if (!registry.TryRead(computerIdsKey, computerIdName, out var computerSummary))
if (!registry.TryRead(computerIdsKey, computerIdName, out computerSummary))
continue; continue;
isVirtualMachine |= IsVirtualSystemInfo((string) computerSummary, (string) systemManufacturer, (string) systemProductName); isVirtualMachine |= IsVirtualSystemInfo((string) computerSummary, (string) systemManufacturer, (string) systemProductName);
@ -190,26 +182,22 @@ namespace SafeExamBrowser.SystemComponents
// check Windows timeline caches for current hardware config // check Windows timeline caches for current hardware config
const string deviceCacheParentKey = "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\TaskFlow\\DeviceCache"; const string deviceCacheParentKey = "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\TaskFlow\\DeviceCache";
IEnumerable<string> deviceCacheKeys; bool has_dc_keys = registry.TryGetSubKeys(deviceCacheParentKey, out var deviceCacheKeys);
bool has_dc_keys = registry.TryGetSubKeys(deviceCacheParentKey, out deviceCacheKeys);
if (deviceName != null && has_dc_keys) if (deviceName != null && has_dc_keys)
{ {
foreach (string cacheId in deviceCacheKeys) foreach (string cacheId in deviceCacheKeys)
{ {
var cacheIdKey = $"{deviceCacheParentKey}\\{cacheId}"; var cacheIdKey = $"{deviceCacheParentKey}\\{cacheId}";
object cacheDeviceName;
object cacheDeviceManufacturer;
object cacheDeviceModel;
bool success = true; bool success = true;
success &= registry.TryRead(cacheIdKey, "DeviceName", out cacheDeviceName); success &= registry.TryRead(cacheIdKey, "DeviceName", out var cacheDeviceName);
if (!success || deviceName.ToLower() != ((string) cacheDeviceName).ToLower()) if (!success || deviceName.ToLower() != ((string) cacheDeviceName).ToLower())
continue; continue;
success &= registry.TryRead(cacheIdKey, "DeviceMake", out cacheDeviceManufacturer); success &= registry.TryRead(cacheIdKey, "DeviceMake", out var cacheDeviceManufacturer);
success &= registry.TryRead(cacheIdKey, "DeviceModel", out cacheDeviceModel); success &= registry.TryRead(cacheIdKey, "DeviceModel", out var cacheDeviceModel);
if (!success) if (!success)
continue; continue;