frameworks/SDL2.git - OutOfOrder git server

			@@ -27,6 +27,7 @@
			#include "SDL_windowsjoystick_c.h"
			#include "SDL_dinputjoystick_c.h"
			#include "SDL_xinputjoystick_c.h"
			#include "../hidapi/SDL_hidapijoystick_c.h"

			#ifndef DIDFT_OPTIONAL
			#define DIDFT_OPTIONAL 0x80000000
			@@ -34,6 +35,8 @@

			#define INPUT_QSIZE 32 /* Buffer up to 32 input messages */
			#define JOY_AXIS_THRESHOLD (((SDL_JOYSTICK_AXIS_MAX)-(SDL_JOYSTICK_AXIS_MIN))/100) /* 1% motion */

			#define CONVERT_MAGNITUDE(x) (((x)*10000) / 0x7FFF)

			/* external variables referenced. */
			extern HWND SDL_HelperWindow;
			@@ -46,170 +49,170 @@

			/* Taken from Wine - Thanks! */
			static DIOBJECTDATAFORMAT dfDIJoystick2[] = {
			{ &GUID_XAxis, DIJOFS_X, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, DIJOFS_Y, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, DIJOFS_Z, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, DIJOFS_RX, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, DIJOFS_RY, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, DIJOFS_RZ, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, DIJOFS_SLIDER(0), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, DIJOFS_SLIDER(1), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(0), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(1), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(2), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(3), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(0), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(1), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(2), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(3), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(4), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(5), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(6), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(7), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(8), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(9), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(10), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(11), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(12), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(13), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(14), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(15), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(16), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(17), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(18), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(19), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(20), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(21), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(22), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(23), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(24), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(25), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(26), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(27), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(28), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(29), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(30), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(31), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(32), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(33), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(34), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(35), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(36), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(37), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(38), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(39), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(40), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(41), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(42), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(43), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(44), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(45), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(46), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(47), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(48), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(49), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(50), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(51), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(52), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(53), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(54), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(55), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(56), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(57), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(58), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(59), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(60), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(61), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(62), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(63), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(64), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(65), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(66), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(67), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(68), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(69), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(70), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(71), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(72), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(73), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(74), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(75), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(76), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(77), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(78), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(79), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(80), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(81), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(82), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(83), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(84), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(85), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(86), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(87), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(88), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(89), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(90), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(91), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(92), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(93), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(94), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(95), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(96), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(97), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(98), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(99), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(100), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(101), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(102), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(103), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(104), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(105), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(106), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(107), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(108), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(109), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(110), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(111), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(112), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(113), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(114), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(115), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(116), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(117), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(118), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(119), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(120), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(121), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(122), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(123), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(124), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(125), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(126), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(127), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lVX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lVY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lVZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lVRx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lVRy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lVRz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lAX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lAY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lAZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lARx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lARy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lARz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lFX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lFY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lFZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lFRx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lFRy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lFRz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, DIJOFS_X, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, DIJOFS_Y, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, DIJOFS_Z, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, DIJOFS_RX, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, DIJOFS_RY, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, DIJOFS_RZ, DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, DIJOFS_SLIDER(0), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, DIJOFS_SLIDER(1), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(0), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(1), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(2), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_POV, DIJOFS_POV(3), DIDFT_OPTIONAL \| DIDFT_POV \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(0), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(1), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(2), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(3), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(4), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(5), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(6), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(7), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(8), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(9), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(10), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(11), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(12), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(13), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(14), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(15), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(16), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(17), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(18), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(19), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(20), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(21), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(22), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(23), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(24), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(25), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(26), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(27), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(28), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(29), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(30), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(31), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(32), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(33), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(34), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(35), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(36), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(37), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(38), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(39), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(40), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(41), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(42), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(43), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(44), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(45), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(46), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(47), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(48), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(49), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(50), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(51), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(52), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(53), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(54), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(55), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(56), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(57), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(58), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(59), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(60), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(61), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(62), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(63), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(64), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(65), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(66), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(67), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(68), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(69), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(70), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(71), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(72), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(73), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(74), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(75), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(76), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(77), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(78), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(79), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(80), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(81), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(82), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(83), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(84), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(85), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(86), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(87), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(88), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(89), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(90), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(91), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(92), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(93), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(94), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(95), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(96), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(97), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(98), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(99), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(100), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(101), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(102), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(103), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(104), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(105), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(106), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(107), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(108), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(109), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(110), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(111), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(112), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(113), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(114), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(115), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(116), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(117), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(118), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(119), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(120), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(121), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(122), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(123), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(124), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(125), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(126), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ NULL, DIJOFS_BUTTON(127), DIDFT_OPTIONAL \| DIDFT_BUTTON \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lVX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lVY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lVZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lVRx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lVRy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lVRz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lAX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lAY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lAZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lARx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lARy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lARz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lFX), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lFY), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lFZ), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lFRx), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lFRy), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lFRz), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[0]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			{ &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[1]), DIDFT_OPTIONAL \| DIDFT_AXIS \| DIDFT_ANYINSTANCE, 0 },
			};

			const DIDATAFORMAT SDL_c_dfDIJoystick2 = {
			@@ -311,6 +314,61 @@
			return SDL_FALSE;
			}

			void FreeRumbleEffectData(DIEFFECT *effect)
			{
			if (!effect) {
			return;
			}
			SDL_free(effect->rgdwAxes);
			SDL_free(effect->rglDirection);
			SDL_free(effect->lpvTypeSpecificParams);
			SDL_free(effect);
			}

			DIEFFECT *CreateRumbleEffectData(Sint16 magnitude, Uint32 duration_ms)
			{
			DIEFFECT *effect;
			DIPERIODIC *periodic;

			/* Create the effect */
			effect = (DIEFFECT )SDL_calloc(1, sizeof(effect));
			if (!effect) {
			return NULL;
			}
			effect->dwSize = sizeof(*effect);
			effect->dwGain = 10000;
			effect->dwFlags = DIEFF_OBJECTOFFSETS;
			effect->dwDuration = duration_ms * 1000; /* In microseconds. */
			effect->dwTriggerButton = DIEB_NOTRIGGER;

			effect->cAxes = 2;
			effect->rgdwAxes = (DWORD *)SDL_calloc(effect->cAxes, sizeof(DWORD));
			if (!effect->rgdwAxes) {
			FreeRumbleEffectData(effect);
			return NULL;
			}

			effect->rglDirection = (LONG *)SDL_calloc(effect->cAxes, sizeof(LONG));
			if (!effect->rglDirection) {
			FreeRumbleEffectData(effect);
			return NULL;
			}
			effect->dwFlags \|= DIEFF_CARTESIAN;

			periodic = (DIPERIODIC )SDL_calloc(1, sizeof(periodic));
			if (!periodic) {
			FreeRumbleEffectData(effect);
			return NULL;
			}
			periodic->dwMagnitude = CONVERT_MAGNITUDE(magnitude);
			periodic->dwPeriod = 1000000;

			effect->cbTypeSpecificParams = sizeof(*periodic);
			effect->lpvTypeSpecificParams = periodic;

			return effect;
			}

			int
			SDL_DINPUT_JoystickInit(void)
			{
			@@ -348,28 +406,29 @@
			static BOOL CALLBACK
			EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
			{
			const Uint16 BUS_USB = 0x03;
			const Uint16 BUS_BLUETOOTH = 0x05;
			JoyStick_DeviceData *pNewJoystick;
			JoyStick_DeviceData *pPrevJoystick = NULL;
			const DWORD devtype = (pdidInstance->dwDevType & 0xFF);
			Uint16 *guid16;
			Uint16 vendor = 0;
			Uint16 product = 0;
			Uint16 version = 0;
			WCHAR hidPath[MAX_PATH];

			if (devtype == DI8DEVTYPE_SUPPLEMENTAL) {
			/* Add any supplemental devices that should be ignored here */
			#define MAKE_TABLE_ENTRY(VID, PID) ((((DWORD)PID)<<16)\|VID)
			static DWORD ignored_devices[] = {
			MAKE_TABLE_ENTRY(0, 0)
			};
			#define MAKE_TABLE_ENTRY(VID, PID) ((((DWORD)PID)<<16)\|VID)
			static DWORD ignored_devices[] = {
			MAKE_TABLE_ENTRY(0, 0)
			};
			#undef MAKE_TABLE_ENTRY
			unsigned int i;
			unsigned int i;

			for (i = 0; i < SDL_arraysize(ignored_devices); ++i) {
			if (pdidInstance->guidProduct.Data1 == ignored_devices[i]) {
			return DIENUM_CONTINUE;
			}
			}
			for (i = 0; i < SDL_arraysize(ignored_devices); ++i) {
			if (pdidInstance->guidProduct.Data1 == ignored_devices[i]) {
			return DIENUM_CONTINUE;
			}
			}
			}

			if (SDL_IsXInputDevice(&pdidInstance->guidProduct)) {
			@@ -452,27 +511,38 @@

			guid16 = (Uint16 *)pNewJoystick->guid.data;
			if (SDL_memcmp(&pdidInstance->guidProduct.Data4[2], "PIDVID", 6) == 0) {
			*guid16++ = SDL_SwapLE16(BUS_USB);
			vendor = (Uint16)LOWORD(pdidInstance->guidProduct.Data1);
			product = (Uint16)HIWORD(pdidInstance->guidProduct.Data1);
			version = 0;

			*guid16++ = SDL_SwapLE16(SDL_HARDWARE_BUS_USB);
			*guid16++ = 0;
			guid16++ = SDL_SwapLE16((Uint16)LOWORD(pdidInstance->guidProduct.Data1)); / vendor */
			*guid16++ = SDL_SwapLE16(vendor);
			*guid16++ = 0;
			guid16++ = SDL_SwapLE16((Uint16)HIWORD(pdidInstance->guidProduct.Data1)); / product */
			*guid16++ = SDL_SwapLE16(product);
			*guid16++ = 0;
			guid16++ = 0; / version */
			*guid16++ = SDL_SwapLE16(version);
			*guid16++ = 0;
			} else {
			*guid16++ = SDL_SwapLE16(BUS_BLUETOOTH);
			*guid16++ = SDL_SwapLE16(SDL_HARDWARE_BUS_BLUETOOTH);
			*guid16++ = 0;
			SDL_strlcpy((char*)guid16, pNewJoystick->joystickname, sizeof(pNewJoystick->guid.data) - 4);
			}

			if (SDL_IsGameControllerNameAndGUID(pNewJoystick->joystickname, pNewJoystick->guid) &&
			SDL_ShouldIgnoreGameController(pNewJoystick->joystickname, pNewJoystick->guid)) {
			if (SDL_ShouldIgnoreJoystick(pNewJoystick->joystickname, pNewJoystick->guid)) {
			SDL_free(pNewJoystick);
			return DIENUM_CONTINUE;
			}

			SDL_SYS_AddJoystickDevice(pNewJoystick);
			#ifdef SDL_JOYSTICK_HIDAPI
			if (HIDAPI_IsDevicePresent(vendor, product, 0)) {
			/* The HIDAPI driver is taking care of this device */
			SDL_free(pNewJoystick);
			return DIENUM_CONTINUE;
			}
			#endif

			WINDOWS_AddJoystickDevice(pNewJoystick);

			return DIENUM_CONTINUE; /* get next device, please */
			}
			@@ -683,7 +753,6 @@

			/* Force capable? */
			if (joystick->hwdata->Capabilities.dwFlags & DIDC_FORCEFEEDBACK) {

			result = IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::Acquire", result);
			@@ -752,6 +821,89 @@
			return 0;
			}

			static int
			SDL_DINPUT_JoystickInitRumble(SDL_Joystick * joystick, Sint16 magnitude, Uint32 duration_ms)
			{
			HRESULT result;

			/* Reset and then enable actuators */
			result = IDirectInputDevice8_SendForceFeedbackCommand(joystick->hwdata->InputDevice, DISFFC_RESET);
			if (result == DIERR_INPUTLOST \|\| result == DIERR_NOTEXCLUSIVEACQUIRED) {
			result = IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
			if (SUCCEEDED(result)) {
			result = IDirectInputDevice8_SendForceFeedbackCommand(joystick->hwdata->InputDevice, DISFFC_RESET);
			}
			}
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::SendForceFeedbackCommand(DISFFC_RESET)", result);
			}

			result = IDirectInputDevice8_SendForceFeedbackCommand(joystick->hwdata->InputDevice, DISFFC_SETACTUATORSON);
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::SendForceFeedbackCommand(DISFFC_SETACTUATORSON)", result);
			}

			/* Create the effect */
			joystick->hwdata->ffeffect = CreateRumbleEffectData(magnitude, duration_ms);
			if (!joystick->hwdata->ffeffect) {
			return SDL_OutOfMemory();
			}

			result = IDirectInputDevice8_CreateEffect(joystick->hwdata->InputDevice, &GUID_Sine,
			joystick->hwdata->ffeffect, &joystick->hwdata->ffeffect_ref, NULL);
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::CreateEffect", result);
			}
			return 0;
			}

			int
			SDL_DINPUT_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
			{
			HRESULT result;

			/* Scale and average the two rumble strengths */
			Sint16 magnitude = (Sint16)(((low_frequency_rumble / 2) + (high_frequency_rumble / 2)) / 2);

			if (!(joystick->hwdata->Capabilities.dwFlags & DIDC_FORCEFEEDBACK)) {
			return SDL_Unsupported();
			}

			if (joystick->hwdata->ff_initialized) {
			DIPERIODIC periodic = ((DIPERIODIC )joystick->hwdata->ffeffect->lpvTypeSpecificParams);
			joystick->hwdata->ffeffect->dwDuration = duration_ms * 1000; /* In microseconds. */
			periodic->dwMagnitude = CONVERT_MAGNITUDE(magnitude);

			result = IDirectInputEffect_SetParameters(joystick->hwdata->ffeffect_ref, joystick->hwdata->ffeffect, (DIEP_DURATION \| DIEP_TYPESPECIFICPARAMS));
			if (result == DIERR_INPUTLOST) {
			result = IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
			if (SUCCEEDED(result)) {
			result = IDirectInputEffect_SetParameters(joystick->hwdata->ffeffect_ref, joystick->hwdata->ffeffect, (DIEP_DURATION \| DIEP_TYPESPECIFICPARAMS));
			}
			}
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::SetParameters", result);
			}
			} else {
			if (SDL_DINPUT_JoystickInitRumble(joystick, magnitude, duration_ms) < 0) {
			return -1;
			}
			joystick->hwdata->ff_initialized = SDL_TRUE;
			}

			result = IDirectInputEffect_Start(joystick->hwdata->ffeffect_ref, 1, 0);
			if (result == DIERR_INPUTLOST \|\| result == DIERR_NOTEXCLUSIVEACQUIRED) {
			result = IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
			if (SUCCEEDED(result)) {
			result = IDirectInputEffect_Start(joystick->hwdata->ffeffect_ref, 1, 0);
			}
			}
			if (FAILED(result)) {
			return SetDIerror("IDirectInputDevice8::Start", result);
			}
			return 0;
			}

			static Uint8
			TranslatePOV(DWORD value)
			{
			@@ -803,8 +955,6 @@

			/* Handle the events or punt */
			if (FAILED(result)) {
			joystick->hwdata->send_remove_event = SDL_TRUE;
			joystick->hwdata->removed = SDL_TRUE;
			return;
			}

			@@ -859,8 +1009,6 @@
			}

			if (result != DI_OK) {
			joystick->hwdata->send_remove_event = SDL_TRUE;
			joystick->hwdata->removed = SDL_TRUE;
			return;
			}

			@@ -933,8 +1081,17 @@
			void
			SDL_DINPUT_JoystickClose(SDL_Joystick * joystick)
			{
			if (joystick->hwdata->ffeffect_ref) {
			IDirectInputEffect_Unload(joystick->hwdata->ffeffect_ref);
			joystick->hwdata->ffeffect_ref = NULL;
			}
			if (joystick->hwdata->ffeffect) {
			FreeRumbleEffectData(joystick->hwdata->ffeffect);
			joystick->hwdata->ffeffect = NULL;
			}
			IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice);
			IDirectInputDevice8_Release(joystick->hwdata->InputDevice);
			joystick->hwdata->ff_initialized = SDL_FALSE;
			}

			void
			@@ -972,6 +1129,12 @@
			return SDL_Unsupported();
			}

			int
			SDL_DINPUT_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
			{
			return SDL_Unsupported();
			}

			void
			SDL_DINPUT_JoystickUpdate(SDL_Joystick * joystick)
			{