February 2022 - Wine-Commits

Jinoh Kang : server: Attempt to complete I/O request immediately in recv_socket.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: e5ce4fa917a0e679e5a9444a5e277b141918fb29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ce4fa917a0e679e5a9444a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Feb 10 01:17:59 2022 +0900 server: Attempt to complete I/O request immediately in recv_socket. Make recv_socket alert the async immediately if poll() call detects that there are incoming data in the socket, bypassing the wineserver's main polling loop. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++---- dlls/ntdll/unix/sync.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/sock.c | 21 ++++++++++++++++++++- server/trace.c | 1 + 8 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 71dfcdd1114..03a9a93d04a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -686,6 +686,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi NTSTATUS status; unsigned int i; ULONG options; + BOOL nonblocking, alerted; if (unix_flags & MSG_OOB) { @@ -756,16 +757,29 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if ((!NT_ERROR(status) || wait_handle) && status != STATUS_PENDING) + nonblocking = reply->nonblocking; + } + SERVER_END_REQ; + + alerted = status == STATUS_ALERTED; + if (alerted) + { + status = try_recv( fd, async, &information ); + if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) + status = STATUS_PENDING; + } + + if (status != STATUS_PENDING) + { + if (!NT_ERROR(status) || (wait_handle && !alerted)) { io->Status = status; io->Information = information; } + release_fileio( &async->io ); } - SERVER_END_REQ; - - if (status != STATUS_PENDING) release_fileio( &async->io ); + if (alerted) set_async_direct_result( &wait_handle, status, information ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 442243d8bcf..ee25dfd0099 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2510,3 +2510,29 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG } #endif + +/* Notify direct completion of async and close the wait handle if it is no longer needed. + * This function is a no-op (returns status as-is) if the supplied handle is NULL. + */ +void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ) +{ + NTSTATUS ret; + + if (!*optional_handle) return; + + SERVER_START_REQ( set_async_direct_result ) + { + req->handle = wine_server_obj_handle( *optional_handle ); + req->status = status; + req->information = information; + ret = wine_server_call( req ); + if (ret == STATUS_SUCCESS) + *optional_handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) + ERR( "cannot report I/O result back to server: %08x\n", ret ); + + return; +} diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a79edabc37c..75f03706401 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -274,6 +274,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; +extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ); extern void dbg_init(void) DECLSPEC_HIDDEN; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5ed95a41c19..be63b290353 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1772,6 +1772,8 @@ struct recv_socket_reply struct reply_header __header; obj_handle_t wait; unsigned int options; + int nonblocking; + char __pad_20[4]; }; @@ -6282,7 +6284,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 744 +#define SERVER_PROTOCOL_VERSION 745 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index ce05e9a38c6..5c0f9a86822 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1456,6 +1456,7 @@ enum server_fd_type @REPLY obj_handle_t wait; /* handle to wait on for blocking recv */ unsigned int options; /* device open options */ + int nonblocking; /* is socket non-blocking? */ @END diff --git a/server/request.h b/server/request.h index 128b70fe3cf..98e23bfd4ba 100644 --- a/server/request.h +++ b/server/request.h @@ -1049,7 +1049,8 @@ C_ASSERT( FIELD_OFFSET(struct recv_socket_request, total) == 60 ); C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); -C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, nonblocking) == 16 ); +C_ASSERT( sizeof(struct recv_socket_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, status) == 56 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, total) == 60 ); diff --git a/server/sock.c b/server/sock.c index 512b7c0f78e..38aaaac9e39 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3422,6 +3422,24 @@ DECL_HANDLER(recv_socket) if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->rd_shutdown) status = STATUS_PIPE_DISCONNECTED; + /* NOTE: If read_q is not empty, we cannot really tell if the already queued asyncs + * NOTE: will not consume all available data; if there's no data available, + * NOTE: the current request won't be immediately satiable. */ + if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && !async_queued( &sock->read_q )) + { + struct pollfd pollfd; + pollfd.fd = get_unix_fd( sock->fd ); + pollfd.events = req->oob ? POLLPRI : POLLIN; + pollfd.revents = 0; + if (poll(&pollfd, 1, 0) >= 0 && pollfd.revents) + { + /* Give the client opportunity to complete synchronously. + * If it turns out that the I/O request is not actually immediately satiable, + * the client may then choose to re-queue the async (with STATUS_PENDING). */ + status = STATUS_ALERTED; + } + } + sock->pending_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); sock->reported_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); @@ -3438,7 +3456,7 @@ DECL_HANDLER(recv_socket) if (timeout) async_set_timeout( async, timeout, STATUS_IO_TIMEOUT ); - if (status == STATUS_PENDING) + if (status == STATUS_PENDING || status == STATUS_ALERTED) queue_async( &sock->read_q, async ); /* always reselect; we changed reported_events above */ @@ -3446,6 +3464,7 @@ DECL_HANDLER(recv_socket) reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); + reply->nonblocking = sock->nonblocking; release_object( async ); } release_object( sock ); diff --git a/server/trace.c b/server/trace.c index 6b50b9d0d18..1fb39d4f997 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2040,6 +2040,7 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) { fprintf( stderr, " wait=%04x", req->wait ); fprintf( stderr, ", options=%08x", req->options ); + fprintf( stderr, ", nonblocking=%d", req->nonblocking ); } static void dump_send_socket_request( const struct send_socket_request *req )

