wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Nikolay Sivov : mf/samplegrabber: Release current media type on shutdown.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: c45ae2c680f0d6789d4fee495e17e7027be3c1b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45ae2c680f0d6789d4fee495e17e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 09:45:46 2023 +0100 mf/samplegrabber: Release current media type on shutdown. --- dlls/mf/samplegrabber.c | 33 ++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 5 ++--- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index deb1ce09a55..5e5b6ad6d0e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -655,34 +655,50 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF IMFMediaType **media_type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, media_type); if (!media_type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + { + hr = MF_E_STREAMSINK_REMOVED; + } + else + { + *media_type = grabber->current_media_type; + IMFMediaType_AddRef(*media_type); + } - *media_type = grabber->current_media_type; - IMFMediaType_AddRef(*media_type); + LeaveCriticalSection(&grabber->cs); - return S_OK; + return hr; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, type); if (!type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + hr = MF_E_STREAMSINK_REMOVED; + else + hr = IMFMediaType_GetMajorType(grabber->current_media_type, type); - return IMFMediaType_GetMajorType(grabber->current_media_type, type); + LeaveCriticalSection(&grabber->cs); + + return hr; } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -867,7 +883,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); - IMFMediaType_Release(grabber->current_media_type); + if (grabber->current_media_type) + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1091,6 +1108,8 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { sample_grabber_set_presentation_clock(grabber, NULL); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = NULL; IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); IMFMediaEventQueue_Shutdown(grabber->event_queue); } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 18c97b93593..8ec379be991 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4697,10 +4697,9 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get type count, hr %#lx.\n", hr); ref = IMFMediaType_Release(media_type2); - todo_wine - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IMFMediaType_Release(media_type); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr);

1 0

Zebediah Figura : server: Only set sock->event when the event is first noticed.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 25f8698fcdb1907010bb34169c0d3ecf46b3bf51 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f8698fcdb1907010bb34169c0d3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:22:31 2023 -0500 server: Only set sock->event when the event is first noticed. Do not set it every time another event is polled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55838 --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5e22496e6ef..f9cc1482c41 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14025,7 +14025,7 @@ static void test_select_after_WSAEventSelect(void) check_poll(client, POLLRDNORM | POLLWRNORM); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); CloseHandle(event); closesocket(server); diff --git a/server/sock.c b/server/sock.c index 45a4955d603..f774cded733 100644 --- a/server/sock.c +++ b/server/sock.c @@ -787,18 +787,11 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; } -/* wake anybody waiting on the socket event or send the associated message */ -static void sock_wake_up( struct sock *sock ) +static void post_sock_messages( struct sock *sock ) { unsigned int events = sock->pending_events & sock->mask; int i; - if (sock->event) - { - if (debug_level) fprintf(stderr, "signalling events %x ptr %p\n", events, sock->event ); - if (events) - set_event( sock->event ); - } if (sock->window) { if (debug_level) fprintf(stderr, "signalling events %x win %08x\n", events, sock->window ); @@ -1285,6 +1278,9 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit ) { sock->pending_events |= event; sock->reported_events |= event; + + if ((sock->mask & event) && sock->event) + set_event( sock->event ); } } @@ -1329,7 +1325,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs break; } - sock_wake_up( sock ); + post_sock_messages( sock ); } static void sock_poll_event( struct fd *fd, int event ) @@ -2858,11 +2854,23 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->nonblocking = 1; sock_reselect( sock ); - /* Explicitly wake the socket up if the mask causes it to become - * signaled. Note that reselecting isn't enough, since we might already - * have had events recorded in sock->reported_events and we don't want - * to select for them again. */ - sock_wake_up( sock ); + + /* Explicitly wake the socket up if the mask matches pending_events. + * + * The logic here is a bit surprising. We always set the event if the + * socket has events that haven't been consumed by + * WSAEnumNetworkEvents() yet, including if WSAEventSelect() is called + * multiple times without consuming the events. + * However, once the events are consumed by WSAEnumNetworkEvents(), we + * don't set the event again (even though e.g. data is still available) + * until a "reset" call (i.e. that clears reported_events). */ + + if (event && (sock->pending_events & mask)) + { + if (debug_level) fprintf( stderr, "signalling pending events %#x due to event select\n", + sock->pending_events & mask ); + set_event( event ); + } return; }

1 0

