Bug Fix 🐛

modified: Cargo.lock modified: Cargo.toml modified: README.md modified: src/lib.rs modified: src/window.rs modified: windows-capture-python/Cargo.lock modified: windows-capture-python/Cargo.toml modified: windows-capture-python/pyproject.toml
NiiightmareXD · Nov 26, 2023 · a849ad6 · a849ad6
1 parent 62b3eb0
commit a849ad6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture"
-version = "1.0.39"
+version = "1.0.41"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Rust 🔥"

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Add this library to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-windows-capture = "1.0.39"
+windows-capture = "1.0.41"
 ```
 or run this command
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -22,7 +22,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! windows-capture = "1.0.39"
+//! windows-capture = "1.0.41"
 //! ```
 //! or run this command
 //!

diff --git a/src/window.rs b/src/window.rs
@@ -73,17 +73,26 @@ impl Window {
 
     /// Get Window Title
     pub fn title(&self) -> Result<String, Box<dyn Error + Send + Sync>> {
-        let len = unsafe { GetWindowTextLengthW(self.window) } + 1;
+        let len = unsafe { GetWindowTextLengthW(self.window) };
 
-        let mut name = vec![0u16; len as usize];
+        let mut name = vec![0u16; len as usize + 1];
         if len > 1 {
             let copied = unsafe { GetWindowTextW(self.window, &mut name) };
             if copied == 0 {
                 return Ok(String::new());
             }
         }
 
-        Ok(String::from_utf16_lossy(&name))
+        let name = String::from_utf16(
+            &name
+                .as_slice()
+                .iter()
+                .take_while(|ch| **ch != 0x0000)
+                .copied()
+                .collect::<Vec<_>>(),
+        )?;
+
+        Ok(name)
     }
 
     /// Check If The Window Is A Valid Window

diff --git a/windows-capture-python/Cargo.lock b/windows-capture-python/Cargo.lock
diff --git a/windows-capture-python/Cargo.toml b/windows-capture-python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture-python"
-version = "1.0.39"
+version = "1.0.41"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Python 🔥"

diff --git a/windows-capture-python/pyproject.toml b/windows-capture-python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "windows-capture"
-version = "1.0.39"
+version = "1.0.41"
 description = "Fastest Windows Screen Capture Library For Python 🔥"
 readme = "README.md"
 requires-python = ">=3.9"