December 2022 - Wine-Commits

Rémi Bernon : dinput/tests: Test windows.gaming.input infinite effect duration.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: d348cf37221e40a7d584d910faa14ce1eaf6be33 URL: https://gitlab.winehq.org/wine/wine/-/commit/d348cf37221e40a7d584d910faa14c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:31:42 2022 +0100 dinput/tests: Test windows.gaming.input infinite effect duration. --- dlls/dinput/tests/force_feedback.c | 77 +++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 6c7d4791c84..353a8968f89 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <stdint.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -5024,7 +5025,7 @@ static void test_windows_gaming_input(void) LOGICAL_MINIMUM(1, 0), LOGICAL_MAXIMUM(2, 0x7fff), PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MAXIMUM(1, 0), REPORT_SIZE(1, 16), REPORT_COUNT(1, 4), OUTPUT(1, Data|Var|Abs), @@ -5709,6 +5710,54 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x05,0x04,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, }, }; + struct hid_expect expect_create_ramp_inf[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x05,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set ramp */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 10, + .report_len = 6, + .report_buf = {10,0x01,0xe8,0x03,0xa0,0x0f}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0x8f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_effect_start = { .code = IOCTL_HID_WRITE_REPORT, @@ -5756,7 +5805,7 @@ static void test_windows_gaming_input(void) .dwHow = DIPH_DEVICE, }, }; - TimeSpan delay = {100000}, attack_duration = {200000}, release_duration = {300000}, duration = {400000}; + TimeSpan delay = {100000}, attack_duration = {200000}, release_duration = {300000}, duration = {400000}, infinite_duration = {INT64_MAX}; Vector3 direction = {0.1, 0.2, 0.3}, end_direction = {0.4, 0.5, 0.6}; DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; IAsyncOperation_ForceFeedbackLoadEffectResult *result_async; @@ -6441,6 +6490,30 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IRampForceEffect, (void **)&ramp_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IRampForceEffect_SetParameters( ramp_effect, direction, end_direction, infinite_duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + IRampForceEffect_Release( ramp_effect ); + + set_hid_expect( file, expect_create_ramp_inf, sizeof(expect_create_ramp_inf) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect );

1 0

Rémi Bernon : dinput/tests: Test dinput force feedback effect envelope removal.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 11374e7020999e94d3f2366db068b3b72490fc2a URL: https://gitlab.winehq.org/wine/wine/-/commit/11374e7020999e94d3f2366db068b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:55:41 2022 +0100 dinput/tests: Test dinput force feedback effect envelope removal. --- dlls/dinput/tests/force_feedback.c | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 353a8968f89..145f6108ab6 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -425,6 +425,55 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, }, }; + struct hid_expect expect_download_3[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x01,0x00,0x04,0x00}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + }, + }; + struct hid_expect expect_download_4[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x01,0x00,0x04,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + }, + }; struct hid_expect expect_update[] = { /* update effect */ @@ -1441,6 +1490,32 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Unload( effect ); + ok( hr == DI_OK, "Unload returned %#lx\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); + set_hid_expect( file, expect_download_3, sizeof(expect_download_3) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Unload( effect ); + ok( hr == DI_OK, "Unload returned %#lx\n", hr ); + set_hid_expect( file, NULL, 0 ); + + desc = expect_desc; + desc.lpEnvelope = NULL; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_ENVELOPE ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); + set_hid_expect( file, expect_download_4, sizeof(expect_download_4) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %ld\n", ref );

1 0

Rémi Bernon : dinput/tests: Factor async await together with some new helpers.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 735adb9ff44958d09f267a0f2861ebc46c69d4ca URL: https://gitlab.winehq.org/wine/wine/-/commit/735adb9ff44958d09f267a0f2861eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:06:52 2022 +0100 dinput/tests: Factor async await together with some new helpers. --- dlls/dinput/tests/force_feedback.c | 125 +++++++++++++------------------------ 1 file changed, 43 insertions(+), 82 deletions(-)

1 0