Zebediah Figura : ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 99dd3c5cba1debf39bb386790ebee923a50f1b0f URL: https://gitlab.winehq.org/wine/wine/-/commit/99dd3c5cba1debf39bb386790ebee9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:16:51 2023 -0500 ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select. --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9f6cd487777..5e22496e6ef 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14002,6 +14002,36 @@ static void test_tcp_sendto_recvfrom(void) closesocket(server); } +/* Regression test for an internal bug affecting wget.exe. */ +static void test_select_after_WSAEventSelect(void) +{ + SOCKET client, server; + HANDLE event; + int ret; + + tcp_socketpair(&client, &server); + event = CreateEventA(NULL, FALSE, FALSE, NULL); + + ret = WSAEventSelect(client, event, FD_READ); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + + /* Poll. This must not trigger any events to be signalled again. */ + check_poll(client, POLLRDNORM | POLLWRNORM); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + + CloseHandle(event); + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -14061,6 +14091,7 @@ START_TEST( sock ) test_write_watch(); test_events(); + test_select_after_WSAEventSelect(); test_ipv6only(); test_TransmitFile();

1 0

Nikolay Sivov : shell32: Fix string size condition check (Coverity).
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: eb8cac0f08312b83cf7607925ca0e5996e35499b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb8cac0f08312b83cf7607925ca0e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 30 17:30:43 2023 +0100 shell32: Fix string size condition check (Coverity). The issue was introduced by 68fd74e7f9bdd2310aebeb59bc86754271cdc063. --- dlls/shell32/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index e0a768012e6..eb9ca4a06df 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -164,8 +164,8 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp case 'l': case 'L': if (lpFile) { - if ((size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL) - && size <= ARRAY_SIZE(xlpFile))) + size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL); + if (size && size <= ARRAY_SIZE(xlpFile)) cmd = xlpFile; else cmd = lpFile;

1 0

Paul Gofman : mfplat/sample: Optimize copying to 2d buffer.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: bf58285a90eb4833fd6013e067353c566b460cd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf58285a90eb4833fd6013e067353c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 12:24:46 2023 -0600 mfplat/sample: Optimize copying to 2d buffer. --- dlls/mfplat/sample.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 3099f903779..a50f81c93d4 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -796,8 +796,9 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff struct sample *sample = impl_from_IMFSample(iface); DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; BYTE *src_ptr, *dst_ptr; - BOOL locked; - HRESULT hr; + IMF2DBuffer *buffer2d; + BOOL locked = FALSE; + HRESULT hr = E_FAIL; size_t i; TRACE("%p, %p.\n", iface, buffer); @@ -807,6 +808,25 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff total_length = sample_get_total_length(sample); dst_current_length = 0; + if (sample->buffer_count == 1 + && SUCCEEDED(IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&buffer2d))) + { + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[0], &current_length)) + && SUCCEEDED(IMF2DBuffer_GetContiguousLength(buffer2d, &dst_length)) + && current_length == dst_length + && SUCCEEDED(IMFMediaBuffer_Lock(sample->buffers[0], &src_ptr, &src_max_length, &current_length))) + { + hr = IMF2DBuffer_ContiguousCopyFrom(buffer2d, src_ptr, current_length); + IMFMediaBuffer_Unlock(sample->buffers[0]); + } + IMF2DBuffer_Release(buffer2d); + if (SUCCEEDED(hr)) + { + dst_current_length = current_length; + goto done; + } + } + dst_ptr = NULL; dst_length = current_length = 0; locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length));

1 0

Paul Gofman : mfplat/sample: Refactor sample_CopyToBuffer().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: ac4a2c4c75b0891052648e189653b577abfa0440 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac4a2c4c75b0891052648e189653b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 11:14:32 2023 -0600 mfplat/sample: Refactor sample_CopyToBuffer(). --- dlls/mfplat/sample.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 687ada1a477..3099f903779 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -810,36 +810,42 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff dst_ptr = NULL; dst_length = current_length = 0; locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); - if (locked) + if (!locked) + goto done; + + if (dst_length < total_length) { - if (dst_length < total_length) - hr = MF_E_BUFFERTOOSMALL; - else if (dst_ptr) + hr = MF_E_BUFFERTOOSMALL; + goto done; + } + + if (!dst_ptr) + goto done; + + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + + if (FAILED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + continue; + + if (src_ptr) { - for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) { - src_ptr = NULL; - src_max_length = current_length = 0; - if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) - { - if (src_ptr) - { - if (current_length > dst_length) - hr = MF_E_BUFFERTOOSMALL; - else if (current_length) - { - memcpy(dst_ptr, src_ptr, current_length); - dst_length -= current_length; - dst_current_length += current_length; - dst_ptr += current_length; - } - } - IMFMediaBuffer_Unlock(sample->buffers[i]); - } + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; } } + IMFMediaBuffer_Unlock(sample->buffers[i]); } +done: IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); if (locked)

