@@ -5,7 +5,6 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
55use crate :: config:: Config ;
66use crate :: util:: api:: Api ;
77
8- type WndProc = unsafe extern "system" fn ( usize , u32 , usize , isize ) -> isize ;
98type TaskDialogIndirectFn = unsafe extern "system" fn ( * const TaskDialogConfig , * mut i32 , * mut i32 , * mut i32 ) -> i32 ;
109
1110static ORIGINAL_WNDPROC : AtomicUsize = AtomicUsize :: new ( 0 ) ;
@@ -21,7 +20,6 @@ const MB_OKCANCEL: u32 = 0x0000_0001;
2120const MB_DEFBUTTON2 : u32 = 0x0000_0100 ;
2221const IDOK : i32 = 1 ;
2322const TDF_ALLOW_DIALOG_CANCELLATION : u32 = 0x0008 ;
24- const TDCBF_CANCEL_BUTTON : u32 = 0x0008 ;
2523const TASKDIALOG_BUTTON_EXIT : i32 = 1001 ;
2624const GWL_WNDPROC : i32 = -4 ;
2725
@@ -35,7 +33,6 @@ extern "system" {
3533 flags : u32 ,
3634 id : * mut u32 ,
3735 ) -> usize ;
38- fn GetModuleHandleA ( module_name : * const u8 ) -> usize ;
3936 fn GetProcAddress ( module : usize , proc_name : * const u8 ) -> * const c_void ;
4037 fn Sleep ( ms : u32 ) ;
4138 fn CreateActCtxA ( ctx : * const ActCtxA ) -> usize ;
@@ -58,12 +55,10 @@ struct ActCtxA {
5855 h_module : usize ,
5956}
6057
61- const ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID : u32 = 0x004 ;
6258const INVALID_HANDLE_VALUE : usize = usize:: MAX ;
6359
6460#[ link( name = "user32" ) ]
6561extern "system" {
66- fn FindWindowA ( class_name : * const u8 , window_name : * const u8 ) -> usize ;
6762 fn CallWindowProcA ( prev_wnd_func : usize , hwnd : usize , msg : u32 , wp : usize , lp : isize ) -> isize ;
6863 fn MessageBoxW ( hwnd : usize , text : * const u16 , caption : * const u16 , flags : u32 ) -> i32 ;
6964 fn PostMessageA ( hwnd : usize , msg : u32 , wp : usize , lp : isize ) -> i32 ;
@@ -151,7 +146,7 @@ unsafe extern "system" fn wndproc_hook_thread(_param: *mut c_void) -> u32 {
151146 return 0 ;
152147 }
153148
154- let old = SetWindowLongA ( hwnd, GWL_WNDPROC , confirming_wndproc as i32 ) ;
149+ let old = SetWindowLongA ( hwnd, GWL_WNDPROC , confirming_wndproc as * const ( ) as i32 ) ;
155150 if old != 0 {
156151 ORIGINAL_WNDPROC . store ( old as usize , Ordering :: SeqCst ) ;
157152 }
0 commit comments