diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-12-19 16:17:54 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-12-19 16:17:54 +0100 |
| commit | 1e100f9b66c33515dc71ec094909c510461b3689 (patch) | |
| tree | 2857c4e7fb85d0d173bde5d67416d2b6b00a60c9 | |
| parent | e73ab2e962136f60d45ada5ad21e78a289088396 (diff) | |
| parent | b4ba15bbb3a993d5f8345311c07ef002de6607d8 (diff) | |
| download | mullvadvpn-1e100f9b66c33515dc71ec094909c510461b3689.tar.xz mullvadvpn-1e100f9b66c33515dc71ec094909c510461b3689.zip | |
Merge branch 'remove-direct-winapi-dep'
| -rw-r--r-- | mullvad-daemon/src/exception_logging/win.rs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mullvad-daemon/src/exception_logging/win.rs b/mullvad-daemon/src/exception_logging/win.rs index 94f78018d7..0a890a7e74 100644 --- a/mullvad-daemon/src/exception_logging/win.rs +++ b/mullvad-daemon/src/exception_logging/win.rs @@ -211,11 +211,13 @@ unsafe extern "system" fn logging_exception_filter(info_ptr: *const EXCEPTION_PO #[cfg(target_arch = "aarch64")] fn get_context_info(context: &CONTEXT) -> String { - use winapi::um::winnt::{CONTEXT_CONTROL, CONTEXT_FLOATING_POINT, CONTEXT_INTEGER}; + use windows_sys::Win32::System::Diagnostics::Debug::{ + CONTEXT_CONTROL_ARM64, CONTEXT_FLOATING_POINT_ARM64, CONTEXT_INTEGER_ARM64, + }; let mut context_str = "Context:\n".to_string(); - if context.ContextFlags & CONTEXT_CONTROL != 0 { + if context.ContextFlags & CONTEXT_CONTROL_ARM64 != 0 { writeln!( &mut context_str, "\n\tFp: {:#x?}\n \ @@ -232,7 +234,7 @@ fn get_context_info(context: &CONTEXT) -> String { .unwrap(); } - if context.ContextFlags & CONTEXT_INTEGER != 0 { + if context.ContextFlags & CONTEXT_INTEGER_ARM64 != 0 { context_str.push('\n'); for x in 0..=28 { writeln!(&mut context_str, "\tX{}: {:#x?}", x, unsafe { @@ -241,7 +243,7 @@ fn get_context_info(context: &CONTEXT) -> String { .unwrap(); } } - if context.ContextFlags & CONTEXT_FLOATING_POINT != 0 { + if context.ContextFlags & CONTEXT_FLOATING_POINT_ARM64 != 0 { writeln!( &mut context_str, "\n\tFpcr: {:#x?}\n \ @@ -260,13 +262,15 @@ fn get_context_info(context: &CONTEXT) -> String { context_str } -#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] +#[cfg(target_arch = "x86_64")] fn get_context_info(context: &CONTEXT) -> String { - use winapi::um::winnt::{CONTEXT_CONTROL, CONTEXT_INTEGER, CONTEXT_SEGMENTS}; + use windows_sys::Win32::System::Diagnostics::Debug::{ + CONTEXT_CONTROL_AMD64, CONTEXT_INTEGER_AMD64, CONTEXT_SEGMENTS_AMD64, + }; let mut context_str = "Context:\n".to_string(); - if context.ContextFlags & CONTEXT_CONTROL != 0 { + if context.ContextFlags & CONTEXT_CONTROL_AMD64 != 0 { writeln!( &mut context_str, "\n\tSegSs: {:#x?}\n \ @@ -279,7 +283,7 @@ fn get_context_info(context: &CONTEXT) -> String { .unwrap(); } - if context.ContextFlags & CONTEXT_INTEGER != 0 { + if context.ContextFlags & CONTEXT_INTEGER_AMD64 != 0 { writeln!( &mut context_str, "\n\tRax: {:#x?}\n \ @@ -316,7 +320,7 @@ fn get_context_info(context: &CONTEXT) -> String { .unwrap(); } - if context.ContextFlags & CONTEXT_SEGMENTS != 0 { + if context.ContextFlags & CONTEXT_SEGMENTS_AMD64 != 0 { writeln!( &mut context_str, "\n\tSegDs: {:#x?}\n \ |