Skip to content

Commit ab8b188

Browse files
committed
Add instance to win32 window handle
1 parent 2eccec6 commit ab8b188

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

plugin-canvas/src/platform/win32/window.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::collections::HashSet;
2+
use std::num::NonZero;
23
use std::sync::Weak;
34
use std::{cell::RefCell, ffi::OsString, mem::{size_of, transmute}, num::NonZeroIsize, os::windows::prelude::OsStringExt, ptr::{null, null_mut}, sync::{atomic::{AtomicBool, Ordering}, Arc}, time::Duration};
45

@@ -161,7 +162,12 @@ impl OsWindowInterface for OsWindow {
161162
};
162163
unsafe { TrackMouseEvent(&mut tracking_info).unwrap() };
163164

164-
let window_handle = Win32WindowHandle::new(NonZeroIsize::new(hwnd.0 as _).unwrap());
165+
let mut window_handle = Win32WindowHandle::new(NonZeroIsize::new(hwnd.0 as _).unwrap());
166+
PLUGIN_HINSTANCE.with(|instance| {
167+
if let Some(instance) = NonZero::new(instance.0 as isize) {
168+
window_handle.hinstance = Some(instance);
169+
}
170+
});
165171

166172
let running: Arc<AtomicBool> = Arc::new(true.into());
167173
let moved: Arc<AtomicBool> = Arc::new(false.into());

0 commit comments

Comments
 (0)