From 96bbff5be272bb808513ed5dcb87e5ae6556ed6b Mon Sep 17 00:00:00 2001 From: Peter Atashian Date: Sun, 26 Mar 2017 14:44:06 -0400 Subject: [PATCH] Some more minor formatting tweaks --- .gitattributes | 4 ++ src/sapi.rs | 151 +++++++++++++++++++++--------------------- src/shared/guiddef.rs | 4 +- src/shared/hidpi.rs | 69 ++++++++++--------- src/shared/inaddr.rs | 13 ++-- src/um/combaseapi.rs | 18 ++--- src/um/d2d1_1.rs | 2 +- src/um/d3d11.rs | 12 ++-- src/um/dwrite_1.rs | 12 ++-- src/um/dwrite_2.rs | 16 ++--- src/um/dwrite_3.rs | 20 +++--- src/um/handleapi.rs | 74 ++++++++++----------- src/um/wingdi.rs | 11 +-- src/um/winnt.rs | 38 +++++------ src/um/winuser.rs | 2 +- src/usbspec.rs | 80 +++++++++++----------- src/winusb.rs | 64 +++++++++--------- src/winusbio.rs | 44 ++++++------ 18 files changed, 324 insertions(+), 310 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..e15372f2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto eol=lf +*.rs text whitespace=tab-in-indent,trailing-space,tabwidth=4 diff=cpp +*.def text +*.a binary diff --git a/src/sapi.rs b/src/sapi.rs index ac7b6983..32676ec3 100644 --- a/src/sapi.rs +++ b/src/sapi.rs @@ -22,77 +22,77 @@ pub const SPDUI_UserEnrollment: &'static str = "UserEnrollment"; pub const SPDUI_ShareData: &'static str = "ShareData"; pub const SPDUI_Tutorial: &'static str = "Tutorial"; ENUM!{enum SPSTREAMFORMAT { - SPSF_Default = -1i32 as u32, - SPSF_NoAssignedFormat = 0, - SPSF_Text = 1, - SPSF_NonStandardFormat = 2, - SPSF_ExtendedAudioFormat = 3, - SPSF_8kHz8BitMono = 4, - SPSF_8kHz8BitStereo = 5, - SPSF_8kHz16BitMono = 6, - SPSF_8kHz16BitStereo = 7, - SPSF_11kHz8BitMono = 8, - SPSF_11kHz8BitStereo = 9, - SPSF_11kHz16BitMono = 10, - SPSF_11kHz16BitStereo = 11, - SPSF_12kHz8BitMono = 12, - SPSF_12kHz8BitStereo = 13, - SPSF_12kHz16BitMono = 14, - SPSF_12kHz16BitStereo = 15, - SPSF_16kHz8BitMono = 16, - SPSF_16kHz8BitStereo = 17, - SPSF_16kHz16BitMono = 18, - SPSF_16kHz16BitStereo = 19, - SPSF_22kHz8BitMono = 20, - SPSF_22kHz8BitStereo = 21, - SPSF_22kHz16BitMono = 22, - SPSF_22kHz16BitStereo = 23, - SPSF_24kHz8BitMono = 24, - SPSF_24kHz8BitStereo = 25, - SPSF_24kHz16BitMono = 26, - SPSF_24kHz16BitStereo = 27, - SPSF_32kHz8BitMono = 28, - SPSF_32kHz8BitStereo = 29, - SPSF_32kHz16BitMono = 30, - SPSF_32kHz16BitStereo = 31, - SPSF_44kHz8BitMono = 32, - SPSF_44kHz8BitStereo = 33, - SPSF_44kHz16BitMono = 34, - SPSF_44kHz16BitStereo = 35, - SPSF_48kHz8BitMono = 36, - SPSF_48kHz8BitStereo = 37, - SPSF_48kHz16BitMono = 38, - SPSF_48kHz16BitStereo = 39, - SPSF_TrueSpeech_8kHz1BitMono = 40, - SPSF_CCITT_ALaw_8kHzMono = 41, - SPSF_CCITT_ALaw_8kHzStereo = 42, - SPSF_CCITT_ALaw_11kHzMono = 43, - SPSF_CCITT_ALaw_11kHzStereo = 44, - SPSF_CCITT_ALaw_22kHzMono = 45, - SPSF_CCITT_ALaw_22kHzStereo = 46, - SPSF_CCITT_ALaw_44kHzMono = 47, - SPSF_CCITT_ALaw_44kHzStereo = 48, - SPSF_CCITT_uLaw_8kHzMono = 49, - SPSF_CCITT_uLaw_8kHzStereo = 50, - SPSF_CCITT_uLaw_11kHzMono = 51, - SPSF_CCITT_uLaw_11kHzStereo = 52, - SPSF_CCITT_uLaw_22kHzMono = 53, - SPSF_CCITT_uLaw_22kHzStereo = 54, - SPSF_CCITT_uLaw_44kHzMono = 55, - SPSF_CCITT_uLaw_44kHzStereo = 56, - SPSF_ADPCM_8kHzMono = 57, - SPSF_ADPCM_8kHzStereo = 58, - SPSF_ADPCM_11kHzMono = 59, - SPSF_ADPCM_11kHzStereo = 60, - SPSF_ADPCM_22kHzMono = 61, - SPSF_ADPCM_22kHzStereo = 62, - SPSF_ADPCM_44kHzMono = 63, - SPSF_ADPCM_44kHzStereo = 64, - SPSF_GSM610_8kHzMono = 65, - SPSF_GSM610_11kHzMono = 66, - SPSF_GSM610_22kHzMono = 67, - SPSF_GSM610_44kHzMono = 68, - SPSF_NUM_FORMATS = 69, + SPSF_Default = -1i32 as u32, + SPSF_NoAssignedFormat = 0, + SPSF_Text = 1, + SPSF_NonStandardFormat = 2, + SPSF_ExtendedAudioFormat = 3, + SPSF_8kHz8BitMono = 4, + SPSF_8kHz8BitStereo = 5, + SPSF_8kHz16BitMono = 6, + SPSF_8kHz16BitStereo = 7, + SPSF_11kHz8BitMono = 8, + SPSF_11kHz8BitStereo = 9, + SPSF_11kHz16BitMono = 10, + SPSF_11kHz16BitStereo = 11, + SPSF_12kHz8BitMono = 12, + SPSF_12kHz8BitStereo = 13, + SPSF_12kHz16BitMono = 14, + SPSF_12kHz16BitStereo = 15, + SPSF_16kHz8BitMono = 16, + SPSF_16kHz8BitStereo = 17, + SPSF_16kHz16BitMono = 18, + SPSF_16kHz16BitStereo = 19, + SPSF_22kHz8BitMono = 20, + SPSF_22kHz8BitStereo = 21, + SPSF_22kHz16BitMono = 22, + SPSF_22kHz16BitStereo = 23, + SPSF_24kHz8BitMono = 24, + SPSF_24kHz8BitStereo = 25, + SPSF_24kHz16BitMono = 26, + SPSF_24kHz16BitStereo = 27, + SPSF_32kHz8BitMono = 28, + SPSF_32kHz8BitStereo = 29, + SPSF_32kHz16BitMono = 30, + SPSF_32kHz16BitStereo = 31, + SPSF_44kHz8BitMono = 32, + SPSF_44kHz8BitStereo = 33, + SPSF_44kHz16BitMono = 34, + SPSF_44kHz16BitStereo = 35, + SPSF_48kHz8BitMono = 36, + SPSF_48kHz8BitStereo = 37, + SPSF_48kHz16BitMono = 38, + SPSF_48kHz16BitStereo = 39, + SPSF_TrueSpeech_8kHz1BitMono = 40, + SPSF_CCITT_ALaw_8kHzMono = 41, + SPSF_CCITT_ALaw_8kHzStereo = 42, + SPSF_CCITT_ALaw_11kHzMono = 43, + SPSF_CCITT_ALaw_11kHzStereo = 44, + SPSF_CCITT_ALaw_22kHzMono = 45, + SPSF_CCITT_ALaw_22kHzStereo = 46, + SPSF_CCITT_ALaw_44kHzMono = 47, + SPSF_CCITT_ALaw_44kHzStereo = 48, + SPSF_CCITT_uLaw_8kHzMono = 49, + SPSF_CCITT_uLaw_8kHzStereo = 50, + SPSF_CCITT_uLaw_11kHzMono = 51, + SPSF_CCITT_uLaw_11kHzStereo = 52, + SPSF_CCITT_uLaw_22kHzMono = 53, + SPSF_CCITT_uLaw_22kHzStereo = 54, + SPSF_CCITT_uLaw_44kHzMono = 55, + SPSF_CCITT_uLaw_44kHzStereo = 56, + SPSF_ADPCM_8kHzMono = 57, + SPSF_ADPCM_8kHzStereo = 58, + SPSF_ADPCM_11kHzMono = 59, + SPSF_ADPCM_11kHzStereo = 60, + SPSF_ADPCM_22kHzMono = 61, + SPSF_ADPCM_22kHzStereo = 62, + SPSF_ADPCM_44kHzMono = 63, + SPSF_ADPCM_44kHzStereo = 64, + SPSF_GSM610_8kHzMono = 65, + SPSF_GSM610_11kHzMono = 66, + SPSF_GSM610_22kHzMono = 67, + SPSF_GSM610_44kHzMono = 68, + SPSF_NUM_FORMATS = 69, }} pub const SPREG_USER_ROOT: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech"; pub const SPREG_LOCAL_MACHINE_ROOT: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech"; @@ -1836,9 +1836,8 @@ ENUM!{enum SPGRAMMAROPTIONS { SPGO_SRGS_MS_SCRIPT = 0x8, SPGO_SRGS_W3C_SCRIPT = 0x100, SPGO_SRGS_STG_SCRIPT = 0x200, - SPGO_SRGS_SCRIPT = - SPGO_SRGS | SPGO_SRGS_MS_SCRIPT | SPGO_SRGS_W3C_SCRIPT | - SPGO_SRGS_STG_SCRIPT, + SPGO_SRGS_SCRIPT = SPGO_SRGS | SPGO_SRGS_MS_SCRIPT | SPGO_SRGS_W3C_SCRIPT + | SPGO_SRGS_STG_SCRIPT, SPGO_FILE = 0x10, SPGO_HTTP = 0x20, SPGO_RES = 0x40, @@ -2128,8 +2127,8 @@ ENUM!{enum SpeechTokenContext { STCInprocHandler = ::CLSCTX_INPROC_HANDLER, STCLocalServer = ::CLSCTX_LOCAL_SERVER, STCRemoteServer = ::CLSCTX_REMOTE_SERVER, - STCAll = ::CLSCTX_INPROC_SERVER | ::CLSCTX_INPROC_HANDLER | - ::CLSCTX_LOCAL_SERVER | ::CLSCTX_REMOTE_SERVER, + STCAll = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER + | CLSCTX_REMOTE_SERVER, }} ENUM!{enum SpeechTokenShellFolder { STSF_AppData = 0x1a, diff --git a/src/shared/guiddef.rs b/src/shared/guiddef.rs index d86c7f8e..43c91423 100644 --- a/src/shared/guiddef.rs +++ b/src/shared/guiddef.rs @@ -29,5 +29,7 @@ pub type REFCLSID = *const IID; pub type REFFMTID = *const IID; #[inline] pub fn IsEqualGUID(g1: &GUID, g2: &GUID) -> bool { - (g1.Data1, g1.Data2, g1.Data3, g1.Data4) == (g2.Data1, g2.Data2, g2.Data3, g2.Data4) + let a = unsafe { &*(g1 as *const _ as *const [u32; 4]) }; + let b = unsafe { &*(g2 as *const _ as *const [u32; 4]) }; + a[0] == b[0] && a[1] == b[1] && a[2] == b[2] && a[3] == b[3] } diff --git a/src/shared/hidpi.rs b/src/shared/hidpi.rs index 9f1ed244..bc6906d4 100644 --- a/src/shared/hidpi.rs +++ b/src/shared/hidpi.rs @@ -12,15 +12,41 @@ use um::winnt::{BOOLEAN, LONG, PCHAR, PVOID}; pub const HIDP_LINK_COLLECTION_ROOT: USHORT = -1i16 as u16; pub const HIDP_LINK_COLLECTION_UNSPECIFIED: USHORT = 0; ENUM!{enum HIDP_REPORT_TYPE { - HidP_Input, - HidP_Output, - HidP_Feature, + HidP_Input, + HidP_Output, + HidP_Feature, }} STRUCT!{struct USAGE_AND_PAGE { Usage: USAGE, UsagePage: USAGE, }} pub type PUSAGE_AND_PAGE = *mut USAGE_AND_PAGE; +// HidP_IsSameUsageAndPage +STRUCT!{struct HIDP_CAPS_Range { + UsageMin: USAGE, + UsageMax: USAGE, + StringMin: USHORT, + StringMax: USHORT, + DesignatorMin: USHORT, + DesignatorMax: USHORT, + DataIndexMin: USHORT, + DataIndexMax: USHORT, +}} +STRUCT!{struct HIDP_CAPS_NotRange { + Usage: USAGE, + Reserved1: USAGE, + StringIndex: USHORT, + Reserved2: USHORT, + DesignatorIndex: USHORT, + Reserved3: USHORT, + DataIndex: USHORT, + Reserved4: USHORT, +}} +UNION2!{union HIDP_CAPS_u { + [u16; 8], + Range Range_mut: HIDP_CAPS_Range, + NotRange NotRange_mut: HIDP_CAPS_NotRange, +}} STRUCT!{struct HIDP_BUTTON_CAPS { UsagePage: USAGE, ReportID: UCHAR, @@ -34,31 +60,9 @@ STRUCT!{struct HIDP_BUTTON_CAPS { IsDesignatorRange: BOOLEAN, IsAbsolute: BOOLEAN, Reserved: [ULONG; 10], - S_un: [u16; 8], + u: HIDP_CAPS_u, }} -UNION!{HIDP_BUTTON_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT} -UNION!{HIDP_BUTTON_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT} pub type PHIDP_BUTTON_CAPS = *mut HIDP_BUTTON_CAPS; -STRUCT!{struct HIDP_RANGE_STRUCT { - UsageMin: USAGE, - UsageMax: USAGE, - StringMin: USHORT, - StringMax: USHORT, - DesignatorMin: USHORT, - DesignatorMax: USHORT, - DataIndexMin: USHORT, - DataIndexMax: USHORT, -}} -STRUCT!{struct HIDP_NOTRANGE_STRUCT { - Usage: USAGE, - Reserved1: USAGE, - StringIndex: USHORT, - Reserved2: USHORT, - DesignatorIndex: USHORT, - Reserved3: USHORT, - DataIndex: USHORT, - Reserved4: USHORT, -}} STRUCT!{struct HIDP_VALUE_CAPS { UsagePage: USAGE, ReportID: UCHAR, @@ -82,10 +86,8 @@ STRUCT!{struct HIDP_VALUE_CAPS { LogicalMax: LONG, PhysicalMin: LONG, PhysicalMax: LONG, - S_un: [u16; 8], + u: HIDP_CAPS_u, }} -UNION!{HIDP_VALUE_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT} -UNION!{HIDP_VALUE_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT} pub type PHIDP_VALUE_CAPS = *mut HIDP_VALUE_CAPS; STRUCT!{struct HIDP_LINK_COLLECTION_NODE { LinkUsage: USAGE, @@ -124,13 +126,16 @@ STRUCT!{struct HIDP_CAPS { NumberFeatureDataIndices: USHORT, }} pub type PHIDP_CAPS = *mut HIDP_CAPS; +UNION2!{union HIDP_DATA_u { + [u32; 1], + RawValue RawValue_mut: ULONG, + On On_mut: BOOLEAN, +}} STRUCT!{struct HIDP_DATA { DataIndex: USHORT, Reserved: USHORT, - S_un: [u32; 1], + u: HIDP_DATA_u, }} -UNION!{HIDP_DATA, S_un, RawValue, RawValue_mut, ULONG} -UNION!{HIDP_DATA, S_un, On, On_mut, BOOLEAN} pub type PHIDP_DATA = *mut HIDP_DATA; STRUCT!{struct HIDP_UNKNOWN_TOKEN { Token: UCHAR, diff --git a/src/shared/inaddr.rs b/src/shared/inaddr.rs index b48d4514..f9612d3b 100644 --- a/src/shared/inaddr.rs +++ b/src/shared/inaddr.rs @@ -16,12 +16,15 @@ STRUCT!{struct in_addr_S_un_w { s_w1: USHORT, s_w2: USHORT, }} -STRUCT!{struct in_addr { - S_un: ULONG, +UNION2!{union in_addr_S_un { + [u32; 1], + S_un_b S_un_b_mut: in_addr_S_un_b, + S_un_w S_un_w_mut: in_addr_S_un_w, + S_addr S_addr_mut: ULONG, +}} +STRUCT!{struct in_addr { + S_un: in_addr_S_un, }} -UNION!(in_addr, S_un, S_un_b, S_un_b_mut, in_addr_S_un_b); -UNION!(in_addr, S_un, S_un_w, S_un_w_mut, in_addr_S_un_w); -UNION!(in_addr, S_un, S_addr, S_addr_mut, ULONG); pub type IN_ADDR = in_addr; pub type PIN_ADDR = *mut in_addr; pub type LPIN_ADDR = *mut in_addr; diff --git a/src/um/combaseapi.rs b/src/um/combaseapi.rs index baee552a..5f9e5791 100644 --- a/src/um/combaseapi.rs +++ b/src/um/combaseapi.rs @@ -210,17 +210,17 @@ extern "system" { // pub fn FreePropVariantArray(); // pub fn CoWaitForMultipleHandles(); ENUM!{enum COWAIT_FLAGS { - COWAIT_DEFAULT = 0, - COWAIT_WAITALL = 1, - COWAIT_ALERTABLE = 2, - COWAIT_INPUTAVAILABLE = 4, - COWAIT_DISPATCH_CALLS = 8, - COWAIT_DISPATCH_WINDOW_MESSAGES = 0x10, + COWAIT_DEFAULT = 0, + COWAIT_WAITALL = 1, + COWAIT_ALERTABLE = 2, + COWAIT_INPUTAVAILABLE = 4, + COWAIT_DISPATCH_CALLS = 8, + COWAIT_DISPATCH_WINDOW_MESSAGES = 0x10, }} ENUM!{enum CWMO_FLAGS { - CWMO_DEFAULT = 0, - CWMO_DISPATCH_CALLS = 1, - CWMO_DISPATCH_WINDOW_MESSAGES = 2, + CWMO_DEFAULT = 0, + CWMO_DISPATCH_CALLS = 1, + CWMO_DISPATCH_WINDOW_MESSAGES = 2, }} // pub fn CoWaitForMultipleObjects(); // #define CWMO_MAX_HANDLES 56 diff --git a/src/um/d2d1_1.rs b/src/um/d2d1_1.rs index c86f32ca..ff47bd6c 100644 --- a/src/um/d2d1_1.rs +++ b/src/um/d2d1_1.rs @@ -897,4 +897,4 @@ extern "system" { z: FLOAT ) -> FLOAT; -} \ No newline at end of file +} diff --git a/src/um/d3d11.rs b/src/um/d3d11.rs index 5613c58d..c8dd8352 100644 --- a/src/um/d3d11.rs +++ b/src/um/d3d11.rs @@ -1538,9 +1538,9 @@ interface ID3D11DeviceContext(ID3D11DeviceContextVtbl): ID3D11DeviceChild(ID3D11 pAsync: *mut ID3D11Asynchronous, ) -> (), fn GetData( - pAsync: *mut ID3D11Asynchronous, - pData: *mut c_void, - DataSize: UINT, + pAsync: *mut ID3D11Asynchronous, + pData: *mut c_void, + DataSize: UINT, GetDataFlags: UINT, ) -> HRESULT, fn SetPredication( @@ -2969,9 +2969,9 @@ interface ID3D11VideoDevice(ID3D11VideoDeviceVtbl): IUnknown(IUnknownVtbl) { pKeyExchangeType: *mut GUID, ) -> HRESULT, fn SetPrivateData( - guid: REFGUID, - DataSize: UINT, - pData: *const c_void, + guid: REFGUID, + DataSize: UINT, + pData: *const c_void, ) -> HRESULT, fn SetPrivateDataInterface( guid: REFGUID, diff --git a/src/um/dwrite_1.rs b/src/um/dwrite_1.rs index 094c8ebe..7919705c 100644 --- a/src/um/dwrite_1.rs +++ b/src/um/dwrite_1.rs @@ -629,13 +629,13 @@ interface IDWriteFont1(IDWriteFont1Vtbl): IDWriteFont(IDWriteFontVtbl) { }} RIDL!{#[uuid(0x94413cf4, 0xa6fc, 0x4248, 0x8b, 0x50, 0x66, 0x74, 0x34, 0x8f, 0xca, 0xd3)] -interface IDWriteRenderingParams1(IDWriteRenderingParams1Vtbl): +interface IDWriteRenderingParams1(IDWriteRenderingParams1Vtbl): IDWriteRenderingParams(IDWriteRenderingParamsVtbl) { fn GetGrayscaleEnhancedContrast() -> FLOAT, }} RIDL!{#[uuid(0x80dad800, 0xe21f, 0x4e83, 0x96, 0xce, 0xbf, 0xcc, 0xe5, 0x00, 0xdb, 0x7c)] -interface IDWriteTextAnalyzer1(IDWriteTextAnalyzer1Vtbl): +interface IDWriteTextAnalyzer1(IDWriteTextAnalyzer1Vtbl): IDWriteTextAnalyzer(IDWriteTextAnalyzerVtbl) { fn ApplyCharacterSpacing( leadingSpacing: FLOAT, @@ -725,7 +725,7 @@ interface IDWriteTextAnalyzer1(IDWriteTextAnalyzer1Vtbl): }} RIDL!{#[uuid(0x639cfad8, 0x0fb4, 0x4b21, 0xa5, 0x8a, 0x06, 0x79, 0x20, 0x12, 0x00, 0x09)] -interface IDWriteTextAnalysisSource1(IDWriteTextAnalysisSource1Vtbl): +interface IDWriteTextAnalysisSource1(IDWriteTextAnalysisSource1Vtbl): IDWriteTextAnalysisSource(IDWriteTextAnalysisSourceVtbl) { fn GetVerticalGlyphOrientation( textPosition: UINT32, @@ -736,7 +736,7 @@ interface IDWriteTextAnalysisSource1(IDWriteTextAnalysisSource1Vtbl): }} RIDL!{#[uuid(0xb0d941a0, 0x85e7, 0x4d8b, 0x9f, 0xd3, 0x5c, 0xed, 0x99, 0x34, 0x48, 0x2a)] -interface IDWriteTextAnalysisSink1(IDWriteTextAnalysisSink1Vtbl): +interface IDWriteTextAnalysisSink1(IDWriteTextAnalysisSink1Vtbl): IDWriteTextAnalysisSink(IDWriteTextAnalysisSinkVtbl) { fn SetGlyphOrientation( textPosition: UINT32, @@ -749,7 +749,7 @@ interface IDWriteTextAnalysisSink1(IDWriteTextAnalysisSink1Vtbl): }} RIDL!{#[uuid(0x9064d822, 0x80a7, 0x465c, 0xa9, 0x86, 0xdf, 0x65, 0xf7, 0x8b, 0x8f, 0xeb)] -interface IDWriteTextLayout1(IDWriteTextLayout1Vtbl): +interface IDWriteTextLayout1(IDWriteTextLayout1Vtbl): IDWriteTextLayout(IDWriteTextLayoutVtbl) { fn SetPairKerning( isPairKerningEnabled: BOOL, @@ -781,7 +781,7 @@ ENUM!{enum DWRITE_TEXT_ANTIALIAS_MODE { }} RIDL!{#[uuid(0x791e8298, 0x3ef3, 0x4230, 0x98, 0x80, 0xc9, 0xbd, 0xec, 0xc4, 0x20, 0x64)] -interface IDWriteBitmapRenderTarget1(IDWriteBitmapRenderTarget1Vtbl): +interface IDWriteBitmapRenderTarget1(IDWriteBitmapRenderTarget1Vtbl): IDWriteBitmapRenderTarget(IDWriteBitmapRenderTargetVtbl) { fn GetTextAntialiasMode() -> DWRITE_TEXT_ANTIALIAS_MODE, fn SetTextAntialiasMode(antialiasMode: DWRITE_TEXT_ANTIALIAS_MODE,) -> HRESULT, diff --git a/src/um/dwrite_2.rs b/src/um/dwrite_2.rs index 0a8f02c5..6683e7ac 100644 --- a/src/um/dwrite_2.rs +++ b/src/um/dwrite_2.rs @@ -54,7 +54,7 @@ STRUCT!{struct DWRITE_TEXT_METRICS1 { }} RIDL!{#[uuid(0xd3e0e934, 0x22a0, 0x427e, 0xaa, 0xe4, 0x7d, 0x95, 0x74, 0xb5, 0x9d, 0xb1)] -interface IDWriteTextRenderer1(IDWriteTextRenderer1Vtbl): +interface IDWriteTextRenderer1(IDWriteTextRenderer1Vtbl): IDWriteTextRenderer(IDWriteTextRendererVtbl) { fn DrawGlyphRun( clientDrawingContext: *mut c_void, @@ -95,7 +95,7 @@ interface IDWriteTextRenderer1(IDWriteTextRenderer1Vtbl): }} RIDL!{#[uuid(0x5f174b49, 0x0d8b, 0x4cfb, 0x8b, 0xca, 0xf1, 0xcc, 0xe9, 0xd0, 0x6c, 0x67)] -interface IDWriteTextFormat1(IDWriteTextFormat1Vtbl): +interface IDWriteTextFormat1(IDWriteTextFormat1Vtbl): IDWriteTextFormat(IDWriteTextFormatVtbl) { fn SetVerticalGlyphOrientation(glyphOrientation: DWRITE_VERTICAL_GLYPH_ORIENTATION,) -> HRESULT, fn GetVerticalGlyphOrientation() -> DWRITE_VERTICAL_GLYPH_ORIENTATION, @@ -108,7 +108,7 @@ interface IDWriteTextFormat1(IDWriteTextFormat1Vtbl): }} RIDL!{#[uuid(0x1093c18f, 0x8d5e, 0x43f0, 0xb0, 0x64, 0x09, 0x17, 0x31, 0x1b, 0x52, 0x5e)] -interface IDWriteTextLayout2(IDWriteTextLayout2Vtbl): +interface IDWriteTextLayout2(IDWriteTextLayout2Vtbl): IDWriteTextLayout1(IDWriteTextLayout1Vtbl) { fn GetMetrics(textMetrics: *mut DWRITE_TEXT_METRICS1,) -> HRESULT, fn SetVerticalGlyphOrientation(glyphOrientation: DWRITE_VERTICAL_GLYPH_ORIENTATION,) -> HRESULT, @@ -122,7 +122,7 @@ interface IDWriteTextLayout2(IDWriteTextLayout2Vtbl): }} RIDL!{#[uuid(0x553a9ff3, 0x5693, 0x4df7, 0xb5, 0x2b, 0x74, 0x80, 0x6f, 0x7f, 0x2e, 0xb9)] -interface IDWriteTextAnalyzer2(IDWriteTextAnalyzer2Vtbl): +interface IDWriteTextAnalyzer2(IDWriteTextAnalyzer2Vtbl): IDWriteTextAnalyzer1(IDWriteTextAnalyzer1Vtbl) { fn GetGlyphOrientationTransform( glyphOrientationAngle: DWRITE_GLYPH_ORIENTATION_ANGLE, @@ -168,7 +168,7 @@ interface IDWriteFontFallback(IDWriteFontFallbackVtbl): IUnknown(IUnknownVtbl) { }} RIDL!{#[uuid(0xfd882d06, 0x8aba, 0x4fb8, 0xb8, 0x49, 0x8b, 0xe8, 0xb7, 0x3e, 0x14, 0xde)] -interface IDWriteFontFallbackBuilder(IDWriteFontFallbackBuilderVtbl): +interface IDWriteFontFallbackBuilder(IDWriteFontFallbackBuilderVtbl): IUnknown(IUnknownVtbl) { fn AddMapping( ranges: *const DWRITE_UNICODE_RANGE, @@ -191,7 +191,7 @@ interface IDWriteFont2(IDWriteFont2Vtbl): IDWriteFont1(IDWriteFont1Vtbl) { }} RIDL!{#[uuid(0xd8b768ff, 0x64bc, 0x4e66, 0x98, 0x2b, 0xec, 0x8e, 0x87, 0xf6, 0x93, 0xf7)] -interface IDWriteFontFace2(IDWriteFontFace2Vtbl): +interface IDWriteFontFace2(IDWriteFontFace2Vtbl): IDWriteFontFace1(IDWriteFontFace1Vtbl) { fn IsColorFont() -> BOOL, fn GetColorPaletteCount() -> UINT32, @@ -226,14 +226,14 @@ STRUCT!{struct DWRITE_COLOR_GLYPH_RUN { }} RIDL!{#[uuid(0xd31fbe17, 0xf157, 0x41a2, 0x8d, 0x24, 0xcb, 0x77, 0x9e, 0x05, 0x60, 0xe8)] -interface IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumeratorVtbl): +interface IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumeratorVtbl): IUnknown(IUnknownVtbl) { fn MoveNext(hasRun: *mut BOOL,) -> HRESULT, fn GetCurrentRun(colorGlyphRun: *mut *const DWRITE_COLOR_GLYPH_RUN,) -> HRESULT, }} RIDL!{#[uuid(0xf9d711c3, 0x9777, 0x40ae, 0x87, 0xe8, 0x3e, 0x5a, 0xf9, 0xbf, 0x09, 0x48)] -interface IDWriteRenderingParams2(IDWriteRenderingParams2Vtbl): +interface IDWriteRenderingParams2(IDWriteRenderingParams2Vtbl): IDWriteRenderingParams1(IDWriteRenderingParams1Vtbl) { fn GetGridFitMode() -> DWRITE_GRID_FIT_MODE, }} diff --git a/src/um/dwrite_3.rs b/src/um/dwrite_3.rs index 8ba4e0ed..f6e7d37a 100644 --- a/src/um/dwrite_3.rs +++ b/src/um/dwrite_3.rs @@ -68,7 +68,7 @@ ENUM!{enum DWRITE_RENDERING_MODE1 { }} RIDL!{#[uuid(0xb7924baa, 0x391b, 0x412a, 0x8c, 0x5c, 0xe4, 0x4c, 0xc2, 0xd8, 0x67, 0xdc)] -interface IDWriteRenderingParams3(IDWriteRenderingParams3Vtbl): +interface IDWriteRenderingParams3(IDWriteRenderingParams3Vtbl): IDWriteRenderingParams2(IDWriteRenderingParams2Vtbl) { fn GetRenderingMode1() -> DWRITE_RENDERING_MODE1, }} @@ -186,7 +186,7 @@ interface IDWriteFontSetBuilder(IDWriteFontSetBuilderVtbl): IUnknown(IUnknownVtb }} RIDL!{#[uuid(0x53585141, 0xd9f8, 0x4095, 0x83, 0x21, 0xd7, 0x3c, 0xf6, 0xbd, 0x11, 0x6c)] -interface IDWriteFontCollection1(IDWriteFontCollection1Vtbl): +interface IDWriteFontCollection1(IDWriteFontCollection1Vtbl): IDWriteFontCollection(IDWriteFontCollectionVtbl) { fn GetFontSet(fontSet: *mut *mut IDWriteFontSet,) -> HRESULT, fn GetFontFamily( @@ -196,7 +196,7 @@ interface IDWriteFontCollection1(IDWriteFontCollection1Vtbl): }} RIDL!{#[uuid(0xda20d8ef, 0x812a, 0x4c43, 0x98, 0x02, 0x62, 0xec, 0x4a, 0xbd, 0x7a, 0xdf)] -interface IDWriteFontFamily1(IDWriteFontFamily1Vtbl): +interface IDWriteFontFamily1(IDWriteFontFamily1Vtbl): IDWriteFontFamily(IDWriteFontFamilyVtbl) { fn GetFontLocality(listIndex: UINT32,) -> DWRITE_LOCALITY, fn GetFont( @@ -223,7 +223,7 @@ interface IDWriteFontList1(IDWriteFontList1Vtbl): IDWriteFontList(IDWriteFontLis }} RIDL!{#[uuid(0x5e7fa7ca, 0xdde3, 0x424c, 0x89, 0xf0, 0x9f, 0xcd, 0x6f, 0xed, 0x58, 0xcd)] -interface IDWriteFontFaceReference(IDWriteFontFaceReferenceVtbl): +interface IDWriteFontFaceReference(IDWriteFontFaceReferenceVtbl): IUnknown(IUnknownVtbl) { fn CreateFontFace(fontFace: *mut *mut IDWriteFontFace3,) -> HRESULT, fn CreateFontFaceWithSimulations( @@ -263,7 +263,7 @@ interface IDWriteFont3(IDWriteFont3Vtbl): IDWriteFont2(IDWriteFont2Vtbl) { }} RIDL!{#[uuid(0xd37d7598, 0x09be, 0x4222, 0xa2, 0x36, 0x20, 0x81, 0x34, 0x1c, 0xc1, 0xf2)] -interface IDWriteFontFace3(IDWriteFontFace3Vtbl): +interface IDWriteFontFace3(IDWriteFontFace3Vtbl): IDWriteFontFace2(IDWriteFontFace2Vtbl) { fn GetFontFaceReference(fontFaceReference: *mut *mut IDWriteFontFaceReference,) -> HRESULT, fn GetPanose(panose: *mut DWRITE_PANOSE,) -> (), @@ -330,7 +330,7 @@ interface IDWriteStringList(IDWriteStringListVtbl): IUnknown(IUnknownVtbl) { }} RIDL!{#[uuid(0xb06fe5b9, 0x43ec, 0x4393, 0x88, 0x1b, 0xdb, 0xe4, 0xdc, 0x72, 0xfd, 0xa7)] -interface IDWriteFontDownloadListener(IDWriteFontDownloadListenerVtbl): +interface IDWriteFontDownloadListener(IDWriteFontDownloadListenerVtbl): IUnknown(IUnknownVtbl) { fn DownloadCompleted( downloadQueue: *mut IDWriteFontDownloadQueue, @@ -340,7 +340,7 @@ interface IDWriteFontDownloadListener(IDWriteFontDownloadListenerVtbl): }} RIDL!{#[uuid(0xb71e6052, 0x5aea, 0x4fa3, 0x83, 0x2e, 0xf6, 0x0d, 0x43, 0x1f, 0x7e, 0x91)] -interface IDWriteFontDownloadQueue(IDWriteFontDownloadQueueVtbl): +interface IDWriteFontDownloadQueue(IDWriteFontDownloadQueueVtbl): IUnknown(IUnknownVtbl) { fn AddListener( listener: *mut IDWriteFontDownloadListener, @@ -354,7 +354,7 @@ interface IDWriteFontDownloadQueue(IDWriteFontDownloadQueueVtbl): }} RIDL!{#[uuid(0x4556be70, 0x3abd, 0x4f70, 0x90, 0xbe, 0x42, 0x17, 0x80, 0xa6, 0xf5, 0x15)] -interface IDWriteGdiInterop1(IDWriteGdiInterop1Vtbl): +interface IDWriteGdiInterop1(IDWriteGdiInterop1Vtbl): IDWriteGdiInterop(IDWriteGdiInteropVtbl) { fn CreateFontFromLOGFONT( logFont: *const LOGFONTW, @@ -402,14 +402,14 @@ STRUCT!{struct DWRITE_LINE_SPACING { }} RIDL!{#[uuid(0xf67e0edd, 0x9e3d, 0x4ecc, 0x8c, 0x32, 0x41, 0x83, 0x25, 0x3d, 0xfe, 0x70)] -interface IDWriteTextFormat2(IDWriteTextFormat2Vtbl): +interface IDWriteTextFormat2(IDWriteTextFormat2Vtbl): IDWriteTextFormat1(IDWriteTextFormat1Vtbl) { fn SetLineSpacing(lineSpacingOptions: *const DWRITE_LINE_SPACING,) -> HRESULT, fn GetLineSpacing(lineSpacingOptions: *mut DWRITE_LINE_SPACING,) -> HRESULT, }} RIDL!{#[uuid(0x07ddcd52, 0x020e, 0x4de8, 0xac, 0x33, 0x6c, 0x95, 0x3d, 0x83, 0xf9, 0x2d)] -interface IDWriteTextLayout3(IDWriteTextLayout3Vtbl): +interface IDWriteTextLayout3(IDWriteTextLayout3Vtbl): IDWriteTextLayout2(IDWriteTextLayout2Vtbl) { fn InvalidateLayout() -> HRESULT, fn SetLineSpacing(lineSpacingOptions: *const DWRITE_LINE_SPACING,) -> HRESULT, diff --git a/src/um/handleapi.rs b/src/um/handleapi.rs index 3338813d..93e1510f 100644 --- a/src/um/handleapi.rs +++ b/src/um/handleapi.rs @@ -1,37 +1,37 @@ -// Copyright © 2016-2017 winapi-rs developers -// Licensed under the Apache License, Version 2.0 -// or the MIT license -// , at your option. -// All files in the project carrying such notice may not be copied, modified, or distributed -// except according to those terms. -//! handleapi include file -use shared::minwindef::{BOOL, DWORD, LPDWORD, LPHANDLE}; -use um::winnt::HANDLE; -pub const INVALID_HANDLE_VALUE: HANDLE = -1isize as HANDLE; -extern "system" { - pub fn CloseHandle( - hObject: HANDLE, - ) -> BOOL; - pub fn DuplicateHandle( - hSourceProcessHandle: HANDLE, - hSourceHandle: HANDLE, - hTargetProcessHandle: HANDLE, - lpTargetHandle: LPHANDLE, - dwDesiredAccess: DWORD, - bInheritHandle: BOOL, - dwOptions: DWORD, - ) -> BOOL; - pub fn CompareObjectHandles( - hFirstObjectHandle: HANDLE, - hSecondObjectHandle: HANDLE, - ) -> BOOL; - pub fn GetHandleInformation( - hObject: HANDLE, - lpdwFlags: LPDWORD, - ) -> BOOL; - pub fn SetHandleInformation( - hObject: HANDLE, - dwMask: DWORD, - dwFlags: DWORD, - ) -> BOOL; -} +// Copyright © 2016-2017 winapi-rs developers +// Licensed under the Apache License, Version 2.0 +// or the MIT license +// , at your option. +// All files in the project carrying such notice may not be copied, modified, or distributed +// except according to those terms. +//! handleapi include file +use shared::minwindef::{BOOL, DWORD, LPDWORD, LPHANDLE}; +use um::winnt::HANDLE; +pub const INVALID_HANDLE_VALUE: HANDLE = -1isize as HANDLE; +extern "system" { + pub fn CloseHandle( + hObject: HANDLE, + ) -> BOOL; + pub fn DuplicateHandle( + hSourceProcessHandle: HANDLE, + hSourceHandle: HANDLE, + hTargetProcessHandle: HANDLE, + lpTargetHandle: LPHANDLE, + dwDesiredAccess: DWORD, + bInheritHandle: BOOL, + dwOptions: DWORD, + ) -> BOOL; + pub fn CompareObjectHandles( + hFirstObjectHandle: HANDLE, + hSecondObjectHandle: HANDLE, + ) -> BOOL; + pub fn GetHandleInformation( + hObject: HANDLE, + lpdwFlags: LPDWORD, + ) -> BOOL; + pub fn SetHandleInformation( + hObject: HANDLE, + dwMask: DWORD, + dwFlags: DWORD, + ) -> BOOL; +} diff --git a/src/um/wingdi.rs b/src/um/wingdi.rs index 5013bbfc..f0d52fdf 100644 --- a/src/um/wingdi.rs +++ b/src/um/wingdi.rs @@ -7,8 +7,9 @@ //! GDI procedure declarations, constant definitions and macros use ctypes::{c_char, c_int, c_long, c_short, c_ushort}; use shared::basetsd::ULONG_PTR; -use shared::minwindef::{BOOL, BYTE, DWORD, FLOAT, HMETAFILE, LPARAM, LPVOID, MAX_PATH, UINT, ULONG, - USHORT, WORD}; +use shared::minwindef::{ + BOOL, BYTE, DWORD, FLOAT, HMETAFILE, LPARAM, LPVOID, MAX_PATH, UINT, ULONG, USHORT, WORD, +}; use shared::windef::{COLORREF, HBRUSH, HDC, HGDIOBJ, POINT, RECT, RECTL, SIZEL}; use um::winnt::{CHAR, LONG, LPCSTR, LPCWSTR, LPSTR, LPWSTR, PSTR, SHORT, VOID, WCHAR}; pub const R2_BLACK: c_int = 1; @@ -1049,9 +1050,9 @@ STRUCT!{struct GLYPHMETRICS { }} pub type LPGLYPHMETRICS = *mut GLYPHMETRICS; STRUCT!{struct KERNINGPAIR { - wFirst: WORD, - wSecond: WORD, - iKernAmount: c_int, + wFirst: WORD, + wSecond: WORD, + iKernAmount: c_int, }} pub type LPKERNINGPAIR = *mut KERNINGPAIR; STRUCT!{struct PANOSE { diff --git a/src/um/winnt.rs b/src/um/winnt.rs index 1f25dcc9..070d4276 100644 --- a/src/um/winnt.rs +++ b/src/um/winnt.rs @@ -2801,25 +2801,25 @@ UNION!(WOW64_LDT_ENTRY, HighWord, Bytes, Bytes_mut, WOW64_LDT_ENTRY_Bytes); UNION!(WOW64_LDT_ENTRY, HighWord, Bits, Bits_mut, WOW64_LDT_ENTRY_Bits); pub type PWOW64_LDT_ENTRY = *mut WOW64_LDT_ENTRY; STRUCT!{struct IMAGE_DOS_HEADER { - e_magic: WORD, - e_cblp: WORD, - e_cp: WORD, - e_crlc: WORD, - e_cparhdr: WORD, - e_minalloc: WORD, - e_maxalloc: WORD, - e_ss: WORD, - e_sp: WORD, - e_csum: WORD, - e_ip: WORD, - e_cs: WORD, - e_lfarlc: WORD, - e_ovno: WORD, - e_res: [WORD; 4], - e_oemid: WORD, - e_oeminfo: WORD, - e_res2: [WORD; 10], - e_lfanew: LONG, + e_magic: WORD, + e_cblp: WORD, + e_cp: WORD, + e_crlc: WORD, + e_cparhdr: WORD, + e_minalloc: WORD, + e_maxalloc: WORD, + e_ss: WORD, + e_sp: WORD, + e_csum: WORD, + e_ip: WORD, + e_cs: WORD, + e_lfarlc: WORD, + e_ovno: WORD, + e_res: [WORD; 4], + e_oemid: WORD, + e_oeminfo: WORD, + e_res2: [WORD; 10], + e_lfanew: LONG, }} pub type PIMAGE_DOS_HEADER = *mut IMAGE_DOS_HEADER; pub const DLL_PROCESS_ATTACH: DWORD = 1; diff --git a/src/um/winuser.rs b/src/um/winuser.rs index cc12ec97..89778d46 100644 --- a/src/um/winuser.rs +++ b/src/um/winuser.rs @@ -1281,7 +1281,7 @@ pub const WM_MOUSELAST: UINT = 0x020E; pub const WHEEL_DELTA: c_short = 120; #[inline] pub fn GET_WHEEL_DELTA_WPARAM(wParam: WPARAM) -> c_short { - HIWORD(wParam as DWORD) as c_short + HIWORD(wParam as DWORD) as c_short } pub const WHEEL_PAGESCROLL: UINT = UINT_MAX; #[inline] diff --git a/src/usbspec.rs b/src/usbspec.rs index 4d1859e1..532e161b 100644 --- a/src/usbspec.rs +++ b/src/usbspec.rs @@ -1,40 +1,40 @@ -// Copyright © 2016-2017 winapi-rs developers -// Licensed under the Apache License, Version 2.0 -// or the MIT license -// , at your option. -// All files in the project carrying such notice may not be copied, modified, or distributed -// except according to those terms. -//! USB Spec Definitions. -ENUM!{enum USB_DEVICE_SPEED { - UsbLowSpeed = 0, - UsbFullSpeed, - UsbHighSpeed, - UsbSuperSpeed, -}} -ENUM!{enum USB_DEVICE_TYPE { - Usb11Device = 0, - Usb20Device, -}} -STRUCT!{struct BM_REQUEST_TYPE { - _BM: ::UCHAR, - B: ::UCHAR, -}} -BITFIELD!{BM_REQUEST_TYPE _BM: ::UINT8 [ - Recipient set_Recipient[0..2], - Reserved set_Reserved[2..5], - Type set_Type[5..7], - Dir set_Dir[7..8], -]} -pub type PBM_REQUEST_TYPE = *mut BM_REQUEST_TYPE; - -STRUCT!{#[repr(packed)] struct USB_CONFIGURATION_DESCRIPTOR { - bLength: ::UCHAR, - bDescriptorType: ::UCHAR, - wTotalLength: ::USHORT, - bNumInterfaces: ::UCHAR, - bConfigurationValue: ::UCHAR, - iConfiguration: ::UCHAR, - bmAttributes: ::UCHAR, - MaxPower: ::UCHAR, -}} -pub type PUSB_CONFIGURATION_DESCRIPTOR = *mut USB_CONFIGURATION_DESCRIPTOR; +// Copyright © 2016-2017 winapi-rs developers +// Licensed under the Apache License, Version 2.0 +// or the MIT license +// , at your option. +// All files in the project carrying such notice may not be copied, modified, or distributed +// except according to those terms. +//! USB Spec Definitions. +ENUM!{enum USB_DEVICE_SPEED { + UsbLowSpeed = 0, + UsbFullSpeed, + UsbHighSpeed, + UsbSuperSpeed, +}} +ENUM!{enum USB_DEVICE_TYPE { + Usb11Device = 0, + Usb20Device, +}} +STRUCT!{struct BM_REQUEST_TYPE { + _BM: ::UCHAR, + B: ::UCHAR, +}} +BITFIELD!{BM_REQUEST_TYPE _BM: ::UINT8 [ + Recipient set_Recipient[0..2], + Reserved set_Reserved[2..5], + Type set_Type[5..7], + Dir set_Dir[7..8], +]} +pub type PBM_REQUEST_TYPE = *mut BM_REQUEST_TYPE; + +STRUCT!{#[repr(packed)] struct USB_CONFIGURATION_DESCRIPTOR { + bLength: ::UCHAR, + bDescriptorType: ::UCHAR, + wTotalLength: ::USHORT, + bNumInterfaces: ::UCHAR, + bConfigurationValue: ::UCHAR, + iConfiguration: ::UCHAR, + bmAttributes: ::UCHAR, + MaxPower: ::UCHAR, +}} +pub type PUSB_CONFIGURATION_DESCRIPTOR = *mut USB_CONFIGURATION_DESCRIPTOR; diff --git a/src/winusb.rs b/src/winusb.rs index c4724bec..c1f0d89b 100644 --- a/src/winusb.rs +++ b/src/winusb.rs @@ -1,32 +1,32 @@ -// Copyright © 2016-2017 winapi-rs developers -// Licensed under the Apache License, Version 2.0 -// or the MIT license -// , at your option. -// All files in the project carrying such notice may not be copied, modified, or distributed -// except according to those terms. -//! FFI bindings to winusb. -pub type WINUSB_INTERFACE_HANDLE = ::PVOID; -pub type PWINUSB_INTERFACE_HANDLE = *mut ::PVOID; -pub type WINUSB_ISOCH_BUFFER_HANDLE = ::PVOID; -pub type PWINUSB_ISOCH_BUFFER_HANDLE = *mut ::PVOID; -STRUCT!{#[repr(packed)] struct WINUSB_SETUP_PACKET { - RequestType: ::UCHAR, - Request: ::UCHAR, - Value: ::USHORT, - Index: ::USHORT, - Length: ::USHORT, -}} -pub type PWINUSB_SETUP_PACKET = *mut WINUSB_SETUP_PACKET; - -STRUCT!{struct USB_INTERFACE_DESCRIPTOR { - bLength: ::UCHAR, - bDescriptorType: ::UCHAR, - bInterfaceNumber: ::UCHAR, - bAlternateSetting: ::UCHAR, - bNumEndpoints: ::UCHAR, - bInterfaceClass: ::UCHAR, - bInterfaceSubClass: ::UCHAR, - bInterfaceProtocol: ::UCHAR, - iInterface: ::UCHAR, -}} -pub type PUSB_INTERFACE_DESCRIPTOR = *mut USB_INTERFACE_DESCRIPTOR; +// Copyright © 2016-2017 winapi-rs developers +// Licensed under the Apache License, Version 2.0 +// or the MIT license +// , at your option. +// All files in the project carrying such notice may not be copied, modified, or distributed +// except according to those terms. +//! FFI bindings to winusb. +pub type WINUSB_INTERFACE_HANDLE = ::PVOID; +pub type PWINUSB_INTERFACE_HANDLE = *mut ::PVOID; +pub type WINUSB_ISOCH_BUFFER_HANDLE = ::PVOID; +pub type PWINUSB_ISOCH_BUFFER_HANDLE = *mut ::PVOID; +STRUCT!{#[repr(packed)] struct WINUSB_SETUP_PACKET { + RequestType: ::UCHAR, + Request: ::UCHAR, + Value: ::USHORT, + Index: ::USHORT, + Length: ::USHORT, +}} +pub type PWINUSB_SETUP_PACKET = *mut WINUSB_SETUP_PACKET; + +STRUCT!{struct USB_INTERFACE_DESCRIPTOR { + bLength: ::UCHAR, + bDescriptorType: ::UCHAR, + bInterfaceNumber: ::UCHAR, + bAlternateSetting: ::UCHAR, + bNumEndpoints: ::UCHAR, + bInterfaceClass: ::UCHAR, + bInterfaceSubClass: ::UCHAR, + bInterfaceProtocol: ::UCHAR, + iInterface: ::UCHAR, +}} +pub type PUSB_INTERFACE_DESCRIPTOR = *mut USB_INTERFACE_DESCRIPTOR; diff --git a/src/winusbio.rs b/src/winusbio.rs index 66d1e452..0673104b 100644 --- a/src/winusbio.rs +++ b/src/winusbio.rs @@ -1,22 +1,22 @@ -// Copyright © 2016-2017 winapi-rs developers -// Licensed under the Apache License, Version 2.0 -// or the MIT license -// , at your option. -// All files in the project carrying such notice may not be copied, modified, or distributed -// except according to those terms. -//! USBIO Definitions. -STRUCT!{struct WINUSB_PIPE_INFORMATION { - PipeType: ::USBD_PIPE_TYPE, - PipeId: ::UCHAR, - MaximumPacketSize: ::USHORT, - Interval: ::UCHAR, -}} -pub type PWINUSB_PIPE_INFORMATION = *mut WINUSB_PIPE_INFORMATION; -STRUCT!{struct WINUSB_PIPE_INFORMATION_EX { - PipeType: ::USBD_PIPE_TYPE, - PipeId: ::UCHAR, - MaximumPacketSize: ::USHORT, - Interval: ::UCHAR, - MaximumBytesPerInterval: ::ULONG, -}} -pub type PWINUSB_PIPE_INFORMATION_EX = *mut WINUSB_PIPE_INFORMATION_EX; +// Copyright © 2016-2017 winapi-rs developers +// Licensed under the Apache License, Version 2.0 +// or the MIT license +// , at your option. +// All files in the project carrying such notice may not be copied, modified, or distributed +// except according to those terms. +//! USBIO Definitions. +STRUCT!{struct WINUSB_PIPE_INFORMATION { + PipeType: ::USBD_PIPE_TYPE, + PipeId: ::UCHAR, + MaximumPacketSize: ::USHORT, + Interval: ::UCHAR, +}} +pub type PWINUSB_PIPE_INFORMATION = *mut WINUSB_PIPE_INFORMATION; +STRUCT!{struct WINUSB_PIPE_INFORMATION_EX { + PipeType: ::USBD_PIPE_TYPE, + PipeId: ::UCHAR, + MaximumPacketSize: ::USHORT, + Interval: ::UCHAR, + MaximumBytesPerInterval: ::ULONG, +}} +pub type PWINUSB_PIPE_INFORMATION_EX = *mut WINUSB_PIPE_INFORMATION_EX;