Replace winapi with windows crate and use webview2-com instead of webview2 (#2615)

* Switch to webview2-com version of tao and wry

* Pick up latest branch of TAO and WRY

* Let WRY pick the branch for TAO instead of patch

* Add comment for wry next branch pending merge

* Add changelog

* Revert wry redirect in Cargo.toml

* Use pinned rev for matching PR merge commit

Author: wravery

.changes/webview2-com.md

@@ -0,0 +1,7 @@
+---
+"tauri": patch
+"tauri-runtime": patch
+"tauri-runtime-wry": patch
+---
+
+Replace all of the `winapi` crate references with the `windows` crate, and replace `webview2` and `webview2-sys` with `webview2-com` and `webview2-com-sys` built with the `windows` crate. This goes along with updates to the TAO and WRY `next` branches.

core/tauri-runtime-wry/Cargo.toml

@@ -13,15 +13,15 @@ readme = "README.md"
 
 [dependencies]
 #wry = { version = "0.12", default-features = false, features = [ "file-drop", "protocol" ] }
-wry = { git = "https://github.com/tauri-apps/wry", rev = "21692d986138570d2edc31f84bddb442a3c84a9c", default-features = false, features = [ "file-drop", "protocol" ] }
+wry = { git = "https://github.com/tauri-apps/wry", rev = "e056fb2a15e29de1b8ed85a548cfeb1f85031357", default-features = false, features = [ "file-drop", "protocol" ] }
 tauri-runtime = { version = "0.2.1", path = "../tauri-runtime" }
 tauri-utils = { version = "1.0.0-beta.3", path = "../tauri-utils" }
 uuid = { version = "0.8.2", features = [ "v4" ] }
 infer = "0.4"
 
 [target."cfg(windows)".dependencies]
 ico = "0.1"
-winapi = "0.3"
+webview2-com = "0.4.0"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 png = "0.16"

core/tauri-runtime-wry/src/lib.rs

@@ -26,7 +26,10 @@ use tauri_runtime::window::MenuEvent;
 #[cfg(feature = "system-tray")]
 use tauri_runtime::{SystemTray, SystemTrayEvent};
 #[cfg(windows)]
-use winapi::shared::windef::HWND;
+use webview2_com::{
+  FocusChangedEventHandler,
+  Windows::Win32::{Foundation::HWND, System::WinRT::EventRegistrationToken},
+};
 #[cfg(all(feature = "system-tray", target_os = "macos"))]
 use wry::application::platform::macos::{SystemTrayBuilderExtMacOS, SystemTrayExtMacOS};
 #[cfg(target_os = "linux")]
@@ -1634,25 +1637,34 @@ impl Runtime for Wry {
       if let WindowHandle::Webview(ref webview) = webview.inner {
         if let Some(controller) = webview.controller() {
           let proxy = self.event_loop.create_proxy();
-          controller
-            .add_got_focus(move |_| {
-              let _ = proxy.send_event(Message::Webview(
-                id,
-                WebviewMessage::WebviewEvent(WebviewEvent::Focused(true)),
-              ));
-              Ok(())
-            })
-            .unwrap();
+          let mut token = EventRegistrationToken::default();
+          unsafe {
+            controller.add_GotFocus(
+              FocusChangedEventHandler::create(Box::new(move |_, _| {
+                let _ = proxy.send_event(Message::Webview(
+                  id,
+                  WebviewMessage::WebviewEvent(WebviewEvent::Focused(true)),
+                ));
+                Ok(())
+              })),
+              &mut token,
+            )
+          }
+          .unwrap();
           let proxy = self.event_loop.create_proxy();
-          controller
-            .add_lost_focus(move |_| {
-              let _ = proxy.send_event(Message::Webview(
-                id,
-                WebviewMessage::WebviewEvent(WebviewEvent::Focused(false)),
-              ));
-              Ok(())
-            })
-            .unwrap();
+          unsafe {
+            controller.add_LostFocus(
+              FocusChangedEventHandler::create(Box::new(move |_, _| {
+                let _ = proxy.send_event(Message::Webview(
+                  id,
+                  WebviewMessage::WebviewEvent(WebviewEvent::Focused(false)),
+                ));
+                Ok(())
+              })),
+              &mut token,
+            )
+          }
+          .unwrap();
         }
       }
     }
@@ -2024,7 +2036,7 @@ fn handle_event_loop(
             #[cfg(target_os = "macos")]
             WindowMessage::NSWindow(tx) => tx.send(NSWindow(window.ns_window())).unwrap(),
             #[cfg(windows)]
-            WindowMessage::Hwnd(tx) => tx.send(Hwnd(window.hwnd() as HWND)).unwrap(),
+            WindowMessage::Hwnd(tx) => tx.send(Hwnd(HWND(window.hwnd() as _))).unwrap(),
             #[cfg(any(
               target_os = "linux",
               target_os = "dragonfly",

core/tauri-runtime/Cargo.toml

@@ -32,7 +32,7 @@ http-range = "0.1.4"
 infer = "0.4"
 
 [target."cfg(windows)".dependencies]
-winapi = "0.3"
+webview2-com-sys = "0.4.0"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.14", features = [ "v3_20" ] }

core/tauri-runtime/src/lib.rs

@@ -11,7 +11,7 @@ use std::{fmt::Debug, path::PathBuf, sync::mpsc::Sender};
 use uuid::Uuid;
 
 #[cfg(windows)]
-use winapi::shared::windef::HWND;
+use webview2_com_sys::Windows::Win32::Foundation::HWND;
 
 pub mod http;
 /// Create window and system tray menus.

core/tauri-runtime/src/webview.rs

@@ -13,7 +13,7 @@ use serde_json::Value as JsonValue;
 use tauri_utils::config::{WindowConfig, WindowUrl};
 
 #[cfg(windows)]
-use winapi::shared::windef::HWND;
+use webview2_com_sys::Windows::Win32::Foundation::HWND;
 
 use std::{fmt, path::PathBuf};
 

core/tauri/src/window.rs

@@ -526,7 +526,7 @@ impl<R: Runtime> Window<R> {
       .window
       .dispatcher
       .hwnd()
-      .map(|hwnd| hwnd as *mut _)
+      .map(|hwnd| hwnd.0 as *mut _)
       .map_err(Into::into)
   }