Replace windows with windows-sys

.github/workflows/rust.yml

@@ -36,14 +36,14 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: "[Ubuntu] install dependencies"
       if: matrix.name == 'Ubuntu GTK'
       run: sudo apt update && sudo apt install libgtk-3-dev
     - name: "[WASM] rustup"
       if: matrix.name == 'WASM32'
       run: rustup target add wasm32-unknown-unknown
-    - uses: Swatinem/rust-cache@v1
+    - uses: Swatinem/rust-cache@v2
     - name: Build
       run: cargo build --target ${{ matrix.target }} ${{ matrix.flags }}
     - name: Test

Cargo.toml

@@ -15,7 +15,7 @@ default = ["gtk3"]
 file-handle-inner = []
 gtk3 = ["gtk-sys", "glib-sys", "gobject-sys"]
 xdg-portal = ["ashpd", "urlencoding", "pollster"]
-common-controls-v6 = ["windows/Win32_UI_Controls"]
+common-controls-v6 = ["windows-sys/Win32_UI_Controls"]
 
 [dev-dependencies]
 futures = "0.3.12"
@@ -32,7 +32,7 @@ block = "0.1.6"
 objc-foundation = "0.1.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.44", features = [
+windows-sys = { version = "0.48", features = [
   "Win32_Foundation",
   "Win32_System_Com",
   "Win32_UI_Shell_Common",
@@ -76,4 +76,3 @@ name = "async"
 
 [package.metadata.docs.rs]
 features = ["file-handle-inner"]
-

build.rs

@@ -1,13 +1,18 @@
 fn main() {
-    let target = std::env::var("TARGET").unwrap();
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("target OS not detected");
 
-    if target.contains("darwin") {
-        println!("cargo:rustc-link-lib=framework=AppKit");
-    }
-
-    #[cfg(all(feature = "gtk3", feature = "xdg-portal"))]
-    compile_error!("You can't enable both GTK3 & XDG Portal features at once");
+    match target_os.as_str() {
+        "macos" => println!("cargo:rustc-link-lib=framework=AppKit"),
+        "windows" => {}
+        _ => {
+            let gtk = std::env::var_os("CARGO_FEATURE_GTK3").is_some();
+            let xdg = std::env::var_os("CARGO_FEATURE_XDG_PORTAL").is_some();
 
-    #[cfg(not(any(feature = "gtk3", feature = "xdg-portal")))]
-    compile_error!("You need to choose at least one backend: `gtk3` or `xdg-portal` features");
+            if gtk && xdg {
+                panic!("You can't enable both `gtk3` and `xdg-portal` features at once");
+            } else if !gtk && !xdg {
+                panic!("You need to choose at least one backend: `gtk3` or `xdg-portal` features");
+            }
+        }
+    }
 }

src/backend/win_cid/file_dialog.rs

@@ -1,7 +1,7 @@
 pub mod dialog_ffi;
 mod dialog_future;
 
-use dialog_ffi::IDialog;
+use dialog_ffi::{IDialog, Result};
 use dialog_future::{multiple_return_future, single_return_future};
 
 use crate::backend::DialogFutureType;
@@ -10,8 +10,6 @@ use crate::FileHandle;
 
 use std::path::PathBuf;
 
-use windows::core::Result;
-
 use super::utils::init_com;
 
 //