Shaun Ren : mfmediaengine: Pause the session in media_engine_Pause.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 5ef7a45bc9bbb21c1892ce939670302f15214601 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ef7a45bc9bbb21c1892ce93967030… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Dec 17 00:30:26 2022 -0500 mfmediaengine: Pause the session in media_engine_Pause. --- dlls/mfmediaengine/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 27dafd616a2..63e9a8f07d5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1952,11 +1952,14 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) { if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); + if (SUCCEEDED(hr = IMFMediaSession_Pause(engine->session))) + { + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + } } IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0);

1 0

Shaun Ren : mfmediaengine: Change media_engine_Shutdown FIXME to TRACE.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: adbc4b666d166e24d4010b5a4f3408b9fca5d0fa URL: https://gitlab.winehq.org/wine/wine/-/commit/adbc4b666d166e24d4010b5a4f3408… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Dec 17 00:28:51 2022 -0500 mfmediaengine: Change media_engine_Shutdown FIXME to TRACE. --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index f2fae1cac3e..27dafd616a2 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2123,7 +2123,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngineEx *iface) struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; - FIXME("(%p): stub.\n", iface); + TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)

1 0

Ziqing Hui : mfplat/tests: Add MEDIASUBTYPE_RGB* and NV11 image size tests.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: ae32fb465eacd9bf13874d344c6ede98c7a5637a URL: https://gitlab.winehq.org/wine/wine/-/commit/ae32fb465eacd9bf13874d344c6ede… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Dec 21 11:33:24 2022 +0800 mfplat/tests: Add MEDIASUBTYPE_RGB* and NV11 image size tests. --- dlls/mfplat/tests/mfplat.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83d2aacf843..13055d4c5e4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -337,6 +337,15 @@ static WCHAR *load_resource(const WCHAR *name) return pathW; } +static BOOL is_MEDIASUBTYPE_RGB(const GUID *subtype) +{ + return IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32); +} + struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; @@ -4261,6 +4270,16 @@ image_size_tests[] = { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_A16B16G16R16F, 3, 5, 120, 0, 320, 120, 64 }, { &MFVideoFormat_A16B16G16R16F, 1, 1, 8, 0, 64, 8, 64 }, + { &MEDIASUBTYPE_RGB8, 3, 5, 20 }, + { &MEDIASUBTYPE_RGB8, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB555, 3, 5, 40 }, + { &MEDIASUBTYPE_RGB555, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB565, 3, 5, 40 }, + { &MEDIASUBTYPE_RGB565, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB24, 3, 5, 60 }, + { &MEDIASUBTYPE_RGB24, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB32, 3, 5, 60 }, + { &MEDIASUBTYPE_RGB32, 1, 1, 4 }, /* YUV 4:4:4, 32 bpp, packed */ { &MFVideoFormat_AYUV, 1, 1, 4, 0, 64, 4, 64 }, @@ -4338,6 +4357,15 @@ image_size_tests[] = { &MFVideoFormat_IMC4, 4, 2, 12, 0, 384, 12, 128 }, { &MFVideoFormat_IMC4, 4, 3, 18, 0, 576, 18, 128 }, { &MFVideoFormat_IMC4, 320, 240, 115200, 0, 138240, 115200, 384 }, + + /* YUV 4:1:1, 12 bpp, semi-planar */ + { &MFVideoFormat_NV11, 1, 3, 18, 4, 576, 3, 128 }, + { &MFVideoFormat_NV11, 1, 2, 12, 3, 384, 2, 128 }, + { &MFVideoFormat_NV11, 2, 2, 12, 6, 384, 6, 128 }, + { &MFVideoFormat_NV11, 2, 4, 24, 12, 768, 12, 128 }, + { &MFVideoFormat_NV11, 3, 2, 12, 9, 384, 8, 128 }, + { &MFVideoFormat_NV11, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_NV11, 320, 240, 115200, 0, 138240, 115200, 384 }, }; static void test_MFCalculateImageSize(void) @@ -4360,7 +4388,9 @@ static void test_MFCalculateImageSize(void) IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); + todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); + todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); } @@ -4387,9 +4417,12 @@ static void test_MFGetPlaneSize(void) { const struct image_size_test *ptr = &image_size_tests[i]; unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + if ((is_MEDIASUBTYPE_RGB(ptr->subtype))) + plane_size = 0; hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(size == plane_size, "%u: unexpected plane size %lu, expected %u. Size %u x %u, format %s.\n", i, size, plane_size, ptr->width, ptr->height, wine_dbgstr_an((char*)&ptr->subtype->Data1, 4)); } @@ -5932,8 +5965,14 @@ static void test_MFCreate2DMediaBuffer(void) { const struct image_size_test *ptr = &image_size_tests[i]; + if (is_MEDIASUBTYPE_RGB(ptr->subtype)) + continue; + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + if (hr != S_OK) + continue; hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -6070,8 +6109,14 @@ static void test_MFCreate2DMediaBuffer(void) { const struct image_size_test *ptr = &image_size_tests[i]; + if (is_MEDIASUBTYPE_RGB(ptr->subtype)) + continue; + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + if (hr != S_OK) + continue; hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr);

