Fix windows.native_exec.cpuid for py3

This commit is contained in:
hakril
2024-06-14 14:22:21 +02:00
parent b8dd03a1ef
commit 703c7f2ec2
2 changed files with 13 additions and 7 deletions
+6
View File
@@ -0,0 +1,6 @@
import windows
import windows.native_exec.cpuid
def test_native_exec_cpuid():
assert windows.native_exec.cpuid.do_cpuid(0)
assert windows.native_exec.cpuid.get_proc_family_model()
+7 -7
View File
@@ -1,9 +1,9 @@
import ctypes
import struct
import native_function
import simple_x86 as x86
import simple_x64 as x64
from windows.native_exec import native_function
import windows.native_exec.simple_x86 as x86
import windows.native_exec.simple_x64 as x64
from windows.generated_def.winstructs import *
@@ -126,13 +126,13 @@ def get_vendor_id():
# platform.processor() could do the trick
def is_intel_proc():
"""get_vendor_id() == 'GenuineIntel'"""
return get_vendor_id() == "GenuineIntel"
"""get_vendor_id() == b'GenuineIntel'"""
return get_vendor_id() == b"GenuineIntel"
def is_amd_proc():
"""get_vendor_id() == 'AuthenticAMD'"""
return get_vendor_id() == "AuthenticAMD"
"""get_vendor_id() == b'AuthenticAMD'"""
return get_vendor_id() == b"AuthenticAMD"
def get_proc_family_model():