alex/baseview
1
0
Fork 0
Code Activity

get Window as pointer instead of using Arc::from_raw()

Browse source
This commit is contained in:
Micah Johnston 2020-09-07 02:12:06 -05:00
parent 89bd912a73
commit aafd54b76c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/win/window.rs
View file

@ -45,7 +45,7 @@ unsafe fn generate_guid() -> String {
const WIN_FRAME_TIMER: usize = 4242; const WIN_FRAME_TIMER: usize = 4242;
unsafe fn handle_timer<A: AppWindow>(win: &Arc<Mutex<Window<A>>>, timer_id: usize) { unsafe fn handle_timer<A: AppWindow>(win: &Mutex<Window<A>>, timer_id: usize) {
match timer_id { match timer_id {
WIN_FRAME_TIMER => {} WIN_FRAME_TIMER => {}
_ => (), _ => (),
@ -65,7 +65,7 @@ unsafe extern "system" fn wnd_proc<A: AppWindow>(
let win_ptr = GetWindowLongPtrA(hwnd, GWLP_USERDATA) as *const c_void; let win_ptr = GetWindowLongPtrA(hwnd, GWLP_USERDATA) as *const c_void;
if !win_ptr.is_null() { if !win_ptr.is_null() {
let win: Arc<Mutex<Window<A>>> = Arc::from_raw(win_ptr as *mut Mutex<Window<A>>); let win: &Mutex<Window<A>> = &*(win_ptr as *const Mutex<Window<A>>);
match msg { match msg {
WM_MOUSEMOVE => { WM_MOUSEMOVE => {
@ -83,9 +83,6 @@ unsafe extern "system" fn wnd_proc<A: AppWindow>(
} }
_ => {} _ => {}
} }
// If we don't do this, the Arc will be dropped and we'll get a crash.
let _ = Arc::into_raw(win);
} }
return DefWindowProcA(hwnd, msg, wparam, lparam); return DefWindowProcA(hwnd, msg, wparam, lparam);