1 0

Rémi Bernon : mf/tests: Add some WMA decoder ProcessOutput tests.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 6ed3af99b5526e32361f958f48e11fbee401f30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed3af99b5526e32361f958f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 9 11:18:04 2022 +0100 mf/tests: Add some WMA decoder ProcessOutput tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 09bc4ef1c1e..b9e2a3b940f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5815,6 +5815,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; ULONG wma_encoded_data_len; IMFMediaType *media_type; @@ -5822,6 +5823,7 @@ static void test_wma_decoder(void) IMFSample *sample; HRSRC resource; GUID class_id; + DWORD status; ULONG i, ret; HRESULT hr; @@ -6006,8 +6008,145 @@ static void test_wma_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + /* As output_info.dwFlags doesn't have MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES + * IMFTransform_ProcessOutput needs a sample or returns MF_E_TRANSFORM_NEED_MORE_INPUT */ + + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!output.pSample, "got pSample %p\n", output.pSample); + todo_wine + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, + "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + todo_wine + ok(status == 0, "got status %#x\n", status); + + sample = create_sample(wma_encoded_data, wma_block_size); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(!output.pSample, "got pSample %p\n", output.pSample); + todo_wine + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, + "got dwStatus %#x\n", output.dwStatus); + todo_wine + ok(status == 0, "got status %#x\n", status); + + i = 1; + status = 0xdeadbeef; + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + while (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + { + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + check_sample(sample, NULL, 0, NULL); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + sample = create_sample(wma_encoded_data + i * wma_block_size, wma_block_size); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret == 1, "Release returned %u\n", ret); + i++; + + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + } + + todo_wine + ok(hr == S_OK, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + + i = 0; + while (hr == S_OK) + { + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE || output.dwStatus == 0 || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7) || output.dwStatus == 7) /* Win7 */, + "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + if (output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7))) + { + check_sample(sample, wma_decoded_data, sizeof(wma_decoded_data), NULL); + i += sizeof(wma_decoded_data); + } + else + { + check_sample(sample, wma_decoded_data, sizeof(wma_decoded_data) / 2, NULL); + i += sizeof(wma_decoded_data) / 2; + } + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + } + todo_wine + ok(i == 0xe000, "ProcessOutput produced %#x bytes\n", i); + + todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + todo_wine + ok(status == 0, "got status %#x\n", status); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0 || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, + "got dwStatus %#x\n", output.dwStatus); + todo_wine + ok(status == 0, "got status %#x\n", status); + check_sample(sample, NULL, 0, NULL); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + sample = create_sample(wma_encoded_data, wma_block_size); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); failed: CoUninitialize();

1 0

