chore(lib): update windows crate

progre · May 11, 2024 · c6bd9be · c6bd9be
1 parent db6b585
commit c6bd9be
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,3 +30,22 @@ tracing-subscriber = { version = "0.3.17", features = [
   "env-filter",
   "local-time"
 ] }
+windows = { version = "0.56.0", features = [
+  "Win32_Foundation",
+  "Win32_Graphics_Direct3D9",
+  "Win32_Graphics_Gdi",
+  "Win32_Security",
+  "Win32_Storage_FileSystem",
+  "Win32_System_Console",
+  "Win32_System_Diagnostics_Debug",
+  "Win32_System_Diagnostics_ToolHelp",
+  "Win32_System_LibraryLoader",
+  "Win32_System_Memory",
+  "Win32_System_ProcessStatus",
+  "Win32_System_SystemInformation",
+  "Win32_System_SystemServices",
+  "Win32_System_Threading",
+  "Win32_UI_Input_KeyboardAndMouse",
+  "Win32_UI_Shell",
+  "Win32_UI_WindowsAndMessaging",
+] }
diff --git a/archives/th19padlight/Cargo.toml b/archives/th19padlight/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ['cdylib']
 [dependencies]
 anyhow.workspace = true
 junowen-lib.workspace = true
-windows = { version = "0.52.0", features = [
+windows = { workspace = true, features = [
   "Win32_Foundation",
   "Win32_Graphics_Direct3D9",
   "Win32_Graphics_Gdi",

diff --git a/junowen-lib/Cargo.toml b/junowen-lib/Cargo.toml
@@ -30,19 +30,4 @@ toml = "0.8.0"
 tracing.workspace = true
 uuid = "1.5.0"
 webrtc = "0.9.0"
-windows = { version = "0.52.0", features = [
-  "Win32_Foundation",
-  "Win32_Graphics_Direct3D9",
-  "Win32_Graphics_Gdi",
-  "Win32_Security",
-  "Win32_Storage_FileSystem",
-  "Win32_System_Console",
-  "Win32_System_Diagnostics_Debug",
-  "Win32_System_Diagnostics_ToolHelp",
-  "Win32_System_LibraryLoader",
-  "Win32_System_Memory",
-  "Win32_System_ProcessStatus",
-  "Win32_System_SystemInformation",
-  "Win32_System_SystemServices",
-  "Win32_System_Threading",
-] }
+windows.workspace = true
diff --git a/junowen-lib/src/find_process_id.rs b/junowen-lib/src/find_process_id.rs
@@ -1,4 +1,4 @@
-use std::mem::size_of;
+use std::mem::{size_of, transmute};
 
 use anyhow::{anyhow, Result};
 use windows::Win32::System::Diagnostics::ToolHelp::{
@@ -24,7 +24,8 @@ fn find_process_id_in_snapshot(snapshot: SafeHandle, exe_file: &str) -> Option<u
         return None;
     }
     loop {
-        let current = String::from_utf8_lossy(&pe.szExeFile);
+        let current =
+            String::from_utf8_lossy(unsafe { transmute::<&[i8], &[u8]>(&pe.szExeFile[..]) });
         if current.contains(exe_file) {
             return Some(pe.th32ProcessID);
         }

diff --git a/junowen/Cargo.toml b/junowen/Cargo.toml
@@ -39,21 +39,4 @@ tracing-appender = "0.2.2"
 tracing-subscriber.workspace = true
 urlencoding = "2.1.3"
 webrtc = "0.9.0"
-windows = { version = "0.52.0", features = [
-  "Win32_Foundation",
-  "Win32_Graphics_Direct3D9",
-  "Win32_Graphics_Gdi",
-  "Win32_Security",
-  "Win32_Storage_FileSystem",
-  "Win32_System_Console",
-  "Win32_System_Diagnostics_Debug",
-  "Win32_System_Diagnostics_ToolHelp",
-  "Win32_System_LibraryLoader",
-  "Win32_System_Memory",
-  "Win32_System_ProcessStatus",
-  "Win32_System_SystemInformation",
-  "Win32_System_SystemServices",
-  "Win32_System_Threading",
-  "Win32_UI_Input_KeyboardAndMouse",
-  "Win32_UI_Shell",
-] }
+windows.workspace = true
diff --git a/th19loader/Cargo.toml b/th19loader/Cargo.toml
@@ -16,20 +16,7 @@ winres = "0.1"
 [dependencies]
 anyhow.workspace = true
 junowen-lib = { path = "../junowen-lib" }
-windows = { version = "0.52.0", features = [
-  "Win32_Foundation",
-  "Win32_Graphics_Direct3D9",
-  "Win32_System_Console",
-  "Win32_System_Diagnostics_Debug",
-  "Win32_System_Diagnostics_ToolHelp",
-  "Win32_System_LibraryLoader",
-  "Win32_System_Memory",
-  "Win32_System_ProcessStatus",
-  "Win32_System_SystemInformation",
-  "Win32_System_SystemServices",
-  "Win32_System_Threading",
-  "Win32_UI_WindowsAndMessaging",
-] }
+windows.workspace = true
 
 [package.metadata.winres]
 LegalCopyright = "© Progre"