September 2021 - Wine-Commits

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetEffectInfo tests.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: e47fcc112fe31d9edbfb00b7bc2d93a61d836cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e47fcc112fe31d9edbfb00b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:34 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetEffectInfo tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cf47216cd9e..149790f1484 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3679,6 +3679,7 @@ static void test_simple_joystick(void) DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEOBJECTINSTANCEW objinst = {0}; DIDEVICEINSTANCEW devinst = {0}; + DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; @@ -4049,6 +4050,21 @@ static void test_simple_joystick(void) ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); + hr = IDirectInputDevice8_GetEffectInfo( device, NULL, &GUID_Sine ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW) + 1; + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); @@ -5416,6 +5432,7 @@ static void test_force_feedback_joystick( void ) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; + DIEFFECTINFOW effectinfo = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -5514,6 +5531,19 @@ static void test_force_feedback_joystick( void ) ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + todo_wine + check_member_guid( effectinfo, expect_effects[0], guid ); + check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); + todo_wine + check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); + todo_wine + check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); + todo_wine + check_member_wstr( effectinfo, expect_effects[0], tszName ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr );

1 0

Rémi Bernon : dinput: Fix HID joystick DIDFT_POV enumeration.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 5d782424d87259e4276801d118a1ad4a3044d428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d782424d87259e4276801d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 13:50:03 2021 +0200 dinput: Fix HID joystick DIDFT_POV enumeration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 7c4b637d018..834a5de0860 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -417,7 +417,7 @@ static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPD TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); if (!callback) return DIERR_INVALIDPARAM; - if (flags & ~(DIDFT_AXIS | DIDFT_AXIS | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) + if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) return DIERR_INVALIDPARAM; if (flags == DIDFT_ALL || (flags & DIDFT_AXIS))

1 0

