March 2023 - Wine-commits - list.winehq.org

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_USERNAME property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 2656e418e2de27491f92eae0569b4f4e02c28128 URL: https://gitlab.winehq.org/wine/wine/-/commit/2656e418e2de27491f92eae0569b4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 13:27:37 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_USERNAME property. --- dlls/dinput/tests/joystick8.c | 50 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 6dbd4f3e9d6..a1720bb7b26 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -725,11 +725,29 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e {.objid = TRUE}, {.objid = TRUE, .how = TRUE}, }; + DIPROPSTRING prop_username = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPSTRING), + .dwHow = DIPH_DEVICE, + } + }; DIACTIONW actions[ARRAY_SIZE(expect_actions)]; DIACTIONFORMATW action_format; - DWORD flags; + WCHAR username[256]; + DWORD res, flags; HRESULT hr; + res = ARRAY_SIZE(username); + GetUserNameW( username, &res ); + + memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); + hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); + ok( hr == DI_NOEFFECT, "GetProperty returned %#lx\n", hr ); + ok( !wcscmp( prop_username.wsz, L"" ), "got username %s\n", debugstr_w(prop_username.wsz) ); + hr = IDirectInputDevice8_BuildActionMap( device, NULL, L"username", DIDBAM_DEFAULT ); ok( hr == DIERR_INVALIDPARAM, "BuildActionMap returned %#lx\n", hr ); @@ -768,12 +786,26 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); + memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); + hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) ); + hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_DEFAULT ); ok( hr == DI_NOEFFECT, "SetActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_FORCESAVE ); todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); + memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); + hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) ); + action_format = action_format_1; action_format.rgoAction = actions; @@ -891,6 +923,22 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_PRESERVE ); ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2, actions_todos_2 ); + + + /* DIDSAM_NOUSER flag clears the device user property */ + + memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); + hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( !wcscmp( prop_username.wsz, L"username" ), "got username %s\n", debugstr_w(prop_username.wsz) ); + + hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_NOUSER ); + ok( hr == DI_OK, "SetActionMap returned %#lx\n", hr ); + + memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); + hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); + ok( hr == DI_NOEFFECT, "GetProperty returned %#lx\n", hr ); + ok( !wcscmp( prop_username.wsz, L"" ), "got username %s\n", debugstr_w(prop_username.wsz) ); } static void test_simple_joystick( DWORD version )

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_APPDATA property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 2750d924db6db1523d9dd5ac2322bf09fa84e9df URL: https://gitlab.winehq.org/wine/wine/-/commit/2750d924db6db1523d9dd5ac2322bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 13:26:06 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_APPDATA property. --- dlls/dinput/tests/joystick8.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index a1720bb7b26..31f49b5b482 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -734,6 +734,14 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .dwHow = DIPH_DEVICE, } }; + DIPROPPOINTER prop_pointer = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPPOINTER), + } + }; DIACTIONW actions[ARRAY_SIZE(expect_actions)]; DIACTIONFORMATW action_format; WCHAR username[256]; @@ -885,6 +893,14 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "SetActionMap returned %#lx\n", hr ); + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + + /* saving action map actually does nothing */ action_format = action_format_2_filled; @@ -903,6 +919,34 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2_filled, actions_todos_2_filled ); + prop_pointer.diph.dwHow = DIPH_DEVICE; + prop_pointer.diph.dwObj = 0; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYID; + prop_pointer.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 3 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DIERR_NOTFOUND, "GetProperty returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYID; + prop_pointer.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 6, "got uData %#Ix\n", prop_pointer.uData ); + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + + action_format = action_format_2; action_format.rgoAction = actions; memcpy( actions, default_actions, sizeof(default_actions) ); @@ -925,6 +969,28 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2, actions_todos_2 ); + /* setting the data format resets action map */ + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + + /* DIDSAM_NOUSER flag clears the device user property */ memset( prop_username.wsz, 0, sizeof(prop_username.wsz) );

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_BUFFERSIZE property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 4edea8a93ae14820c85f2201907b25ff74d5b936 URL: https://gitlab.winehq.org/wine/wine/-/commit/4edea8a93ae14820c85f2201907b25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 14:04:50 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_BUFFERSIZE property. --- dlls/dinput/tests/joystick8.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 31f49b5b482..dd59f388efb 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -725,6 +725,15 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e {.objid = TRUE}, {.objid = TRUE, .how = TRUE}, }; + DIPROPDWORD prop_dword = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + } + }; DIPROPSTRING prop_username = { .diph = @@ -900,6 +909,11 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got dwData %#lx\n", prop_dword.dwData ); + /* saving action map actually does nothing */ @@ -946,6 +960,10 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); + action_format = action_format_2; action_format.rgoAction = actions; @@ -990,6 +1008,10 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); + /* DIDSAM_NOUSER flag clears the device user property */

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_RANGE property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: e7b3e3514c6a12388d7772479777d16a3309575b URL: https://gitlab.winehq.org/wine/wine/-/commit/e7b3e3514c6a12388d7772479777d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 14:06:52 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_RANGE property. --- dlls/dinput/tests/joystick8.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index dd59f388efb..8de3d743e57 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -725,6 +725,15 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e {.objid = TRUE}, {.objid = TRUE, .how = TRUE}, }; + DIPROPRANGE prop_range = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPRANGE), + .dwHow = DIPH_DEVICE, + } + }; DIPROPDWORD prop_dword = { .diph = @@ -909,6 +918,24 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_range.lMin == +1000, "got lMin %+ld\n", prop_range.lMin ); + todo_wine + ok( prop_range.lMax == +51000, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_range.lMin == -14000, "got lMin %+ld\n", prop_range.lMin ); + todo_wine + ok( prop_range.lMax == -4000, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); todo_wine @@ -960,6 +987,20 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); @@ -1008,6 +1049,20 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData );

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on HID joystick input.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: ed3f06b11afada68e0d389e866d45cbd3b708c40 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed3f06b11afada68e0d389e866d45c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 16:36:38 2023 +0100 dinput/tests: Test SaveActionMap effect on HID joystick input. --- dlls/dinput/tests/joystick8.c | 132 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 8de3d743e57..587a4aec4ac 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -570,6 +570,53 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .tszActionMap = L"Action Map Filled", .dwCRC = 0x3d98f717, }; + struct hid_expect injected_input[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x38,0x38,0x10,0x10,0x10,0xf8}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x80,0x80,0x10,0x10,0x10,0xff}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x10,0xee,0x10,0x10,0x10,0x54}, + }, + }; + const DWORD expect_state[ARRAY_SIZE(injected_input)][ARRAY_SIZE(expect_actions)] = + { + { 0, 0, 0, -1, 0, 0, 0, 0}, + { 0, 0, 0, -1, 0, 0, 0, 0}, + {+128, 0, 0, +31500, 0, 0, 0, +128}, + { 0, 0, 0, -1, 0, 0, 0, -43}, + { 0, 0, 0, -1, 0, 0, 0, -43}, + {+128, 0, 0, -1, 0, 0, 0, -128}, + }; + const DIDEVICEOBJECTDATA expect_objdata[8] = + { + {.dwOfs = 0x1c, .dwData = +128, .uAppData = 8}, + {.dwOfs = 0xc, .dwData = +31500, .uAppData = 4}, + {.dwOfs = 0, .dwData = +128, .uAppData = 1}, + {.dwOfs = 0x1c, .dwData = -43, .uAppData = 8}, + {.dwOfs = 0xc, .dwData = -1, .uAppData = 4}, + {.dwOfs = 0, .dwData = 0, .uAppData = 1}, + {.dwOfs = 0x1c, .dwData = -128, .uAppData = 8}, + {.dwOfs = 0, .dwData = +128, .uAppData = 1}, + }; DIACTIONW voice_actions[] = { {.dwSemantic = DIVOICE_CHANNEL1}, @@ -760,10 +807,12 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .dwSize = sizeof(DIPROPPOINTER), } }; + DIDEVICEOBJECTDATA objdata[ARRAY_SIZE(expect_objdata)]; DIACTIONW actions[ARRAY_SIZE(expect_actions)]; + DWORD state[ARRAY_SIZE(expect_actions)]; DIACTIONFORMATW action_format; WCHAR username[256]; - DWORD res, flags; + DWORD i, res, flags; HRESULT hr; res = ARRAY_SIZE(username); @@ -1028,6 +1077,87 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2, actions_todos_2 ); + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DI_OK, "Acquire returned: %#lx\n", hr ); + if (hr != DI_OK) goto skip_input; + + hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_DEFAULT ); + ok( hr == DIERR_ACQUIRED, "SetActionMap returned %#lx\n", hr ); + + send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + if (res == WAIT_TIMEOUT) /* Acquire is asynchronous */ + { + send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + } + todo_wine + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + + for (i = 0; i < ARRAY_SIZE(injected_input); ++i) + { + winetest_push_context( "state[%ld]", i ); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); + todo_wine + ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); + todo_wine_if( expect_state[i][0] ) + ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); + todo_wine_if( expect_state[i][1] ) + ok( state[1] == expect_state[i][1], "got state[1] %+ld\n", state[1] ); + todo_wine_if( expect_state[i][2] ) + ok( state[2] == expect_state[i][2], "got state[2] %+ld\n", state[2] ); + todo_wine_if( expect_state[i][3] ) + ok( state[3] == expect_state[i][3], "got state[3] %+ld\n", state[3] ); + todo_wine_if( expect_state[i][4] ) + ok( state[4] == expect_state[i][4], "got state[4] %+ld\n", state[4] ); + todo_wine_if( expect_state[i][5] ) + ok( state[5] == expect_state[i][5], "got state[5] %+ld\n", state[5] ); + todo_wine_if( expect_state[i][6] ) + ok( state[6] == expect_state[i][6], "got state[6] %+ld\n", state[6] ); + todo_wine_if( expect_state[i][7] ) + ok( state[7] == expect_state[i][7] || + broken(state[7] == -45 && expect_state[i][7] == -43) /* 32-bit rounding */, + "got state[7] %+ld\n", state[7] ); + + send_hid_input( file, &injected_input[i], sizeof(*injected_input) ); + + res = WaitForSingleObject( event, 100 ); + if (i == 0 || i == 3) ok( res == WAIT_TIMEOUT, "WaitForSingleObject succeeded\n" ); + else todo_wine ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + winetest_pop_context(); + } + + res = ARRAY_SIZE(objdata); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(*objdata), objdata, &res, DIGDD_PEEK ); + todo_wine + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#lx\n", hr ); + ok( res == 8, "got %lu expected %u\n", res, 8 ); + while (res--) + { + winetest_push_context( "%lu", res ); + todo_wine_if( expect_objdata[res].dwOfs ) + check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); + todo_wine_if( expect_objdata[res].dwData ) + ok( objdata[res].dwData == expect_objdata[res].dwData || + broken(objdata[res].dwData == -45 && expect_objdata[res].dwData == -43) /* 32-bit rounding */, + "got dwData %+ld\n", objdata[res].dwData ); + todo_wine + check_member( objdata[res], expect_objdata[res], "%#Ix", uAppData ); + winetest_pop_context(); + } + +skip_input: + hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_DEFAULT ); + ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + todo_wine + ok( hr == DI_OK, "Acquire returned: %#lx\n", hr ); + + /* setting the data format resets action map */ prop_pointer.diph.dwHow = DIPH_BYUSAGE;

1 0

Rémi Bernon : dinput/tests: Remove BuildActionMap / SaveActionMap mouse and keyboard tests.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 07753da93ce1f78c710f666e193a0434eb99699b URL: https://gitlab.winehq.org/wine/wine/-/commit/07753da93ce1f78c710f666e193a04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 21:04:01 2023 +0100 dinput/tests: Remove BuildActionMap / SaveActionMap mouse and keyboard tests. --- dlls/dinput/tests/device8.c | 517 -------------------------------------------- 1 file changed, 517 deletions(-)

1 0

Rémi Bernon : dinput/tests: Increase timeouts for waits not supposed to fail.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 659525268b5193347ffe98a039906388b61bdd8f URL: https://gitlab.winehq.org/wine/wine/-/commit/659525268b5193347ffe98a0399063… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 19:58:19 2023 +0100 dinput/tests: Increase timeouts for waits not supposed to fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54594 --- dlls/dinput/tests/device8.c | 48 +++++++++++++++++++------------------- dlls/dinput/tests/force_feedback.c | 8 +++---- dlls/dinput/tests/joystick8.c | 26 ++++++++++----------- 3 files changed, 41 insertions(+), 41 deletions(-)

1 0

Rémi Bernon : widl: Use a struct list to keep imported files.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 9d1f1a3fb1533f72243bfc9258f421d294fee5ad URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1f1a3fb1533f72243bfc9258f421… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use a struct list to keep imported files. --- tools/widl/parser.l | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 85d33d6e86a..710b6e37636 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -89,6 +89,13 @@ struct { } import_stack[MAX_IMPORT_DEPTH]; int import_stack_ptr = 0; +struct import +{ + const char *name; + struct list entry; +}; +static struct list imports = LIST_INIT( imports ); + /* converts an integer in string form to an unsigned long and prints an error * on overflow */ static unsigned int xstrtoul(const char *nptr, char **endptr, int base) @@ -513,28 +520,20 @@ void pop_import(void) import_stack_ptr--; } -struct imports { - char *name; - struct imports *next; -} *first_import; - int do_import(char *fname) { FILE *f; char *path, *name; - struct imports *import; + struct import *import; int ptr = import_stack_ptr; int ret; - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ + LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) + if (!strcmp( import->name, fname )) return 0; /* already imported */ - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; + import = xmalloc( sizeof(struct import) ); + import->name = xstrdup( fname ); + list_add_tail( &imports, &import->entry ); /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */

