mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 17:23:39 +00:00
joy.cpl: Use the DIJOYSTATE2 user data format to support more buttons.
This commit is contained in:
parent
bb9ee1e94a
commit
b4b6c3af75
|
@ -236,7 +236,7 @@ static BOOL CALLBACK enum_devices( const DIDEVICEINSTANCEW *instance, void *cont
|
||||||
if (!(entry = calloc( 1, sizeof(*entry) ))) return DIENUM_STOP;
|
if (!(entry = calloc( 1, sizeof(*entry) ))) return DIENUM_STOP;
|
||||||
|
|
||||||
IDirectInput8_CreateDevice( dinput, &instance->guidInstance, &entry->device, NULL );
|
IDirectInput8_CreateDevice( dinput, &instance->guidInstance, &entry->device, NULL );
|
||||||
IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick );
|
IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick2 );
|
||||||
IDirectInputDevice8_GetCapabilities( entry->device, &caps );
|
IDirectInputDevice8_GetCapabilities( entry->device, &caps );
|
||||||
|
|
||||||
list_add_tail( &devices, &entry->entry );
|
list_add_tail( &devices, &entry->entry );
|
||||||
|
@ -266,7 +266,7 @@ static DWORD WINAPI input_thread( void *param )
|
||||||
while (WaitForMultipleObjects( 2, events, FALSE, INFINITE ) != 0)
|
while (WaitForMultipleObjects( 2, events, FALSE, INFINITE ) != 0)
|
||||||
{
|
{
|
||||||
IDirectInputEffect *effect;
|
IDirectInputEffect *effect;
|
||||||
DIJOYSTATE state = {0};
|
DIJOYSTATE2 state = {0};
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
SendMessageW( dialog_hwnd, WM_USER, 0, 0 );
|
SendMessageW( dialog_hwnd, WM_USER, 0, 0 );
|
||||||
|
@ -437,7 +437,7 @@ LRESULT CALLBACK test_di_axes_window_proc( HWND hwnd, UINT msg, WPARAM wparam, L
|
||||||
{
|
{
|
||||||
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
||||||
IDirectInputDevice8W *device;
|
IDirectInputDevice8W *device;
|
||||||
DIJOYSTATE state = {0};
|
DIJOYSTATE2 state = {0};
|
||||||
RECT rect, tmp_rect;
|
RECT rect, tmp_rect;
|
||||||
PAINTSTRUCT paint;
|
PAINTSTRUCT paint;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
@ -503,7 +503,7 @@ LRESULT CALLBACK test_di_povs_window_proc( HWND hwnd, UINT msg, WPARAM wparam, L
|
||||||
{
|
{
|
||||||
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
||||||
IDirectInputDevice8W *device;
|
IDirectInputDevice8W *device;
|
||||||
DIJOYSTATE state = {0};
|
DIJOYSTATE2 state = {0};
|
||||||
PAINTSTRUCT paint;
|
PAINTSTRUCT paint;
|
||||||
RECT rect;
|
RECT rect;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
@ -547,7 +547,7 @@ LRESULT CALLBACK test_di_buttons_window_proc( HWND hwnd, UINT msg, WPARAM wparam
|
||||||
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
|
||||||
UINT i, j, offs, size, step, space = 2;
|
UINT i, j, offs, size, step, space = 2;
|
||||||
IDirectInputDevice8W *device;
|
IDirectInputDevice8W *device;
|
||||||
DIJOYSTATE state = {0};
|
DIJOYSTATE2 state = {0};
|
||||||
PAINTSTRUCT paint;
|
PAINTSTRUCT paint;
|
||||||
RECT rect;
|
RECT rect;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
|
Loading…
Reference in a new issue