Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
532a45533e
1 changed files with 2 additions and 1 deletions
|
|
@ -71,7 +71,8 @@ KNOWN_HIVE_NAMES = {
|
||||||
winreg.HKEY_LOCAL_MACHINE: 'HKEY_LOCAL_MACHINE',
|
winreg.HKEY_LOCAL_MACHINE: 'HKEY_LOCAL_MACHINE',
|
||||||
winreg.HKEY_USERS: 'HKEY_USERS',
|
winreg.HKEY_USERS: 'HKEY_USERS',
|
||||||
}
|
}
|
||||||
OS_VERSION = float(platform.win32_ver()[0])
|
OS_VERSION = platform.win32_ver()[0]
|
||||||
|
OS_VERSION = 8.1 if OS_VERSION == '8.1' else int(OS_VERSION)
|
||||||
RAM_OK = 5.5 * 1024**3 # ~6 GiB assuming a bit of shared memory
|
RAM_OK = 5.5 * 1024**3 # ~6 GiB assuming a bit of shared memory
|
||||||
RAM_WARNING = 3.5 * 1024**3 # ~4 GiB assuming a bit of shared memory
|
RAM_WARNING = 3.5 * 1024**3 # ~4 GiB assuming a bit of shared memory
|
||||||
REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
|
REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue