December 2022 - Wine-Commits

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

Gerald Pfeifer : wmc: Avoid uninitialized variable in init_argv0_dir.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 4bbdbc759a8c1b8eab8aea8c8f581eafe5ed4d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bbdbc759a8c1b8eab8aea8c8f581e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 20 00:02:19 2022 +0100 wmc: Avoid uninitialized variable in init_argv0_dir. init_argv0_dir has conditional code for different operating systems. In case of FreeBSD a variable remains uninitialized in the error case, yet is then used. Fix that by handling the error case. --- tools/wmc/wmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index f5ff7abcdf9..145acb5d718 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -160,6 +160,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Alexandre Julliard : d3d8/tests: Don't require WM_MOVE on window reactivation.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 971ef0d3b376f3b67f8608219b4f495263fbb15f URL: https://gitlab.winehq.org/wine/wine/-/commit/971ef0d3b376f3b67f8608219b4f49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:42:17 2022 +0100 d3d8/tests: Don't require WM_MOVE on window reactivation. It can be activated without moving. --- dlls/d3d8/tests/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 12d8aeb89f6..9dcdcab066f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2922,7 +2922,6 @@ static void test_wndproc(void) { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, };

1 0

Alexandre Julliard : d3d8/tests: Make sure that the window has focus before testing loss of focus.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9761191f1c3aa7714204da470db1c8ef5dedc5c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9761191f1c3aa7714204da470db1c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:44:07 2022 +0100 d3d8/tests: Make sure that the window has focus before testing loss of focus. --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9dcdcab066f..59532d0a208 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3305,6 +3305,7 @@ static void test_wndproc(void) skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + SetForegroundWindow(focus_window); /* make sure that the window has focus */ filter_messages = NULL;

1 0

