| dinput.h (6.1.7600.16385-Windows_7.0) | | dinput.h (6.3.9600.17415-Windows_8.1) |
| | |
| skipping to change at line 13 | | skipping to change at line 13 |
| * Copyright (C) 1996-2002 Microsoft Corporation. All Rights Reserved. | | * Copyright (C) 1996-2002 Microsoft Corporation. All Rights Reserved. |
| * | | * |
| * File: dinput.h | | * File: dinput.h |
| * Content: DirectInput include file | | * Content: DirectInput include file |
| * | | * |
| ****************************************************************************/ | | ****************************************************************************/ |
| | |
| #ifndef __DINPUT_INCLUDED__ | | #ifndef __DINPUT_INCLUDED__ |
| #define __DINPUT_INCLUDED__ | | #define __DINPUT_INCLUDED__ |
| | |
|
| | #include <winapifamily.h> |
| | |
| #ifndef DIJ_RINGZERO | | #ifndef DIJ_RINGZERO |
| | |
| #ifdef _WIN32 | | #ifdef _WIN32 |
| #define COM_NO_WINDOWS_H | | #define COM_NO_WINDOWS_H |
| #include <objbase.h> | | #include <objbase.h> |
| #endif | | #endif |
| | |
| #endif /* DIJ_RINGZERO */ | | #endif /* DIJ_RINGZERO */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
|
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| * To build applications for older versions of DirectInput | | * To build applications for older versions of DirectInput |
| * | | * |
| * #define DIRECTINPUT_VERSION [ 0x0300 | 0x0500 | 0x0700 ] | | * #define DIRECTINPUT_VERSION [ 0x0300 | 0x0500 | 0x0700 ] |
| * | | * |
| * before #include <dinput.h>. By default, #include <dinput.h> | | * before #include <dinput.h>. By default, #include <dinput.h> |
| * will produce a DirectX 8-compatible header file. | | * will produce a DirectX 8-compatible header file. |
| * | | * |
| */ | | */ |
| | |
| | |
| skipping to change at line 2014 | | skipping to change at line 2019 |
| * | | * |
| ****************************************************************************/ | | ****************************************************************************/ |
| | |
| #ifndef DIJ_RINGZERO | | #ifndef DIJ_RINGZERO |
| | |
| /**************************************************************************** | | /**************************************************************************** |
| * | | * |
| * DirectInput keyboard scan codes | | * DirectInput keyboard scan codes |
| * | | * |
| ****************************************************************************/ | | ****************************************************************************/ |
|
| | // |
| | // Copyright (C) Microsoft. All rights reserved. |
| | // |
| #define DIK_ESCAPE 0x01 | | #define DIK_ESCAPE 0x01 |
| #define DIK_1 0x02 | | #define DIK_1 0x02 |
| #define DIK_2 0x03 | | #define DIK_2 0x03 |
| #define DIK_3 0x04 | | #define DIK_3 0x04 |
| #define DIK_4 0x05 | | #define DIK_4 0x05 |
| #define DIK_5 0x06 | | #define DIK_5 0x06 |
| #define DIK_6 0x07 | | #define DIK_6 0x07 |
| #define DIK_7 0x08 | | #define DIK_7 0x08 |
| #define DIK_8 0x09 | | #define DIK_8 0x09 |
| #define DIK_9 0x0A | | #define DIK_9 0x0A |
| | |
| skipping to change at line 2955 | | skipping to change at line 2963 |
| * pressed at once.) | | * pressed at once.) |
| */ | | */ |
| #define DIERR_REPORTFULL 0x8004020AL | | #define DIERR_REPORTFULL 0x8004020AL |
| | |
| /* | | /* |
| * A mapper file function failed because reading or writing the user or IHV | | * A mapper file function failed because reading or writing the user or IHV |
| * settings file failed. | | * settings file failed. |
| */ | | */ |
| #define DIERR_MAPFILEFAIL 0x8004020BL | | #define DIERR_MAPFILEFAIL 0x8004020BL |
| | |
|
| | // |
| | // Copyright (C) Microsoft. All rights reserved. |
| | // |
| | |
| | // |
| | // Copyright (C) Microsoft. All rights reserved. |
| | // |
| /*--- DINPUT Mapper Definitions: New for Dx8 ---*/ | | /*--- DINPUT Mapper Definitions: New for Dx8 ---*/ |
| | |
| /*--- Keyboard | | /*--- Keyboard |
| Physical Keyboard Device ---*/ | | Physical Keyboard Device ---*/ |
| | |
|
| | // |
| | // Copyright (C) Microsoft. All rights reserved. |
| | // |
| #define DIKEYBOARD_ESCAPE 0x81000401 | | #define DIKEYBOARD_ESCAPE 0x81000401 |
| #define DIKEYBOARD_1 0x81000402 | | #define DIKEYBOARD_1 0x81000402 |
| #define DIKEYBOARD_2 0x81000403 | | #define DIKEYBOARD_2 0x81000403 |
| #define DIKEYBOARD_3 0x81000404 | | #define DIKEYBOARD_3 0x81000404 |
| #define DIKEYBOARD_4 0x81000405 | | #define DIKEYBOARD_4 0x81000405 |
| #define DIKEYBOARD_5 0x81000406 | | #define DIKEYBOARD_5 0x81000406 |
| #define DIKEYBOARD_6 0x81000407 | | #define DIKEYBOARD_6 0x81000407 |
| #define DIKEYBOARD_7 0x81000408 | | #define DIKEYBOARD_7 0x81000408 |
| #define DIKEYBOARD_8 0x81000409 | | #define DIKEYBOARD_8 0x81000409 |
| #define DIKEYBOARD_9 0x8100040A | | #define DIKEYBOARD_9 0x8100040A |
| | |
| skipping to change at line 4257 | | skipping to change at line 4275 |
| #define DIAXIS_ANY_3 0xFF004203 | | #define DIAXIS_ANY_3 0xFF004203 |
| #define DIAXIS_ANY_4 0xFF004204 | | #define DIAXIS_ANY_4 0xFF004204 |
| | |
| #define DIPOV_ANY_1 0xFF004601 | | #define DIPOV_ANY_1 0xFF004601 |
| #define DIPOV_ANY_2 0xFF004602 | | #define DIPOV_ANY_2 0xFF004602 |
| #define DIPOV_ANY_3 0xFF004603 | | #define DIPOV_ANY_3 0xFF004603 |
| #define DIPOV_ANY_4 0xFF004604 | | #define DIPOV_ANY_4 0xFF004604 |
| | |
| #define DIBUTTON_ANY(instance) ( 0xFF004400 | instance ) | | #define DIBUTTON_ANY(instance) ( 0xFF004400 | instance ) |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| }; | | }; |
| #endif | | #endif |
| | |
| #endif /* __DINPUT_INCLUDED__ */ | | #endif /* __DINPUT_INCLUDED__ */ |
| | |
| /**************************************************************************** | | /**************************************************************************** |
| * | | * |
| * Definitions for non-IDirectInput (VJoyD) features defined more recently | | * Definitions for non-IDirectInput (VJoyD) features defined more recently |
| * than the current sdk files | | * than the current sdk files |
| | |
| skipping to change at line 4280 | | skipping to change at line 4301 |
| #ifdef _INC_MMSYSTEM | | #ifdef _INC_MMSYSTEM |
| #ifndef MMNOJOY | | #ifndef MMNOJOY |
| | |
| #ifndef __VJOYDX_INCLUDED__ | | #ifndef __VJOYDX_INCLUDED__ |
| #define __VJOYDX_INCLUDED__ | | #define __VJOYDX_INCLUDED__ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
|
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| * Flag to indicate that the dwReserved2 field of the JOYINFOEX structure | | * Flag to indicate that the dwReserved2 field of the JOYINFOEX structure |
| * contains mini-driver specific data to be passed by VJoyD to the mini- | | * contains mini-driver specific data to be passed by VJoyD to the mini- |
| * driver instead of doing a poll. | | * driver instead of doing a poll. |
| */ | | */ |
| #define JOY_PASSDRIVERDATA 0x10000000l | | #define JOY_PASSDRIVERDATA 0x10000000l |
| | |
| /* | | /* |
| * Informs the joystick driver that the configuration has been changed | | * Informs the joystick driver that the configuration has been changed |
| * and should be reloaded from the registery. | | * and should be reloaded from the registery. |
| | |
| skipping to change at line 4351 | | skipping to change at line 4375 |
| */ | | */ |
| #define JOY_HWS_ISGAMEPORTBUS 0x80000000l | | #define JOY_HWS_ISGAMEPORTBUS 0x80000000l |
| #define JOY_HWS_GAMEPORTBUSBUSY 0x00000001l | | #define JOY_HWS_GAMEPORTBUSBUSY 0x00000001l |
| | |
| /* | | /* |
| * Usage Setting indicating that the settings are volatile and | | * Usage Setting indicating that the settings are volatile and |
| * should be removed if still present on a reboot. | | * should be removed if still present on a reboot. |
| */ | | */ |
| #define JOY_US_VOLATILE 0x00000008L | | #define JOY_US_VOLATILE 0x00000008L |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| }; | | }; |
| #endif | | #endif |
| | |
| #endif /* __VJOYDX_INCLUDED__ */ | | #endif /* __VJOYDX_INCLUDED__ */ |
| | |
| #endif /* not MMNOJOY */ | | #endif /* not MMNOJOY */ |
| #endif /* _INC_MMSYSTEM */ | | #endif /* _INC_MMSYSTEM */ |
| | |
| /**************************************************************************** | | /**************************************************************************** |
| | |
| End of changes. 8 change blocks. |
| 0 lines changed or deleted | | 27 lines changed or added |
|