v0.6.1: cargo update

modelflat · Sep 1, 2024 · 82e9a07 · 82e9a07
1 parent f040e0d
commit 82e9a07
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 104 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["zbl", "zbl_py"]
 resolver = "2"
 
 [workspace.package]
-version = "0.6.0"
+version = "0.6.1"
 
 [profile.release]
 strip = true
diff --git a/zbl/Cargo.toml b/zbl/Cargo.toml
@@ -11,7 +11,7 @@ once_cell = "1"
 log = "0.4"
 
 [dependencies.windows]
-version = "0.56"
+version = "0.58"
 features = [
     "Foundation",
     "Graphics_Capture",

diff --git a/zbl/examples/simple.rs b/zbl/examples/simple.rs
@@ -1,4 +1,4 @@
-use std::time::Instant;
+use std::{os::raw::c_void, time::Instant};
 
 use clap::Parser;
 use opencv::{
@@ -29,7 +29,7 @@ fn main() {
         window.print_info();
         Box::new(window) as Box<dyn Capturable>
     } else if let Some(window_handle) = args.window_handle {
-        let window = Window::new(HWND(window_handle));
+        let window = Window::new(HWND(window_handle as *mut c_void));
         window.print_info();
         Box::new(window) as Box<dyn Capturable>
     } else if let Some(display_id) = args.display_id {

diff --git a/zbl/src/capture/display.rs b/zbl/src/capture/display.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::HashMap,
+    ptr::null_mut,
     sync::{
         mpsc::{sync_channel, Receiver, SyncSender},
         RwLock,
@@ -47,7 +48,13 @@ extern "system" fn enum_monitor(monitor: HMONITOR, _: HDC, _: *mut RECT, state:
 fn enumerate_displays() -> Result<Box<Vec<Result<Display>>>> {
     let displays = Box::into_raw(Default::default());
     unsafe {
-        EnumDisplayMonitors(HDC(0), None, Some(enum_monitor), LPARAM(displays as isize)).ok()?;
+        EnumDisplayMonitors(
+            HDC(null_mut()),
+            None,
+            Some(enum_monitor),
+            LPARAM(displays as isize),
+        )
+        .ok()?;
         Ok(Box::from_raw(displays))
     }
 }
@@ -104,11 +111,11 @@ impl Capturable for Display {
         OBJECT_DESTROYED_USER_DATA
             .write()
             .unwrap()
-            .insert(self.handle.0, (self.handle.0, sender));
+            .insert(self.handle.0 as isize, (self.handle.0 as isize, sender));
         receiver
     }
 
     fn get_raw_handle(&self) -> isize {
-        self.handle.0
+        self.handle.0 as isize
     }
 }
diff --git a/zbl/src/capture/window.rs b/zbl/src/capture/window.rs
@@ -50,8 +50,8 @@ extern "system" fn object_destroyed_cb(
 ) {
     if id_object == 0 && id_child == 0 && handle != HWND::default() {
         let has_been_closed = if let Ok(handles) = OBJECT_DESTROYED_USER_DATA.read() {
-            if let Some((window_handle, tx)) = handles.get(&this.0) {
-                if *window_handle == handle.0 {
+            if let Some((window_handle, tx)) = handles.get(&(this.0 as isize)) {
+                if *window_handle == handle.0 as isize {
                     tx.send(()).ok();
                     true
                 } else {
@@ -299,12 +299,12 @@ impl Capturable for Window {
             )
         };
         if let Ok(mut handles) = OBJECT_DESTROYED_USER_DATA.write() {
-            handles.insert(hook_id.0, (self.handle.0, sender));
+            handles.insert(hook_id.0 as isize, (self.handle.0 as isize, sender));
         }
         receiver
     }
 
     fn get_raw_handle(&self) -> isize {
-        self.handle.0
+        self.handle.0 as isize
     }
 }
diff --git a/zbl_py/pyproject.toml b/zbl_py/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "zbl"
 description = "real-time window capture library based on D3D11 and Windows.Graphics.Capture"
-version = "0.6.0"
+version = "0.6.1"
 readme = "../README.md"
 requires-python = ">=3.8"
 license = { file = "../LICENSE.txt" }

diff --git a/zbl_py/src/lib.rs b/zbl_py/src/lib.rs
@@ -160,7 +160,8 @@ impl Capture {
             )?)
         } else if let Some(handle) = window_handle {
             Ok(Self::from_capturable(
-                Box::new(::zbl::Window::new(HWND(handle as isize))) as Box<dyn ::zbl::Capturable>,
+                Box::new(::zbl::Window::new(HWND(handle as *mut c_void)))
+                    as Box<dyn ::zbl::Capturable>,
                 is_cursor_capture_enabled,
                 is_border_required,
                 cpu_access,