Zebediah Figura : httpapi/tests: Test passing NULL size to request reading functions.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 266c855fbd2a6a939c78cfb44391bdb5d71b5e2b URL: https://gitlab.winehq.org/wine/wine/-/commit/266c855fbd2a6a939c78cfb44391bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:58:56 2022 -0600 httpapi/tests: Test passing NULL size to request reading functions. --- dlls/httpapi/tests/httpapi.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 1d00aa22c50..fa412b1093a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -572,27 +572,39 @@ static void test_v1_short_buffer(void) ok(ret == strlen(req_text), "send() returned %d.\n", ret); memset(req_buffer, 0xcc, sizeof(req_buffer)); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1) - 1, &ret_size, NULL); ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", ret); + ok(ret_size == 1 /* win < 10 */ || !ret_size, "Got size %lu.\n", ret_size); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1), &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!!req->ConnectionId, "Got connection ID %s.\n", wine_dbgstr_longlong(req->ConnectionId)); ok(!!req->RequestId, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); ok(!req->Version.MajorVersion || req->Version.MajorVersion == 0xcccc /* < Vista */, "Got major version %u.\n", req->Version.MajorVersion); ok(!req->BytesReceived || req->BytesReceived == ((ULONGLONG)0xcccccccc << 32 | 0xcccccccc) /* < Vista */, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + req_id = req->RequestId; /* At this point the request has been assigned a specific ID, and one cannot * receive it by calling with HTTP_NULL_ID. */ ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl); ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); - req_id = req->RequestId; memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + + memset(req_buffer, 0xcc, sizeof(req_buffer)); + ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, NULL, NULL); + ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size, &ret_size, NULL); @@ -828,11 +840,15 @@ static void test_v1_entity_body(void) ok(ret_size == 2, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 1, NULL, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(!memcmp(recv_body, "n", 1), "Entity body didn't match.\n"); + ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 3, "Got size %lu.\n", ret_size); - ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + ok(ret_size == 2, "Got size %lu.\n", ret_size); + ok(!memcmp(recv_body, "g", 2), "Entity body didn't match.\n"); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL);

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: c9f628042216eea338a154f0585003fe9187bacc URL: https://gitlab.winehq.org/wine/wine/-/commit/c9f628042216eea338a154f0585003… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:38 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody(). --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index cd00608c1ca..10131fdd029 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -278,6 +278,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", @@ -292,6 +293,9 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, ret_size, ovl)) ret = GetLastError();

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveHttpRequest().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: d1d37e40d2cd2e7eb181db733ac8a2141cae4d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d37e40d2cd2e7eb181db733ac8a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:18 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveHttpRequest(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53980 --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 964589021d6..cd00608c1ca 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -323,6 +323,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", @@ -340,6 +341,9 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, ret_size, ovl)) ret = GetLastError();

1 0

Eric Pouech : kernel32/tests: Silence a failing test on Win10+.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: f5a81ff02a8f359f9b1a7b1aa78ce1a5341c2158 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5a81ff02a8f359f9b1a7b1aa78ce1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 20 15:47:56 2022 +0100 kernel32/tests: Silence a failing test on Win10+. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..eb0b5fec772 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -87,7 +87,9 @@ static void test_query_dos_deviceA(void) for (;;) { if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); + /* Win10+ exposes security device which requires extra priviledges to be queried. So skip it */ + ok(ret2 || broken( !strcmp( p, "MSSECFLTSYS" ) && GetLastError() == ERROR_ACCESS_DENIED ), + "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); p += strlen(p) + 1; if (ret <= (p-buffer)) break; }

1 0

Ziqing Hui : mf/tests: Use one input type for GetOutputType tests.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9c4bcbea00b1f31b4cdece3fee501070c428c8c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c4bcbea00b1f31b4cdece3fee5010… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 20 09:54:44 2022 +0800 mf/tests: Use one input type for GetOutputType tests. --- dlls/mf/tests/transform.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ccb2413faf4..35dc6aea6b8 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4956,30 +4956,11 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputType returned %#lx.\n", hr); /* Test GetOutputType after setting input type. */ - for (i = 0; i < ARRAY_SIZE(expected_input_types); ++i) - { - const GUID *subtype = &expected_input_types[i].subtype; - if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) - || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) - { - skip("Skipping GetOutputType tests for input subtype %s.\n", debugstr_guid(subtype)); - continue; - } - - winetest_push_context("in %lu", i); - - init_dmo_media_type_video(input_type, &expected_input_types[i].subtype, 16, 16); - hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); - - todo_wine - check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); - - winetest_pop_context(); - } + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : mf/tests: Test SetOutputType for WMV decoder.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 3eaa44a75cc3205bf5d3f4fef05b024570c30d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3eaa44a75cc3205bf5d3f4fef05b02… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Dec 19 10:16:36 2022 +0800 mf/tests: Test SetOutputType for WMV decoder. --- dlls/mf/tests/transform.c | 130 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 35dc6aea6b8..3c068aae743 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -55,6 +55,58 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +static BOOL is_compressed_subtype(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVP) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) + || IsEqualGUID(subtype, &MFVideoFormat_WMV_Unknown) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV3) + || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) + return TRUE; + return FALSE; +} + +static DWORD subtype_to_compression(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return BI_RGB; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565)) + return BI_BITFIELDS; + else + return subtype->Data1; +} + +static DWORD subtype_to_bpp(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return 8; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_NV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_IYUV) + || IsEqualGUID(subtype, &MEDIASUBTYPE_I420) + || IsEqualGUID(subtype, &MEDIASUBTYPE_NV11)) + return 12; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YUY2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_UYVY) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YVYU) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555)) + return 16; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24)) + return 24; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32)) + return 32; + else + return 0; +} + static void load_resource(const WCHAR *filename, const BYTE **data, DWORD *length) { HRSRC resource = FindResourceW(NULL, filename, (const WCHAR *)RT_RCDATA); @@ -274,17 +326,19 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, const GUID *subtype, const LONG width, const LONG height) { VIDEOINFOHEADER *header = (VIDEOINFOHEADER *)(media_type + 1); + BOOL compressed = is_compressed_subtype(subtype); memset(header, 0, sizeof(*header)); header->bmiHeader.biSize = sizeof(header->bmiHeader); header->bmiHeader.biWidth = width; header->bmiHeader.biHeight = height; - header->bmiHeader.biCompression = subtype->Data1; + header->bmiHeader.biBitCount = subtype_to_bpp(subtype); + header->bmiHeader.biCompression = subtype_to_compression(subtype); media_type->majortype = MEDIATYPE_Video; media_type->subtype = *subtype; - media_type->bFixedSizeSamples = FALSE; - media_type->bTemporalCompression = TRUE; + media_type->bFixedSizeSamples = !compressed; + media_type->bTemporalCompression = compressed; media_type->lSampleSize = 0; media_type->formattype = FORMAT_VideoInfo; media_type->pUnk = NULL; @@ -1411,6 +1465,62 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); } +static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *subtype) +{ + DMO_MEDIA_TYPE bad_media_type, *good_media_type; + char buffer[1024]; + DWORD i, flag; + HRESULT hr; + + const DWORD flags[] = {0, 0x4, DMO_SET_TYPEF_CLEAR, DMO_SET_TYPEF_TEST_ONLY, DMO_SET_TYPEF_TEST_ONLY | 0x4}; + + memset(&bad_media_type, 0, sizeof(bad_media_type)); + good_media_type = (DMO_MEDIA_TYPE *)buffer; + init_dmo_media_type_video(good_media_type, subtype, 16, 16); + + /* Test invalid stream index. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 1, NULL, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, &bad_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, good_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test unaccepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + if (!(flag & DMO_SET_TYPEF_CLEAR)) + { + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == E_POINTER, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + hr = IMediaObject_SetOutputType(media_object, 0, &bad_media_type, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test clearing the type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = DMO_SET_TYPEF_CLEAR | flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test accepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, good_media_type, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } +} + + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -4962,6 +5072,20 @@ static void test_wmv_decoder_media_object(void) todo_wine check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); + /* Test SetOutputType without setting input type. */ + hr = IMediaObject_SetInputType(media_object, 0, NULL, DMO_SET_TYPEF_CLEAR); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + hr = IMediaObject_SetOutputType(media_object, 0, &media_type, 0); + todo_wine + ok(hr == DMO_E_TYPE_NOT_SET, "SetOutputType returned %#lx.\n", hr); + + /* Test SetOutputType after setting input type. */ + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_set_output_type(media_object, &MEDIASUBTYPE_RGB24); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Eric Pouech : kernel32/tests: Test that control characters can be read & stored.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 26699b363003d8040edca5f0a47de0490c539c8d URL: https://gitlab.winehq.org/wine/wine/-/commit/26699b363003d8040edca5f0a47de0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 19 18:09:58 2022 +0100 kernel32/tests: Test that control characters can be read & stored. WriteConsole (not in processed mode) and WriteConsoleOutput* functions allow to write control characters, which can then be read back as is. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1f285faf1e2..f8e39c164d2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -306,6 +306,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) DWORD len, mode; const char* mytest = "123"; const int mylen = strlen(mytest); + char ctrl_buf[32]; int ret; int p; @@ -336,6 +337,17 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + + /* test how control chars are handled. */ + c.X = c.Y = 0; + ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); + for (p = 0; p < 32; p++) ctrl_buf[p] = (char)p; + ok(WriteConsoleA(hCon, ctrl_buf, 32, &len, NULL) != 0 && len == 32, "WriteConsole\n"); + for (p = 0; p < 32; p++) + { + c.X = p; c.Y = 0; + okCHAR(hCon, c, (char)p, TEST_ATTRIB); + } } static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) @@ -2378,6 +2390,19 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 0, "Expected count to be 0, got %lu\n", count); + + for (i = 1; i < 32; i++) + { + CONSOLE_SCREEN_BUFFER_INFO csbi; + char ch = (char)i; + COORD c = {1, 2}; + + ret = WriteConsoleOutputCharacterA(output_handle, &ch, 1, c, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %lu\n", count); + okCHAR(output_handle, c, (char)i, 7); + ret = GetConsoleScreenBufferInfo(output_handle, &csbi); + } } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle)

1 0

Ziqing Hui : mf/tests: Introduce check_dmo_set_input_type.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 6353af03d37cfb8a03d3f0bb8d731dceb16437cf URL: https://gitlab.winehq.org/wine/wine/-/commit/6353af03d37cfb8a03d3f0bb8d731d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 13 11:26:58 2022 +0800 mf/tests: Introduce check_dmo_set_input_type. --- dlls/mf/tests/transform.c | 349 ++++++++++++++++++++++------------------------ 1 file changed, 168 insertions(+), 181 deletions(-)

1 0

Ziqing Hui : mf/tests: Shorten test messages.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 5b67e30fd8393cb3a8cc2f97ad63bf9320a7c77d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b67e30fd8393cb3a8cc2f97ad63bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 20 09:07:01 2022 +0800 mf/tests: Shorten test messages. --- dlls/mf/tests/transform.c | 90 +++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 45 deletions(-)

1 0

Eric Pouech : conhost: Don't print control characters for Unix tty.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 0a7c04816f2497d6bdb4006d01f3266cc91bf3fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0a7c04816f2497d6bdb4006d01f326… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 19 18:09:59 2022 +0100 conhost: Don't print control characters for Unix tty. They will be reinterpreted by Unix tty, leading to wrong display. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c3a106c9321..769f998f404 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -358,6 +358,8 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) int x, y, size, trailing_spaces; char_info_t *ch; char buf[8]; + WCHAR wch; + const unsigned int mask = (1u << '\0') | (1u << '\b') | (1u << '\t') | (1u << '\n') | (1u << '\a') | (1u << '\r'); if (!is_active( screen_buffer ) || rect->top > rect->bottom || rect->right < rect->left) return; @@ -393,9 +395,11 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) tty_write( screen_buffer->console, "\x1b[K", 3 ); break; } - + wch = ch->ch; + if (screen_buffer->console->is_unix && wch < L' ' && mask & (1u << wch)) + wch = L'?'; size = WideCharToMultiByte( get_tty_cp( screen_buffer->console ), 0, - &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); + &wch, 1, buf, sizeof(buf), NULL, NULL ); tty_write( screen_buffer->console, buf, size ); screen_buffer->console->tty_cursor_x++; }

