Skip to content

Commit

Permalink
Some more minor formatting tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@retep998
retep998 committed Mar 26, 2017
1 parent be7fbeb commit 96bbff5
Show file tree
Hide file tree
Showing 18 changed files with 320 additions and 306 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
View file
@@ -0,0 +1,4 @@
* text=auto eol=lf
*.rs text whitespace=tab-in-indent,trailing-space,tabwidth=4 diff=cpp
*.def text
*.a binary
151 changes: 75 additions & 76 deletions src/sapi.rs
View file
Expand Up @@ -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";
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/shared/guiddef.rs
View file
Expand Up @@ -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]
}
63 changes: 34 additions & 29 deletions src/shared/hidpi.rs
View file
Expand Up @@ -12,34 +12,17 @@ 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;
STRUCT!{struct HIDP_BUTTON_CAPS {
UsagePage: USAGE,
ReportID: UCHAR,
IsAlias: BOOLEAN,
BitField: USHORT,
LinkCollection: USHORT,
LinkUsage: USAGE,
LinkUsagePage: USAGE,
IsRange: BOOLEAN,
IsStringRange: BOOLEAN,
IsDesignatorRange: BOOLEAN,
IsAbsolute: BOOLEAN,
Reserved: [ULONG; 10],
S_un: [u16; 8],
}}
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 {
// HidP_IsSameUsageAndPage
STRUCT!{struct HIDP_CAPS_Range {
UsageMin: USAGE,
UsageMax: USAGE,
StringMin: USHORT,
Expand All @@ -49,7 +32,7 @@ STRUCT!{struct HIDP_RANGE_STRUCT {
DataIndexMin: USHORT,
DataIndexMax: USHORT,
}}
STRUCT!{struct HIDP_NOTRANGE_STRUCT {
STRUCT!{struct HIDP_CAPS_NotRange {
Usage: USAGE,
Reserved1: USAGE,
StringIndex: USHORT,
Expand All @@ -59,6 +42,27 @@ STRUCT!{struct HIDP_NOTRANGE_STRUCT {
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,
IsAlias: BOOLEAN,
BitField: USHORT,
LinkCollection: USHORT,
LinkUsage: USAGE,
LinkUsagePage: USAGE,
IsRange: BOOLEAN,
IsStringRange: BOOLEAN,
IsDesignatorRange: BOOLEAN,
IsAbsolute: BOOLEAN,
Reserved: [ULONG; 10],
u: HIDP_CAPS_u,
}}
pub type PHIDP_BUTTON_CAPS = *mut HIDP_BUTTON_CAPS;
STRUCT!{struct HIDP_VALUE_CAPS {
UsagePage: USAGE,
ReportID: UCHAR,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
11 changes: 7 additions & 4 deletions src/shared/inaddr.rs
View file
Expand Up @@ -16,12 +16,15 @@ STRUCT!{struct in_addr_S_un_w {
s_w1: USHORT,
s_w2: USHORT,
}}
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: ULONG,
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;
18 changes: 9 additions & 9 deletions src/um/combaseapi.rs
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/um/d2d1_1.rs
View file
Expand Up @@ -897,4 +897,4 @@ extern "system" {
z: FLOAT
) -> FLOAT;

}
}
12 changes: 6 additions & 6 deletions src/um/d3d11.rs
View file
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 96bbff5

Please sign in to comment.