From 2ce473e5220b7624e2d6e5f28ee0d09c7b835b5a Mon Sep 17 00:00:00 2001 From: Kerndog73 Date: Wed, 24 Feb 2021 10:03:26 +1030 Subject: [PATCH] Change type of VK_* from c_int to WORD --- src/um/winuser.rs | 384 +++++++++++++++++++++++----------------------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/src/um/winuser.rs b/src/um/winuser.rs index caeb5d95f..0e3f30b80 100644 --- a/src/um/winuser.rs +++ b/src/um/winuser.rs @@ -250,198 +250,198 @@ pub const KF_MENUMODE: WORD = 0x1000; pub const KF_ALTDOWN: WORD = 0x2000; pub const KF_REPEAT: WORD = 0x4000; pub const KF_UP: WORD = 0x8000; -pub const VK_LBUTTON: c_int = 0x01; -pub const VK_RBUTTON: c_int = 0x02; -pub const VK_CANCEL: c_int = 0x03; -pub const VK_MBUTTON: c_int = 0x04; -pub const VK_XBUTTON1: c_int = 0x05; -pub const VK_XBUTTON2: c_int = 0x06; -pub const VK_BACK: c_int = 0x08; -pub const VK_TAB: c_int = 0x09; -pub const VK_CLEAR: c_int = 0x0C; -pub const VK_RETURN: c_int = 0x0D; -pub const VK_SHIFT: c_int = 0x10; -pub const VK_CONTROL: c_int = 0x11; -pub const VK_MENU: c_int = 0x12; -pub const VK_PAUSE: c_int = 0x13; -pub const VK_CAPITAL: c_int = 0x14; -pub const VK_KANA: c_int = 0x15; -pub const VK_HANGEUL: c_int = 0x15; -pub const VK_HANGUL: c_int = 0x15; -pub const VK_JUNJA: c_int = 0x17; -pub const VK_FINAL: c_int = 0x18; -pub const VK_HANJA: c_int = 0x19; -pub const VK_KANJI: c_int = 0x19; -pub const VK_ESCAPE: c_int = 0x1B; -pub const VK_CONVERT: c_int = 0x1C; -pub const VK_NONCONVERT: c_int = 0x1D; -pub const VK_ACCEPT: c_int = 0x1E; -pub const VK_MODECHANGE: c_int = 0x1F; -pub const VK_SPACE: c_int = 0x20; -pub const VK_PRIOR: c_int = 0x21; -pub const VK_NEXT: c_int = 0x22; -pub const VK_END: c_int = 0x23; -pub const VK_HOME: c_int = 0x24; -pub const VK_LEFT: c_int = 0x25; -pub const VK_UP: c_int = 0x26; -pub const VK_RIGHT: c_int = 0x27; -pub const VK_DOWN: c_int = 0x28; -pub const VK_SELECT: c_int = 0x29; -pub const VK_PRINT: c_int = 0x2A; -pub const VK_EXECUTE: c_int = 0x2B; -pub const VK_SNAPSHOT: c_int = 0x2C; -pub const VK_INSERT: c_int = 0x2D; -pub const VK_DELETE: c_int = 0x2E; -pub const VK_HELP: c_int = 0x2F; -pub const VK_LWIN: c_int = 0x5B; -pub const VK_RWIN: c_int = 0x5C; -pub const VK_APPS: c_int = 0x5D; -pub const VK_SLEEP: c_int = 0x5F; -pub const VK_NUMPAD0: c_int = 0x60; -pub const VK_NUMPAD1: c_int = 0x61; -pub const VK_NUMPAD2: c_int = 0x62; -pub const VK_NUMPAD3: c_int = 0x63; -pub const VK_NUMPAD4: c_int = 0x64; -pub const VK_NUMPAD5: c_int = 0x65; -pub const VK_NUMPAD6: c_int = 0x66; -pub const VK_NUMPAD7: c_int = 0x67; -pub const VK_NUMPAD8: c_int = 0x68; -pub const VK_NUMPAD9: c_int = 0x69; -pub const VK_MULTIPLY: c_int = 0x6A; -pub const VK_ADD: c_int = 0x6B; -pub const VK_SEPARATOR: c_int = 0x6C; -pub const VK_SUBTRACT: c_int = 0x6D; -pub const VK_DECIMAL: c_int = 0x6E; -pub const VK_DIVIDE: c_int = 0x6F; -pub const VK_F1: c_int = 0x70; -pub const VK_F2: c_int = 0x71; -pub const VK_F3: c_int = 0x72; -pub const VK_F4: c_int = 0x73; -pub const VK_F5: c_int = 0x74; -pub const VK_F6: c_int = 0x75; -pub const VK_F7: c_int = 0x76; -pub const VK_F8: c_int = 0x77; -pub const VK_F9: c_int = 0x78; -pub const VK_F10: c_int = 0x79; -pub const VK_F11: c_int = 0x7A; -pub const VK_F12: c_int = 0x7B; -pub const VK_F13: c_int = 0x7C; -pub const VK_F14: c_int = 0x7D; -pub const VK_F15: c_int = 0x7E; -pub const VK_F16: c_int = 0x7F; -pub const VK_F17: c_int = 0x80; -pub const VK_F18: c_int = 0x81; -pub const VK_F19: c_int = 0x82; -pub const VK_F20: c_int = 0x83; -pub const VK_F21: c_int = 0x84; -pub const VK_F22: c_int = 0x85; -pub const VK_F23: c_int = 0x86; -pub const VK_F24: c_int = 0x87; -pub const VK_NAVIGATION_VIEW: c_int = 0x88; -pub const VK_NAVIGATION_MENU: c_int = 0x89; -pub const VK_NAVIGATION_UP: c_int = 0x8A; -pub const VK_NAVIGATION_DOWN: c_int = 0x8B; -pub const VK_NAVIGATION_LEFT: c_int = 0x8C; -pub const VK_NAVIGATION_RIGHT: c_int = 0x8D; -pub const VK_NAVIGATION_ACCEPT: c_int = 0x8E; -pub const VK_NAVIGATION_CANCEL: c_int = 0x8F; -pub const VK_NUMLOCK: c_int = 0x90; -pub const VK_SCROLL: c_int = 0x91; -pub const VK_OEM_NEC_EQUAL: c_int = 0x92; -pub const VK_OEM_FJ_JISHO: c_int = 0x92; -pub const VK_OEM_FJ_MASSHOU: c_int = 0x93; -pub const VK_OEM_FJ_TOUROKU: c_int = 0x94; -pub const VK_OEM_FJ_LOYA: c_int = 0x95; -pub const VK_OEM_FJ_ROYA: c_int = 0x96; -pub const VK_LSHIFT: c_int = 0xA0; -pub const VK_RSHIFT: c_int = 0xA1; -pub const VK_LCONTROL: c_int = 0xA2; -pub const VK_RCONTROL: c_int = 0xA3; -pub const VK_LMENU: c_int = 0xA4; -pub const VK_RMENU: c_int = 0xA5; -pub const VK_BROWSER_BACK: c_int = 0xA6; -pub const VK_BROWSER_FORWARD: c_int = 0xA7; -pub const VK_BROWSER_REFRESH: c_int = 0xA8; -pub const VK_BROWSER_STOP: c_int = 0xA9; -pub const VK_BROWSER_SEARCH: c_int = 0xAA; -pub const VK_BROWSER_FAVORITES: c_int = 0xAB; -pub const VK_BROWSER_HOME: c_int = 0xAC; -pub const VK_VOLUME_MUTE: c_int = 0xAD; -pub const VK_VOLUME_DOWN: c_int = 0xAE; -pub const VK_VOLUME_UP: c_int = 0xAF; -pub const VK_MEDIA_NEXT_TRACK: c_int = 0xB0; -pub const VK_MEDIA_PREV_TRACK: c_int = 0xB1; -pub const VK_MEDIA_STOP: c_int = 0xB2; -pub const VK_MEDIA_PLAY_PAUSE: c_int = 0xB3; -pub const VK_LAUNCH_MAIL: c_int = 0xB4; -pub const VK_LAUNCH_MEDIA_SELECT: c_int = 0xB5; -pub const VK_LAUNCH_APP1: c_int = 0xB6; -pub const VK_LAUNCH_APP2: c_int = 0xB7; -pub const VK_OEM_1: c_int = 0xBA; -pub const VK_OEM_PLUS: c_int = 0xBB; -pub const VK_OEM_COMMA: c_int = 0xBC; -pub const VK_OEM_MINUS: c_int = 0xBD; -pub const VK_OEM_PERIOD: c_int = 0xBE; -pub const VK_OEM_2: c_int = 0xBF; -pub const VK_OEM_3: c_int = 0xC0; -pub const VK_GAMEPAD_A: c_int = 0xC3; -pub const VK_GAMEPAD_B: c_int = 0xC4; -pub const VK_GAMEPAD_X: c_int = 0xC5; -pub const VK_GAMEPAD_Y: c_int = 0xC6; -pub const VK_GAMEPAD_RIGHT_SHOULDER: c_int = 0xC7; -pub const VK_GAMEPAD_LEFT_SHOULDER: c_int = 0xC8; -pub const VK_GAMEPAD_LEFT_TRIGGER: c_int = 0xC9; -pub const VK_GAMEPAD_RIGHT_TRIGGER: c_int = 0xCA; -pub const VK_GAMEPAD_DPAD_UP: c_int = 0xCB; -pub const VK_GAMEPAD_DPAD_DOWN: c_int = 0xCC; -pub const VK_GAMEPAD_DPAD_LEFT: c_int = 0xCD; -pub const VK_GAMEPAD_DPAD_RIGHT: c_int = 0xCE; -pub const VK_GAMEPAD_MENU: c_int = 0xCF; -pub const VK_GAMEPAD_VIEW: c_int = 0xD0; -pub const VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON: c_int = 0xD1; -pub const VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON: c_int = 0xD2; -pub const VK_GAMEPAD_LEFT_THUMBSTICK_UP: c_int = 0xD3; -pub const VK_GAMEPAD_LEFT_THUMBSTICK_DOWN: c_int = 0xD4; -pub const VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT: c_int = 0xD5; -pub const VK_GAMEPAD_LEFT_THUMBSTICK_LEFT: c_int = 0xD6; -pub const VK_GAMEPAD_RIGHT_THUMBSTICK_UP: c_int = 0xD7; -pub const VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN: c_int = 0xD8; -pub const VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT: c_int = 0xD9; -pub const VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT: c_int = 0xDA; -pub const VK_OEM_4: c_int = 0xDB; -pub const VK_OEM_5: c_int = 0xDC; -pub const VK_OEM_6: c_int = 0xDD; -pub const VK_OEM_7: c_int = 0xDE; -pub const VK_OEM_8: c_int = 0xDF; -pub const VK_OEM_AX: c_int = 0xE1; -pub const VK_OEM_102: c_int = 0xE2; -pub const VK_ICO_HELP: c_int = 0xE3; -pub const VK_ICO_00: c_int = 0xE4; -pub const VK_PROCESSKEY: c_int = 0xE5; -pub const VK_ICO_CLEAR: c_int = 0xE6; -pub const VK_PACKET: c_int = 0xE7; -pub const VK_OEM_RESET: c_int = 0xE9; -pub const VK_OEM_JUMP: c_int = 0xEA; -pub const VK_OEM_PA1: c_int = 0xEB; -pub const VK_OEM_PA2: c_int = 0xEC; -pub const VK_OEM_PA3: c_int = 0xED; -pub const VK_OEM_WSCTRL: c_int = 0xEE; -pub const VK_OEM_CUSEL: c_int = 0xEF; -pub const VK_OEM_ATTN: c_int = 0xF0; -pub const VK_OEM_FINISH: c_int = 0xF1; -pub const VK_OEM_COPY: c_int = 0xF2; -pub const VK_OEM_AUTO: c_int = 0xF3; -pub const VK_OEM_ENLW: c_int = 0xF4; -pub const VK_OEM_BACKTAB: c_int = 0xF5; -pub const VK_ATTN: c_int = 0xF6; -pub const VK_CRSEL: c_int = 0xF7; -pub const VK_EXSEL: c_int = 0xF8; -pub const VK_EREOF: c_int = 0xF9; -pub const VK_PLAY: c_int = 0xFA; -pub const VK_ZOOM: c_int = 0xFB; -pub const VK_NONAME: c_int = 0xFC; -pub const VK_PA1: c_int = 0xFD; -pub const VK_OEM_CLEAR: c_int = 0xFE; +pub const VK_LBUTTON: WORD = 0x01; +pub const VK_RBUTTON: WORD = 0x02; +pub const VK_CANCEL: WORD = 0x03; +pub const VK_MBUTTON: WORD = 0x04; +pub const VK_XBUTTON1: WORD = 0x05; +pub const VK_XBUTTON2: WORD = 0x06; +pub const VK_BACK: WORD = 0x08; +pub const VK_TAB: WORD = 0x09; +pub const VK_CLEAR: WORD = 0x0C; +pub const VK_RETURN: WORD = 0x0D; +pub const VK_SHIFT: WORD = 0x10; +pub const VK_CONTROL: WORD = 0x11; +pub const VK_MENU: WORD = 0x12; +pub const VK_PAUSE: WORD = 0x13; +pub const VK_CAPITAL: WORD = 0x14; +pub const VK_KANA: WORD = 0x15; +pub const VK_HANGEUL: WORD = 0x15; +pub const VK_HANGUL: WORD = 0x15; +pub const VK_JUNJA: WORD = 0x17; +pub const VK_FINAL: WORD = 0x18; +pub const VK_HANJA: WORD = 0x19; +pub const VK_KANJI: WORD = 0x19; +pub const VK_ESCAPE: WORD = 0x1B; +pub const VK_CONVERT: WORD = 0x1C; +pub const VK_NONCONVERT: WORD = 0x1D; +pub const VK_ACCEPT: WORD = 0x1E; +pub const VK_MODECHANGE: WORD = 0x1F; +pub const VK_SPACE: WORD = 0x20; +pub const VK_PRIOR: WORD = 0x21; +pub const VK_NEXT: WORD = 0x22; +pub const VK_END: WORD = 0x23; +pub const VK_HOME: WORD = 0x24; +pub const VK_LEFT: WORD = 0x25; +pub const VK_UP: WORD = 0x26; +pub const VK_RIGHT: WORD = 0x27; +pub const VK_DOWN: WORD = 0x28; +pub const VK_SELECT: WORD = 0x29; +pub const VK_PRINT: WORD = 0x2A; +pub const VK_EXECUTE: WORD = 0x2B; +pub const VK_SNAPSHOT: WORD = 0x2C; +pub const VK_INSERT: WORD = 0x2D; +pub const VK_DELETE: WORD = 0x2E; +pub const VK_HELP: WORD = 0x2F; +pub const VK_LWIN: WORD = 0x5B; +pub const VK_RWIN: WORD = 0x5C; +pub const VK_APPS: WORD = 0x5D; +pub const VK_SLEEP: WORD = 0x5F; +pub const VK_NUMPAD0: WORD = 0x60; +pub const VK_NUMPAD1: WORD = 0x61; +pub const VK_NUMPAD2: WORD = 0x62; +pub const VK_NUMPAD3: WORD = 0x63; +pub const VK_NUMPAD4: WORD = 0x64; +pub const VK_NUMPAD5: WORD = 0x65; +pub const VK_NUMPAD6: WORD = 0x66; +pub const VK_NUMPAD7: WORD = 0x67; +pub const VK_NUMPAD8: WORD = 0x68; +pub const VK_NUMPAD9: WORD = 0x69; +pub const VK_MULTIPLY: WORD = 0x6A; +pub const VK_ADD: WORD = 0x6B; +pub const VK_SEPARATOR: WORD = 0x6C; +pub const VK_SUBTRACT: WORD = 0x6D; +pub const VK_DECIMAL: WORD = 0x6E; +pub const VK_DIVIDE: WORD = 0x6F; +pub const VK_F1: WORD = 0x70; +pub const VK_F2: WORD = 0x71; +pub const VK_F3: WORD = 0x72; +pub const VK_F4: WORD = 0x73; +pub const VK_F5: WORD = 0x74; +pub const VK_F6: WORD = 0x75; +pub const VK_F7: WORD = 0x76; +pub const VK_F8: WORD = 0x77; +pub const VK_F9: WORD = 0x78; +pub const VK_F10: WORD = 0x79; +pub const VK_F11: WORD = 0x7A; +pub const VK_F12: WORD = 0x7B; +pub const VK_F13: WORD = 0x7C; +pub const VK_F14: WORD = 0x7D; +pub const VK_F15: WORD = 0x7E; +pub const VK_F16: WORD = 0x7F; +pub const VK_F17: WORD = 0x80; +pub const VK_F18: WORD = 0x81; +pub const VK_F19: WORD = 0x82; +pub const VK_F20: WORD = 0x83; +pub const VK_F21: WORD = 0x84; +pub const VK_F22: WORD = 0x85; +pub const VK_F23: WORD = 0x86; +pub const VK_F24: WORD = 0x87; +pub const VK_NAVIGATION_VIEW: WORD = 0x88; +pub const VK_NAVIGATION_MENU: WORD = 0x89; +pub const VK_NAVIGATION_UP: WORD = 0x8A; +pub const VK_NAVIGATION_DOWN: WORD = 0x8B; +pub const VK_NAVIGATION_LEFT: WORD = 0x8C; +pub const VK_NAVIGATION_RIGHT: WORD = 0x8D; +pub const VK_NAVIGATION_ACCEPT: WORD = 0x8E; +pub const VK_NAVIGATION_CANCEL: WORD = 0x8F; +pub const VK_NUMLOCK: WORD = 0x90; +pub const VK_SCROLL: WORD = 0x91; +pub const VK_OEM_NEC_EQUAL: WORD = 0x92; +pub const VK_OEM_FJ_JISHO: WORD = 0x92; +pub const VK_OEM_FJ_MASSHOU: WORD = 0x93; +pub const VK_OEM_FJ_TOUROKU: WORD = 0x94; +pub const VK_OEM_FJ_LOYA: WORD = 0x95; +pub const VK_OEM_FJ_ROYA: WORD = 0x96; +pub const VK_LSHIFT: WORD = 0xA0; +pub const VK_RSHIFT: WORD = 0xA1; +pub const VK_LCONTROL: WORD = 0xA2; +pub const VK_RCONTROL: WORD = 0xA3; +pub const VK_LMENU: WORD = 0xA4; +pub const VK_RMENU: WORD = 0xA5; +pub const VK_BROWSER_BACK: WORD = 0xA6; +pub const VK_BROWSER_FORWARD: WORD = 0xA7; +pub const VK_BROWSER_REFRESH: WORD = 0xA8; +pub const VK_BROWSER_STOP: WORD = 0xA9; +pub const VK_BROWSER_SEARCH: WORD = 0xAA; +pub const VK_BROWSER_FAVORITES: WORD = 0xAB; +pub const VK_BROWSER_HOME: WORD = 0xAC; +pub const VK_VOLUME_MUTE: WORD = 0xAD; +pub const VK_VOLUME_DOWN: WORD = 0xAE; +pub const VK_VOLUME_UP: WORD = 0xAF; +pub const VK_MEDIA_NEXT_TRACK: WORD = 0xB0; +pub const VK_MEDIA_PREV_TRACK: WORD = 0xB1; +pub const VK_MEDIA_STOP: WORD = 0xB2; +pub const VK_MEDIA_PLAY_PAUSE: WORD = 0xB3; +pub const VK_LAUNCH_MAIL: WORD = 0xB4; +pub const VK_LAUNCH_MEDIA_SELECT: WORD = 0xB5; +pub const VK_LAUNCH_APP1: WORD = 0xB6; +pub const VK_LAUNCH_APP2: WORD = 0xB7; +pub const VK_OEM_1: WORD = 0xBA; +pub const VK_OEM_PLUS: WORD = 0xBB; +pub const VK_OEM_COMMA: WORD = 0xBC; +pub const VK_OEM_MINUS: WORD = 0xBD; +pub const VK_OEM_PERIOD: WORD = 0xBE; +pub const VK_OEM_2: WORD = 0xBF; +pub const VK_OEM_3: WORD = 0xC0; +pub const VK_GAMEPAD_A: WORD = 0xC3; +pub const VK_GAMEPAD_B: WORD = 0xC4; +pub const VK_GAMEPAD_X: WORD = 0xC5; +pub const VK_GAMEPAD_Y: WORD = 0xC6; +pub const VK_GAMEPAD_RIGHT_SHOULDER: WORD = 0xC7; +pub const VK_GAMEPAD_LEFT_SHOULDER: WORD = 0xC8; +pub const VK_GAMEPAD_LEFT_TRIGGER: WORD = 0xC9; +pub const VK_GAMEPAD_RIGHT_TRIGGER: WORD = 0xCA; +pub const VK_GAMEPAD_DPAD_UP: WORD = 0xCB; +pub const VK_GAMEPAD_DPAD_DOWN: WORD = 0xCC; +pub const VK_GAMEPAD_DPAD_LEFT: WORD = 0xCD; +pub const VK_GAMEPAD_DPAD_RIGHT: WORD = 0xCE; +pub const VK_GAMEPAD_MENU: WORD = 0xCF; +pub const VK_GAMEPAD_VIEW: WORD = 0xD0; +pub const VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON: WORD = 0xD1; +pub const VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON: WORD = 0xD2; +pub const VK_GAMEPAD_LEFT_THUMBSTICK_UP: WORD = 0xD3; +pub const VK_GAMEPAD_LEFT_THUMBSTICK_DOWN: WORD = 0xD4; +pub const VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT: WORD = 0xD5; +pub const VK_GAMEPAD_LEFT_THUMBSTICK_LEFT: WORD = 0xD6; +pub const VK_GAMEPAD_RIGHT_THUMBSTICK_UP: WORD = 0xD7; +pub const VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN: WORD = 0xD8; +pub const VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT: WORD = 0xD9; +pub const VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT: WORD = 0xDA; +pub const VK_OEM_4: WORD = 0xDB; +pub const VK_OEM_5: WORD = 0xDC; +pub const VK_OEM_6: WORD = 0xDD; +pub const VK_OEM_7: WORD = 0xDE; +pub const VK_OEM_8: WORD = 0xDF; +pub const VK_OEM_AX: WORD = 0xE1; +pub const VK_OEM_102: WORD = 0xE2; +pub const VK_ICO_HELP: WORD = 0xE3; +pub const VK_ICO_00: WORD = 0xE4; +pub const VK_PROCESSKEY: WORD = 0xE5; +pub const VK_ICO_CLEAR: WORD = 0xE6; +pub const VK_PACKET: WORD = 0xE7; +pub const VK_OEM_RESET: WORD = 0xE9; +pub const VK_OEM_JUMP: WORD = 0xEA; +pub const VK_OEM_PA1: WORD = 0xEB; +pub const VK_OEM_PA2: WORD = 0xEC; +pub const VK_OEM_PA3: WORD = 0xED; +pub const VK_OEM_WSCTRL: WORD = 0xEE; +pub const VK_OEM_CUSEL: WORD = 0xEF; +pub const VK_OEM_ATTN: WORD = 0xF0; +pub const VK_OEM_FINISH: WORD = 0xF1; +pub const VK_OEM_COPY: WORD = 0xF2; +pub const VK_OEM_AUTO: WORD = 0xF3; +pub const VK_OEM_ENLW: WORD = 0xF4; +pub const VK_OEM_BACKTAB: WORD = 0xF5; +pub const VK_ATTN: WORD = 0xF6; +pub const VK_CRSEL: WORD = 0xF7; +pub const VK_EXSEL: WORD = 0xF8; +pub const VK_EREOF: WORD = 0xF9; +pub const VK_PLAY: WORD = 0xFA; +pub const VK_ZOOM: WORD = 0xFB; +pub const VK_NONAME: WORD = 0xFC; +pub const VK_PA1: WORD = 0xFD; +pub const VK_OEM_CLEAR: WORD = 0xFE; pub const WH_MIN: c_int = -1; pub const WH_MSGFILTER: c_int = -1; pub const WH_JOURNALRECORD: c_int = 0;