1 0

Jacek Caban : win32u/tests: Add inter-process message tests.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 4a415b0c56377e0b92f768835b9468a078c11e57 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a415b0c56377e0b92f768835b9468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 13:52:26 2022 +0100 win32u/tests: Add inter-process message tests. --- dlls/win32u/tests/win32u.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index bcfafbf13b3..87419f6fadb 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -694,11 +694,149 @@ static void test_NtUserDisplayConfigGetDeviceInfo(void) ok(status == STATUS_UNSUCCESSFUL || status == STATUS_NOT_SUPPORTED, "got %#lx.\n", status); } +static LRESULT WINAPI test_ipc_message_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + switch (msg) + { + case WM_SETTEXT: + case CB_FINDSTRING: + ok( !wcscmp( (const WCHAR *)lparam, L"test" ), + "lparam = %s\n", wine_dbgstr_w( (const WCHAR *)lparam )); + return 6; + + case WM_GETTEXT: + case EM_GETLINE: + case CB_GETLBTEXT: + ok( wparam == 100, "wparam = %Iu\n", wparam ); + wcscpy( (void *)lparam, L"Test" ); + return 4; + + case WM_GETTEXTLENGTH: + return 99; + + case WM_MDICREATE: + { + MDICREATESTRUCTW *mdi = (MDICREATESTRUCTW *)lparam; + ok( !wcscmp( mdi->szClass, L"TestClass" ), "szClass = %s\n", wine_dbgstr_w( mdi->szClass )); + ok( !wcscmp( mdi->szTitle, L"TestTitle" ), "szTitle = %s\n", wine_dbgstr_w( mdi->szTitle )); + return 0xdeadbeef; + } + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void test_inter_process_messages( const char *argv0 ) +{ + WNDCLASSW cls = { 0 }; + char path[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA startup; + MSG msg; + HWND hwnd; + BOOL ret; + + cls.lpfnWndProc = test_ipc_message_proc; + cls.lpszClassName = L"TestIPCClass"; + RegisterClassW( &cls ); + + hwnd = CreateWindowExW( 0, L"TestIPCClass", NULL, WS_POPUP | CBS_HASSTRINGS, 0,0,0,0,0,0,0, NULL ); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + sprintf( path, "%s win32u ipcmsg %Ix", argv0, (INT_PTR)hwnd ); + ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); + ok( ret, "CreateProcess '%s' failed err %lu.\n", path, GetLastError() ); + + do + { + GetMessageW( &msg, NULL, 0, 0 ); + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } while (msg.message != WM_USER); + + wait_child_process( pi.hProcess ); + + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + + DestroyWindow( hwnd ); + UnregisterClassW( L"TestIPCClass", NULL ); +} + +static void test_inter_process_child( HWND hwnd ) +{ + MDICREATESTRUCTA mdi; + WCHAR bufW[100]; + char buf[100]; + int res; + + res = SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)"test" ); + ok( res == 6, "WM_SETTEXT returned %d\n", res ); + + res = NtUserMessageCall( hwnd, WM_SETTEXT, 0, (LPARAM)"test", NULL, NtUserSendMessage, TRUE ); + ok( res == 6, "res = %d\n", res ); + + res = NtUserMessageCall( hwnd, CB_FINDSTRING, 0, (LPARAM)"test", NULL, NtUserSendMessage, TRUE ); + ok( res == 6, "res = %d\n", res ); + + memset( buf, 0xcc, sizeof(buf) ); + res = NtUserMessageCall( hwnd, WM_GETTEXT, sizeof(buf), (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + ok( !strcmp( buf, "Test" ), "buf = %s\n", buf ); + + memset( bufW, 0xcc, sizeof(bufW) ); + res = NtUserMessageCall( hwnd, WM_GETTEXT, ARRAYSIZE(bufW), (LPARAM)bufW, NULL, NtUserSendMessage, FALSE ); + ok( res == 4, "res = %d\n", res ); + ok( !wcscmp( bufW, L"Test" ), "buf = %s\n", buf ); + + memset( buf, 0xcc, sizeof(buf) ); + res = NtUserMessageCall( hwnd, CB_GETLBTEXT, 100, (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + todo_wine + ok( res == 1, "res = %d\n", res ); + ok( buf[0] == 'T', "buf[0] = %c\n", buf[0] ); + todo_wine + ok( buf[1] == (char)0xcc, "buf[1] = %x\n", buf[1] ); + + memset( buf, 0xcc, sizeof(buf) ); + *(DWORD *)buf = ARRAYSIZE(buf); + res = NtUserMessageCall( hwnd, EM_GETLINE, sizeof(buf), (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + ok( !strcmp( buf, "Test" ), "buf = %s\n", buf ); + + res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + + mdi.szClass = "TestClass"; + mdi.szTitle = "TestTitle"; + mdi.hOwner = 0; + mdi.x = mdi.y = 10; + mdi.cx = mdi.cy = 100; + mdi.style = 0; + mdi.lParam = 0xdeadbeef; + res = NtUserMessageCall( hwnd, WM_MDICREATE, 0, (LPARAM)&mdi, NULL, NtUserSendMessage, TRUE ); + ok( res == 0xdeadbeef, "res = %d\n", res ); + + PostMessageA( hwnd, WM_USER, 0, 0 ); +} + START_TEST(win32u) { + char **argv; + int argc; + /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + argc = winetest_get_mainargs( &argv ); + if (argc > 3 && !strcmp( argv[2], "ipcmsg" )) + { + test_inter_process_child( LongToHandle( strtol( argv[3], NULL, 16 ))); + return; + } + test_NtUserEnumDisplayDevices(); test_window_props(); test_class(); @@ -709,6 +847,7 @@ START_TEST(win32u) test_menu(); test_message_filter(); test_timer(); + test_inter_process_messages( argv[0] ); test_NtUserCloseWindowStation(); test_NtUserDisplayConfigGetDeviceInfo();

1 0

Jacek Caban : win32u: Convert inter-process messages to Unicode.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: d222dcc2a47b0d4cb05c967eade773efcb208543 URL: https://gitlab.winehq.org/wine/wine/-/commit/d222dcc2a47b0d4cb05c967eade773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 13:53:04 2022 +0100 win32u: Convert inter-process messages to Unicode. Based on user32 WINPROC_CallProcWtoA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53744 --- dlls/win32u/font.c | 82 +++++++++++++ dlls/win32u/message.c | 282 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/win32u_private.h | 3 + 4 files changed, 366 insertions(+), 2 deletions(-)

1 0

Paul Gofman : winhttp: Check for NULL lpszAutoConfigUrl in WinHttpGetProxyForUrl().
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 2b0cd25b5f5794463a59cac999583fb52fa021cc URL: https://gitlab.winehq.org/wine/wine/-/commit/2b0cd25b5f5794463a59cac999583f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 10:22:15 2022 -0600 winhttp: Check for NULL lpszAutoConfigUrl in WinHttpGetProxyForUrl(). Fixes a regression introduced by cbfe940a1eaf5e158de3127b1265462bfbfb70af. --- dlls/winhttp/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 65e471f7ee5..6b426bee220 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2094,7 +2094,8 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO !(options->dwFlags & (WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL)) || ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && !options->dwAutoDetectFlags) || ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && - (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL))) + (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL)) || + (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL && !options->lpszAutoConfigUrl)) { release_object( &session->hdr ); SetLastError( ERROR_INVALID_PARAMETER );

1 0

Alexandre Julliard : d3d9/tests: Mark some of the depth bias tests as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 1efcbeacf152404b7ed389836ed78125376cde02 URL: https://gitlab.winehq.org/wine/wine/-/commit/1efcbeacf152404b7ed389836ed781… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:16:01 2022 +0100 d3d9/tests: Mark some of the depth bias tests as todo. They fail on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f630a074ea0..ccfa8ce5e3a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22485,23 +22485,29 @@ static void test_depthbias(void) /* The broken results are for the WARP driver on the testbot. It seems to initialize * a scaling factor based on the first depth format that is used. Other formats with * a different depth size then render incorrectly. */ + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=64, format %u.\n", color, formats[i]); color = getPixelColor(device, 190, 240); + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=190, format %u.\n", color, formats[i]); color = getPixelColor(device, 194, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=194, format %u.\n", color, formats[i]); color = getPixelColor(device, 318, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=318, format %u.\n", color, formats[i]); color = getPixelColor(device, 322, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=322, format %u.\n", color, formats[i]); color = getPixelColor(device, 446, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]);

1 0

Alexandre Julliard : d3d8/tests: Mark a zero-size pixel test as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 28eafda808c5c426ebc54580607ae714bad1a8f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/28eafda808c5c426ebc54580607ae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:15:09 2022 +0100 d3d8/tests: Mark a zero-size pixel test as todo. It fails on the Gitlab CI. --- dlls/d3d8/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 434474b292d..ea2d96378f7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7833,6 +7833,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0))

1 0

Alexandre Julliard : d3d9/tests: Mark a zero-size pixel test as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: ab8d0dafde662d2c912c7f115c151b78e5b91597 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab8d0dafde662d2c912c7f115c151b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:15:32 2022 +0100 d3d9/tests: Mark a zero-size pixel test as todo. It fails on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1bcaf39c14..f630a074ea0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12220,6 +12220,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0))

1 0

Rémi Bernon : user32/tests: Test IsMouseInPointerEnabled behavior.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: eb681558896ed299dbee347a40b52efe551f1ece URL: https://gitlab.winehq.org/wine/wine/-/commit/eb681558896ed299dbee347a40b52e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Test IsMouseInPointerEnabled behavior. --- dlls/user32/tests/input.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index fde5aedeb4a..3f9ad8b184f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -82,6 +82,7 @@ static struct { } key_status; static BOOL (WINAPI *pEnableMouseInPointer)( BOOL ); +static BOOL (WINAPI *pIsMouseInPointerEnabled)(void); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static BOOL (WINAPI *pGetPointerInfo)(UINT32, POINTER_INFO*); @@ -151,6 +152,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func) GET_PROC(EnableMouseInPointer); + GET_PROC(IsMouseInPointerEnabled); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerInfo); @@ -4606,10 +4608,18 @@ static void test_EnableMouseInPointer_process( const char *arg ) ok( !ret, "EnableMouseInPointer succeeded\n" ); todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + if (!pIsMouseInPointerEnabled) ret = !enable; + else ret = pIsMouseInPointerEnabled(); + todo_wine_if(!pIsMouseInPointerEnabled) + ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); ret = pEnableMouseInPointer( enable ); todo_wine ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); + if (!pIsMouseInPointerEnabled) ret = !enable; + else ret = pIsMouseInPointerEnabled(); + todo_wine_if(!pIsMouseInPointerEnabled) + ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); } static void test_EnableMouseInPointer( char **argv, BOOL enable )

1 0