December 2022 - Wine-commits

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

20 Dec '22

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

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

20 Dec '22

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

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

20 Dec '22

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

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

20 Dec '22

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/tests: Test passing NULL size to request reading functions.
by Alexandre Julliard 20 Dec '22

20 Dec '22

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

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

20 Dec '22

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

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

20 Dec '22

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

Ziqing Hui : mf/tests: Shorten test messages.
by Alexandre Julliard 20 Dec '22

20 Dec '22

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

Ziqing Hui : mf/tests: Introduce check_dmo_set_input_type.
by Alexandre Julliard 20 Dec '22

20 Dec '22

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: Use one input type for GetOutputType tests.
by Alexandre Julliard 20 Dec '22

20 Dec '22

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