Rémi Bernon : mf/tests: Add some WMA encoder ProcessOutput tests.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: c426c72b5c5ce23f16910fb21ca8572bb1f2889a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c426c72b5c5ce23f16910fb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 9 11:18:02 2022 +0100 mf/tests: Add some WMA encoder ProcessOutput tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 ++ dlls/mf/tests/mf.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/resource.rc | 24 +++++++++++++ dlls/mf/tests/wmadata.bin | Bin 0 -> 49071 bytes 4 files changed, 112 insertions(+) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index da9882fb7db..53592a8758d 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = mf mfplat mfuuid ole32 user32 propsys C_SRCS = \ mf.c + +RC_SRCS = resource.rc diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ebf42bcad9c..229e2e30134 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5492,6 +5492,32 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) return sample; } +#define check_sample(a, b, c, d) check_sample_(__LINE__, a, b, c, d) +static void check_sample_(int line, IMFSample *sample, const void *expect_buf, ULONG expect_len, HANDLE output_file) +{ + IMFMediaBuffer *media_buffer; + DWORD length; + BYTE *buffer; + HRESULT hr; + ULONG ret; + + hr = IMFSample_ConvertToContiguousBuffer(sample, &media_buffer); + ok_(__FILE__, line)(hr == S_OK, "ConvertToContiguousBuffer returned %#x\n", hr); + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok_(__FILE__, line)(hr == S_OK, "Lock returned %#x\n", hr); + ok_(__FILE__, line)(expect_len == length, "got length %u\n", length); + if (length && length == expect_len) + { + ok_(__FILE__, line)(!memcmp(expect_buf, buffer, expect_len), + "unexpected buffer data\n"); + } + if (output_file) WriteFile(output_file, buffer, length, &length, NULL); + hr = IMFMediaBuffer_Unlock(media_buffer); + ok_(__FILE__, line)(hr == S_OK, "Unlock returned %#x\n", hr); + ret = IMFMediaBuffer_Release(media_buffer); + ok_(__FILE__, line)(ret == 1, "Release returned %u\n", ret); +} + static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; static const BYTE wma_decoded_data[0x4000] = {0}; static const ULONG wma_block_size = 1487; @@ -5552,10 +5578,17 @@ static void test_wma_encoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + MFT_OUTPUT_DATA_BUFFER output; + const BYTE *wma_encoded_data; + WCHAR output_path[MAX_PATH]; + ULONG wma_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; + HANDLE output_file; IMFSample *sample; + HRSRC resource; GUID class_id; + DWORD status; ULONG i, ret; HRESULT hr; @@ -5612,6 +5645,59 @@ static void test_wma_encoder(void) hr = IMFTransform_ProcessInput(transform, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + + /* check wmadata.bin against current encoder output */ + resource = FindResourceW(NULL, L"wmadata.bin", (const WCHAR *)RT_RCDATA); + ok(resource != 0, "FindResourceW failed, error %u\n", GetLastError()); + wma_encoded_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + wma_encoded_data_len = SizeofResource(GetModuleHandleW(NULL), resource); + ok(wma_encoded_data_len % wma_block_size == 0, "got wma encoded length %u\n", wma_encoded_data_len); + + /* and generate a new one as well in a temporary directory */ + GetTempPathW(ARRAY_SIZE(output_path), output_path); + lstrcatW(output_path, L"wmadata.bin"); + output_file = CreateFileW(output_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(output_file != INVALID_HANDLE_VALUE, "CreateFileW failed, error %u\n", GetLastError()); + + i = 0; + while (SUCCEEDED(hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status))) + { + winetest_push_context("%u", i); + ok(hr == S_OK, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|5)) /* win7 */, + "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + ok(wma_encoded_data_len > i * wma_block_size, "got %u blocks\n", i); + check_sample(sample, wma_encoded_data + i * wma_block_size, wma_block_size, output_file); + winetest_pop_context(); + i++; + } + + trace("created %s\n", debugstr_w(output_path)); + CloseHandle(output_file); + + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + check_sample(sample, NULL, 0, NULL); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc new file mode 100644 index 00000000000..931139c741a --- /dev/null +++ b/dlls/mf/tests/resource.rc @@ -0,0 +1,24 @@ +/* + * Resources for mf test suite. + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: wmadata.bin */ +wmadata.bin RCDATA wmadata.bin diff --git a/dlls/mf/tests/wmadata.bin b/dlls/mf/tests/wmadata.bin new file mode 100644 index 00000000000..6c70c14ce32 Binary files /dev/null and b/dlls/mf/tests/wmadata.bin differ

1 0

