Skip to content

fix(device_info_plus): close registry keys and use win32's RtlGetVersion #3809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halildurmus wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −15
Open

fix(device_info_plus): close registry keys and use win32's RtlGetVersion #3809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions packages/device_info_plus/device_info_plus/lib/src/device_info_plus_windows.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,6 @@ class DeviceInfoPlusWindowsPlugin extends DeviceInfoPlatform {

WindowsDeviceInfo? _cache;

// In a well-meaning but somewhat misguided attempt to reduce apps from using
// version numbers for feature detection, most version number APIs don't give
// expected results on Windows 8 and above. RtlGetVersion is reliable and
// stable, but as a kernel API is documented in the Windows DDK (Driver
// Development Kit), rather than the SDK. As such, it's not included in
// package:win32, so we have to manually define it here.
//
// ignore: non_constant_identifier_names
void Function(Pointer<OSVERSIONINFOEX>) RtlGetVersion =
DynamicLibrary.open('ntdll.dll').lookupFunction<
Void Function(Pointer<OSVERSIONINFOEX>),
void Function(Pointer<OSVERSIONINFOEX>)
>('RtlGetVersion');

/// Returns a [WindowsDeviceInfo] with information about the device.
@override
Future<BaseDeviceInfo> deviceInfo() {
Expand Down Expand Up @@ -68,14 +54,16 @@ class DeviceInfoPlusWindowsPlugin extends DeviceInfoPlatform {
final registeredOwner =
currentVersionKey.getString('RegisteredOwner') ?? '';
final releaseId = currentVersionKey.getString('ReleaseId') ?? '';
currentVersionKey.close();

final sqmClientKey = LOCAL_MACHINE.open(r'SOFTWARE\Microsoft\SQMClient');
final machineId = sqmClientKey.getString('MachineId') ?? '';
sqmClientKey.close();

GetSystemInfo(systemInfo);

// Use `RtlGetVersion` from `ntdll.dll` to get the Windows version.
RtlGetVersion(osVersionInfo);
RtlGetVersion(osVersionInfo.cast());

// Handle [productName] for Windows 11 separately (as per Raymond Chen's comment).
// https://stackoverflow.com/questions/69460588/how-can-i-find-the-windows-product-name-in-windows-11
Expand Down
Loading