| dinput.h (6.3.9600.17415-Windows 8.1) | | dinput.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 642 | | skipping to change at line 642 |
|---|
| extern const DIDATAFORMAT c_dfDIJoystick; | | extern const DIDATAFORMAT c_dfDIJoystick; |
| extern const DIDATAFORMAT c_dfDIJoystick2; | | extern const DIDATAFORMAT c_dfDIJoystick2; |
| #endif /* DIRECTINPUT_VERSION >= 0x0500 */ | | #endif /* DIRECTINPUT_VERSION >= 0x0500 */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| }; | | }; |
| #endif | | #endif |
| | |
| #if DIRECTINPUT_VERSION > 0x0700 | | #if DIRECTINPUT_VERSION > 0x0700 |
| | |
|
| | #pragma warning(push) |
| | #pragma warning(disable:4201) // Nameless union / struct when compiled for C. |
| | |
| typedef struct _DIACTIONA { | | typedef struct _DIACTIONA { |
| UINT_PTR uAppData; | | UINT_PTR uAppData; |
| DWORD dwSemantic; | | DWORD dwSemantic; |
| OPTIONAL DWORD dwFlags; | | OPTIONAL DWORD dwFlags; |
| OPTIONAL union { | | OPTIONAL union { |
| LPCSTR lptszActionName; | | LPCSTR lptszActionName; |
| UINT uResIdString; | | UINT uResIdString; |
| }; | | }; |
| OPTIONAL GUID guidInstance; | | OPTIONAL GUID guidInstance; |
| OPTIONAL DWORD dwObjID; | | OPTIONAL DWORD dwObjID; |
| | |
| skipping to change at line 685 | | skipping to change at line 688 |
|---|
| typedef const DIACTIONW *LPCDIACTIONW; | | typedef const DIACTIONW *LPCDIACTIONW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef DIACTIONW DIACTION; | | typedef DIACTIONW DIACTION; |
| typedef LPCDIACTIONW LPCDIACTION; | | typedef LPCDIACTIONW LPCDIACTION; |
| #else | | #else |
| typedef DIACTIONA DIACTION; | | typedef DIACTIONA DIACTION; |
| typedef LPCDIACTIONA LPCDIACTION; | | typedef LPCDIACTIONA LPCDIACTION; |
| #endif // UNICODE | | #endif // UNICODE |
| typedef const DIACTION *LPCDIACTION; | | typedef const DIACTION *LPCDIACTION; |
| | |
|
| | #pragma warning(pop) |
| | |
| #define DIA_FORCEFEEDBACK 0x00000001 | | #define DIA_FORCEFEEDBACK 0x00000001 |
| #define DIA_APPMAPPED 0x00000002 | | #define DIA_APPMAPPED 0x00000002 |
| #define DIA_APPNOMAP 0x00000004 | | #define DIA_APPNOMAP 0x00000004 |
| #define DIA_NORANGE 0x00000008 | | #define DIA_NORANGE 0x00000008 |
| #define DIA_APPFIXED 0x00000010 | | #define DIA_APPFIXED 0x00000010 |
| | |
| #define DIAH_UNMAPPED 0x00000000 | | #define DIAH_UNMAPPED 0x00000000 |
| #define DIAH_USERCONFIG 0x00000001 | | #define DIAH_USERCONFIG 0x00000001 |
| #define DIAH_APPREQUESTED 0x00000002 | | #define DIAH_APPREQUESTED 0x00000002 |
| #define DIAH_HWAPP 0x00000004 | | #define DIAH_HWAPP 0x00000004 |
| | |
| End of changes. 2 change blocks. |
|---|
| 0 lines changed or deleted | | 5 lines changed or added |
|---|
|