Rust for Windows 0.60対応

Author: nusu-github

Cargo.toml

@@ -12,12 +12,11 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 anyhow = "1.0"
-windows = { version = "0.58", features = [
-    "implement",
+windows = { version = "^0.60.0", features = [
     "Win32_Foundation",
     "Win32_System_Com",
     "Win32_System_Ole",
     "Win32_System_Variant"
 ] }
-windows-core = "0.58"
-windows-bindgen = "0.58"
+windows-core = "^0.60.0"
+windows-bindgen = "^0.60.0"

crates/cevio-sys/.metadata/generate.proj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Windows.WinmdGenerator/0.61.15-preview">
+<Project Sdk="Microsoft.Windows.WinmdGenerator/0.63.31-preview">
     <PropertyGroup Label="Globals">
         <OutputWinmd>../.windows/winmd/CeVIO.Talk.RemoteService2.winmd</OutputWinmd>
         <WinmdVersion>255.255.255.255</WinmdVersion>

crates/cevio-sys/.windows/winmd/CeVIO.Talk.RemoteService2.winmd

@@ -3,16 +3,18 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     windows_bindgen::bindgen([
+        "--in",
+        "default",
         "--in",
         ".windows/winmd/CeVIO.Talk.RemoteService2.winmd",
         "--out",
         "src/bindings.rs",
         "--filter",
         "CeVIO.Talk.RemoteService2",
-        "--config",
-        "implement",
-        "--config",
-        "vtbl",
-    ])
-    .unwrap();
+        "--flat",
+        "--reference",
+        "windows,skip-root,Windows.Win32.System.Com",
+        "--reference",
+        "windows,skip-root,Windows.Win32.Foundation",
+    ]);
 }

crates/cevio-sys/build.rs

@@ -1,4 +1,4 @@
-pub use bindings::Talk::RemoteService2::{
+pub use bindings::{
     IPhonemeData2, IPhonemeDataArray2, IServiceControl2, IServiceControl2V40,
     IServiceControl2V40Part, ISpeakingState2, IStringArray2, ITalker2, ITalker2V40,
     ITalker2V40Part, ITalkerComponent2, ITalkerComponentArray2, PhonemeData2, PhonemeDataArray2,

crates/cevio-sys/src/lib.rs

@@ -10,8 +10,7 @@ default = []
 
 [dependencies]
 anyhow = { workspace = true }
-derive_builder = "0.20.0"
+derive_builder = "0.20.2"
 windows = { workspace = true }
-windows-core = { workspace = true }
 
 cevio-sys = { path = "../cevio-sys" }