1 0

Paul Gofman : mfplat/buffer: Do not flip in memory_2d_buffer_ContiguousCopy{From|To}().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: b7fe6359c812803455c0775dab56d36ffd50c4a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7fe6359c812803455c0775dab56d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 19:24:23 2023 -0600 mfplat/buffer: Do not flip in memory_2d_buffer_ContiguousCopy{From|To}(). --- dlls/mfplat/buffer.c | 10 ++++++++-- dlls/mfplat/tests/mfplat.c | 14 +++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 597767aa03d..b7f32f12cdc 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -626,7 +626,10 @@ static HRESULT WINAPI memory_2d_buffer_ContiguousCopyTo(IMF2DBuffer2 *iface, BYT if (SUCCEEDED(hr)) { - copy_image(buffer, dest_buffer, buffer->_2d.width, src_scanline0, src_pitch, buffer->_2d.width, buffer->_2d.height); + if (src_pitch < 0) + src_pitch = -src_pitch; + copy_image(buffer, dest_buffer, buffer->_2d.width, src_buffer_start, src_pitch, + buffer->_2d.width, buffer->_2d.height); if (FAILED(IMF2DBuffer2_Unlock2D(iface))) WARN("Couldn't unlock source buffer %p, hr %#lx.\n", iface, hr); @@ -652,7 +655,10 @@ static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, c if (SUCCEEDED(hr)) { - copy_image(buffer, dst_scanline0, dst_pitch, src_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); + if (dst_pitch < 0) + dst_pitch = -dst_pitch; + copy_image(buffer, dst_buffer_start, dst_pitch, src_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height); if (FAILED(IMF2DBuffer2_Unlock2D(iface))) WARN("Couldn't unlock destination buffer %p, hr %#lx.\n", iface, hr); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 30fbf27fa3f..5f9460655ec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -9506,9 +9506,9 @@ static void test_MFCreatePathFromURL(void) } } -#define check_reset_data(a, b, c, d, e, f) check_reset_data_(__LINE__, a, b, c, d, e, f) +#define check_reset_data(a, b, c, d, e) check_reset_data_(__LINE__, a, b, c, d, e) static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const BYTE *data, BOOL bottom_up, - DWORD width, DWORD height, BOOL todo) + DWORD width, DWORD height) { BYTE *scanline0, *buffer_start; DWORD length, max_length; @@ -9534,7 +9534,7 @@ static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const B ok(buffer_start == scanline0, "buffer start mismatch.\n"); } for (i = 0; i < height; ++i) - todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), + ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), "2D Data mismatch, scaline %d.\n", i); hr = IMF2DBuffer2_Unlock2D(buffer2d); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9543,7 +9543,7 @@ static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const B ok(hr == S_OK, "got hr %#lx.\n", hr); ok_(__FILE__,line)(max_length == width * height * 4, "got max_length %lu.\n", max_length); ok_(__FILE__,line)(length == width * height * 4, "got length %lu.\n", length); - todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); + ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); memset(lock, 0xcc, length); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9600,7 +9600,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi memset(data, 0xcc, sizeof(data)); data[0] = ((BYTE *)test_data)[0]; - check_reset_data(buffer2d, data, bottom_up, width, height, FALSE); + check_reset_data(buffer2d, data, bottom_up, width, height); hr = IMF2DBuffer2_ContiguousCopyFrom(buffer2d, (BYTE *)test_data, sizeof(test_data)); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9608,7 +9608,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi ok(hr == S_OK, "got hr %#lx.\n", hr); ok(!memcmp(data, test_data, sizeof(data)), "data mismatch.\n"); - check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, TRUE); + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height); hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data) + 1); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9620,7 +9620,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi hr = IMFSample_CopyToBuffer(sample, buffer); ok(hr == S_OK, "got hr %#lx.\n", hr); - check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, FALSE); + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height); IMF2DBuffer2_Release(buffer2d); ref = IMFSample_Release(sample);

1 0

Paul Gofman : mfplat/tests: Add more tests for copying 2d buffers.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 8487666e9c9bcca6cde2c203046d536a0abe61bd URL: https://gitlab.winehq.org/wine/wine/-/commit/8487666e9c9bcca6cde2c203046d53… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 13:28:48 2023 -0600 mfplat/tests: Add more tests for copying 2d buffers. --- dlls/mfplat/tests/mfplat.c | 187 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f7ae614a109..30fbf27fa3f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -9506,6 +9506,192 @@ static void test_MFCreatePathFromURL(void) } } +#define check_reset_data(a, b, c, d, e, f) check_reset_data_(__LINE__, a, b, c, d, e, f) +static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const BYTE *data, BOOL bottom_up, + DWORD width, DWORD height, BOOL todo) +{ + BYTE *scanline0, *buffer_start; + DWORD length, max_length; + IMFMediaBuffer *buffer; + LONG pitch; + BYTE *lock; + HRESULT hr; + int i; + + hr = IMF2DBuffer2_QueryInterface(buffer2d, &IID_IMFMediaBuffer, (void **)&buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(buffer2d, MF2DBuffer_LockFlags_Read, &scanline0, &pitch, &buffer_start, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + if (bottom_up) + { + ok(pitch < 0, "got pitch %ld.\n", pitch); + ok(buffer_start == scanline0 + pitch * (LONG)(height - 1), "buffer start mismatch.\n"); + } + else + { + ok(pitch > 0, "got pitch %ld.\n", pitch); + ok(buffer_start == scanline0, "buffer start mismatch.\n"); + } + for (i = 0; i < height; ++i) + todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), + "2D Data mismatch, scaline %d.\n", i); + hr = IMF2DBuffer2_Unlock2D(buffer2d); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok_(__FILE__,line)(max_length == width * height * 4, "got max_length %lu.\n", max_length); + ok_(__FILE__,line)(length == width * height * 4, "got length %lu.\n", length); + todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); + memset(lock, 0xcc, length); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); +} + +static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD width, DWORD height) +{ + static const unsigned int test_data[] = + { + 0x01010101, 0x01010101, + 0x02020202, 0x02020202, + }; + + BYTE data[sizeof(test_data)]; + IMFMediaBuffer *src_buffer; + DWORD length, max_length; + IMF2DBuffer2 *buffer2d; + IMFSample *sample; + BYTE *lock; + HRESULT hr; + ULONG ref; + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&buffer2d); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = MFCreateMemoryBuffer(sizeof(test_data) * 2, &src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_AddBuffer(sample, src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(src_buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(max_length == sizeof(test_data) * 2, "got %lu.\n", max_length); + memcpy(lock, test_data, sizeof(test_data)); + hr = IMFMediaBuffer_Unlock(src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(max_length == 16, "got %lu.\n", max_length); + ok(length == 16, "got %lu.\n", length); + memset(lock, 0xcc, length); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, 1); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + memset(data, 0xcc, sizeof(data)); + data[0] = ((BYTE *)test_data)[0]; + check_reset_data(buffer2d, data, bottom_up, width, height, FALSE); + + hr = IMF2DBuffer2_ContiguousCopyFrom(buffer2d, (BYTE *)test_data, sizeof(test_data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMF2DBuffer2_ContiguousCopyTo(buffer2d, data, sizeof(data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(!memcmp(data, test_data, sizeof(data)), "data mismatch.\n"); + + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, TRUE); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data) + 1); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == MF_E_BUFFERTOOSMALL, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, FALSE); + + IMF2DBuffer2_Release(buffer2d); + ref = IMFSample_Release(sample); + ok(!ref, "got %lu.\n", ref); + ref = IMFMediaBuffer_Release(src_buffer); + ok(!ref, "got %lu.\n", ref); +} + +static void test_2dbuffer_copy(void) +{ + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IMFMediaBuffer *buffer; + ID3D11Device *device; + HRESULT hr; + ULONG ref; + + if (!pMFCreate2DMediaBuffer) + { + win_skip("MFCreate2DMediaBuffer() is not available.\n"); + return; + } + + winetest_push_context("top down"); + hr = pMFCreate2DMediaBuffer(2, 2, D3DFMT_A8R8G8B8, FALSE, &buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, FALSE, 2, 2); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + winetest_pop_context(); + + winetest_push_context("bottom up"); + hr = pMFCreate2DMediaBuffer(2, 2, D3DFMT_A8R8G8B8, TRUE, &buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, TRUE, 2, 2); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + winetest_pop_context(); + + if (!pMFCreateDXGISurfaceBuffer) + { + win_skip("MFCreateDXGISurfaceBuffer() is not available.\n"); + return; + } + + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.Width = 2; + desc.Height = 2; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Failed to create a texture, hr %#lx.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, FALSE, 2, 2); + + ID3D11Texture2D_Release(texture); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { char **argv; @@ -9590,6 +9776,7 @@ START_TEST(mfplat) test_MFInitMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromAMMediaType(); test_MFCreatePathFromURL(); + test_2dbuffer_copy(); CoUninitialize(); }

1 0

Paul Gofman : mfplat/buffer: Use absolute pitch in memory_1d_2d_buffer_[Un]Lock().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: ffae0d818bc817eb623e6aaff672cabf6cb58b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffae0d818bc817eb623e6aaff672ca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 19:22:04 2023 -0600 mfplat/buffer: Use absolute pitch in memory_1d_2d_buffer_[Un]Lock(). --- dlls/mfplat/buffer.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 932b1147cb8..597767aa03d 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -313,8 +313,14 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) - copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, buffer->_2d.pitch, + { + int pitch = buffer->_2d.pitch; + + if (pitch < 0) + pitch = -pitch; + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, pitch, buffer->_2d.width, buffer->_2d.height); + } } if (SUCCEEDED(hr)) @@ -342,7 +348,11 @@ static HRESULT WINAPI memory_1d_2d_buffer_Unlock(IMFMediaBuffer *iface) if (buffer->_2d.linear_buffer && !--buffer->_2d.locks) { - copy_image(buffer, buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + int pitch = buffer->_2d.pitch; + + if (pitch < 0) + pitch = -pitch; + copy_image(buffer, buffer->data, pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); free(buffer->_2d.linear_buffer);

1 0

Alex Henrie : dxgi/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 3bc570e8ec1dcccdedd70f8da7b9c385869fede0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bc570e8ec1dcccdedd70f8da7b9c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:35:00 2023 -0600 dxgi/tests: Use CRT allocation functions. --- dlls/dxgi/tests/dxgi.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5b007d8a626..f929a571823 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -27,7 +27,6 @@ #include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" -#include "wine/heap.h" #include "wine/test.h" enum frame_latency @@ -67,7 +66,7 @@ static void queue_test(void (*test)(void)) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count++].test = test; } @@ -105,7 +104,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -116,7 +115,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static ULONG get_refcount(void *iface) @@ -149,7 +148,7 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ DISPLAY_DEVICEW display_device; DEVMODEW *modes, *tmp; - if (!(modes = heap_alloc(size * sizeof(*modes)))) + if (!(modes = malloc(size * sizeof(*modes)))) return FALSE; display_device.cb = sizeof(display_device); @@ -165,9 +164,9 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ if (count >= size) { size *= 2; - if (!(tmp = heap_realloc(modes, size * sizeof(*modes)))) + if (!(tmp = realloc(modes, size * sizeof(*modes)))) { - heap_free(modes); + free(modes); return FALSE; } modes = tmp; @@ -177,7 +176,7 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ modes[count].dmSize = sizeof(modes[count]); if (!EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) { - heap_free(modes); + free(modes); return FALSE; } @@ -1440,7 +1439,7 @@ static void test_output(void) ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp); mode_count_comp = mode_count; - modes = heap_calloc(mode_count + 10, sizeof(*modes)); + modes = calloc(mode_count + 10, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -1514,7 +1513,7 @@ static void test_output(void) skip("Not enough modes for test.\n"); } - heap_free(modes); + free(modes); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -1572,7 +1571,7 @@ static void test_find_closest_matching_mode(void) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); @@ -1703,7 +1702,7 @@ static void test_find_closest_matching_mode(void) } } - heap_free(modes); + free(modes); done: IDXGIOutput_Release(output); @@ -2623,7 +2622,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, ++output_count; } - output_monitor_info = heap_calloc(output_count, sizeof(*output_monitor_info)); + output_monitor_info = calloc(output_count, sizeof(*output_monitor_info)); ok(!!output_monitor_info, "Failed to allocate memory.\n"); for (i = 0; i < output_count; ++i) { @@ -2724,7 +2723,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, IDXGIOutput_Release(output); } - heap_free(output_monitor_info); + free(output_monitor_info); } static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) @@ -3159,7 +3158,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, return; } - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); @@ -3196,7 +3195,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, wine_dbgstr_rect(&expected_state.fullscreen_state.monitor_rect)); } - heap_free(modes); + free(modes); IDXGIOutput_Release(target); } @@ -6895,7 +6894,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) continue; } - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -6926,7 +6925,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) swapchain_desc.BufferDesc.ScanlineOrdering = modes[mode_idx].ScanlineOrdering; swapchain_desc.BufferDesc.Scaling = modes[mode_idx].Scaling; swapchain_desc.OutputWindow = create_window(); - heap_free(modes); + free(modes); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7715,7 +7714,7 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); - heap_free(original_modes); + free(original_modes); } static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023