1 0

Rémi Bernon : widl: Simplify handling of already parsed imports.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 5deda2de3fb6ddcf8d84ed8245597a7b46020df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5deda2de3fb6ddcf8d84ed8245597a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:02:38 2023 +0100 widl: Simplify handling of already parsed imports. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 36 ++++++++++++++++++++---------------- tools/widl/parser.y | 15 ++++----------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 83832ecfcd8..f465fafa03c 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -29,7 +29,7 @@ extern int parser_debug; extern int yy_flex_debug; extern int import_stack_ptr; -int do_import(char *fname); +void push_import( char *import_name ); void pop_import(void); #define parse_only import_stack_ptr diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 710b6e37636..47783cbacb3 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -512,7 +512,7 @@ void pop_import(void) { int ptr = import_stack_ptr-1; - fclose(yyin); + if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( import_stack[ptr].state ); input_name = import_stack[ptr].input_name; @@ -520,7 +520,7 @@ void pop_import(void) import_stack_ptr--; } -int do_import(char *fname) +void push_import( char *import_name ) { FILE *f; char *path, *name; @@ -528,26 +528,32 @@ int do_import(char *fname) int ptr = import_stack_ptr; int ret; + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + yyin = NULL; + + /* reset buffer for <<EOF>>, in case import fails or already imported */ + yy_scan_string( "" ); + LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) - if (!strcmp( import->name, fname )) return 0; /* already imported */ + if (!strcmp( import->name, import_name )) return; /* already imported */ import = xmalloc( sizeof(struct import) ); - import->name = xstrdup( fname ); + import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); + if (strchr( import_name, '/' ) || strchr( import_name, '\\' )) + path = xstrdup( import_name ); + else if (!(path = wpp_find_include( import_name, input_name ))) + error_loc( "Unable to open include file %s\n", import_name ); - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); - - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; input_name = path; line_number = 1; @@ -562,9 +568,7 @@ int do_import(char *fname) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; } static void switch_to_acf(void) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6777a281ec7..031e5482792 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -331,7 +331,7 @@ int parser_lex( PARSER_STYPE *yylval ); %type <str> libraryhdr callconv cppquote importlib import %type <str> typename m_typename %type <uuid> uuid_string -%type <import> import_start +%type <str> import_start %type <typelib> library_start librarydef %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements @@ -504,17 +504,10 @@ typedecl: cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } ; -import_start: tIMPORT aSTRING ';' { $$ = xmalloc(sizeof(struct _import_t)); - $$->name = $2; - $$->import_performed = do_import($2); - if (!$$->import_performed) yychar = aEOF; - } - ; -import: import_start imp_statements aEOF { $$ = $1->name; - if ($1->import_performed) pop_import(); - free($1); - } +import_start: tIMPORT aSTRING ';' { $$ = $2; push_import($2); } + ; +import: import_start imp_statements aEOF { pop_import(); } ; importlib: tIMPORTLIB '(' aSTRING ')'

