|
1 | 1 | #include-once |
2 | 2 |
|
3 | 3 | #include <Array.au3> |
| 4 | +#include <WinAPISys.au3> |
4 | 5 | #include <StringConstants.au3> |
5 | 6 |
|
6 | 7 | #include "GetDiskInfo.au3" |
@@ -70,8 +71,8 @@ Func _GetCPUInfo($iFlag = 0) |
70 | 71 | $sArch = $Obj_Item.AddressWidth |
71 | 72 | $sVersion = $Obj_Item.Caption |
72 | 73 | $sFamily = $Obj_Item.Level |
73 | | - $sModel = $Obj_Item.Revision |
74 | | - $sStepping = $Obj_Item.Stepping |
| 74 | + $sModel = $Obj_Item.Revision ; Doesn't work for Intel... |
| 75 | + $sStepping = $Obj_Item.Stepping ; Doesn't work for Intel... |
75 | 76 | Next |
76 | 77 |
|
77 | 78 | $Col_Items = $Obj_WMIService.ExecQuery('Select * from Win32_ComputerSystem') |
@@ -105,9 +106,17 @@ Func _GetCPUInfo($iFlag = 0) |
105 | 106 | Case 6 |
106 | 107 | Return Number($sFamily) |
107 | 108 | Case 7 |
108 | | - Return BitAND(BitShift($sModel, 8), 0xFF) |
| 109 | + If StringInStr($vName, "Intel") Then |
| 110 | + Return BitAND(BitShift(_WinAPI_GetSystemInfo()[9], 8), 0xFF) |
| 111 | + Else |
| 112 | + Return BitAND(BitShift($sModel, 8), 0xFF) |
| 113 | + EndIf |
109 | 114 | Case 8 |
110 | | - Return BitAND($sStepping, 0xFF) |
| 115 | + If StringInStr($vName, "Intel") Then |
| 116 | + Return BitAND(_WinAPI_GetSystemInfo()[9], 0xFF) |
| 117 | + Else |
| 118 | + Return BitAND($sStepping, 0xFF) |
| 119 | + EndIf |
111 | 120 | Case Else |
112 | 121 | Return 0 |
113 | 122 | EndSwitch |
|
0 commit comments