chore: upgrade to windows-rs@0.28

Author: saschanaz

rust/Cargo.lock

@@ -16,7 +16,7 @@ ruststringrange = { path = "../ruststringrange" }
 numberkey_windows = { path = "../numberkey_windows" }
 
 [dependencies.windows]
-version = "0.26.0"
+version = "0.28.0"
 features = [
   "Win32_Foundation",
   "Win32_System_LibraryLoader",

rust/composition_processor/Cargo.toml

@@ -11,4 +11,4 @@ name = "globals"
 crate-type = ["rlib", "staticlib"]
 
 [dependencies]
-windows = "0.26.0"
+windows = "0.28.0"

rust/globals/Cargo.toml

@@ -1,4 +1,4 @@
-use windows::runtime::GUID;
+use windows::core::GUID;
 
 //---------------------------------------------------------------------
 // SampleIME CLSID

rust/globals/src/lib.rs

@@ -14,7 +14,7 @@ globals = { path = "../globals" }
 winreg = "0.10.1"
 
 [dependencies.windows]
-version = "0.26.0"
+version = "0.28.0"
 features = [
   "Win32_System_Com",
   "Win32_System_SystemServices",

rust/ime/Cargo.toml

@@ -1,4 +1,4 @@
-use windows::runtime::{Interface, Result, GUID};
+use windows::core::{Interface, Result, GUID};
 use windows::Win32::System::Com::{CoCreateInstance, CLSCTX_INPROC_SERVER};
 
 pub fn create_instance_inproc<T: Interface>(clsid: &GUID) -> Result<T> {

rust/ime/src/com.rs

@@ -1,4 +1,4 @@
-use windows::runtime::HRESULT;
+use windows::core::HRESULT;
 use windows::Win32::Foundation::{E_FAIL, HINSTANCE, S_OK};
 
 use crate::registry;
@@ -10,9 +10,9 @@ pub static mut DLL_INSTANCE: HINSTANCE = HINSTANCE { 0: 0 };
 #[allow(non_snake_case)]
 #[doc(hidden)]
 pub unsafe extern "system" fn DllRegisterServer() -> HRESULT {
-    unsafe fn register() -> windows::runtime::Result<()> {
+    unsafe fn register() -> windows::core::Result<()> {
         registry::register_server(DLL_INSTANCE).map_err(|_| {
-            windows::runtime::Error::new(E_FAIL, "Failed to register server".into())
+            windows::core::Error::new(E_FAIL, "Failed to register server".into())
         })?;
         registry::register_profile(DLL_INSTANCE)?;
         registry::register_categories()?;

rust/ime/src/dll.rs

@@ -1,5 +1,5 @@
 use globals::{SAMPLEIME_CLSID, SAMPLEIME_GUID_PROFILE};
-use windows::runtime::GUID;
+use windows::core::GUID;
 use winreg::{enums::HKEY_CLASSES_ROOT, RegKey};
 
 use crate::com::create_instance_inproc;
@@ -31,7 +31,7 @@ fn get_module_file_name(dll_instance_handle: HINSTANCE) -> String {
     }
 }
 
-pub fn register_profile(dll_instance_handle: HINSTANCE) -> windows::runtime::Result<()> {
+pub fn register_profile(dll_instance_handle: HINSTANCE) -> windows::core::Result<()> {
     let profile_manager: ITfInputProcessorProfileMgr =
         create_instance_inproc(&CLSID_TF_InputProcessorProfiles)?;
 
@@ -61,7 +61,7 @@ pub fn register_profile(dll_instance_handle: HINSTANCE) -> windows::runtime::Res
     Ok(())
 }
 
-pub fn unregister_profile() -> Result<(), windows::runtime::Error> {
+pub fn unregister_profile() -> Result<(), windows::core::Error> {
     let profile_manager: ITfInputProcessorProfileMgr =
         create_instance_inproc(&CLSID_TF_InputProcessorProfiles)?;
 
@@ -88,7 +88,7 @@ static SUPPORT_CATEGORIES: [GUID; 8] = [
     GUID_TFCAT_TIPCAP_SYSTRAYSUPPORT,
 ];
 
-pub fn register_categories() -> windows::runtime::Result<()> {
+pub fn register_categories() -> windows::core::Result<()> {
     let category_manager: ITfCategoryMgr = create_instance_inproc(&CLSID_TF_CategoryMgr)?;
 
     for guid in SUPPORT_CATEGORIES {
@@ -100,7 +100,7 @@ pub fn register_categories() -> windows::runtime::Result<()> {
     Ok(())
 }
 
-pub fn unregister_categories() -> windows::runtime::Result<()> {
+pub fn unregister_categories() -> windows::core::Result<()> {
     let category_manager: ITfCategoryMgr = create_instance_inproc(&CLSID_TF_CategoryMgr)?;
 
     for guid in SUPPORT_CATEGORIES {

rust/ime/src/registry.rs

@@ -13,7 +13,7 @@ crate-type = ["staticlib"]
 globals = { path = "../globals" }
 
 [dependencies.windows]
-version = "0.26.0"
+version = "0.28.0"
 features = [
   "build",
   "std",

rust/itf_components/Cargo.toml

@@ -2,7 +2,7 @@
 
 use std::ffi::c_void;
 
-use windows::runtime::{IUnknown, Interface, GUID, HRESULT};
+use windows::core::{IUnknown, Interface, GUID, HRESULT};
 use windows::Win32::System::Com::VARIANT;
 use windows::Win32::System::Ole::VT_I4;
 use windows::Win32::UI::TextServices::{
@@ -28,7 +28,7 @@ impl Compartment {
         Box::from_raw(engine as *mut Compartment)
     }
 
-    fn get_compartment(&self) -> windows::runtime::Result<ITfCompartment> {
+    fn get_compartment(&self) -> windows::core::Result<ITfCompartment> {
         let mut manager: Option<ITfCompartmentMgr> = None;
         unsafe {
             self.manager
@@ -38,17 +38,17 @@ impl Compartment {
         }
     }
 
-    pub fn get_bool(&self) -> windows::runtime::Result<bool> {
+    pub fn get_bool(&self) -> windows::core::Result<bool> {
         // VT_BOOL also exists and maybe preferrable for better strictness
         // The Microsoft demo was using VT_I4 here, so this just follows that.
         Ok(self.get_u32()? != 0)
     }
 
-    pub fn set_bool(&self, flag: bool) -> windows::runtime::Result<()> {
+    pub fn set_bool(&self, flag: bool) -> windows::core::Result<()> {
         self.set_u32(if flag { 1 } else { 0 })
     }
 
-    pub fn get_u32(&self) -> windows::runtime::Result<u32> {
+    pub fn get_u32(&self) -> windows::core::Result<u32> {
         unsafe {
             let variant = self.get_compartment()?.GetValue()?;
             if variant.Anonymous.Anonymous.vt != VT_I4.0 as u16 {
@@ -58,7 +58,7 @@ impl Compartment {
         }
     }
 
-    pub fn set_u32(&self, data: u32) -> windows::runtime::Result<()> {
+    pub fn set_u32(&self, data: u32) -> windows::core::Result<()> {
         let mut variant = VARIANT::default();
         unsafe {
             (*variant.Anonymous.Anonymous).vt = VT_I4.0 as u16;
@@ -68,7 +68,7 @@ impl Compartment {
         }
     }
 
-    pub fn clear(&self) -> windows::runtime::Result<()> {
+    pub fn clear(&self) -> windows::core::Result<()> {
         if self.guid == GUID_COMPARTMENT_KEYBOARD_OPENCLOSE {
             return Ok(());
         }