1 0

Rémi Bernon : widl: Use a struct list for the import stack.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 9d537999e315a74ef559fabb79d5b632b8a00208 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d537999e315a74ef559fabb79d5b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:05:44 2023 +0100 widl: Use a struct list for the import stack. --- tools/widl/parser.h | 4 +--- tools/widl/parser.l | 66 ++++++++++++++++++++++++++++++----------------------- tools/widl/widl.c | 2 -- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index f465fafa03c..abe215de02f 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -28,12 +28,10 @@ extern char *parser_text; extern int parser_debug; extern int yy_flex_debug; -extern int import_stack_ptr; +extern int parse_only; void push_import( char *import_name ); void pop_import(void); -#define parse_only import_stack_ptr - int is_type(const char *name); int do_warning(const char *toggle, warning_list_t *wnum); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 47783cbacb3..89383fe810e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -81,13 +81,15 @@ static void switch_to_acf(void); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 20 -struct { - YY_BUFFER_STATE state; - char *input_name; - int line_number; -} import_stack[MAX_IMPORT_DEPTH]; -int import_stack_ptr = 0; +struct import_state +{ + YY_BUFFER_STATE buffer; + char *input_name; + int line_number; + struct list entry; +}; +static struct list import_stack = LIST_INIT( import_stack ); +int parse_only = 0; struct import { @@ -159,7 +161,8 @@ struct uuid *parse_uuid(const char *u) } <PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; <PP_PRAGMA>winrt[^\n]* { - if(import_stack_ptr) { + if (!list_empty( &import_stack )) + { if(!winrt_mode) error_loc("winrt IDL file imported in non-winrt mode\n"); }else { @@ -234,7 +237,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) + if (!list_empty( &import_stack )) return aEOF; if (acf_name) { @@ -510,32 +513,38 @@ static char *get_buffered_cstring(void) void pop_import(void) { - int ptr = import_stack_ptr-1; - - if (yyin) fclose( yyin ); - yy_delete_buffer( YY_CURRENT_BUFFER ); - yy_switch_to_buffer( import_stack[ptr].state ); - input_name = import_stack[ptr].input_name; - line_number = import_stack[ptr].line_number; - import_stack_ptr--; + struct list *entry = list_head( &import_stack ); + struct import_state *state; + assert( entry ); + + state = LIST_ENTRY( entry, struct import_state, entry ); + list_remove( &state->entry ); + parse_only = !list_empty( &import_stack ); + + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer( state->buffer ); + input_name = state->input_name; + line_number = state->line_number; + free( state ); } void push_import( char *import_name ) { + struct import_state *state; FILE *f; char *path, *name; struct import *import; - int ptr = import_stack_ptr; int ret; - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); + state = xmalloc( sizeof(struct import_state )); + list_add_head( &import_stack, &state->entry ); + parse_only = !list_empty( &import_stack ); - import_stack[ptr].state = YY_CURRENT_BUFFER; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - yyin = NULL; + state->buffer = YY_CURRENT_BUFFER; + state->input_name = input_name; + state->line_number = line_number; + input_name = NULL; /* reset buffer for <<EOF>>, in case import fails or already imported */ yy_scan_string( "" ); @@ -573,12 +582,12 @@ void push_import( char *import_name ) static void switch_to_acf(void) { - int ptr = import_stack_ptr; - int ret; char *name; + int ret; FILE *f; - assert(import_stack_ptr == 0); + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); input_name = acf_name; acf_name = NULL; @@ -595,7 +604,6 @@ static void switch_to_acf(void) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1bc52a2a3a2..f259f0abe20 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -871,8 +871,6 @@ int main(int argc,char *argv[]) init_types(); ret = parser_parse(); - fclose(parser_in); - if(ret) { exit(1); }

1 0