win32

Author: epompeii

lib/bencher_context/Cargo.toml

@@ -23,6 +23,7 @@ uuid = { workspace = true, optional = true, features = ["serde"] }
 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.60", optional = true, features = [
     "System_Profile_SystemManufacturers",
+    "Win32",
 ] }
 
 [lints]

lib/bencher_context/src/client/platform/target_os/windows.rs

@@ -25,19 +25,13 @@ fn serial_number() -> Option<Uuid> {
 }
 
 fn digital_product_id() -> Option<Uuid> {
-    let sub_key = PCWSTR::from(
-        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\0"
-            .encode_utf16()
-            .collect::<Vec<u16>>()
-            .as_ptr(),
-    );
+    let key = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\0"
+        .encode_utf16()
+        .collect::<Vec<u16>>();
+    let sub_key = PCWSTR::from_raw(key.as_ptr());
     let hkey = RegOpenKeyExW(HKEY_LOCAL_MACHINE, sub_key, 0, KEY_READ).ok()?;
-    let value_name = PCWSTR::from(
-        "DigitalProductId\0"
-            .encode_utf16()
-            .collect::<Vec<u16>>()
-            .as_ptr(),
-    );
+    let value = "DigitalProductId\0".encode_utf16().collect::<Vec<u16>>();
+    let value_name = PCWSTR::from_raw(value.as_ptr());
     let mut data = vec![0u8; 256];
     let mut data_size = data.len() as u32;
     RegQueryValueExW(