fix raw_window_handle panic in Windows

This commit is contained in:
Billy Messenger
2025-04-16 10:33:30 -05:00
parent 490e7b5ed8
commit ac250420fb
2 changed files with 4 additions and 10 deletions

View File

@@ -388,15 +388,12 @@ fn baseview_window_to_surface_target(
) )
} }
raw_window_handle::RawWindowHandle::Win32(handle) => { raw_window_handle::RawWindowHandle::Win32(handle) => {
// will this work? i have no idea!
let mut raw_handle = raw_window_handle_06::Win32WindowHandle::new( let mut raw_handle = raw_window_handle_06::Win32WindowHandle::new(
NonZeroIsize::new(handle.hwnd as isize).unwrap(), NonZeroIsize::new(handle.hwnd as isize).unwrap(),
); );
raw_handle.hinstance = handle raw_handle.hinstance =
.hinstance raw_handle.hinstance = NonZeroIsize::new(handle.hinstance as isize);
.is_null()
.then(|| NonZeroIsize::new(handle.hinstance as isize).unwrap());
raw_window_handle_06::RawWindowHandle::Win32(raw_handle) raw_window_handle_06::RawWindowHandle::Win32(raw_handle)
} }

View File

@@ -474,15 +474,12 @@ fn baseview_window_to_surface_target(window: &baseview::Window<'_>) -> wgpu::Sur
) )
} }
raw_window_handle::RawWindowHandle::Win32(handle) => { raw_window_handle::RawWindowHandle::Win32(handle) => {
// will this work? i have no idea!
let mut raw_handle = raw_window_handle_06::Win32WindowHandle::new( let mut raw_handle = raw_window_handle_06::Win32WindowHandle::new(
NonZeroIsize::new(handle.hwnd as isize).unwrap(), NonZeroIsize::new(handle.hwnd as isize).unwrap(),
); );
raw_handle.hinstance = handle raw_handle.hinstance =
.hinstance raw_handle.hinstance = NonZeroIsize::new(handle.hinstance as isize);
.is_null()
.then(|| NonZeroIsize::new(handle.hinstance as isize).unwrap());
raw_window_handle_06::RawWindowHandle::Win32(raw_handle) raw_window_handle_06::RawWindowHandle::Win32(raw_handle)
} }