Fix errors

Author: CraftSpider

Cargo.lock

@@ -60,6 +60,7 @@ features = [
     "Win32_System_SystemInformation",
     "Win32_System_Threading",
     "Win32_System_WindowsProgramming",
+    "Win32_Globalization",
 ]
 
 [build-dependencies]

Cargo.toml

@@ -8,7 +8,7 @@
 
 #![allow(bad_style)]
 
-use super::super::windows::*;
+use windows_sys::Win32::System::Diagnostics::Debug::*;
 use core::ffi::c_void;
 
 #[derive(Clone, Copy)]
@@ -17,7 +17,7 @@ pub struct Frame {
     ip: *mut c_void,
     sp: *mut c_void,
     #[cfg(not(target_env = "gnu"))]
-    inline_context: Option<DWORD>,
+    inline_context: Option<u32>,
 }
 
 // we're just sending around raw pointers and reading them, never interpreting
@@ -43,7 +43,7 @@ impl Frame {
     }
 
     #[cfg(not(target_env = "gnu"))]
-    pub fn inline_context(&self) -> Option<DWORD> {
+    pub fn inline_context(&self) -> Option<u32> {
         self.inline_context
     }
 }
@@ -54,12 +54,12 @@ struct MyContext(CONTEXT);
 #[cfg(any(target_arch = "x86_64", target_arch = "arm64ec"))]
 impl MyContext {
     #[inline(always)]
-    fn ip(&self) -> DWORD64 {
+    fn ip(&self) -> u64 {
         self.0.Rip
     }
 
     #[inline(always)]
-    fn sp(&self) -> DWORD64 {
+    fn sp(&self) -> u64 {
         self.0.Rsp
     }
 }
@@ -133,7 +133,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
             ip,
             fn_entry,
             &mut context.0,
-            ptr::addr_of_mut!(handler_data).cast::<PVOID>(),
+            ptr::addr_of_mut!(handler_data).cast::<*mut c_void>(),
             &mut establisher_frame,
             ptr::null_mut(),
         );

src/backtrace/dbghelp64.rs

@@ -28,7 +28,7 @@ use alloc::vec::Vec;
 use windows_sys::{
     core::*, Win32::Foundation::*, Win32::System::Diagnostics::Debug::*,
     Win32::System::LibraryLoader::*, Win32::System::Threading::*,
-    Win32::System::WindowsProgramming::*,
+    Win32::System::WindowsProgramming::*, Win32::Globalization::*,
 };
 
 use core::ffi::c_void;
@@ -151,7 +151,7 @@ dbghelp! {
         fn EnumerateLoadedModulesW64(
             hprocess: HANDLE,
             enumloadedmodulescallback: PENUMLOADED_MODULES_CALLBACKW64,
-            usercontext: PVOID
+            usercontext: *const c_void
         ) -> BOOL;
         fn StackWalk64(
             MachineType: u32,
@@ -224,18 +224,6 @@ dbghelp! {
             CurContext: *mut u32,
             CurFrameIndex: *mut u32
         ) -> BOOL;
-        fn SymFromAddrW(
-            hProcess: HANDLE,
-            Address: u64,
-            Displacement: *mut u64,
-            Symbol: PSYMBOL_INFOW
-        ) -> BOOL;
-        fn SymGetLineFromAddrW64(
-            hProcess: HANDLE,
-            dwAddr: u64,
-            pdwDisplacement: *mut u32,
-            Line: PIMAGEHLP_LINEW64
-        ) -> BOOL;
     }
 }
 
@@ -308,7 +296,7 @@ pub fn init() -> Result<Init, ()> {
         let mut lock = LOCK.load(SeqCst);
         if lock.is_null() {
             let name = mutex_name();
-            lock = CreateMutexA(ptr::null_mut(), 0, name.as_ptr().cast::<i8>());
+            lock = CreateMutexA(ptr::null_mut(), 0, name.as_ptr());
             if lock.is_null() {
                 return Err(());
             }
@@ -387,7 +375,7 @@ fn set_optional_options() -> Option<()> {
         ) == 1
         {
             // Trim the buffer to the actual length of the string.
-            let len = lstrlenW(search_path_buf.as_mut_ptr());
+            let len =   lstrlenW(search_path_buf.as_mut_ptr());
             assert!(len >= 0);
             search_path_buf.truncate(len as usize);
         } else {
@@ -461,16 +449,16 @@ impl SearchPath {
 extern "system" fn enum_loaded_modules_callback(
     module_name: PCWSTR,
     _: u64,
-    _: ULONG,
-    user_context: PVOID,
+    _: u32,
+    user_context: *const c_void,
 ) -> BOOL {
     // `module_name` is an absolute path like `C:\path\to\module.dll`
     // or `C:\path\to\module.exe`
     let len: usize = unsafe { lstrlenW(module_name).try_into().unwrap() };
 
     if len == 0 {
         // This should not happen, but if it does, we can just ignore it.
-        return TRUE;
+        return 1;
     }
 
     let module_name = unsafe { slice::from_raw_parts(module_name, len) };
@@ -483,13 +471,13 @@ extern "system" fn enum_loaded_modules_callback(
     else {
         // `module_name` being an absolute path, it should always contain at least one
         // path separator. If not, there is nothing we can do.
-        return TRUE;
+        return 1;
     };
 
     let search_path = unsafe { &mut *(user_context as *mut SearchPath) };
     search_path.add(&module_name[..end_of_directory]);
 
-    TRUE
+    1
 }
 
 impl Drop for Init {

src/dbghelp.rs

@@ -19,6 +19,7 @@
 
 use windows_sys::{
     Win32::Foundation::*, Win32::System::Diagnostics::Debug::*, Win32::System::Threading::*,
+    Win32::Globalization::*,
 };
 
 use super::super::dbghelp;
@@ -180,7 +181,7 @@ unsafe fn resolve_with_inline(
                 addr,
                 &mut inline_context,
                 &mut 0,
-            ) != TRUE)
+            ) != 1)
             || inlined_frame_count == 0
         {
             inlined_frame_count = 0;
@@ -212,7 +213,7 @@ unsafe fn do_resolve(
     const SIZE: usize = 2 * MAX_SYM_NAME as usize + mem::size_of::<SYMBOL_INFOW>();
     let mut data = Aligned8([0u8; SIZE]);
     let info = &mut *data.0.as_mut_ptr().cast::<SYMBOL_INFOW>();
-    info.MaxNameLen = MAX_SYM_NAME as ULONG;
+    info.MaxNameLen = MAX_SYM_NAME as u32;
     // the struct size in C.  the value is different to
     // `size_of::<SYMBOL_INFOW>() - MAX_SYM_NAME + 1` (== 81)
     // due to struct alignment.
@@ -236,7 +237,7 @@ unsafe fn do_resolve(
         0,
         name_ptr,
         name_len as i32,
-        name_buffer.as_mut_ptr().cast::<i8>(),
+        name_buffer.as_mut_ptr(),
         name_buffer.len() as i32,
         core::ptr::null_mut(),
         core::ptr::null_mut(),