Replace winapi with windows

Author: kkent030315

Cargo.toml

@@ -18,5 +18,10 @@ rustc-args = ["--cfg", "windows"]
 [dependencies]
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["impl-default","winnt","commoncontrols","commctrl","libloaderapi"] }
-widestring = "1.0.2"
+windows = { version = "0.61", features = [
+    "Win32_Foundation",
+    "Win32_System_LibraryLoader",
+    "Win32_UI_Controls",
+    "Win32_UI_WindowsAndMessaging",
+] }
+widestring = "1.2"

example/src/main.rs

@@ -10,16 +10,17 @@ fn hyperlink_callback(context: &str) {
 
 unsafe extern "system" fn callback(
     hwnd: HWND,
-    msg: u32,
-    w_param: usize,
-    l_param: isize,
+    msg: TASKDIALOG_NOTIFICATIONS,
+    w_param: WPARAM,
+    l_param: LPARAM,
     ref_data: *mut TaskDialogConfig,
-) -> i32 {
+) -> HRESULT {
     println!(
         "callback: hwnd={:?} msg={} wparam={:#X} lparam={:#X} ref_data={:?}",
-        hwnd, msg, w_param, l_param, ref_data
+        hwnd, msg.0, w_param.0, l_param.0, ref_data
     );
-    0
+
+    S_OK
 }
 
 fn main() {
@@ -161,39 +162,40 @@ fn show_process_bar() {
 fn page_navigation() {
     unsafe extern "system" fn page1_callback(
         _: HWND,
-        msg: u32,
-        w_param: usize,
-        _: isize,
+        msg: TASKDIALOG_NOTIFICATIONS,
+        w_param: WPARAM,
+        _: LPARAM,
         ref_data: *mut TaskDialogConfig,
-    ) -> i32 {
+    ) -> HRESULT {
         if msg == TDN_NAVIGATED {
         } else if msg == TDN_BUTTON_CLICKED {
             // TDN_BUTTON_CLICKED
 
             // Note that lifetime is limited in Rust objects
             // and we cannot make new struct in stack here.
             // Instead we should modify `ref_data`.
-            if w_param as i32 == 1776 {
+            if w_param.0 == 1776 {
                 (*ref_data).window_title = "Page #1".to_owned();
                 (*ref_data).main_instruction = "Page #1".to_owned();
                 (*ref_data).buttons = vec![TaskDialogButton {
                     id: 1777,
                     text: "Continue".to_owned(),
                 }];
                 (*ref_data).navigate_page(&mut *ref_data);
-                return 1; // S_FALSE
-            } else if w_param as i32 == 1777 {
+                return S_FALSE;
+            } else if w_param.0 == 1777 {
                 (*ref_data).window_title = "Page #2".to_owned();
                 (*ref_data).main_instruction = "Page #2".to_owned();
                 (*ref_data).buttons = vec![TaskDialogButton {
                     id: 1776,
                     text: "Back to page #1".to_owned(),
                 }];
                 (*ref_data).navigate_page(&mut *ref_data);
-                return 1; // S_FALSE
+                return S_FALSE;
             }
         }
-        0
+
+        S_OK
     }
 
     let mut conf = TaskDialogConfig {

src/constants.rs

@@ -1,8 +1,5 @@
 #[cfg(windows)]
-extern crate winapi;
-
-#[cfg(windows)]
-pub use winapi::um::commctrl::{
+pub use windows::Win32::UI::Controls::{
     TDCBF_CANCEL_BUTTON, TDCBF_CLOSE_BUTTON, TDCBF_NO_BUTTON, TDCBF_OK_BUTTON, TDCBF_RETRY_BUTTON,
     TDCBF_YES_BUTTON, TDF_ALLOW_DIALOG_CANCELLATION, TDF_CAN_BE_MINIMIZED, TDF_ENABLE_HYPERLINKS,
     TDF_EXPANDED_BY_DEFAULT, TDF_EXPAND_FOOTER_AREA, TDF_NO_DEFAULT_RADIO_BUTTON,