June 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move WM_CONTEXTMENU and WM_POPUPSYSTEMMENU implementation from user32.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: fc940d5834751c80d4e7ded25f46c4eacfa1c041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc940d5834751c80d4e7ded2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 00:09:52 2022 +0200 win32u: Move WM_CONTEXTMENU and WM_POPUPSYSTEMMENU implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 26 ------- dlls/user32/nonclient.c | 182 ------------------------------------------------ dlls/win32u/defwnd.c | 26 +++++++ 4 files changed, 26 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc940d5834751c80d4e7…

1 0

Rémi Bernon : winegstreamer: Register stub ResamplerMediaObject transform.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: b6a7a02159eccc7fb40aa119a828e48ae256313a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a7a02159eccc7fb40aa119… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 23:52:45 2022 +0200 winegstreamer: Register stub ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 42 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 13 + dlls/winegstreamer/mfplat.c | 20 +- dlls/winegstreamer/resampler.c | 606 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 7 files changed, 681 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6a7a02159eccc7fb40a…

1 0

Sebastián Aedo : winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: b39fa96d0c95b047e54e74aca6a27e556a0f5893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39fa96d0c95b047e54e74ac… Author: Sebastián Aedo <sebastian.aedo29(a)gmail.com> Date: Wed Jun 15 17:48:09 2022 -0400 winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float. Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. Signed-off-by: Sebastián Aedo <sebastian.aedo29(a)gmail.com> --- dlls/winex11.drv/opengl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 91aef7f67be..017a8813caa 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3180,11 +3180,6 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension("WGL_ARB_create_context_profile"); } - if (has_extension( glxExtensions, "GLX_ARB_fbconfig_float")) - { - register_extension("WGL_ARB_pixel_format_float"); - register_extension("WGL_ATI_pixel_format_float"); - } register_extension( "WGL_ARB_extensions_string" ); opengl_funcs.ext.p_wglGetExtensionsStringARB = X11DRV_wglGetExtensionsStringARB; @@ -3214,6 +3209,12 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = X11DRV_wglGetPixelFormatAttribfvARB; opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = X11DRV_wglGetPixelFormatAttribivARB; + if (has_extension( glxExtensions, "GLX_ARB_fbconfig_float")) + { + register_extension("WGL_ARB_pixel_format_float"); + register_extension("WGL_ATI_pixel_format_float"); + } + /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ if (has_extension( glxExtensions, "GLX_ARB_render_texture") || (glxRequireVersion(3) && use_render_texture_emulation))

1 0

Rémi Bernon : winegstreamer: Remove unnecessary WineAudioConverter transform.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 09b56e2f3631bebdd5581586465fcfe1556ff39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b56e2f3631bebdd5581586… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 11:21:30 2022 +0100 winegstreamer: Remove unnecessary WineAudioConverter transform. Superseded by the standard ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 584 --------------------------- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/mfplat.c | 13 - dlls/winegstreamer/winegstreamer_classes.idl | 6 - 5 files changed, 605 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09b56e2f3631bebdd558…

1 0

Jacek Caban : win32u: Move menu tracking implementation from user32.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: b9d8a842f0ba1e4c3c59b9e9ede667bea1761e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9d8a842f0ba1e4c3c59b9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 12 16:52:40 2022 +0200 win32u: Move menu tracking implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 3 - dlls/user32/defwnd.c | 3 +- dlls/user32/input.c | 10 - dlls/user32/menu.c | 3216 +++--------------------------------------- dlls/user32/nonclient.c | 59 - dlls/user32/user32.spec | 8 +- dlls/user32/user_main.c | 16 +- dlls/user32/user_private.h | 1 - dlls/win32u/defwnd.c | 30 +- dlls/win32u/gdiobj.c | 3 + dlls/win32u/menu.c | 1816 +++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 4 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 8 +- dlls/win32u/win32u_private.h | 11 + dlls/win32u/window.c | 6 +- dlls/win32u/wrappers.c | 19 + dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 + include/ntuser.h | 5 +- 21 files changed, 2081 insertions(+), 3146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9d8a842f0ba1e4c3c59…

1 0

