Add cpu architecture to Windows device info

fluttercommunity · Nov 21, 2024 · a641c3b · a641c3b
1 parent 2d69758
commit a641c3b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_windows.dart b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_windows.dart
@@ -74,6 +74,8 @@ class DeviceInfoPlusWindowsPlugin extends DeviceInfoPlatform {
 
       GetSystemInfo(systemInfo);
 
+      final cpuArchitecture = deriveCpuArch(systemInfo);
+
       // Use `RtlGetVersion` from `ntdll.dll` to get the Windows version.
       RtlGetVersion(osVersionInfo);
 
@@ -108,6 +110,7 @@ class DeviceInfoPlusWindowsPlugin extends DeviceInfoPlatform {
         registeredOwner: registeredOwner,
         releaseId: releaseId,
         deviceId: machineId,
+        cpuArch: cpuArchitecture,
       );
       return data;
     } finally {
@@ -116,6 +119,25 @@ class DeviceInfoPlusWindowsPlugin extends DeviceInfoPlatform {
     }
   }
 
+  @visibleForTesting
+  String deriveCpuArch(Pointer<SYSTEM_INFO> systemInfo) {
+    final cpuArchInt = systemInfo.ref.wProcessorArchitecture;
+    switch (cpuArchInt) {
+      case PROCESSOR_ARCHITECTURE.PROCESSOR_ARCHITECTURE_AMD64:
+        return 'x64';
+      case PROCESSOR_ARCHITECTURE.PROCESSOR_ARCHITECTURE_ARM:
+        return 'arm';
+      case PROCESSOR_ARCHITECTURE.PROCESSOR_ARCHITECTURE_ARM64:
+        return 'arm64';
+      case PROCESSOR_ARCHITECTURE.PROCESSOR_ARCHITECTURE_IA64:
+        return 'ia64';
+      case PROCESSOR_ARCHITECTURE.PROCESSOR_ARCHITECTURE_INTEL:
+        return 'x86';
+      default:
+        return 'Unknown';
+    }
+  }
+
   @visibleForTesting
   int getSystemMemoryInMegabytes() {
     final memoryInKilobytes = calloc<ULONGLONG>();

diff --git a/packages/device_info_plus/device_info_plus/lib/src/model/windows_device_info.dart b/packages/device_info_plus/device_info_plus/lib/src/model/windows_device_info.dart
@@ -35,6 +35,7 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
     required this.registeredOwner,
     required this.releaseId,
     required this.deviceId,
+    required this.cpuArch,
   });
 
   /// The computer's fully-qualified DNS name, where available.
@@ -146,6 +147,9 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
   /// `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SQMClient\MachineId` registry key.
   final String deviceId;
 
+  /// Displayed as "System Architecture" in Windows Settings.
+  final String cpuArch;
+
   @Deprecated('use [data] instead')
   @override
   Map<String, dynamic> toMap() {
@@ -175,6 +179,7 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
       'registeredOwner': registeredOwner,
       'releaseId': releaseId,
       'deviceId': deviceId,
+      'cpuArch': cpuArch,
     };
   }
 

diff --git a/packages/device_info_plus/device_info_plus/test/device_info_plus_windows_test.dart b/packages/device_info_plus/device_info_plus/test/device_info_plus_windows_test.dart
@@ -82,5 +82,7 @@ void main() {
     expect(windowsInfo.releaseId, isNotEmpty);
     // Check whether windowsInfo.deviceId is a valid non-empty string.
     expect(windowsInfo.deviceId, isNotEmpty);
+    // Check whether windowsInfo.cpuArch is a known variant.
+    expect(windowsInfo.cpuArch, isNot('Unknown'));
   });
 }
diff --git a/packages/device_info_plus/device_info_plus/test/model/windows_device_info_test.dart b/packages/device_info_plus/device_info_plus/test/model/windows_device_info_test.dart
@@ -33,6 +33,7 @@ void main() {
         registeredOwner: 'registeredOwner',
         releaseId: 'releaseId',
         deviceId: 'deviceId',
+        cpuArch: 'x64',
       );
 
       expect(windowsDeviceInfo.data, {
@@ -61,6 +62,7 @@ void main() {
         'registeredOwner': 'registeredOwner',
         'releaseId': 'releaseId',
         'deviceId': 'deviceId',
+        'cpuArch': 'x64',
       });
     });
   });