Better Windows support

Cargo.toml

@@ -215,7 +215,10 @@ hex = "0.4.3"
 ignore = "0.4.22"
 indoc = "1"
 # We explicitly disable http2 support in isahc.
-isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
+isahc = { version = "1.7.2", default-features = false, features = [
+    "static-curl",
+    "text-decoding",
+] }
 itertools = "0.11.0"
 lazy_static = "1.4.0"
 linkify = "0.10.0"
@@ -238,7 +241,10 @@ semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
-serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
+serde_json_lenient = { version = "0.1", features = [
+    "preserve_order",
+    "raw_value",
+] }
 serde_repr = "0.1"
 sha2 = "0.10"
 shellexpand = "2.1.0"
@@ -249,7 +255,11 @@ sysinfo = "0.29.10"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
 tiktoken-rs = "0.5.7"
-time = { version = "0.3", features = ["serde", "serde-well-known", "formatting"] }
+time = { version = "0.3", features = [
+    "serde",
+    "serde-well-known",
+    "formatting",
+] }
 toml = "0.8"
 tower-http = "0.4.4"
 tree-sitter = { version = "0.20", features = ["wasm"] }
@@ -310,16 +320,35 @@ which = "6.0.0"
 sys-locale = "0.3.1"
 
 [workspace.dependencies.windows]
-version = "0.53.0"
+version = "0.54.0"
 features = [
+    "implement",
+    "Wdk_System_SystemServices",
+    "Win32_Foundation",
+    "Win32_Globalization",
     "Win32_Graphics_Gdi",
-    "Win32_UI_WindowsAndMessaging",
-    "Win32_Security",
+    "Win32_Security_Credentials",
+    "Win32_Storage_FileSystem",
+    "Win32_System_Com",
+    "Win32_System_Com_StructuredStorage",
+    "Win32_System_DataExchange",
+    "Win32_System_LibraryLoader",
+    "Win32_System_Memory",
+    "Win32_System_Ole",
+    "Win32_System_SystemInformation",
+    "Win32_System_SystemServices",
+    "Win32_System_Time",
     "Win32_System_Threading",
+    "Win32_UI_Accessibility",
+    "Win32_UI_Controls",
+    "Win32_UI_HiDpi",
+    "Win32_UI_Input_Ime",
+    "Win32_UI_Input_KeyboardAndMouse",
+    "Win32_UI_Shell",
+    "Win32_UI_WindowsAndMessaging",
 ]
 
 
-
 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "e4a23971ec3071a09c1e84816954c98f96e98e52" }
 # Workaround for a broken nightly build of gpui: See #7644 and revisit once 0.5.3 is released.

crates/fs/Cargo.toml

@@ -38,10 +38,7 @@ gpui = { workspace = true, optional = true }
 notify = "6.1.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.52", features = [
-    "Win32_Foundation",
-    "Win32_Storage_FileSystem",
-] }
+windows.workspace = true
 
 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }

crates/fs/src/fs.rs