Zhiyi Zhang : comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 8ce869f40b0887bd465f27ac1db7393067540aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce869f40b0887bd465f27ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:29 2022 +0800 comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE. Fix foobar2000 having an extra edge around tree view non-client size box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d00bba8e625..23e87bdce04 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5498,18 +5498,25 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) /* Draw themed border */ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { - HTHEME theme = GetWindowTheme (infoPtr->hwnd); + int cxEdge, cyEdge; + LONG ex_style; + HTHEME theme; HDC dc; RECT r; HRGN cliprgn; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + if (!(ex_style & WS_EX_CLIENTEDGE)) + return DefWindowProcW(infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); + + theme = GetWindowTheme(infoPtr->hwnd); if (!theme) return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1)

1 0

Zebediah Figura : wined3d: Set resource->client.addr in buffer_resource_sub_resource_map() only if persistently mapping.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 28285f1e76980412cfb40cfa81174ca441e9b5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28285f1e76980412cfb40cfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:35 2022 -0600 wined3d: Set resource->client.addr in buffer_resource_sub_resource_map() only if persistently mapping. Be consistent with wined3d_cs_map_upload_bo(). This may change in the future, but for now we depend on this logic in the Vulkan backend. This fixes test_dynamic_map_synchronization() on 32-bit architectures with the Vulkan backend, which is currently broken because we try to perform accelerated NOOVERWRITE maps while unmapping the same BOs. Fixes: d8e8ab21c0f9f00d295c035534637115a5d70f9f Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f3b5fd316e..a06bfb984ad 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,7 +1002,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (wined3d_map_persistent()) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) {

1 0

Zebediah Figura : wined3d: Call wined3d_context_unmap_bo_address() when updating a buffer BO.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: d9e8f4b4584077f6a1cff8386bdb216981e87234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e8f4b4584077f6a1cff838… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:36 2022 -0600 wined3d: Call wined3d_context_unmap_bo_address() when updating a buffer BO. That is, don't just flush it, but unmap it as well. As of d8e8ab21c0f9f00d295c035534637115a5d70f9f, we can get here even when !wined3d_map_persistent(). Thus we currently end up leaving BOs mapped when performing an accelerated DISCARD map. Try to avoid that. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a06bfb984ad..50e3e9fe2b4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1156,9 +1156,27 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi } if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object) - wined3d_context_flush_bo_address(context, &upload_bo->addr, size); + { + struct wined3d_range range; + + /* We need to flush changes, which is implicitly done by + * wined3d_context_unmap_bo_address() even if we aren't actually going + * to unmap. + * + * We would also like to free up virtual address space used by this BO + * if it's at a premium—note that this BO was allocated for an + * accelerated map. Hence we unmap the BO instead of merely flushing it; + * if we don't care about unmapping BOs then + * wined3d_context_unmap_bo_address() will flush and return. + */ + range.offset = offset; + range.size = size; + wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); + } else + { wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); + } } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer,

1 0

