diff --git a/crates/libs/bindgen/default/Windows.Wdk.winmd b/crates/libs/bindgen/default/Windows.Wdk.winmd
index eba971d094..d006fdba8c 100644
Binary files a/crates/libs/bindgen/default/Windows.Wdk.winmd and b/crates/libs/bindgen/default/Windows.Wdk.winmd differ
diff --git a/crates/libs/bindgen/default/Windows.Win32.winmd b/crates/libs/bindgen/default/Windows.Win32.winmd
index 040025f3e9..36f99f91b6 100644
Binary files a/crates/libs/bindgen/default/Windows.Win32.winmd and b/crates/libs/bindgen/default/Windows.Win32.winmd differ
diff --git a/crates/libs/bindgen/default/readme.md b/crates/libs/bindgen/default/readme.md
index 08b58afca9..81f243032e 100644
--- a/crates/libs/bindgen/default/readme.md
+++ b/crates/libs/bindgen/default/readme.md
@@ -5,12 +5,12 @@ like [ILSpy](https://github.com/icsharpcode/ILSpy).
## `Windows.Win32.winmd`
- Source:
-- Version: `58.0.18`
+- Version: `61.0.15`
## `Windows.Wdk.winmd`
- Source:
-- Version: `0.10.7`
+- Version: `0.12.8`
## `Windows.winmd`
diff --git a/crates/libs/bindgen/src/rust/handles.rs b/crates/libs/bindgen/src/rust/handles.rs
index 4724f125e5..c74a71f33e 100644
--- a/crates/libs/bindgen/src/rust/handles.rs
+++ b/crates/libs/bindgen/src/rust/handles.rs
@@ -11,17 +11,10 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
pub fn gen_sys_handle(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
let ident = to_ident(def.name());
- match def.underlying_type() {
- metadata::Type::ISize if writer.std => quote! {
- pub type #ident = *mut core::ffi::c_void;
- },
- underlying_type => {
- let signature = writer.type_default_name(&underlying_type);
+ let signature = writer.type_default_name(&def.underlying_type());
- quote! {
- pub type #ident = #signature;
- }
- }
+ quote! {
+ pub type #ident = #signature;
}
}
@@ -84,6 +77,7 @@ pub fn gen_win_handle(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
quote! {
impl windows_core::Free for #ident {
+ #[inline]
unsafe fn free(&mut self) {
if !self.is_invalid() {
#result #name(*self #tail);
diff --git a/crates/libs/core/src/imp/bindings.rs b/crates/libs/core/src/imp/bindings.rs
index 0492583977..b03b763bd9 100644
--- a/crates/libs/core/src/imp/bindings.rs
+++ b/crates/libs/core/src/imp/bindings.rs
@@ -216,7 +216,7 @@ pub struct CLIPDATA {
pub ulClipFmt: i32,
pub pClipData: *mut u8,
}
-pub type CO_MTA_USAGE_COOKIE = isize;
+pub type CO_MTA_USAGE_COOKIE = *mut core::ffi::c_void;
#[repr(C)]
#[derive(Clone, Copy)]
pub union CY {
@@ -339,9 +339,9 @@ impl GUID {
}
}
}
-pub type HANDLE = isize;
+pub type HANDLE = *mut core::ffi::c_void;
pub type HEAP_FLAGS = u32;
-pub type HMODULE = isize;
+pub type HMODULE = *mut core::ffi::c_void;
pub type HRESULT = i32;
#[repr(C)]
#[derive(Clone, Copy)]
diff --git a/crates/libs/core/src/imp/delay_load.rs b/crates/libs/core/src/imp/delay_load.rs
index e9e81ae308..27c85dab13 100644
--- a/crates/libs/core/src/imp/delay_load.rs
+++ b/crates/libs/core/src/imp/delay_load.rs
@@ -8,9 +8,13 @@ use super::*;
///
/// * Both the library and function names must be valid null-terminated strings.
pub unsafe fn delay_load(library: crate::PCSTR, function: crate::PCSTR) -> Option {
- let library = LoadLibraryExA(library.0, 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+ let library = LoadLibraryExA(
+ library.0,
+ core::ptr::null_mut(),
+ LOAD_LIBRARY_SEARCH_DEFAULT_DIRS,
+ );
- if library == 0 {
+ if library.is_null() {
return None;
}
diff --git a/crates/libs/core/src/imp/factory_cache.rs b/crates/libs/core/src/imp/factory_cache.rs
index a6888291a0..e2b03d0b79 100644
--- a/crates/libs/core/src/imp/factory_cache.rs
+++ b/crates/libs/core/src/imp/factory_cache.rs
@@ -88,7 +88,7 @@ pub fn factory() -> crate::Result {
// If RoGetActivationFactory fails because combase hasn't been loaded yet then load combase
// automatically so that it "just works" for apartment-agnostic code.
if code == CO_E_NOTINITIALIZED {
- let mut cookie = 0;
+ let mut cookie = core::ptr::null_mut();
CoIncrementMTAUsage(&mut cookie);
// Now try a second time to get the activation factory via the OS.
diff --git a/crates/libs/core/src/imp/waiter.rs b/crates/libs/core/src/imp/waiter.rs
index de36ed4eec..67c9e2c1b6 100644
--- a/crates/libs/core/src/imp/waiter.rs
+++ b/crates/libs/core/src/imp/waiter.rs
@@ -10,7 +10,7 @@ impl Waiter {
pub fn new() -> crate::Result<(Waiter, WaiterSignaler)> {
unsafe {
let handle = CreateEventW(core::ptr::null(), 1, 0, core::ptr::null());
- if handle == 0 {
+ if handle.is_null() {
Err(crate::Error::from_win32())
} else {
Ok((Waiter(handle), WaiterSignaler(handle)))
diff --git a/crates/libs/registry/Cargo.toml b/crates/libs/registry/Cargo.toml
index 37bdaee963..3ca2174d38 100644
--- a/crates/libs/registry/Cargo.toml
+++ b/crates/libs/registry/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "windows-registry"
-version = "0.1.2"
+version = "0.2.0"
authors = ["Microsoft"]
edition = "2021"
rust-version = "1.60"
diff --git a/crates/libs/registry/src/bindings.rs b/crates/libs/registry/src/bindings.rs
index 076dc7c6e2..0e52bd79b3 100644
--- a/crates/libs/registry/src/bindings.rs
+++ b/crates/libs/registry/src/bindings.rs
@@ -28,9 +28,9 @@ pub struct FILETIME {
pub dwLowDateTime: u32,
pub dwHighDateTime: u32,
}
-pub type HANDLE = isize;
+pub type HANDLE = *mut core::ffi::c_void;
pub type HEAP_FLAGS = u32;
-pub type HKEY = isize;
+pub type HKEY = *mut core::ffi::c_void;
pub const HKEY_CLASSES_ROOT: HKEY = -2147483648i32 as _;
pub const HKEY_CURRENT_CONFIG: HKEY = -2147483643i32 as _;
pub const HKEY_CURRENT_USER: HKEY = -2147483647i32 as _;
diff --git a/crates/libs/registry/src/key.rs b/crates/libs/registry/src/key.rs
index d62e24a05e..4b0076fca8 100644
--- a/crates/libs/registry/src/key.rs
+++ b/crates/libs/registry/src/key.rs
@@ -3,13 +3,19 @@ use core::ptr::{null, null_mut};
/// A registry key.
#[repr(transparent)]
-#[derive(Default, Debug)]
+#[derive(Debug)]
pub struct Key(pub(crate) HKEY);
+impl Default for Key {
+ fn default() -> Self {
+ Self(core::ptr::null_mut())
+ }
+}
+
impl Key {
/// Creates a registry key. If the key already exists, the function opens it.
pub fn create>(&self, path: T) -> Result {
- let mut handle = 0;
+ let mut handle = core::ptr::null_mut();
let result = unsafe {
RegCreateKeyExW(
@@ -30,7 +36,7 @@ impl Key {
/// Opens a registry key.
pub fn open>(&self, path: T) -> Result