1 0

Gabriel Ivăncescu : jscript: Fix JSCaller Release refcount.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: aa7f3b1ef6efec4aa7cec131ec03086833bb4813 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa7f3b1ef6efec4aa7cec131ec0308… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 20 21:39:46 2022 +0200 jscript: Fix JSCaller Release refcount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 8c1eedf4283..3dfcd08f14c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -1017,7 +1017,7 @@ static ULONG WINAPI JSCaller_AddRef(IServiceProvider *iface) static ULONG WINAPI JSCaller_Release(IServiceProvider *iface) { JSCaller *This = impl_from_IServiceProvider(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%ld\n", This, ref);

1 0

Paul Gofman : winhttp: Only read server reply in send_request() if the whole request is sent.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 3f51fcf8ac40296265f0bf88ed51e0778f6b266a URL: https://gitlab.winehq.org/wine/wine/-/commit/3f51fcf8ac40296265f0bf88ed51e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 17:06:13 2022 -0600 winhttp: Only read server reply in send_request() if the whole request is sent. Fixes a regression introduced by aa8f97e8294b0618de0e8a45ff2adef0c4e516da. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54184 --- dlls/winhttp/request.c | 45 ++++++++++++++++++++++++++++++++------- dlls/winhttp/tests/notification.c | 36 +++++++++++++++++++++++-------- dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 43d123de129..07d0ff19b7c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2216,9 +2216,9 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD { struct connect *connect = request->connect; struct session *session = connect->session; + DWORD ret, len, buflen, content_length; char *wire_req; int bytes_sent; - DWORD ret, len; TRACE( "request state %d.\n", request->state ); @@ -2305,14 +2305,29 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->optional_len = optional_len; len += optional_len; } - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); - request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); - if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) - request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + buflen = sizeof(content_length); + if (query_headers( request, WINHTTP_QUERY_FLAG_REQUEST_HEADERS | WINHTTP_QUERY_CONTENT_LENGTH + | WINHTTP_QUERY_FLAG_NUMBER, NULL, &content_length, &buflen, NULL )) + content_length = total_len; + + if (content_length <= optional_len) + { + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED; + else + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; + } else - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + { + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + else + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + } end: if (async) @@ -2895,10 +2910,24 @@ static DWORD receive_response( struct request *request ) case REQUEST_RESPONSE_STATE_REQUEST_SENT: send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + if (async_mode) + { + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + return queue_receive_response( request ); + } + /* fallthrough */ + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break; - case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + case REQUEST_RESPONSE_STATE_REPLY_RECEIVED: + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; + + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED: + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break; default: diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index dbdb958f061..78319f0df5c 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1852,6 +1852,8 @@ struct test_recursion_context DWORD main_thread_id; DWORD receive_response_thread_id; BOOL headers_available; + DWORD total_len; + BYTE *send_buffer; }; /* The limit is 128 before Win7 and 3 on newer Windows. */ @@ -1872,17 +1874,29 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: if (status == context->call_receive_response_status) { - context->receive_response_thread_id = GetCurrentThreadId(); - ret = WinHttpReceiveResponse( context->request, NULL ); - ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + if (context->total_len) + { + ret = WinHttpWriteData( context->request, context->send_buffer, context->total_len, NULL ); + ok(ret, "failed.\n"); + } + else + { + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + } } break; + case WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE: + trace("WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE thread %04lx.\n", GetCurrentThreadId()); + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + break; + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: - if (context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) - ok( GetCurrentThreadId() == context->receive_response_thread_id, - "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); - else + if (context->call_receive_response_status != WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) ok( GetCurrentThreadId() != context->main_thread_id, "expected callback to be called from the other thread, got main.\n" ); context->headers_available = TRUE; @@ -1933,7 +1947,6 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex InterlockedDecrement( &context->recursion_count ); break; case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: - case WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: if (!context->headers_available && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) ok( GetCurrentThreadId() == context->receive_response_thread_id, @@ -1979,7 +1992,10 @@ static void test_recursion(void) ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); context.call_receive_response_status = WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE; - ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + context.total_len = 1; + context.send_buffer = &b; + b = 0; + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, context.total_len, (DWORD_PTR)&context ); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { @@ -1994,6 +2010,8 @@ static void test_recursion(void) ok( ret, "failed to send request, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); + context.total_len = 0; + context.send_buffer = NULL; size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 8e4789356ec..bf1e60e2cee 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -181,6 +181,8 @@ enum request_response_state REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED, REQUEST_RESPONSE_STATE_REQUEST_SENT, REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT, + REQUEST_RESPONSE_STATE_REPLY_RECEIVED, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED, REQUEST_RESPONSE_RECURSIVE_REQUEST, REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, };

1 0

Paul Gofman : winhttp: Handle state in a single switch in receive_response().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 2677546e0a24f647ac98fd3deaf8ae3a2f457825 URL: https://gitlab.winehq.org/wine/wine/-/commit/2677546e0a24f647ac98fd3deaf8ae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 18:04:38 2022 -0600 winhttp: Handle state in a single switch in receive_response(). --- dlls/winhttp/request.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c99cb7ee195..43d123de129 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2871,38 +2871,39 @@ static DWORD receive_response( struct request *request ) { BOOL async_mode = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; DWORD ret, size, query, status; - BOOL return_to_send; TRACE( "request state %d.\n", request->state ); - if (request->state >= REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED) - { - ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; - goto done; - } - - if (request->state == REQUEST_RESPONSE_RECURSIVE_REQUEST) + switch (request->state) { + case REQUEST_RESPONSE_RECURSIVE_REQUEST: TRACE( "Sending request.\n" ); if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done; - } - - return_to_send = async_mode && request->state == REQUEST_RESPONSE_STATE_SENDING_REQUEST; - if (request->state < REQUEST_RESPONSE_STATE_REQUEST_SENT && !return_to_send) - { - ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; - goto done; - } - - if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT) - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; - else send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; - if (return_to_send) - { + case REQUEST_RESPONSE_STATE_SENDING_REQUEST: + if (!async_mode) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED; return queue_receive_response( request ); + + + case REQUEST_RESPONSE_STATE_REQUEST_SENT: + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; + + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + break; + + default: + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED,

1 0

Gerald Pfeifer : winebus.sys: Declare a variable only when used.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 940d13db369f1ebaf5fdeaa5775ecf1794ce6b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/940d13db369f1ebaf5fdeaa5775ecf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 20 03:36:46 2022 +0100 winebus.sys: Declare a variable only when used. udev_add_device declares a variable (product) even when it is not used on all platforms. Use the same condition for the declaration that already guards the code. --- dlls/winebus.sys/bus_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3cd8bfd1ceb..34b3305ed88 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1329,7 +1329,9 @@ static void udev_add_device(struct udev_device *dev, int fd) if (!strcmp(subsystem, "hidraw")) { static const WCHAR hidraw[] = {'h','i','d','r','a','w',0}; +#ifdef HAVE_LINUX_HIDRAW_H char product[MAX_PATH]; +#endif if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw));

1 0