Giovanni Mascellani : mfplat/tests: Test interaction between Lock() and LockRect().
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 0d63116b27df2eb7c098625878b7182aaf83089b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d63116b27df2eb7c0986258… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 17:15:46 2022 +0200 mfplat/tests: Test interaction between Lock() and LockRect(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..2cd27ed1269 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6398,6 +6398,7 @@ static void test_MFCreateDXSurfaceBuffer(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; IDirect3DSwapChain9 *swapchain; + D3DLOCKED_RECT locked_rect; DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; @@ -6470,9 +6471,32 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(length == 2 * max_length, "Unexpected length %lu.\n", length); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock while the surface is locked. */ + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(length == max_length, "Unexpected length %lu instead of %lu.\n", length, max_length); + + /* You can lock the surface while the media buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(length == max_length, "Unexpected length.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer);

1 0

Julian Klemann : httpapi: Stop setting group->url if add_url() fails.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: db3ba1d74e2f9f72614500c6a053ba9c65d297f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3ba1d74e2f9f72614500c6… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 16 12:55:09 2022 -0500 httpapi: Stop setting group->url if add_url() fails. The URL should not be set if the URL cannot be added to a request queue. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 11 ++++++++--- dlls/httpapi/tests/httpapi.c | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 4d2d307ffcb..a5f8007b0a9 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -686,6 +686,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved) { struct url_group *group = get_url_group(id); + ULONG ret; TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), wine_dbgstr_longlong(context), reserved); @@ -696,13 +697,17 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, return ERROR_CALL_NOT_IMPLEMENTED; } + if (group->queue) + { + ret = add_url(group->queue, url, context); + if (ret) + return ret; + } + if (!(group->url = heap_strdupW(url))) return ERROR_OUTOFMEMORY; group->context = context; - if (group->queue) - return add_url(group->queue, url, context); - return ERROR_SUCCESS; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index d231fd1d8ed..3c3f7abcd90 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1268,8 +1268,8 @@ static void test_v2_bound_port(void) s = socket(AF_INET, SOCK_STREAM, 0); ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - todo_wine ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); - todo_wine ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); + ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); + ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); closesocket(s); ret = pHttpCloseRequestQueue(dummy_queue);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: e3ba22e39b1c1686275df3aa72971059754e8cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ba22e39b1c1686275df3aa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 16 22:29:01 2022 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 79d5cd82706..9db084ccc45 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3984,10 +3984,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ei ole Map-objekti" +msgstr "'this' ei ole |-objekti" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value"

1 0

Julian Klemann : httpapi/tests: Add tests for when URLs fail to be added to a queue.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 3b91c7c58f6f43bb6a34edbff929984692aab5fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b91c7c58f6f43bb6a34edbf… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 16 12:55:08 2022 -0500 httpapi/tests: Add tests for when URLs fail to be added to a queue. If a queue is associated to a URL group and the URL cannot be added to the queue, the URL should not be set in the group. In other cases, it should be. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 9d344f26d02..d231fd1d8ed 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1218,6 +1218,122 @@ static void test_HttpCreateUrlGroup(void) ok(!ret, "Unexpected return value %u.\n", ret); } +static void test_v2_bound_port(void) +{ + static const HTTPAPI_VERSION version = {2, 0}; + struct sockaddr_in sockaddr; + HTTP_SERVER_SESSION_ID session; + HTTP_BINDING_INFO binding; + HTTP_URL_GROUP_ID group; + unsigned short port; + WCHAR url[50]; + HANDLE queue, dummy_queue; + int ret; + SOCKET s, s2; + + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Failed to create session, error %u.\n", ret); + ret = pHttpCreateUrlGroup(session, &group, 0); + ok(!ret, "Failed to create URL group, error %u.\n", ret); + + ret = pHttpCreateRequestQueue(version, NULL, NULL, 0, &queue); + ok(!ret, "Failed to create request queue, error %u.\n", ret); + ret = pHttpCreateRequestQueue(version, NULL, NULL, 0, &dummy_queue); + ok(!ret, "Failed to create request queue, error %u.\n", ret); + binding.Flags.Present = 1; + binding.RequestQueueHandle = queue; + ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); + ok(!ret, "Failed to bind request queue, error %u.\n", ret); + + s2 = socket(AF_INET, SOCK_STREAM, 0); + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); + for (port = 50000; port < 51000; ++port) + { + sockaddr.sin_port = htons(port); + ret = bind(s2, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); + if (!ret) + break; + } + ok(!ret, "Failed to bind to port\n"); + swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); + ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0); + ok(ret == ERROR_SHARING_VIOLATION, "Unexpected failure adding %s, error %u.\n", debugstr_w(url), ret); + shutdown(s2, SD_BOTH); + closesocket(s2); + + binding.RequestQueueHandle = dummy_queue; + ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); + ok(!ret, "Failed to rebind request queue, error %u.\n", ret); + + s = socket(AF_INET, SOCK_STREAM, 0); + ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); + todo_wine ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); + todo_wine ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); + + closesocket(s); + ret = pHttpCloseRequestQueue(dummy_queue); + ok(!ret, "Failed to close queue handle, error %u.\n", ret); + ret = pHttpCloseRequestQueue(queue); + ok(!ret, "Failed to close queue handle, error %u.\n", ret); + ret = pHttpCloseUrlGroup(group); + ok(!ret, "Failed to close group, error %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Failed to close group, error %u.\n", ret); +} + +static void test_v2_queue_after_url(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048]; + HTTP_REQUEST_V2 *reqv2 = (HTTP_REQUEST_V2 *)req_buffer; + static const HTTPAPI_VERSION version = {2, 0}; + HTTP_REQUEST_V1 *req = &reqv2->s; + HTTP_SERVER_SESSION_ID session; + HTTP_BINDING_INFO binding; + HTTP_URL_GROUP_ID group; + unsigned short port; + char req_text[100]; + HANDLE queue; + int ret; + SOCKET s; + + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Failed to create session, error %u.\n", ret); + ret = pHttpCreateUrlGroup(session, &group, 0); + ok(!ret, "Failed to create URL group, error %u.\n", ret); + + port = add_url_v2(group); + + ret = pHttpCreateRequestQueue(version, NULL, NULL, 0, &queue); + ok(!ret, "Failed to create request queue, error %u.\n", ret); + binding.Flags.Present = 1; + binding.RequestQueueHandle = queue; + ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); + ok(!ret, "Failed to bind request queue, error %u.\n", ret); + + s = create_client_socket(port); + + sprintf(req_text, simple_req, port); + ret = send(s, req_text, strlen(req_text), 0); + ok(ret == strlen(req_text), "send() returned %d.\n", ret); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, NULL); + ok(!ret, "Got error %u.\n", ret); + + ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + + ret = remove_url_v2(group, port); + ok(!ret, "Got error %u.\n", ret); + + closesocket(s); + ret = pHttpCloseRequestQueue(queue); + ok(!ret, "Failed to close queue handle, error %u.\n", ret); + ret = pHttpCloseUrlGroup(group); + ok(!ret, "Failed to close group, error %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Failed to close group, error %u.\n", ret); +} + static void test_v2_server(void) { char DECLSPEC_ALIGN(8) req_buffer[2048], response_buffer[2048]; @@ -1538,6 +1654,8 @@ START_TEST(httpapi) test_HttpCreateServerSession(); test_HttpCreateUrlGroup(); test_v2_server(); + test_v2_queue_after_url(); + test_v2_bound_port(); test_v2_completion_port(); ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL);

1 0

Julian Klemann : httpapi/tests: Move sleep statement.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 39502adc6c2578c4279e3e6f125673ed6c658a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39502adc6c2578c4279e3e6f… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 16 12:55:07 2022 -0500 httpapi/tests: Move sleep statement. The mentioned bug randomly occurred after some subsequent patches, so the sleep should happen before GetOverlappedResult is called. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index be1d31c12ad..9d344f26d02 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -228,10 +228,6 @@ static void test_v1_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); - ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %lu.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); - /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the * kernel will report success before completely filling the buffer or @@ -239,6 +235,10 @@ static void test_v1_server(void) * around this. */ Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n");

1 0