Jacek Caban : server: Store all 64 bits of window id.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: f139b06651ff259198b3ae765edc81483bf12e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f139b06651ff259198b3ae76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 10 15:02:08 2022 +0100 server: Store all 64 bits of window id. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- include/wine/server_protocol.h | 11 +++++------ server/protocol.def | 7 +++---- server/request.h | 7 +++---- server/trace.c | 7 +++---- server/window.c | 4 ++-- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 82975cadd23..70c3521ab1d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2715,7 +2715,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B break; case GWLP_ID: req->flags = SET_WIN_ID; - req->id = newval; + req->extra_value = newval; break; case GWLP_HINSTANCE: req->flags = SET_WIN_INSTANCE; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 050b682d489..97ab4e25834 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3112,12 +3112,12 @@ struct set_window_info_request user_handle_t handle; unsigned int style; unsigned int ex_style; - unsigned int id; + data_size_t extra_size; mod_handle_t instance; lparam_t user_data; - int extra_offset; - data_size_t extra_size; lparam_t extra_value; + int extra_offset; + char __pad_60[4]; }; struct set_window_info_reply { @@ -3127,8 +3127,7 @@ struct set_window_info_reply mod_handle_t old_instance; lparam_t old_user_data; lparam_t old_extra_value; - unsigned int old_id; - char __pad_44[4]; + lparam_t old_id; }; #define SET_WIN_STYLE 0x01 #define SET_WIN_EXSTYLE 0x02 @@ -6263,7 +6262,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 742 +#define SERVER_PROTOCOL_VERSION 743 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 02e73047f9b..21b17c11551 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2303,19 +2303,18 @@ enum message_type user_handle_t handle; /* handle to the window */ unsigned int style; /* window style */ unsigned int ex_style; /* window extended style */ - unsigned int id; /* window id */ + data_size_t extra_size; /* size to set in extra bytes */ mod_handle_t instance; /* creator instance */ lparam_t user_data; /* user-specific data */ + lparam_t extra_value; /* value to set in extra bytes or window id */ int extra_offset; /* offset to set in extra bytes */ - data_size_t extra_size; /* size to set in extra bytes */ - lparam_t extra_value; /* value to set in extra bytes */ @REPLY unsigned int old_style; /* old window style */ unsigned int old_ex_style; /* old window extended style */ mod_handle_t old_instance; /* old creator instance */ lparam_t old_user_data; /* old user-specific data */ lparam_t old_extra_value; /* old value in extra bytes */ - unsigned int old_id; /* old window id */ + lparam_t old_id; /* old window id */ @END #define SET_WIN_STYLE 0x01 #define SET_WIN_EXSTYLE 0x02 diff --git a/server/request.h b/server/request.h index 98b3300de2c..f2d0e827d94 100644 --- a/server/request.h +++ b/server/request.h @@ -1479,12 +1479,11 @@ C_ASSERT( FIELD_OFFSET(struct set_window_info_request, is_unicode) == 14 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_request, handle) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_request, style) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_request, ex_style) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_window_info_request, id) == 28 ); +C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_size) == 28 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_request, instance) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_request, user_data) == 40 ); -C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_offset) == 48 ); -C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_size) == 52 ); -C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_value) == 56 ); +C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_value) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_window_info_request, extra_offset) == 56 ); C_ASSERT( sizeof(struct set_window_info_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_reply, old_style) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_window_info_reply, old_ex_style) == 12 ); diff --git a/server/trace.c b/server/trace.c index 429b39a5cdd..32606d540f7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2907,12 +2907,11 @@ static void dump_set_window_info_request( const struct set_window_info_request * fprintf( stderr, ", handle=%08x", req->handle ); fprintf( stderr, ", style=%08x", req->style ); fprintf( stderr, ", ex_style=%08x", req->ex_style ); - fprintf( stderr, ", id=%08x", req->id ); + fprintf( stderr, ", extra_size=%u", req->extra_size ); dump_uint64( ", instance=", &req->instance ); dump_uint64( ", user_data=", &req->user_data ); - fprintf( stderr, ", extra_offset=%d", req->extra_offset ); - fprintf( stderr, ", extra_size=%u", req->extra_size ); dump_uint64( ", extra_value=", &req->extra_value ); + fprintf( stderr, ", extra_offset=%d", req->extra_offset ); } static void dump_set_window_info_reply( const struct set_window_info_reply *req ) @@ -2922,7 +2921,7 @@ static void dump_set_window_info_reply( const struct set_window_info_reply *req dump_uint64( ", old_instance=", &req->old_instance ); dump_uint64( ", old_user_data=", &req->old_user_data ); dump_uint64( ", old_extra_value=", &req->old_extra_value ); - fprintf( stderr, ", old_id=%08x", req->old_id ); + dump_uint64( ", old_id=", &req->old_id ); } static void dump_set_parent_request( const struct set_parent_request *req ) diff --git a/server/window.c b/server/window.c index 6b889df9149..7675cd1103d 100644 --- a/server/window.c +++ b/server/window.c @@ -74,7 +74,7 @@ struct window struct region *update_region; /* update region (relative to window rect) */ unsigned int style; /* window style */ unsigned int ex_style; /* window extended style */ - unsigned int id; /* window id */ + lparam_t id; /* window id */ mod_handle_t instance; /* creator instance */ unsigned int is_unicode : 1; /* ANSI or unicode */ unsigned int is_linked : 1; /* is it linked into the parent z-order list? */ @@ -2245,7 +2245,7 @@ DECL_HANDLER(set_window_info) else win->ex_style = (req->ex_style & ~WS_EX_TOPMOST) | (win->ex_style & WS_EX_TOPMOST); if (!(win->ex_style & WS_EX_LAYERED)) win->is_layered = 0; } - if (req->flags & SET_WIN_ID) win->id = req->id; + if (req->flags & SET_WIN_ID) win->id = req->extra_value; if (req->flags & SET_WIN_INSTANCE) win->instance = req->instance; if (req->flags & SET_WIN_UNICODE) win->is_unicode = req->is_unicode; if (req->flags & SET_WIN_USERDATA) win->user_data = req->user_data;

