Upgrade to windows 0.37.0

allenbenz · Jun 17, 2022 · e4c98cb · e4c98cb
1 parent f7879fd
commit e4c98cb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ xml-rs = "0.8.4"
 strum = { version = "0.22.0", features = ["derive"] }
 
 [target.'cfg(target_env = "msvc")'.dependencies.windows]
-version = "0.24.0"
+version = "0.37.0"
 features = [
  "Win32_Foundation",
  "Foundation_Collections",
@@ -29,8 +29,9 @@ features = [
 ]
 
 [target.'cfg(target_env = "gnu")'.dependencies.windows]
-version = "0.24.0"
+version = "0.37.0"
 features = [
+ "alloc",
  "Win32_Foundation",
  "Foundation_Collections",
  "Win32_System_SystemInformation",

diff --git a/examples/without_library.rs b/examples/without_library.rs
@@ -14,7 +14,7 @@ use windows::{
  UI::Notifications::ToastNotificationManager,
 };
 
-pub use windows::runtime::{
+pub use windows::core::{
  Error,
  HSTRING,
 };
@@ -26,7 +26,7 @@ fn main() {
  std::thread::sleep(std::time::Duration::from_millis(10));
 }
 
-fn do_toast() -> windows::runtime::Result<()> {
+fn do_toast() -> windows::core::Result<()> {
  let toast_xml = XmlDocument::new()?;
 
  toast_xml.LoadXml(HSTRING::from(

diff --git a/src/lib.rs b/src/lib.rs
@@ -43,7 +43,7 @@ use std::path::Path;
 use xml::escape::escape_str_attribute;
 mod windows_check;
 
-pub use windows::runtime::{Error, HSTRING, Result};
+pub use windows::core::{Error, HSTRING, Result};
 pub use windows::UI::Notifications::ToastNotification;
 
 pub struct Toast {
@@ -283,7 +283,7 @@ impl Toast {
  self
  }
 
- fn create_template(&self) -> windows::runtime::Result<ToastNotification> {
+ fn create_template(&self) -> windows::core::Result<ToastNotification> {
  //using this to get an instance of XmlDocument
  let toast_xml = XmlDocument::new()?;
 
@@ -325,7 +325,7 @@ impl Toast {
  }
 
  /// Display the toast on the screen
- pub fn show(&self) -> windows::runtime::Result<()> {
+ pub fn show(&self) -> windows::core::Result<()> {
  let toast_template = self.create_template()?;
 
  let toast_notifier = ToastNotificationManager::CreateToastNotifierWithId(HSTRING::from(&self.app_id))?;

diff --git a/src/windows_check.rs b/src/windows_check.rs
@@ -18,7 +18,9 @@ mod internal {
  #[allow(non_snake_case)]
  pub unsafe fn RtlGetNtVersionNumbers(major: *mut u32, minor: *mut u32, build: *mut u32) {
  if CacheRtlGetNtVersionNumbers.is_none() {
- CacheRtlGetNtVersionNumbers = GetProcAddress(GetModuleHandleA("ntdll.dll"), "RtlGetNtVersionNumbers");
+ if let Ok(handle) = GetModuleHandleA("ntdll.dll") {
+ CacheRtlGetNtVersionNumbers = GetProcAddress(handle, "RtlGetNtVersionNumbers");
+ }
  }
 
  if let Some(RtlGetNtVersionNumbers_FUNCTION) = CacheRtlGetNtVersionNumbers {