Remap the Win32 definition of EventRegistrationToken (#3445)

microsoft · Jan 15, 2025 · 0a2c0b9 · 0a2c0b9
1 parent 94e56c9
commit 0a2c0b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/crates/libs/bindgen/src/type_name.rs b/crates/libs/bindgen/src/type_name.rs
@@ -25,6 +25,8 @@ impl TypeName {
 
     pub const HResult: Self = Self("Windows.Foundation", "HResult");
     pub const EventRegistrationToken: Self = Self("Windows.Foundation", "EventRegistrationToken");
+    pub const EventRegistrationToken2: Self =
+        Self("Windows.Win32.System.WinRT", "EventRegistrationToken");
 
     pub const IAsyncAction: Self = Self("Windows.Foundation", "IAsyncAction");
     pub const IAsyncActionWithProgress: Self =

diff --git a/crates/libs/bindgen/src/types/mod.rs b/crates/libs/bindgen/src/types/mod.rs
@@ -172,6 +172,7 @@ impl Type {
             TypeName::IUnknown => Remap::Type(Self::IUnknown),
             TypeName::Type => Remap::Type(Self::Type),
             TypeName::EventRegistrationToken => Remap::Type(Type::I64),
+            TypeName::EventRegistrationToken2 => Remap::Type(Type::I64),
 
             TypeName::D2D_MATRIX_3X2_F => Remap::Name(TypeName::Matrix3x2),
             TypeName::D3DMATRIX => Remap::Name(TypeName::Matrix4x4),

diff --git a/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs b/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs
@@ -560,16 +560,6 @@ impl Default for DispatcherQueueOptions {
         unsafe { core::mem::zeroed() }
     }
 }
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct EventRegistrationToken {
-    pub value: i64,
-}
-impl Default for EventRegistrationToken {
-    fn default() -> Self {
-        unsafe { core::mem::zeroed() }
-    }
-}
 pub const FullTrust: TrustLevel = TrustLevel(2i32);
 #[repr(transparent)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]