1 0

Rémi Bernon : mf/tests: Add some WMA decoder ProcessInput tests.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: a45e4cbf9fc0410b30e8d441dbbac07305212f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45e4cbf9fc0410b30e8d441… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 9 11:18:03 2022 +0100 mf/tests: Add some WMA decoder ProcessInput tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 229e2e30134..09bc4ef1c1e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5815,8 +5815,12 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + const BYTE *wma_encoded_data; + ULONG wma_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; + IMFSample *sample; + HRSRC resource; GUID class_id; ULONG i, ret; HRESULT hr; @@ -5972,6 +5976,36 @@ static void test_wma_decoder(void) ok(output_info.cbSize == sizeof(wma_decoded_data), "got cbSize %#x\n", output_info.cbSize); ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); + /* resource is generated using test_wma_encoder output file */ + resource = FindResourceW(NULL, L"wmadata.bin", (const WCHAR *)RT_RCDATA); + ok(resource != 0, "FindResourceW failed, error %u\n", GetLastError()); + wma_encoded_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + wma_encoded_data_len = SizeofResource(GetModuleHandleW(NULL), resource); + ok(wma_encoded_data_len % wma_block_size == 0, "got wma encoded length %u\n", wma_encoded_data_len); + + sample = create_sample(wma_encoded_data, wma_block_size / 2); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + sample = create_sample(wma_encoded_data, wma_block_size); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + todo_wine + ok(ret == 1, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Zebediah Figura : wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo().
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 06e178e87f1bd40400160741e7a1d003e461c6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e178e87f1bd40400160741… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:34 2022 -0600 wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..f3ec5c03c85 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,6 +456,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; + bo->b.map_ptr = NULL; bo->b.buffer_offset = idx * object_size; bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size;

1 0

Zhiyi Zhang : user32/tests: Test scroll bars use COLOR_BTNFACE instead of COLOR_SCROLLBAR to fill background.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 329abd8fb9e3d442663de134f38f5b7acd27bf59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=329abd8fb9e3d442663de134… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:56:53 2022 +0800 user32/tests: Test scroll bars use COLOR_BTNFACE instead of COLOR_SCROLLBAR to fill background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 7181a028748..c378669991b 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -774,6 +774,46 @@ static void test_subclass(void) DestroyWindow(hwnd); } +static void test_visual(void) +{ + static const int color_indices[] = {COLOR_SCROLLBAR, COLOR_BTNFACE}; + static const DWORD styles[] = {SBS_SIZEBOX, SBS_SIZEGRIP}; + COLORREF old_colors[2], colors[2], color; + HWND hwnd; + BOOL ret; + HDC hdc; + int i; + + old_colors[0] = GetSysColor(color_indices[0]); + old_colors[1] = GetSysColor(color_indices[1]); + colors[0] = RGB(0x11, 0x22, 0x33); + colors[1] = RGB(0xaa, 0xbb, 0xcc); + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + winetest_push_context("style %#x", styles[i]); + + hwnd = CreateWindowA("ScrollBar", "", WS_POPUP | WS_VISIBLE | styles[i], 0, 0, 20, 20, 0, 0, + 0, 0); + ok(hwnd != NULL, "CreateWindowA failed, error %u.\n", GetLastError()); + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + + hdc = GetDC(hwnd); + color = GetPixel(hdc, 5, 5); + todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + winetest_pop_context(); + } + + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, old_colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -810,6 +850,8 @@ START_TEST ( scroll ) FreeLibrary(hUxtheme); } + test_visual(); + scrollbar_test_default( 0); scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_VSCROLL);

1 0