Workaround for Windows issue

emoon · May 20, 2024 · e9cad9f · e9cad9f
1 parent f74e958
commit e9cad9f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ cc = "1.0"
 raw-window-handle = "0.6"
 
 [target.'cfg(windows)'.dependencies.winapi]
-version = "0.3"
+version = "0.3.9"
 features = ["winuser", "wingdi", "libloaderapi", "errhandlingapi", "fileapi"]
 
 [features]

diff --git a/src/icon.rs b/src/icon.rs
@@ -27,7 +27,8 @@ impl FromStr for Icon {
 
         let path = OsStr::new(s)
             .encode_wide()
-            .chain(Some(0).into_iter())
+            //.chain(Some(0).into_iter())
+            .chain(Some(0))
             .collect::<Vec<u16>>();
 
         Ok(Icon::Path(path.as_ptr()))

diff --git a/src/lib.rs b/src/lib.rs
@@ -1141,7 +1141,7 @@ pub(crate) fn check_buffer_size(
     buf_stride: usize,
 ) -> Result<()> {
     buf_width = buf_width.max(buf_stride);
-    let buf_size = buffer.len() * std::mem::size_of::<u32>();
+    let buf_size = std::mem::size_of_val(buffer);
     let required_buf_size = buf_width * buf_height * std::mem::size_of::<u32>();
 
     if buf_size < required_buf_size {

diff --git a/src/os/windows/mod.rs b/src/os/windows/mod.rs
@@ -256,7 +256,6 @@ unsafe extern "system" fn wnd_proc(
         }
 
         winuser::WM_LBUTTONDOWN => wnd.mouse.state[0] = true,
-
         winuser::WM_LBUTTONUP => wnd.mouse.state[0] = false,
 
         winuser::WM_MOUSEMOVE => {
@@ -266,21 +265,14 @@ unsafe extern "system" fn wnd_proc(
                 winuser::MK_RBUTTON,
             ];
 
-            for i in 0..3 {
-                if (wparam & button_checks[i]) == button_checks[i] {
-                    wnd.mouse.state[i] = true;
-                } else {
-                    wnd.mouse.state[i] = false;
-                }
+            for (i, button) in button_checks.iter().enumerate() {
+                wnd.mouse.state[i] = (wparam & *button) == *button;
             }
         }
 
         winuser::WM_MBUTTONDOWN => wnd.mouse.state[1] = true,
-
         winuser::WM_MBUTTONUP => wnd.mouse.state[1] = false,
-
         winuser::WM_RBUTTONDOWN => wnd.mouse.state[2] = true,
-
         winuser::WM_RBUTTONUP => wnd.mouse.state[2] = false,
 
         winuser::WM_CLOSE => {
@@ -299,7 +291,7 @@ unsafe extern "system" fn wnd_proc(
 
         winuser::WM_COMMAND => {
             if lparam == 0 {
-                wnd.accel_key = (wparam & 0xffff) as usize;
+                wnd.accel_key = wparam & 0xffff;
             }
         }
 
@@ -345,7 +337,7 @@ unsafe extern "system" fn wnd_proc(
             let mut x_offset = 0;
             let mut y_offset = 0;
 
-            let dc = wnd.dc.unwrap();
+            let dc = wnd.dc;
             wingdi::SelectObject(dc, wnd.clear_brush as *mut winapi::ctypes::c_void);
 
             match wnd.draw_params.scale_mode {
@@ -502,9 +494,8 @@ impl Default for DrawParameters {
 
 #[repr(C)]
 pub struct Window {
-    mouse: MouseData,
-    dc: Option<windef::HDC>,
     window: Option<windef::HWND>,
+    dc: windef::HDC,
     clear_brush: windef::HBRUSH,
     is_open: bool,
     scale_factor: i32,
@@ -518,6 +509,7 @@ pub struct Window {
     cursor: CursorStyle,
     cursors: [windef::HCURSOR; 8],
     draw_params: DrawParameters,
+    mouse: MouseData,
 }
 
 impl HasWindowHandle for Window {
@@ -587,11 +579,11 @@ impl Window {
             let mut flags = 0;
 
             if opts.title {
-                flags |= winuser::WS_OVERLAPPEDWINDOW as u32;
+                flags |= winuser::WS_OVERLAPPEDWINDOW;
             }
 
             if opts.resize {
-                flags |= winuser::WS_THICKFRAME as u32 | winuser::WS_MAXIMIZEBOX as u32;
+                flags |= winuser::WS_THICKFRAME | winuser::WS_MAXIMIZEBOX;
             } else {
                 flags &= !winuser::WS_MAXIMIZEBOX;
                 flags &= !winuser::WS_THICKFRAME;
@@ -666,7 +658,7 @@ impl Window {
 
             let window = Window {
                 mouse: MouseData::default(),
-                dc: Some(winuser::GetDC(handle.unwrap())),
+                dc: winuser::GetDC(handle.unwrap()),
                 window: Some(handle.unwrap()),
                 key_handler: KeyHandler::new(),
                 update_rate: UpdateRate::new(),
@@ -953,7 +945,7 @@ impl Window {
             {
                 let acc_condition = winuser::TranslateAcceleratorW(
                     msg.hwnd,
-                    std::mem::transmute(self.accel_table),
+                    self.accel_table,
                     &mut msg,
                 ) == 0;
 
@@ -1424,9 +1416,7 @@ impl Menu {
 impl Drop for Window {
     fn drop(&mut self) {
         unsafe {
-            if self.dc.is_some() {
-                winuser::ReleaseDC(self.window.unwrap(), self.dc.unwrap());
-            }
+            winuser::ReleaseDC(self.window.unwrap(), self.dc);
 
             if self.window.is_some() {
                 winuser::DestroyWindow(self.window.unwrap());