chore(deps): update windows and windows-implement crates to 0.52 (#1089)

Cargo.toml

@@ -59,12 +59,13 @@ x11-dl = { version = "2.9", optional = true }
 gdkx11 = { version = "0.18", optional = true }
 
 [target."cfg(target_os = \"windows\")".dependencies]
-webview2-com = "0.27"
-windows-implement = "0.51"
+webview2-com = "0.28"
+windows-implement = "0.52"
+windows-version = "0.1"
 dunce = "1"
 
 [target."cfg(target_os = \"windows\")".dependencies.windows]
-version = "0.51"
+version = "0.52"
 features = [
   "implement",
   "Win32_Foundation",

src/webview2/mod.rs

@@ -15,15 +15,14 @@ use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
 use url::Url;
 use webview2_com::{Microsoft::Web::WebView2::Win32::*, *};
 use windows::{
-  core::{s, ComInterface, PCSTR, PCWSTR, PWSTR},
+  core::{s, ComInterface, PCWSTR, PWSTR},
   Win32::{
     Foundation::*,
     Globalization::{self, MAX_LOCALE_NAME},
     Graphics::Gdi::{RedrawWindow, HBRUSH, HRGN, RDW_INTERNALPAINT},
     System::{
       Com::{CoInitializeEx, IStream, COINIT_APARTMENTTHREADED},
-      LibraryLoader::{GetModuleHandleW, GetProcAddress, LoadLibraryW},
-      SystemInformation::OSVERSIONINFOW,
+      LibraryLoader::GetModuleHandleW,
       WinRT::EventRegistrationToken,
     },
     UI::{
@@ -1181,64 +1180,9 @@ pub fn platform_webview_version() -> Result<String> {
 }
 
 fn is_windows_7() -> bool {
-  if let Some(v) = get_windows_ver() {
-    // windows 7 is 6.1
-    if v.0 == 6 && v.1 == 1 {
-      return true;
-    }
-  }
-  false
-}
-
-fn get_function_impl(library: &str, function: &str) -> Option<FARPROC> {
-  let library = encode_wide(library);
-  assert_eq!(function.chars().last(), Some('\0'));
-  let function = PCSTR::from_raw(function.as_ptr());
-
-  // Library names we will use are ASCII so we can use the A version to avoid string conversion.
-  let module = unsafe { LoadLibraryW(PCWSTR::from_raw(library.as_ptr())) }.unwrap_or_default();
-  if module.is_invalid() {
-    None
-  } else {
-    Some(unsafe { GetProcAddress(module, function) })
-  }
-}
-
-macro_rules! get_function {
-  ($lib:expr, $func:ident) => {
-    crate::webview2::get_function_impl(concat!($lib, '\0'), concat!(stringify!($func), '\0'))
-      .map(|f| unsafe { std::mem::transmute::<windows::Win32::Foundation::FARPROC, $func>(f) })
-  };
-}
-
-pub(crate) use get_function;
-
-/// Returns a tuple of (major, minor, buildnumber)
-fn get_windows_ver() -> Option<(u32, u32, u32)> {
-  type RtlGetVersion = unsafe extern "system" fn(*mut OSVERSIONINFOW) -> i32;
-  let handle = get_function!("ntdll.dll", RtlGetVersion);
-  if let Some(rtl_get_version) = handle {
-    unsafe {
-      let mut vi = OSVERSIONINFOW {
-        dwOSVersionInfoSize: 0,
-        dwMajorVersion: 0,
-        dwMinorVersion: 0,
-        dwBuildNumber: 0,
-        dwPlatformId: 0,
-        szCSDVersion: [0; 128],
-      };
-
-      let status = (rtl_get_version)(&mut vi as _);
-
-      if status >= 0 {
-        Some((vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber))
-      } else {
-        None
-      }
-    }
-  } else {
-    None
-  }
+  let v = windows_version::OsVersion::current();
+  // windows 7 is 6.1
+  v.major == 6 && v.minor == 1
 }
 
 fn url_from_webview(webview: &ICoreWebView2) -> String {