Add first-class types for PCSTR and PCWSTR (#1550)

microsoft · Feb 18, 2022 · 7afc3d4 · 7afc3d4
1 parent 6c55e2d
commit 7afc3d4
Show file tree

Hide file tree

Showing 577 changed files with 76,834 additions and 118,314 deletions.
diff --git a/crates/libs/bindgen/src/constants.rs b/crates/libs/bindgen/src/constants.rs
@@ -4,7 +4,7 @@ use super::*;
 
 pub fn gen(def: &Field, gen: &Gen) -> TokenStream {
     let name = gen_ident(def.name());
-    let ty = def.get_type(None);
+    let ty = def.get_type(None).to_const();
     let cfg = def.cfg();
     let doc = gen.doc(&cfg);
     let features = gen.cfg(&cfg);

diff --git a/crates/libs/bindgen/src/names.rs b/crates/libs/bindgen/src/names.rs
@@ -160,6 +160,22 @@ pub fn gen_element_name(def: &Type, gen: &Gen) -> TokenStream {
             let crate_name = gen_crate_name(gen);
             quote! { ::#crate_name::core::HRESULT }
         }
+        Type::PSTR => {
+            let crate_name = gen_crate_name(gen);
+            quote! { ::#crate_name::core::PSTR }
+        }
+        Type::PWSTR => {
+            let crate_name = gen_crate_name(gen);
+            quote! { ::#crate_name::core::PWSTR }
+        }
+        Type::PCSTR => {
+            let crate_name = gen_crate_name(gen);
+            quote! { ::#crate_name::core::PCSTR }
+        }
+        Type::PCWSTR => {
+            let crate_name = gen_crate_name(gen);
+            quote! { ::#crate_name::core::PCWSTR }
+        }
         Type::Win32Array((kind, len)) => {
             let name = gen_default_type(kind, gen);
             let len = Literal::u32_unsuffixed(*len);

diff --git a/crates/libs/bindgen/src/replacements/bstr.rs b/crates/libs/bindgen/src/replacements/bstr.rs
@@ -28,7 +28,7 @@ pub fn gen() -> TokenStream {
 
                 unsafe {
                     SysAllocStringLen(
-                        PWSTR(value.as_ptr()),
+                        ::windows::core::PCWSTR(value.as_ptr()),
                         value.len() as u32,
                     )
                 }

diff --git a/crates/libs/bindgen/src/replacements/mod.rs b/crates/libs/bindgen/src/replacements/mod.rs
@@ -3,14 +3,10 @@ mod bool32;
 mod bstr;
 mod handle;
 mod ntstatus;
-mod pstr;
-mod pwstr;
 
 pub fn gen(def: &TypeDef) -> Option<TokenStream> {
     match def.type_name() {
         TypeName::BOOL => Some(bool32::gen()),
-        TypeName::PWSTR => Some(pwstr::gen()),
-        TypeName::PSTR => Some(pstr::gen()),
         TypeName::BSTR => Some(bstr::gen()),
         TypeName::NTSTATUS => Some(ntstatus::gen()),
         TypeName::HANDLE => Some(handle::gen()),

diff --git a/crates/libs/bindgen/src/replacements/pstr.rs b/crates/libs/bindgen/src/replacements/pstr.rs
diff --git a/crates/libs/bindgen/src/replacements/pwstr.rs b/crates/libs/bindgen/src/replacements/pwstr.rs
diff --git a/crates/libs/metadata/src/type.rs b/crates/libs/metadata/src/type.rs
@@ -22,6 +22,10 @@ pub enum Type {
     IUnknown,
     IInspectable,
     HRESULT,
+    PSTR,
+    PWSTR,
+    PCSTR,
+    PCWSTR,
     TypeName, // Used for parsing attribute blobs
     GenericParam(&'static str),
     MethodDef(MethodDef),
@@ -139,7 +143,7 @@ impl Type {
     pub fn is_convertible(&self) -> bool {
         match self {
             Self::TypeDef(t) => t.is_convertible(),
-            Self::String | Self::IInspectable | Self::GUID | Self::IUnknown | Self::GenericParam(_) => true,
+            Self::String | Self::IInspectable | Self::GUID | Self::IUnknown | Self::GenericParam(_) | Self::PCSTR | Self::PCWSTR => true,
             Self::WinrtConstRef(kind) => kind.is_convertible(),
             _ => false,
         }
@@ -230,6 +234,8 @@ impl Type {
     pub fn to_const(self) -> Self {
         match self {
             Self::MutPtr((kind, pointers)) => Self::ConstPtr((kind, pointers)),
+            Self::PSTR => Self::PCSTR,
+            Self::PWSTR => Self::PCWSTR,
             _ => self,
         }
     }
@@ -257,7 +263,7 @@ impl Type {
 
     pub fn has_replacement(&self) -> bool {
         match self {
-            Self::HRESULT => true,
+            Self::HRESULT | Self::PCSTR | Self::PCWSTR => true,
             Self::TypeDef(def) => def.is_handle(),
             _ => false,
         }

diff --git a/crates/libs/metadata/src/type_reader.rs b/crates/libs/metadata/src/type_reader.rs
@@ -224,4 +224,4 @@ fn is_well_known(type_name: TypeName) -> bool {
 
 const REMAP_TYPES: [(TypeName, TypeName); 1] = [(TypeName::D2D_MATRIX_3X2_F, TypeName::Matrix3x2)];
 
-const WELL_KNOWN_TYPES: [(TypeName, Type); 9] = [(TypeName::GUID, Type::GUID), (TypeName::IUnknown, Type::IUnknown), (TypeName::HResult, Type::HRESULT), (TypeName::HRESULT, Type::HRESULT), (TypeName::HSTRING, Type::String), (TypeName::IInspectable, Type::IInspectable), (TypeName::LARGE_INTEGER, Type::I64), (TypeName::ULARGE_INTEGER, Type::U64), (TypeName::Type, Type::TypeName)];
+const WELL_KNOWN_TYPES: [(TypeName, Type); 11] = [(TypeName::GUID, Type::GUID), (TypeName::IUnknown, Type::IUnknown), (TypeName::HResult, Type::HRESULT), (TypeName::HRESULT, Type::HRESULT), (TypeName::HSTRING, Type::String), (TypeName::IInspectable, Type::IInspectable), (TypeName::LARGE_INTEGER, Type::I64), (TypeName::ULARGE_INTEGER, Type::U64), (TypeName::Type, Type::TypeName), (TypeName::PSTR, Type::PSTR), (TypeName::PWSTR, Type::PWSTR)];
diff --git a/crates/libs/sys/src/Windows/Win32/AI/MachineLearning/DirectML/mod.rs b/crates/libs/sys/src/Windows/Win32/AI/MachineLearning/DirectML/mod.rs
@@ -1777,35 +1777,29 @@ impl ::core::clone::Clone for DML_GRU_OPERATOR_DESC {
     }
 }
 #[repr(C)]
-#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML', 'Win32_Foundation'*"]
-#[cfg(feature = "Win32_Foundation")]
+#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML'*"]
 pub struct DML_INPUT_GRAPH_EDGE_DESC {
     pub GraphInputIndex: u32,
     pub ToNodeIndex: u32,
     pub ToNodeInputIndex: u32,
-    pub Name: super::super::super::Foundation::PSTR,
+    pub Name: ::windows_sys::core::PCSTR,
 }
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::marker::Copy for DML_INPUT_GRAPH_EDGE_DESC {}
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::clone::Clone for DML_INPUT_GRAPH_EDGE_DESC {
     fn clone(&self) -> Self {
         *self
     }
 }
 #[repr(C)]
-#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML', 'Win32_Foundation'*"]
-#[cfg(feature = "Win32_Foundation")]
+#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML'*"]
 pub struct DML_INTERMEDIATE_GRAPH_EDGE_DESC {
     pub FromNodeIndex: u32,
     pub FromNodeOutputIndex: u32,
     pub ToNodeIndex: u32,
     pub ToNodeInputIndex: u32,
-    pub Name: super::super::super::Foundation::PSTR,
+    pub Name: ::windows_sys::core::PCSTR,
 }
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::marker::Copy for DML_INTERMEDIATE_GRAPH_EDGE_DESC {}
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::clone::Clone for DML_INTERMEDIATE_GRAPH_EDGE_DESC {
     fn clone(&self) -> Self {
         *self
@@ -2135,15 +2129,12 @@ impl ::core::clone::Clone for DML_OPERATOR_DESC {
     }
 }
 #[repr(C)]
-#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML', 'Win32_Foundation'*"]
-#[cfg(feature = "Win32_Foundation")]
+#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML'*"]
 pub struct DML_OPERATOR_GRAPH_NODE_DESC {
     pub Operator: IDMLOperator,
-    pub Name: super::super::super::Foundation::PSTR,
+    pub Name: ::windows_sys::core::PCSTR,
 }
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::marker::Copy for DML_OPERATOR_GRAPH_NODE_DESC {}
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::clone::Clone for DML_OPERATOR_GRAPH_NODE_DESC {
     fn clone(&self) -> Self {
         *self
@@ -2454,17 +2445,14 @@ pub const DML_OPERATOR_DYNAMIC_QUANTIZE_LINEAR: DML_OPERATOR_TYPE = 148i32;
 #[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML'*"]
 pub const DML_OPERATOR_ROI_ALIGN1: DML_OPERATOR_TYPE = 149i32;
 #[repr(C)]
-#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML', 'Win32_Foundation'*"]
-#[cfg(feature = "Win32_Foundation")]
+#[doc = "*Required features: 'Win32_AI_MachineLearning_DirectML'*"]
 pub struct DML_OUTPUT_GRAPH_EDGE_DESC {
     pub FromNodeIndex: u32,
     pub FromNodeOutputIndex: u32,
     pub GraphOutputIndex: u32,
-    pub Name: super::super::super::Foundation::PSTR,
+    pub Name: ::windows_sys::core::PCSTR,
 }
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::marker::Copy for DML_OUTPUT_GRAPH_EDGE_DESC {}
-#[cfg(feature = "Win32_Foundation")]
 impl ::core::clone::Clone for DML_OUTPUT_GRAPH_EDGE_DESC {
     fn clone(&self) -> Self {
         *self
Original file line number	Diff line number	Diff line change
Expand Up		@@ -224,4 +224,4 @@ fn is_well_known(type_name: TypeName) -> bool {

		const REMAP_TYPES: [(TypeName, TypeName); 1] = [(TypeName::D2D_MATRIX_3X2_F, TypeName::Matrix3x2)];

		const WELL_KNOWN_TYPES: [(TypeName, Type); 9] = [(TypeName::GUID, Type::GUID), (TypeName::IUnknown, Type::IUnknown), (TypeName::HResult, Type::HRESULT), (TypeName::HRESULT, Type::HRESULT), (TypeName::HSTRING, Type::String), (TypeName::IInspectable, Type::IInspectable), (TypeName::LARGE_INTEGER, Type::I64), (TypeName::ULARGE_INTEGER, Type::U64), (TypeName::Type, Type::TypeName)];
		const WELL_KNOWN_TYPES: [(TypeName, Type); 11] = [(TypeName::GUID, Type::GUID), (TypeName::IUnknown, Type::IUnknown), (TypeName::HResult, Type::HRESULT), (TypeName::HRESULT, Type::HRESULT), (TypeName::HSTRING, Type::String), (TypeName::IInspectable, Type::IInspectable), (TypeName::LARGE_INTEGER, Type::I64), (TypeName::ULARGE_INTEGER, Type::U64), (TypeName::Type, Type::TypeName), (TypeName::PSTR, Type::PSTR), (TypeName::PWSTR, Type::PWSTR)];