Switch to windows-sys crate

Author: novafacing

Cargo.toml

@@ -77,15 +77,16 @@ tracing = { version = "0.1.40", features = ["log"] }
 yaxpeax-arm = "0.3.0"
 chrono = "0.4.38"
 vergilius = "0.1.2"
-windows = { version = "0.57.0", features = [
-    "Win32_Foundation",
+windows-sys = { features = [
+    "Win32",
     "Win32_System",
     "Win32_System_SystemServices",
     "Win32_System_Diagnostics_Debug",
     "Win32_System_Diagnostics",
     "Win32_System_SystemInformation",
     "Win32_System_Kernel",
-] }
+    "Win32_Foundation",
+], version = "0.59.0" }
 reqwest = { version = "0.12.5", features = [
     "blocking",
     # NOTE: rustls is used because native-tls does not build with the

src/os/windows/debug_info.rs

@@ -12,7 +12,7 @@ use std::{
 
 use lending_iterator::{windows_mut, LendingIterator};
 use simics::{debug, get_object, info, warn, ConfObject};
-use windows::Win32::System::{
+use windows_sys::Win32::System::{
     Diagnostics::Debug::{
         IMAGE_DEBUG_DIRECTORY, IMAGE_DEBUG_TYPE_CODEVIEW, IMAGE_DIRECTORY_ENTRY_DEBUG,
         IMAGE_NT_HEADERS64,
@@ -78,10 +78,10 @@ impl<'a> DebugInfo<'a> {
             let nt_header =
                 read_virtual::<IMAGE_NT_HEADERS64>(processor, base + dos_header.e_lfanew as u64)?;
             let debug_data_directory_offset = nt_header.OptionalHeader.DataDirectory
-                [IMAGE_DIRECTORY_ENTRY_DEBUG.0 as usize]
+                [IMAGE_DIRECTORY_ENTRY_DEBUG as usize]
                 .VirtualAddress;
             let debug_data_directory_size =
-                nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG.0 as usize].Size;
+                nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG as usize].Size;
             let debug_directory = (base + debug_data_directory_offset as u64
                 ..base + debug_data_directory_offset as u64 + debug_data_directory_size as u64)
                 .step_by(std::mem::size_of::<IMAGE_DEBUG_DIRECTORY>())
@@ -223,10 +223,10 @@ impl<'a> DebugInfo<'a> {
                 base + dos_header.e_lfanew as u64,
             )?;
             let debug_data_directory_offset = nt_header.OptionalHeader.DataDirectory
-                [IMAGE_DIRECTORY_ENTRY_DEBUG.0 as usize]
+                [IMAGE_DIRECTORY_ENTRY_DEBUG as usize]
                 .VirtualAddress;
             let debug_data_directory_size =
-                nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG.0 as usize].Size;
+                nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG as usize].Size;
             let debug_directory = (base + debug_data_directory_offset as u64
                 ..base + debug_data_directory_offset as u64 + debug_data_directory_size as u64)
                 .step_by(std::mem::size_of::<IMAGE_DEBUG_DIRECTORY>())

src/os/windows/kernel.rs

@@ -7,7 +7,7 @@ use anyhow::{anyhow, bail, Result};
 use pdb::{FallibleIterator, SymbolData};
 use simics::{debug, get_attribute, get_object, info, ConfObject};
 use vergilius::bindings::*;
-use windows::Win32::System::{
+use windows_sys::Win32::System::{
     Diagnostics::Debug::{IMAGE_DIRECTORY_ENTRY_EXPORT, IMAGE_NT_HEADERS64},
     Kernel::LIST_ENTRY,
     SystemServices::{
@@ -67,11 +67,11 @@ pub fn page_is_kernel(processor: *mut ConfObject, address: u64) -> Result<bool>
         OPTIONAL_HEADER_SIGNATURE_PE32,
         OPTIONAL_HEADER_SIGNATURE_PE32_PLUS,
     ]
-    .contains(&nt_header.OptionalHeader.Magic.0)
+    .contains(&nt_header.OptionalHeader.Magic)
     {
         debug!(
             "Optional header magic {:#x} unrecognized",
-            nt_header.OptionalHeader.Magic.0
+            nt_header.OptionalHeader.Magic
         );
         return Ok(false);
     }
@@ -81,10 +81,10 @@ pub fn page_is_kernel(processor: *mut ConfObject, address: u64) -> Result<bool>
     debug!(get_object("tsffs")?, "Image size is {:#x}", image_size);
 
     let export_header_offset = nt_header.OptionalHeader.DataDirectory
-        [IMAGE_DIRECTORY_ENTRY_EXPORT.0 as usize]
+        [IMAGE_DIRECTORY_ENTRY_EXPORT as usize]
         .VirtualAddress as u64;
     let export_header_size =
-        nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT.0 as usize].Size as u64;
+        nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT as usize].Size as u64;
 
     if export_header_offset == 0 || export_header_offset >= image_size {
         debug!(