Fix username code for ADE key retrieval

This commit is contained in:
Florian Bach 2021-11-28 12:51:22 +01:00 committed by NoDRM
parent 33437073d6
commit e9a6e80e5a
1 changed files with 17 additions and 1 deletions

View File

@ -237,6 +237,20 @@ if iswindows:
return GetUserName
GetUserName = GetUserName()
def GetUserName2():
try:
import winreg
except ImportError:
import _winreg as winreg
try:
DEVICE_KEY_PATH = r'Software\Adobe\Adept\Device'
regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, DEVICE_KEY_PATH)
userREG = winreg.QueryValueEx(regkey, 'username')[0].encode('utf-16-le')[::2]
return userREG
except:
return None
PAGE_EXECUTE_READWRITE = 0x40
MEM_COMMIT = 0x1000
MEM_RESERVE = 0x2000
@ -360,7 +374,9 @@ if iswindows:
serial = GetVolumeSerialNumber(root)
vendor = cpuid0()
signature = struct.pack('>I', cpuid1())[1:]
user = GetUserName()
user = GetUserName2()
if user is None:
user = GetUserName()
entropy = struct.pack('>I12s3s13s', serial, vendor, signature, user)
cuser = winreg.HKEY_CURRENT_USER
try: