Improve windows-bindgen for std usage (#2610)

microsoft · Aug 16, 2023 · 8f47253 · 8f47253
1 parent f1b1edd
commit 8f47253
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/crates/libs/bindgen/src/args.rs b/crates/libs/bindgen/src/args.rs
@@ -30,7 +30,9 @@ where
         }
         if expand {
             for args in crate::read_file_lines(&arg)? {
-                from_string(result, &args)?;
+                if !args.starts_with("//") {
+                    from_string(result, &args)?;
+                }
             }
         } else if arg == "--etc" {
             expand = true;

diff --git a/crates/libs/bindgen/src/rust/handles.rs b/crates/libs/bindgen/src/rust/handles.rs
@@ -14,12 +14,6 @@ pub fn gen_sys_handle(writer: &Writer, def: TypeDef) -> TokenStream {
         Type::ISize if writer.std => quote! {
             pub type #ident = *mut ::core::ffi::c_void;
         },
-        Type::USize if writer.std => quote! {
-            #[cfg(target_pointer_width = "32")]
-            pub type #ident = u32;
-            #[cfg(target_pointer_width = "64")]
-            pub type #ident = u64;
-        },
         underlying_type => {
             let signature = writer.type_default_name(&underlying_type);
 

diff --git a/crates/tests/standalone/src/b_std.rs b/crates/tests/standalone/src/b_std.rs
@@ -36,9 +36,6 @@ pub type HANDLE = *mut ::core::ffi::c_void;
 pub type HMODULE = *mut ::core::ffi::c_void;
 pub type PCSTR = *const u8;
 pub type PSTR = *mut u8;
-#[cfg(target_pointer_width = "32")]
-pub type SOCKET = u32;
-#[cfg(target_pointer_width = "64")]
-pub type SOCKET = u64;
+pub type SOCKET = usize;
 pub type WIN32_ERROR = u32;
 pub type WINSOCK_SOCKET_TYPE = i32;
diff --git a/crates/tools/core/bindings.txt b/crates/tools/core/bindings.txt
@@ -1,3 +1,5 @@
+// These will use `windows-sys` style bindings.
+
 --out crates/libs/core/src/imp/bindings.rs
 --config flatten sys minimal
 

diff --git a/crates/tools/core/com_bindings.txt b/crates/tools/core/com_bindings.txt
@@ -1,3 +1,5 @@
+// These will use `windows` style bindings and include COM APIs.
+
 --out crates/libs/core/src/imp/com_bindings.rs
 --config flatten minimal