@@ -1440,7 +1440,7 @@ async fn file_id(path: impl AsRef<Path>) -> Result<u64> {
     use std::os::windows::io::AsRawHandle;
 
     use smol::fs::windows::OpenOptionsExt;
-    use windows_sys::Win32::{
+    use windows::Win32::{
         Foundation::HANDLE,
         Storage::FileSystem::{
             GetFileInformationByHandle, BY_HANDLE_FILE_INFORMATION, FILE_FLAG_BACKUP_SEMANTICS,
@@ -1449,18 +1449,15 @@ async fn file_id(path: impl AsRef<Path>) -> Result<u64> {
 
     let file = smol::fs::OpenOptions::new()
         .read(true)
-        .custom_flags(FILE_FLAG_BACKUP_SEMANTICS)
+        .custom_flags(FILE_FLAG_BACKUP_SEMANTICS.0)
         .open(path)
         .await?;
 
     let mut info: BY_HANDLE_FILE_INFORMATION = unsafe { std::mem::zeroed() };
     // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfileinformationbyhandle
     // This function supports Windows XP+
     smol::unblock(move || {
-        let ret = unsafe { GetFileInformationByHandle(file.as_raw_handle() as HANDLE, &mut info) };
-        if ret == 0 {
-            return Err(anyhow!(format!("{}", std::io::Error::last_os_error())));
-        };
+        unsafe { GetFileInformationByHandle(HANDLE(file.as_raw_handle() as _), &mut info)? };
 
         Ok(((info.nFileIndexHigh as u64) << 32) | (info.nFileIndexLow as u64))
     })

crates/gpui/Cargo.toml

@@ -105,19 +105,26 @@ cosmic-text = "0.10.0"
 open = "5.0.1"
 ashpd = "0.7.0"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection", "randr", "xkb"] }
-wayland-client= { version = "0.31.2" }
+wayland-client = { version = "0.31.2" }
 wayland-cursor = "0.31.1"
-wayland-protocols = { version = "0.31.2", features = ["client", "staging", "unstable"] }
+wayland-protocols = { version = "0.31.2", features = [
+    "client",
+    "staging",
+    "unstable",
+] }
 wayland-backend = { version = "0.3.3", features = ["client_system"] }
 xkbcommon = { version = "0.7", features = ["wayland", "x11"] }
 as-raw-xcb-connection = "1"
 calloop = "0.12.4"
 calloop-wayland-source = "0.2.0"
 oo7 = "0.3.0"
 
-[target.'cfg(windows)'.dependencies]
+[target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
 
+[target.'cfg(target_os = "windows")'.build-dependencies]
+winresource = "0.1"
+
 [[example]]
 name = "hello_world"
 path = "examples/hello_world.rs"

crates/gpui/assets/windows/manifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity type='win32' 
+                name='Microsoft.Windows.Common-Controls' 
+                version='6.0.0.0' processorArchitecture='*'   
+                publicKeyToken='6595b64144ccf1df' />
+        </dependentAssembly>
+    </dependency>
+</assembly>

crates/gpui/build.rs

@@ -21,6 +21,25 @@ fn main() {
     #[cfg(all(target_os = "macos", not(feature = "macos-blade")))]
     #[cfg(not(feature = "runtime_shaders"))]
     compile_metal_shaders(&header_path);
+
+    // We are using Windows Visita+, right..?
+    // if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "windows" {
+    #[cfg(target_os = "windows")]
+    {
+        println!("cargo:rustc-link-arg=/stack:{}", 4 * 1024 * 1024);
+        println!("cargo:rerun-if-changed=assets/windows/manifest.xml");
+        let mut res = winresource::WindowsResource::new();
+        let manifest_path = std::env::current_dir()
+            .unwrap()
+            .join("assets")
+            .join("windows")
+            .join("manifest.xml");
+        res.set_manifest_file(manifest_path.to_str().unwrap());
+        if let Err(e) = res.compile() {
+            eprintln!("{}", e);
+            std::process::exit(1);
+        }
+    }
 }
 
 fn generate_dispatch_bindings() {

crates/gpui/src/platform.rs

@@ -12,15 +12,15 @@ mod linux;
 #[cfg(target_os = "macos")]
 mod mac;
 
+#[cfg(target_os = "windows")]
+mod windows;
+
 #[cfg(any(target_os = "linux", target_os = "windows", feature = "macos-blade"))]
-mod blade;
+mod cross_platform;
 
 #[cfg(any(test, feature = "test-support"))]
 mod test;
 
-#[cfg(target_os = "windows")]
-mod windows;
-
 use crate::{
     Action, AnyWindowHandle, AsyncWindowContext, BackgroundExecutor, Bounds, DevicePixels, Font,
     FontId, FontMetrics, FontRun, ForegroundExecutor, GlobalPixels, GlyphId, Keymap, LineLayout,
@@ -68,7 +68,7 @@ pub(crate) fn current_platform() -> Rc<dyn Platform> {
 pub(crate) fn current_platform() -> Rc<dyn Platform> {
     Rc::new(LinuxPlatform::new())
 }
-// todo("windows")
+
 #[cfg(target_os = "windows")]
 pub(crate) fn current_platform() -> Rc<dyn Platform> {
     Rc::new(WindowsPlatform::new())

crates/gpui/src/platform/blade.rs → crates/gpui/src/platform/cross_platform.rs

@@ -1,8 +1,12 @@
 mod blade_atlas;
 mod blade_belt;
 mod blade_renderer;
+#[cfg(not(feature = "macos-blade"))]
+mod text_system;
 
 pub(crate) use blade_atlas::*;
 pub(crate) use blade_renderer::*;
+#[cfg(not(feature = "macos-blade"))]
+pub(crate) use text_system::*;
 
 use blade_belt::*;