Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use consistent const GUID code gen across windows and windows-sys #2072

Merged
merged 2 commits into from Sep 27, 2022
Merged

Use consistent const GUID code gen across windows and windows-sys #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b188f
from_u128
kennykerr Sep 27, 2022
7cb91a1
code gen
kennykerr Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 1 addition & 20 deletions crates/libs/bindgen/src/gen.rs
View file
Open in desktop
Expand Up @@ -505,26 +505,7 @@ impl<'a> Gen<'a> {

pub fn guid(&self, value: &GUID) -> TokenStream {
let guid = self.type_name(&Type::GUID);

if self.sys {
let a = Literal::u32_unsuffixed(value.0);
let b = Literal::u16_unsuffixed(value.1);
let c = Literal::u16_unsuffixed(value.2);
let d = Literal::u8_unsuffixed(value.3);
let e = Literal::u8_unsuffixed(value.4);
let f = Literal::u8_unsuffixed(value.5);
let g = Literal::u8_unsuffixed(value.6);
let h = Literal::u8_unsuffixed(value.7);
let i = Literal::u8_unsuffixed(value.8);
let j = Literal::u8_unsuffixed(value.9);
let k = Literal::u8_unsuffixed(value.10);

quote! {
#guid { data1:#a, data2:#b, data3:#c, data4:[#d, #e, #f, #g, #h, #i, #j, #k] }
}
} else {
format!("{}::from_u128(0x{:08x?}_{:04x?}_{:04x?}_{:02x?}{:02x?}_{:02x?}{:02x?}{:02x?}{:02x?}{:02x?}{:02x?})", guid.into_string(), value.0, value.1, value.2, value.3, value.4, value.5, value.6, value.7, value.8, value.9, value.10).into()
}
format!("{}::from_u128(0x{:08x?}_{:04x?}_{:04x?}_{:02x?}{:02x?}_{:02x?}{:02x?}{:02x?}{:02x?}{:02x?}{:02x?})", guid.into_string(), value.0, value.1, value.2, value.3, value.4, value.5, value.6, value.7, value.8, value.9, value.10).into()
}
pub fn interface_core_traits(&self, def: TypeDef, _generics: &[Type], ident: &TokenStream, constraints: &TokenStream, phantoms: &TokenStream, features: &TokenStream) -> TokenStream {
let name = trim_tick(self.reader.type_def_name(def));
Expand Down
28 changes: 14 additions & 14 deletions crates/libs/sys/src/Windows/Win32/Data/HtmlHelp/mod.rs
View file
Open in desktop
Expand Up @@ -5,20 +5,20 @@ pub type IITWordWheel = *mut ::core::ffi::c_void;
pub type IStemSink = *mut ::core::ffi::c_void;
pub type IStemmerConfig = *mut ::core::ffi::c_void;
pub type IWordBreakerConfig = *mut ::core::ffi::c_void;
pub const CLSID_IITCmdInt: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883618, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITDatabase: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1718039634, data2: 35875, data3: 4560, data4: [168, 78, 0, 170, 0, 108, 125, 1] };
pub const CLSID_IITDatabaseLocal: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883625, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITGroupUpdate: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883620, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITIndexBuild: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2409682346, data2: 57055, data3: 4560, data4: [154, 97, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITPropList: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883630, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITResultSet: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883623, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITSvMgr: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883619, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITWWFilterBuild: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2409682347, data2: 57055, data3: 4560, data4: [154, 97, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITWordWheel: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3610715586, data2: 35858, data3: 4560, data4: [168, 78, 0, 170, 0, 108, 125, 1] };
pub const CLSID_IITWordWheelLocal: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883624, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITWordWheelUpdate: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883621, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_ITEngStemmer: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2409682344, data2: 57055, data3: 4560, data4: [154, 97, 0, 192, 79, 182, 139, 247] };
pub const CLSID_ITStdBreaker: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1180883631, data2: 54163, data3: 4560, data4: [154, 86, 0, 192, 79, 182, 139, 247] };
pub const CLSID_IITCmdInt: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa2_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITDatabase: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x66673452_8c23_11d0_a84e_00aa006c7d01);
pub const CLSID_IITDatabaseLocal: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa9_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITGroupUpdate: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa4_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITIndexBuild: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x8fa0d5aa_dedf_11d0_9a61_00c04fb68bf7);
pub const CLSID_IITPropList: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daae_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITResultSet: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa7_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITSvMgr: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa3_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITWWFilterBuild: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x8fa0d5ab_dedf_11d0_9a61_00c04fb68bf7);
pub const CLSID_IITWordWheel: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0xd73725c2_8c12_11d0_a84e_00aa006c7d01);
pub const CLSID_IITWordWheelLocal: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa8_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_IITWordWheelUpdate: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daa5_d393_11d0_9a56_00c04fb68bf7);
pub const CLSID_ITEngStemmer: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x8fa0d5a8_dedf_11d0_9a61_00c04fb68bf7);
pub const CLSID_ITStdBreaker: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x4662daaf_d393_11d0_9a56_00c04fb68bf7);
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
pub const E_ALL_WILD: ::windows_sys::core::HRESULT = -2147479467i32;
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
Expand Down
34 changes: 17 additions & 17 deletions crates/libs/sys/src/Windows/Win32/Data/Xml/MsXml/mod.rs
View file
Open in desktop
Expand Up @@ -1177,9 +1177,9 @@ pub const DISPID_XTLRUNTIME_FORMATTIME: u32 = 195u32;
pub const DISPID_XTLRUNTIME_UNIQUEID: u32 = 187u32;
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub const DISPID_XTLRUNTIME__TOP: u32 = 196u32;
pub const DOMDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 691257232, data2: 31542, data3: 4562, data4: [178, 14, 0, 192, 79, 152, 62, 96] };
pub const DOMDocument60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949829, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const DOMFreeThreadedDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 691257233, data2: 31542, data3: 4562, data4: [178, 14, 0, 192, 79, 152, 62, 96] };
pub const DOMDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x2933bf90_7b36_11d2_b20e_00c04f983e60);
pub const DOMDocument60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a05_f192_11d4_a65f_0040963251e5);
pub const DOMFreeThreadedDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x2933bf91_7b36_11d2_b20e_00c04f983e60);
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub const E_XML_BUFFERTOOSMALL: i32 = -1072897498i32;
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
Expand All @@ -1188,24 +1188,24 @@ pub const E_XML_INVALID: i32 = -1072897499i32;
pub const E_XML_NODTD: i32 = -1072897500i32;
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub const E_XML_NOTWF: i32 = -1072897501i32;
pub const FreeThreadedDOMDocument60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949830, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const FreeThreadedXMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949833, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const MXHTMLWriter60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949840, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const MXNamespaceManager60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949841, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const MXXMLWriter60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949839, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const SAXAttributes60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949838, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const SAXXMLReader60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949836, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const ServerXMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949835, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const FreeThreadedDOMDocument60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a06_f192_11d4_a65f_0040963251e5);
pub const FreeThreadedXMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a09_f192_11d4_a65f_0040963251e5);
pub const MXHTMLWriter60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a10_f192_11d4_a65f_0040963251e5);
pub const MXNamespaceManager60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a11_f192_11d4_a65f_0040963251e5);
pub const MXXMLWriter60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a0f_f192_11d4_a65f_0040963251e5);
pub const SAXAttributes60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a0e_f192_11d4_a65f_0040963251e5);
pub const SAXXMLReader60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a0c_f192_11d4_a65f_0040963251e5);
pub const ServerXMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a0b_f192_11d4_a65f_0040963251e5);
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub const XHR_PROP_ONDATA_ALWAYS: u32 = 0u32;
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub const XHR_PROP_ONDATA_NEVER: u64 = 18446744073709551615u64;
pub const XMLDSOControl: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1426971184, data2: 1345, data3: 4562, data4: [156, 169, 0, 96, 176, 236, 61, 57] };
pub const XMLDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3485702575, data2: 55414, data3: 4560, data4: [156, 16, 0, 192, 79, 201, 156, 142] };
pub const XMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949834, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const XMLHTTPRequest: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3985379470, data2: 17225, data3: 4562, data4: [145, 164, 0, 192, 79, 121, 105, 232] };
pub const XMLSchemaCache60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949831, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const XSLTemplate60: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 2295949832, data2: 61842, data3: 4564, data4: [166, 95, 0, 64, 150, 50, 81, 229] };
pub const XMLDSOControl: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x550dda30_0541_11d2_9ca9_0060b0ec3d39);
pub const XMLDocument: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0xcfc399af_d876_11d0_9c10_00c04fc99c8e);
pub const XMLHTTP60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a0a_f192_11d4_a65f_0040963251e5);
pub const XMLHTTPRequest: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0xed8c108e_4349_11d2_91a4_00c04f7969e8);
pub const XMLSchemaCache60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a07_f192_11d4_a65f_0040963251e5);
pub const XSLTemplate60: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x88d96a08_f192_11d4_a65f_0040963251e5);
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
pub type DOMNodeType = i32;
#[doc = "*Required features: `\"Win32_Data_Xml_MsXml\"`*"]
Expand Down
6 changes: 3 additions & 3 deletions crates/libs/sys/src/Windows/Win32/Data/Xml/XmlLite/mod.rs
View file
Open in desktop
Expand Up @@ -23,9 +23,9 @@ pub type IXmlReader = *mut ::core::ffi::c_void;
pub type IXmlResolver = *mut ::core::ffi::c_void;
pub type IXmlWriter = *mut ::core::ffi::c_void;
pub type IXmlWriterLite = *mut ::core::ffi::c_void;
pub const _IID_IXmlReader: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1920597121, data2: 28829, data3: 16533, data4: [182, 61, 105, 254, 75, 13, 144, 48] };
pub const _IID_IXmlResolver: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1920597122, data2: 28829, data3: 16533, data4: [182, 61, 105, 254, 75, 13, 144, 48] };
pub const _IID_IXmlWriter: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 1920597128, data2: 28829, data3: 16533, data4: [182, 61, 105, 254, 75, 13, 144, 48] };
pub const _IID_IXmlReader: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x7279fc81_709d_4095_b63d_69fe4b0d9030);
pub const _IID_IXmlResolver: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x7279fc82_709d_4095_b63d_69fe4b0d9030);
pub const _IID_IXmlWriter: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0x7279fc88_709d_4095_b63d_69fe4b0d9030);
#[doc = "*Required features: `\"Win32_Data_Xml_XmlLite\"`*"]
pub type DtdProcessing = i32;
#[doc = "*Required features: `\"Win32_Data_Xml_XmlLite\"`*"]
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/sys/src/Windows/Win32/Devices/BiometricFramework/mod.rs
View file
Open in desktop
Expand Up @@ -116,7 +116,7 @@ extern "system" {
pub const FACILITY_NONE: u32 = 0u32;
#[doc = "*Required features: `\"Win32_Devices_BiometricFramework\"`*"]
pub const FACILITY_WINBIO: u32 = 9u32;
pub const GUID_DEVINTERFACE_BIOMETRIC_READER: ::windows_sys::core::GUID = ::windows_sys::core::GUID { data1: 3803519034, data2: 39402, data3: 19651, data4: [173, 107, 128, 202, 141, 113, 91, 128] };
pub const GUID_DEVINTERFACE_BIOMETRIC_READER: ::windows_sys::core::GUID = ::windows_sys::core::GUID::from_u128(0xe2b5183a_99ea_4cc3_ad6b_80ca8d715b80);
#[doc = "*Required features: `\"Win32_Devices_BiometricFramework\"`*"]
pub const IOCTL_BIOMETRIC_VENDOR: u32 = 4464640u32;
#[doc = "*Required features: `\"Win32_Devices_BiometricFramework\"`*"]
Expand Down