Upgrade to windows-sys 0.62

Author: djc

Cargo.lock

@@ -20,7 +20,7 @@ include = ["/src", "LICENSE"]
 default-target = "x86_64-pc-windows-msvc"
 
 [dependencies]
-windows = { version = "0.44.0", features = [
+windows = { version = "0.61.2", features = [
     "Win32_System_Diagnostics_Etw",
     "Win32_Foundation",
     "Win32_System_Time",

Cargo.toml

@@ -13,6 +13,7 @@ use windows::Win32::Foundation::{
     CloseHandle, GetLastError, ERROR_SUCCESS, ERROR_WMI_INSTANCE_NOT_FOUND, HANDLE,
     INVALID_HANDLE_VALUE, WIN32_ERROR,
 };
+use windows::Win32::Security::SE_SYSTEM_PROFILE_NAME;
 use windows::Win32::Security::{
     AdjustTokenPrivileges, LookupPrivilegeValueW, SE_PRIVILEGE_ENABLED, TOKEN_ADJUST_PRIVILEGES,
     TOKEN_PRIVILEGES,
@@ -30,7 +31,6 @@ use windows::Win32::System::Diagnostics::Etw::{
     WNODE_FLAG_TRACED_GUID,
 };
 use windows::Win32::System::SystemInformation::{GetVersionExA, OSVERSIONINFOA};
-use windows::Win32::System::SystemServices::SE_SYSTEM_PROFILE_NAME;
 use windows::Win32::System::Threading::{
     GetCurrentProcess, GetCurrentThread, OpenProcess, OpenProcessToken, SetThreadPriority,
     WaitForSingleObject, CREATE_SUSPENDED, PROCESS_ALL_ACCESS, THREAD_PRIORITY_TIME_CRITICAL,
@@ -89,7 +89,7 @@ impl Drop for TraceContext {
         // SAFETY: TraceContext invariants ensure these are valid
         unsafe {
             let ret = CloseHandle(self.target_process_handle);
-            if ret.0 == 0 {
+            if ret == 0 {
                 panic!("TraceContext::CloseHandle error:{:?}", get_last_error(""));
             }
         }
@@ -172,24 +172,24 @@ fn acquire_privileges() -> Result<()> {
     privs.PrivilegeCount = 1;
     privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
     if unsafe {
-        LookupPrivilegeValueW(None, SE_SYSTEM_PROFILE_NAME, &mut privs.Privileges[0].Luid).0 == 0
+        LookupPrivilegeValueW(None, SE_SYSTEM_PROFILE_NAME, &mut privs.Privileges[0].Luid) == 0
     } {
         return Err(get_last_error("acquire_privileges LookupPrivilegeValueA"));
     }
     let mut pt = HANDLE::default();
-    if unsafe { OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &mut pt).0 == 0 } {
+    if unsafe { OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &mut pt) == 0 } {
         return Err(get_last_error("OpenProcessToken"));
     }
     let adjust = unsafe { AdjustTokenPrivileges(pt, false, Some(addr_of!(privs)), 0, None, None) };
-    if adjust.0 == 0 {
+    if adjust == 0 {
         let err = Err(get_last_error("AdjustTokenPrivileges"));
         unsafe {
             CloseHandle(pt);
         }
         return err;
     }
     let ret = unsafe { CloseHandle(pt) };
-    if ret.0 == 0 {
+    if ret == 0 {
         return Err(get_last_error("acquire_privileges CloseHandle"));
     }
     let status = unsafe { GetLastError() };
@@ -198,6 +198,7 @@ fn acquire_privileges() -> Result<()> {
     }
     Ok(())
 }
+
 /// SAFETY: is_suspended must only be true if `target_process` is suspended
 unsafe fn trace_from_process_id(
     target_process_id: u32,
@@ -207,7 +208,7 @@ unsafe fn trace_from_process_id(
     let mut winver_info = OSVERSIONINFOA::default();
     winver_info.dwOSVersionInfoSize = size_of::<OSVERSIONINFOA>() as u32;
     let ret = GetVersionExA(&mut winver_info);
-    if ret.0 == 0 {
+    if ret == 0 {
         return Err(get_last_error("TraceSetInformation interval"));
     }
     // If we're not win7 or more, return unsupported
@@ -228,7 +229,7 @@ unsafe fn trace_from_process_id(
         // TODO: Parameter?
         interval.Interval = (1000000000 / 8000) / 100;
         let ret = TraceSetInformation(
-            None,
+            CONTROLTRACE_HANDLE::default(),
             // The value is supported on Windows 8, Windows Server 2012, and later.
             TraceSampledProfileIntervalInfo,
             addr_of!(interval).cast(),
@@ -298,7 +299,7 @@ unsafe fn trace_from_process_id(
     {
         let mut event_trace_props_copy = event_trace_props.clone();
         let control_stop_retcode = ControlTraceA(
-            None,
+            CONTROLTRACE_HANDLE::default(),
             kernel_logger_name_with_nul_pcstr,
             addr_of_mut!(event_trace_props_copy) as *mut _,
             EVENT_TRACE_CONTROL_STOP,
@@ -484,7 +485,7 @@ unsafe fn trace_from_process_id(
     log.Anonymous2.EventRecordCallback = Some(event_record_callback);
 
     let trace_processing_handle = OpenTraceA(&mut log);
-    if trace_processing_handle.0 == INVALID_HANDLE_VALUE.0 as u64 {
+    if trace_processing_handle == INVALID_HANDLE_VALUE.0 as u64 {
         return Err(get_last_error("OpenTraceA processing"));
     }