Use meaningful TRUE constant

Author: CraftSpider

src/backtrace/dbghelp32.rs

@@ -158,7 +158,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 Some(get_module_base),
                 None,
                 0,
-            ) == 1
+            ) == TRUE
             {
                 frame.inner.base_address = get_module_base(process_handle, frame.ip() as _) as _;
 
@@ -190,7 +190,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 Some(function_table_access),
                 Some(get_module_base),
                 None,
-            ) == 1
+            ) == TRUE
             {
                 frame.inner.base_address = get_module_base(process_handle, frame.ip() as _) as _;
 

src/dbghelp.rs

@@ -26,11 +26,13 @@
 use alloc::vec::Vec;
 
 use windows_sys::{
-    core::*, Win32::Foundation::*, Win32::System::Diagnostics::Debug::*,
+    core::*,
+    Win32::Foundation::*, Win32::System::Diagnostics::Debug::*,
     Win32::System::LibraryLoader::*, Win32::System::Threading::*,
     Win32::System::WindowsProgramming::*, Win32::Globalization::*,
 };
 
+use super::windows::*;
 use core::ffi::c_void;
 use core::mem;
 use core::ptr;
@@ -355,7 +357,7 @@ fn set_optional_options() -> Option<()> {
         // the time, but now that it's using this crate it means that someone will
         // get to initialization first and the other will pick up that
         // initialization.
-        DBGHELP.SymInitializeW()?(GetCurrentProcess(), ptr::null_mut(), 1);
+        DBGHELP.SymInitializeW()?(GetCurrentProcess(), ptr::null_mut(), TRUE);
 
         // The default search path for dbghelp will only look in the current working
         // directory and (possibly) `_NT_SYMBOL_PATH` and `_NT_ALT_SYMBOL_PATH`.
@@ -373,7 +375,7 @@ fn set_optional_options() -> Option<()> {
             GetCurrentProcess(),
             search_path_buf.as_mut_ptr(),
             search_path_buf.len() as _,
-        ) == 1
+        ) == TRUE
         {
             // Trim the buffer to the actual length of the string.
             let len =   lstrlenW(search_path_buf.as_mut_ptr());
@@ -459,7 +461,7 @@ extern "system" fn enum_loaded_modules_callback(
 
     if len == 0 {
         // This should not happen, but if it does, we can just ignore it.
-        return 1;
+        return TRUE;
     }
 
     let module_name = unsafe { slice::from_raw_parts(module_name, len) };
@@ -472,13 +474,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 1;
+        return TRUE;
     };
 
     let search_path = unsafe { &mut *(user_context as *mut SearchPath) };
     search_path.add(&module_name[..end_of_directory]);
 
-    1
+    TRUE
 }
 
 impl Drop for Init {

src/lib.rs

@@ -248,3 +248,5 @@ mod lock {
     not(target_vendor = "uwp")
 ))]
 mod dbghelp;
+#[cfg(windows)]
+mod windows;

src/symbolize/dbghelp.rs

@@ -22,7 +22,7 @@ use windows_sys::{
     Win32::Globalization::*,
 };
 
-use super::super::dbghelp;
+use super::super::{dbghelp, windows::*};
 use super::{BytesOrWideString, ResolveWhat, SymbolName};
 use core::ffi::c_void;
 use core::marker;
@@ -181,7 +181,7 @@ unsafe fn resolve_with_inline(
                 addr,
                 &mut inline_context,
                 &mut 0,
-            ) != 1)
+            ) != TRUE)
             || inlined_frame_count == 0
         {
             inlined_frame_count = 0;
@@ -219,7 +219,7 @@ unsafe fn do_resolve(
     // due to struct alignment.
     info.SizeOfStruct = 88;
 
-    if sym_from_addr(info) != 1 {
+    if sym_from_addr(info) != TRUE {
         return;
     }
 
@@ -257,7 +257,7 @@ unsafe fn do_resolve(
 
     let mut filename = None;
     let mut lineno = None;
-    if get_line_from_addr(&mut line) == 1 {
+    if get_line_from_addr(&mut line) == TRUE {
         lineno = Some(line.LineNumber);
 
         let base = line.FileName;

src/symbolize/gimli/libs_windows.rs

@@ -24,13 +24,13 @@ unsafe fn add_loaded_images(ret: &mut Vec<Library>) {
 
     let mut me = MaybeUninit::<MODULEENTRY32W>::zeroed().assume_init();
     me.dwSize = mem::size_of_val(&me) as u32;
-    if Module32FirstW(snap, &mut me) == 1 {
+    if Module32FirstW(snap, &mut me) == TRUE {
         loop {
             if let Some(lib) = load_library(&me) {
                 ret.push(lib);
             }
 
-            if Module32NextW(snap, &mut me) != 1 {
+            if Module32NextW(snap, &mut me) != TRUE {
                 break;
             }
         }

src/windows.rs

@@ -0,0 +1,4 @@
+
+use windows_sys::Win32::Foundation::*;
+
+pub const TRUE: BOOL = 1;