gui: update windows dep to 0.4

Cargo.lock

@@ -4499,7 +4499,7 @@ dependencies = [
  "wezterm-toast-notification",
  "winapi 0.3.9",
  "window",
- "windows 0.3.1",
+ "windows",
 ]
 
 [[package]]
@@ -4598,7 +4598,7 @@ dependencies = [
  "objc",
  "open",
  "serde",
- "windows 0.4.0",
+ "windows",
  "xml-rs",
  "zbus",
  "zvariant",
@@ -4704,18 +4704,6 @@ dependencies = [
  "xkbcommon",
 ]
 
-[[package]]
-name = "windows"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426842497696b65fbfc575691d94ef65befb248ed1a8c4361e293c724e7ebe61"
-dependencies = [
- "const-sha1",
- "windows_gen 0.3.1",
- "windows_macros 0.3.1",
- "windows_winmd",
-]
-
 [[package]]
 name = "windows"
 version = "0.4.0"
@@ -4723,22 +4711,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "015de964f21e0b20b9744ebc6f3a3e4dfdd1788f133a4aeec09c035748f88a21"
 dependencies = [
  "const-sha1",
- "windows_gen 0.4.0",
- "windows_macros 0.4.0",
-]
-
-[[package]]
-name = "windows_gen"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac8f0f06b647f42ee5459a8e1ffe41795647582c5926ec3fa363a91aad7d77"
-dependencies = [
- "proc-macro2",
- "quote",
- "squote",
- "syn",
- "windows_gen_macros 0.3.1",
- "windows_winmd",
+ "windows_gen",
+ "windows_macros",
 ]
 
 [[package]]
@@ -4751,18 +4725,7 @@ dependencies = [
  "quote",
  "squote",
  "syn",
- "windows_gen_macros 0.4.0",
-]
-
-[[package]]
-name = "windows_gen_macros"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23eac2169a20173b890c496f9e0e1149a92ef29fe4ba96026b72eec363b993f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "windows_gen_macros",
 ]
 
 [[package]]
@@ -4776,20 +4739,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "windows_macros"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edc57c944eec106c7823b425ab0fd9f90163489e50a4df747f65fcf9030e1fb"
-dependencies = [
- "proc-macro2",
- "quote",
- "squote",
- "syn",
- "windows_gen 0.3.1",
- "windows_winmd",
-]
-
 [[package]]
 name = "windows_macros"
 version = "0.4.0"
@@ -4800,27 +4749,7 @@ dependencies = [
  "quote",
  "squote",
  "syn",
- "windows_gen 0.4.0",
-]
-
-[[package]]
-name = "windows_winmd"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d44527d04c9713312ed598f5d6ce3c453754dbfc03ddc376615be4415ffc88"
-dependencies = [
- "windows_winmd_macros",
-]
-
-[[package]]
-name = "windows_winmd_macros"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2353f43f512938450614a176abf2b6cb31ac3b84fd71c88470fee571303e3f36"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "windows_gen",
 ]
 
 [[package]]

wezterm-gui/Cargo.toml

@@ -13,7 +13,7 @@ anyhow = "1.0"
 [target.'cfg(windows)'.build-dependencies]
 embed-resource = "1.3"
 cc = "1.0"
-windows = "0.3"
+windows = "0.4"
 
 [dependencies]
 anyhow = "1.0"
@@ -71,7 +71,7 @@ window = { path = "../window", features=["wayland"]}
 
 [target."cfg(windows)".dependencies]
 shared_library = "0.1"
-windows = "0.3"
+windows = "0.4"
 winapi = { version = "0.3", features = [
     "winuser",
     "consoleapi",

wezterm-gui/src/main.rs

@@ -404,20 +404,8 @@ fn run() -> anyhow::Result<()> {
     // attributed to our application.
     #[cfg(windows)]
     {
-        /// Convert a rust string to a windows wide string
-        fn wide_string(s: &str) -> Vec<u16> {
-            use std::os::windows::ffi::OsStrExt;
-            std::ffi::OsStr::new(s)
-                .encode_wide()
-                .chain(std::iter::once(0))
-                .collect()
-        }
-
         unsafe {
-            win_bindings::SetCurrentProcessExplicitAppUserModelID(
-                wide_string("org.wezfurlong.wezterm").as_ptr(),
-            )
-            .is_ok();
+            win_bindings::SetCurrentProcessExplicitAppUserModelID("org.wezfurlong.wezterm").is_ok();
         }
     }