Alistair Leslie-Hughes : wininet: Reset context length for http status 304.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 8825ed72d7b8affc1eaaa4359797e68488cdf5d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8825ed72d7b8affc1eaaa435… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 30 18:59:31 2021 +1000 wininet: Reset context length for http status 304. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 ++- dlls/wininet/tests/http.c | 134 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..c9c4a060aac 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,12 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { + if (HTTP_GetCustomHeaderIndex(request, L"Content-Length", 0, FALSE) == -1 || + !wcscmp(request->verb, L"HEAD")) + request->read_size = 0; request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..ae95b4399e0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2375,12 +2375,41 @@ static DWORD CALLBACK server_thread(LPVOID param) recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } - + if (strstr(buffer, "GET /test_no_content_content_length")) + { + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); + } if (strstr(buffer, "GET /test_no_content")) { - static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n" + "0123456789"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified_content_length")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + else if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + if (strstr(buffer, "HEAD /head_content_length")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } + else if (strstr(buffer, "HEAD /head")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3516,106 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6189,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port);

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_CreateEffect tests.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: e69f27d2eee29184b340af9f836bd3039eab48ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69f27d2eee29184b340af9f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:41 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_CreateEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 1 + dlls/dinput8/tests/hid.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 11496640049..d869f439101 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1578,6 +1578,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); FIXME("(%p)->(%s,%p,%p,%p): stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); + if (!ppdef) return E_POINTER; FIXME("not available in the generic implementation\n"); *ppdef = NULL; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f93c2b471f4..1ab6e645947 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3682,6 +3682,7 @@ static void test_simple_joystick(void) DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; + IDirectInputEffect *effect; DIEFFESCAPE escape = {0}; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -4673,9 +4674,21 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_Escape( device, NULL ); todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_Escape returned: %#x\n", hr ); @@ -5051,6 +5064,30 @@ static BOOL test_device_types(void) return success; } +static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) +{ + IDirectInputEffect *effect; + HRESULT hr; + ULONG ref; + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + if (hr != DI_OK) return; + + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); +} + static void test_force_feedback_joystick( void ) { #include "psh_hid_macros.h" @@ -5797,6 +5834,8 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + test_periodic_effect( device, file ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetForceFeedbackState tests.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: beedf615b25f1453943a7c45dbf0ae4773408138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beedf615b25f1453943a7c45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:37 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetForceFeedbackState tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 080f2c944ca..918db40d444 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4643,6 +4643,14 @@ static void test_simple_joystick(void) check_member( state, expect_state_rel[i], "%#x", rgbButtons[2] ); winetest_pop_context(); + hr = IDirectInputDevice8_GetForceFeedbackState( device, NULL ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); @@ -5656,6 +5664,9 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; @@ -5685,6 +5696,10 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == 0x80040301, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_SendForceFeedbackCommand tests.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 4ea75e55b63e63e23871216f921fe10fcc664ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea75e55b63e63e23871216f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:38 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SendForceFeedbackCommand tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 918db40d444..43834d1f602 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4651,6 +4651,13 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); @@ -5667,6 +5674,9 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; @@ -5701,6 +5711,32 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_STOPALL ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_PAUSE ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_CONTINUE ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSON ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSOFF ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add the required PID reports to enumerate some effects.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 5f492b5e8aa8018e6ddfd17838cf3f91fe11c781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f492b5e8aa8018e6ddfd178… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:33 2021 +0200 dinput8/tests: Add the required PID reports to enumerate some effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 184 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 163 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f492b5e8aa8018e6ddf…

1 0

Nikolay Sivov : ole32/composite: Disable cloning of enumerator instances.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: b557c395556a9d2a6b62c7be3b79968e9dc78e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b557c395556a9d2a6b62c7be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:47 2021 +0300 ole32/composite: Disable cloning of enumerator instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 6 +++--- dlls/ole32/tests/moniker.c | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index cde3f1762f0..652962e1a87 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1363,14 +1363,14 @@ EnumMonikerImpl_Reset(IEnumMoniker* iface) static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker *iface, IEnumMoniker **ret) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("%p, %p.\n", iface, ret); if (!ret) return E_INVALIDARG; - return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ret); + *ret = NULL; + + return E_NOTIMPL; } static const IEnumMonikerVtbl VT_EnumMonikerImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a60472951f7..abd17c9961f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3699,10 +3699,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + hr = IEnumMoniker_Reset(enummoniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3718,10 +3717,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + IEnumMoniker_Release(enummoniker); /* Backward direction */ @@ -3783,10 +3781,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + hr = IEnumMoniker_Reset(enummoniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3802,10 +3799,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + IEnumMoniker_Release(enummoniker); IMoniker_Release(moniker);

1 0

Rémi Bernon : dinput8/tests: Add the required PID reports to acquire the device.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 46a42c78af9d2d75c483e6c4d355603e6215682c URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a42c78af9d2d75c483e6c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:35 2021 +0200 dinput8/tests: Add the required PID reports to acquire the device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 15 +++- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 184 ++++++++++++++++++++++++++++++++-------- 3 files changed, 163 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46a42c78af9d2d75c483…

1 0

Rémi Bernon : dinput8/tests: Don't try running more tests after a win_skip.
by Alexandre Julliard Sept. 30, 2021

Sept. 30, 2021

Module: wine Branch: master Commit: 3bc1263e5a9ce23b4744d9b14bb194be06aeb42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc1263e5a9ce23b4744d9b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:31 2021 +0200 dinput8/tests: Don't try running more tests after a win_skip. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ce2a3792593..533c4a8ca42 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4593,7 +4593,7 @@ struct device_desc HIDP_CAPS hid_caps; }; -static void test_device_types( void ) +static BOOL test_device_types(void) { #include "psh_hid_macros.h" static const unsigned char unknown_desc[] = @@ -4837,11 +4837,12 @@ static void test_device_types( void ) DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; + BOOL success = TRUE; IDirectInput8W *di; ULONG i, ref; HRESULT hr; - for (i = 0; i < ARRAY_SIZE(device_desc); ++i) + for (i = 0; i < ARRAY_SIZE(device_desc) && success; ++i) { winetest_push_context( "desc[%d]", i ); GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -4852,7 +4853,7 @@ static void test_device_types( void ) if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, &device_desc[i].hid_caps )) { - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4860,7 +4861,7 @@ static void test_device_types( void ) if (FAILED(hr)) { win_skip( "DirectInput8Create returned %#x\n", hr ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4870,7 +4871,7 @@ static void test_device_types( void ) { win_skip( "device not found, skipping tests\n" ); IDirectInput8_Release( di ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4918,6 +4919,8 @@ static void test_device_types( void ) SetCurrentDirectoryW( cwd ); winetest_pop_context(); } + + return success; } static void test_force_feedback_joystick( void ) @@ -5345,9 +5348,11 @@ START_TEST( hid ) test_hid_driver( 1, TRUE ); CoInitialize( NULL ); - test_device_types(); - test_simple_joystick(); - test_force_feedback_joystick(); + if (test_device_types()) + { + test_simple_joystick(); + test_force_feedback_joystick(); + } CoUninitialize(); UnmapViewOfFile( test_data );

1 0