Update windows-rs to 0.59 (#231)

PolyMeilex · Jan 3, 2025 · a846f86 · a846f86
1 parent 6ab069c
commit a846f86
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,7 @@ core-foundation = "0.10.0"
 core-foundation-sys = "0.8.7"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.48", features = [
+windows-sys = { version = "0.59", features = [
   "Win32_Foundation",
   "Win32_System_Com",
   "Win32_UI_Shell_Common",

diff --git a/src/backend/win_cid/file_dialog/dialog_ffi.rs b/src/backend/win_cid/file_dialog/dialog_ffi.rs
@@ -114,7 +114,7 @@ impl DialogInner {
     #[inline]
     unsafe fn show(&self, parent: Option<HWND>) -> Result<()> {
         let (d, v) = self.fd();
-        wrap_err((v.base.Show)(d, parent.unwrap_or_default()))
+        wrap_err((v.base.Show)(d, parent.unwrap_or(std::ptr::null_mut())))
     }
 
     #[inline]

diff --git a/src/backend/win_cid/message_dialog.rs b/src/backend/win_cid/message_dialog.rs
@@ -134,7 +134,7 @@ impl WinMessageDialog {
 
         let task_dialog_config = TASKDIALOGCONFIG {
             cbSize: core::mem::size_of::<TASKDIALOGCONFIG>() as u32,
-            hwndParent: self.parent.unwrap_or_default(),
+            hwndParent: self.parent.unwrap_or(std::ptr::null_mut()),
             dwFlags: TDF_ALLOW_DIALOG_CANCELLATION | TDF_SIZE_TO_CONTENT,
             pszWindowTitle: self.caption.as_ptr(),
             pszContent: self.text.as_ptr(),
@@ -150,7 +150,7 @@ impl WinMessageDialog {
             pRadioButtons: std::ptr::null(),
             cRadioButtons: 0,
             cxWidth: 0,
-            hInstance: 0,
+            hInstance: std::ptr::null_mut(),
             pfCallback: None,
             lpCallbackData: 0,
             nDefaultButton: 0,
@@ -206,7 +206,7 @@ impl WinMessageDialog {
     pub fn run(self) -> MessageDialogResult {
         let ret = unsafe {
             MessageBoxW(
-                self.parent.unwrap_or_default(),
+                self.parent.unwrap_or(std::ptr::null_mut()),
                 self.text.as_ptr(),
                 self.caption.as_ptr(),
                 self.flags,

diff --git a/src/backend/win_cid/utils.rs b/src/backend/win_cid/utils.rs
@@ -17,7 +17,7 @@ pub fn init_com<T, F: FnOnce() -> T>(f: F) -> Result<T, HRESULT> {
     let res = unsafe {
         CoInitializeEx(
             std::ptr::null(),
-            COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE,
+            (COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) as u32,
         )
     };