wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

Tim Clem : loader: Reserve some space for 32-bit top-down allocations on 64-bit.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 6b0836e3f157318b00effc1de563da4d4b0d16b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b0836e3f157318b00effc1de563da… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 31 10:21:23 2023 -0700 loader: Reserve some space for 32-bit top-down allocations on 64-bit. --- loader/preloader.c | 4 ++-- loader/preloader_mac.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 72556f09720..3fbee0877d4 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,11 +108,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ + { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared user data + virtual heap */ #else { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x00007f000000, 0x00ff0000 }, /* 32-bit top-down allocations + shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 8e249a7dc4d..4e91128c575 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -90,11 +90,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00001000, 0x0000f000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ + { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared user data + virtual heap */ #else /* __i386__ */ { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x00007f000000, 0x00ff0000 }, /* 32-bit top-down allocations + shared user data */ { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ff000000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */

1 0

Rémi Bernon : user32/tests: Test more ClipCursor reset scenarios.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 0a33018211ab50620923943876994266c06cfe3e URL: https://gitlab.winehq.org/wine/wine/-/commit/0a33018211ab506209239438769942… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 14:42:16 2023 +0200 user32/tests: Test more ClipCursor reset scenarios. --- dlls/user32/tests/input.c | 294 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+)

1 0

Rémi Bernon : user32/tests: Add a helper to run a test in a process.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 1bf316c0d9d9afe2c1af10a3a3b21735a6d88994 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bf316c0d9d9afe2c1af10a3a3b217… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:45:15 2023 +0200 user32/tests: Add a helper to run a test in a process. --- dlls/user32/tests/input.c | 86 ++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 53 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6ca8779eceb..d1e132d2491 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -180,6 +180,24 @@ static void init_function_pointers(void) is_wow64 = FALSE; } +#define run_in_process( a, b ) run_in_process_( __FILE__, __LINE__, a, b ) +static void run_in_process_( const char *file, int line, char **argv, const char *args ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + DWORD ret; + + sprintf( cmdline, "%s %s %s", argv[0], argv[1], args ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok_(file, line)( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) { UINT message; @@ -1471,13 +1489,10 @@ done: SetCursorPos(pt_org.x, pt_org.y); } -static void test_GetMouseMovePointsEx(const char *argv0) +static void test_GetMouseMovePointsEx( char **argv ) { #define BUFLIM 64 #define MYERROR 0xdeadbeef - PROCESS_INFORMATION process_info; - STARTUPINFOA startup_info; - char path[MAX_PATH]; int i, count, retval; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; @@ -1695,16 +1710,7 @@ static void test_GetMouseMovePointsEx(const char *argv0) retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_HIGH_RESOLUTION_POINTS ); todo_wine ok( retval == 64, "expected to get 64 high resolution mouse move points but got %d\n", retval ); - sprintf(path, "%s input get_mouse_move_points_test", argv0); - memset(&startup_info, 0, sizeof(startup_info)); - startup_info.cb = sizeof(startup_info); - startup_info.dwFlags = STARTF_USESHOWWINDOW; - startup_info.wShowWindow = SW_SHOWNORMAL; - retval = CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info ); - ok(retval, "CreateProcess \"%s\" failed err %lu.\n", path, GetLastError()); - winetest_wait_child_process(process_info.hProcess); - CloseHandle(process_info.hProcess); - CloseHandle(process_info.hThread); + run_in_process( argv, "test_GetMouseMovePointsEx_process" ); #undef BUFLIM #undef MYERROR } @@ -5045,11 +5051,13 @@ static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) ok( ret, "UnregisterClassW failed: %lu\n", GetLastError() ); } -static void test_EnableMouseInPointer_process( const char *arg ) +static void test_EnableMouseInPointer( const char *arg ) { DWORD enable = strtoul( arg, 0, 10 ); BOOL ret; + winetest_push_context( "enable %lu", enable ); + ret = pEnableMouseInPointer( enable ); todo_wine ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); @@ -5071,23 +5079,8 @@ static void test_EnableMouseInPointer_process( const char *arg ) ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); test_GetPointerInfo( enable ); -} - -static void test_EnableMouseInPointer( char **argv, BOOL enable ) -{ - STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; - PROCESS_INFORMATION info = {0}; - char cmdline[MAX_PATH * 2]; - BOOL ret; - sprintf( cmdline, "%s %s EnableMouseInPointer %u", argv[0], argv[1], enable ); - ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); - ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); - if (!ret) return; - - wait_child_process( info.hProcess ); - CloseHandle( info.hThread ); - CloseHandle( info.hProcess ); + winetest_pop_context(); } START_TEST(input) @@ -5100,25 +5093,12 @@ START_TEST(input) GetCursorPos( &pos ); argc = winetest_get_mainargs(&argv); - if (argc >= 3 && strcmp(argv[2], "rawinput_test") == 0) - { - rawinput_test_process(); - return; - } - - if (argc >= 3 && strcmp(argv[2], "get_mouse_move_points_test") == 0) - { - test_GetMouseMovePointsEx_process(); - return; - } - - if (argc >= 4 && strcmp( argv[2], "EnableMouseInPointer" ) == 0) - { - winetest_push_context( "enable %s", argv[3] ); - test_EnableMouseInPointer_process( argv[3] ); - winetest_pop_context(); - return; - } + if (argc >= 3 && !strcmp( argv[2], "rawinput_test" )) + return rawinput_test_process(); + if (argc >= 3 && !strcmp( argv[2], "test_GetMouseMovePointsEx_process" )) + return test_GetMouseMovePointsEx_process(); + if (argc >= 4 && !strcmp( argv[2], "test_EnableMouseInPointer" )) + return test_EnableMouseInPointer( argv[3] ); test_SendInput(); test_Input_blackbox(); @@ -5144,7 +5124,7 @@ START_TEST(input) test_DefRawInputProc(); if(pGetMouseMovePointsEx) - test_GetMouseMovePointsEx(argv[0]); + test_GetMouseMovePointsEx( argv ); else win_skip("GetMouseMovePointsEx is not available\n"); @@ -5171,7 +5151,7 @@ START_TEST(input) win_skip( "EnableMouseInPointer not found, skipping tests\n" ); else { - test_EnableMouseInPointer( argv, FALSE ); - test_EnableMouseInPointer( argv, TRUE ); + run_in_process( argv, "test_EnableMouseInPointer 0" ); + run_in_process( argv, "test_EnableMouseInPointer 1" ); } }

1 0

Rémi Bernon : user32/tests: Zero-initialize keyboard state array.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 29ac54e3004e2a37b77983253a64e456d5507ffd URL: https://gitlab.winehq.org/wine/wine/-/commit/29ac54e3004e2a37b77983253a64e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 23:27:53 2023 +0200 user32/tests: Zero-initialize keyboard state array. --- dlls/user32/tests/input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f3d5750c2f..6ca8779eceb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4374,7 +4374,7 @@ static DWORD WINAPI get_key_state_thread(void *arg) struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; + BYTE keystate[256] = {0}; BOOL has_queue; BOOL expect_x, expect_c; MSG msg; @@ -4436,7 +4436,7 @@ static void test_GetKeyState(void) struct get_key_state_thread_params params; HANDLE thread; DWORD result; - BYTE keystate[256]; + BYTE keystate[256] = {0}; BOOL expect_x, expect_c; HWND hwnd; MSG msg; @@ -4449,7 +4449,6 @@ static void test_GetKeyState(void) return; } - memset(keystate, 0, sizeof(keystate)); params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL);

1 0

Paul Gofman : winegstreamer: Don't pre-check sample size in wg_transform_read_mf().
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 596dfad38b9cb327b73c6b2f1c42e42080218cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/596dfad38b9cb327b73c6b2f1c42e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 28 12:07:55 2023 -0600 winegstreamer: Don't pre-check sample size in wg_transform_read_mf(). --- dlls/mf/tests/transform.c | 1 - dlls/winegstreamer/wg_sample.c | 5 ----- dlls/winegstreamer/wg_transform.c | 38 +++++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 85102bee70d..8d01a7480a2 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4133,7 +4133,6 @@ static void test_h264_decoder_concat_streams(void) { MFT_OUTPUT_DATA_BUFFER data = {.pSample = create_sample(NULL, 1)}; hr = IMFTransform_ProcessOutput(transform, 0, 1, &data, &output_status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); IMFSample_Release(data.pSample); hr = S_OK; diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index ea83440d9ad..c7d79b5b575 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -358,11 +358,6 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, IMFSample *sample, return hr; wg_sample->size = 0; - if (wg_sample->max_size < sample_size) - { - wg_sample_release(wg_sample); - return MF_E_BUFFERTOOSMALL; - } if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) { diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 8f1f595ea76..19ce2a1013f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -594,19 +594,19 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, +static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, struct wg_sample *sample, gsize *total_size) { + NTSTATUS status = STATUS_UNSUCCESSFUL; GstVideoFrame src_frame, dst_frame; GstVideoInfo src_info, dst_info; GstVideoAlignment align; GstBuffer *dst_buffer; - bool ret = false; if (!gst_video_info_from_caps(&src_info, caps)) { GST_ERROR("Failed to get video info from caps."); - return false; + return STATUS_UNSUCCESSFUL; } dst_info = src_info; @@ -615,14 +615,14 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig if (sample->max_size < dst_info.size) { GST_ERROR("Output buffer is too small."); - return false; + return STATUS_BUFFER_TOO_SMALL; } if (!(dst_buffer = gst_buffer_new_wrapped_full(0, sample->data, sample->max_size, 0, sample->max_size, 0, NULL))) { GST_ERROR("Failed to wrap wg_sample into GstBuffer"); - return false; + return STATUS_UNSUCCESSFUL; } gst_buffer_set_size(dst_buffer, dst_info.size); *total_size = sample->size = dst_info.size; @@ -635,7 +635,9 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig GST_ERROR("Failed to map destination frame."); else { - if (!(ret = gst_video_frame_copy(&dst_frame, &src_frame))) + if (gst_video_frame_copy(&dst_frame, &src_frame)) + status = STATUS_SUCCESS; + else GST_ERROR("Failed to copy video frame."); gst_video_frame_unmap(&dst_frame); } @@ -643,16 +645,16 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig } gst_buffer_unref(dst_buffer); - return ret; + return status; } -static bool copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *sample, +static NTSTATUS copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *sample, gsize *total_size) { GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) - return false; + return STATUS_UNSUCCESSFUL; if (sample->max_size >= info.size) sample->size = info.size; @@ -669,14 +671,15 @@ static bool copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *samp gst_buffer_resize(buffer, sample->size, -1); *total_size = info.size; - return true; + return STATUS_SUCCESS; } static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, struct wg_sample *sample) { - bool ret, needs_copy; gsize total_size; + bool needs_copy; + NTSTATUS status; GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) @@ -686,20 +689,21 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi return STATUS_UNSUCCESSFUL; } needs_copy = info.data != sample->data; + total_size = sample->size = info.size; gst_buffer_unmap(buffer, &info); - if ((ret = !needs_copy)) - total_size = sample->size = info.size; + if (!needs_copy) + status = STATUS_SUCCESS; else if (stream_type_from_caps(caps) == GST_STREAM_TYPE_VIDEO) - ret = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); + status = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); else - ret = copy_buffer(buffer, caps, sample, &total_size); + status = copy_buffer(buffer, caps, sample, &total_size); - if (!ret) + if (status) { GST_ERROR("Failed to copy buffer %p", buffer); sample->size = 0; - return STATUS_UNSUCCESSFUL; + return status; } if (GST_BUFFER_PTS_IS_VALID(buffer))

1 0

Rémi Bernon : winegstreamer: Use the output wg_format in CAPS sink query.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 4d1a331c6619703e5766d50ddf0399eaa079ffe3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d1a331c6619703e5766d50ddf0399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 15:03:22 2023 +0200 winegstreamer: Use the output wg_format in CAPS sink query. Instead of constraining the output caps to the current resolution, which breaks when streams with different resolutions are concatenated. --- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 15 ++++++++++++--- dlls/winegstreamer/wg_transform.c | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index e48204224b4..47b05e14777 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -95,6 +95,7 @@ struct sample_desc DWORD repeat_count; BOOL todo_length; BOOL todo_duration; + BOOL todo_time; }; #define check_mf_sample_collection(a, b, c) check_mf_sample_collection_(__FILE__, __LINE__, a, b, c) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c7b001bfb11..85102bee70d 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1205,6 +1205,7 @@ static DWORD check_mf_sample_(const char *file, int line, IMFSample *sample, con timestamp = 0xdeadbeef; hr = IMFSample_GetSampleTime(sample, &timestamp); ok_(file, line)(hr == S_OK, "GetSampleTime returned %#lx\n", hr); + todo_wine_if(expect->todo_time) ok_(file, line)(llabs(timestamp - expect->sample_time) <= 50, "got sample time %I64d\n", timestamp); @@ -4024,7 +4025,7 @@ static void test_h264_decoder_concat_streams(void) { {.length = 0x3600}, {.length = 0x4980}, - {.length = 0x4980, .todo_length = TRUE}, + {.length = 0, .todo_length = TRUE}, }; const struct attribute_desc output_sample_attributes[] = { @@ -4041,18 +4042,26 @@ static void test_h264_decoder_concat_streams(void) { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 29, - .todo_length = TRUE, + .buffer_count = 1, .buffers = output_buffer_desc + 1, .repeat_count = 29, }, { .attributes = output_sample_attributes + 0, .sample_time = 0, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 29, + .todo_time = TRUE, }, { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 1, .repeat_count = 6, + .todo_time = TRUE, + }, + { + /* Wine outputs spurious buffers */ + .attributes = output_sample_attributes + 0, + .sample_time = 0, .sample_duration = 400000, + .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 22, + .todo_time = TRUE, .todo_length = TRUE, }, {0}, }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d0f94ed7649..8f1f595ea76 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -56,6 +56,7 @@ struct wg_transform GstElement *video_flip; guint output_plane_align; + struct wg_format output_format; struct wg_sample *output_wg_sample; GstAtomicQueue *output_queue; GstSample *output_sample; @@ -174,7 +175,8 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery gchar *str; gst_query_parse_caps(query, &filter); - caps = gst_caps_ref(transform->output_caps); + if (!(caps = wg_format_to_caps(&transform->output_format))) + break; if (filter) { @@ -300,6 +302,7 @@ NTSTATUS wg_transform_create(void *args) goto out; transform->input_max_length = 1; transform->output_plane_align = 0; + transform->output_format = output_format; if (!(src_caps = wg_format_to_caps(&input_format))) goto out; @@ -493,6 +496,7 @@ NTSTATUS wg_transform_set_output_format(void *args) GST_ERROR("Failed to convert format %p to caps.", format); return STATUS_UNSUCCESSFUL; } + transform->output_format = *format; if (gst_caps_is_always_compatible(transform->output_caps, caps)) {

1 0

Rémi Bernon : winegstreamer: Generate H264 timestamps using the input type frame rate.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 52387aa1a4e25ee2dec4117201658b32b160a4ca URL: https://gitlab.winehq.org/wine/wine/-/commit/52387aa1a4e25ee2dec4117201658b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 14:42:28 2023 +0200 winegstreamer: Generate H264 timestamps using the input type frame rate. And remove h264parse element requirement. --- dlls/mf/tests/mf_test.h | 1 - dlls/mf/tests/transform.c | 20 +++----------------- dlls/winegstreamer/h264_decoder.c | 16 +++++++++++++++- dlls/winegstreamer/wg_transform.c | 3 --- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index 05aa34e3d28..e48204224b4 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -95,7 +95,6 @@ struct sample_desc DWORD repeat_count; BOOL todo_length; BOOL todo_duration; - LONGLONG todo_time; }; #define check_mf_sample_collection(a, b, c) check_mf_sample_collection_(__FILE__, __LINE__, a, b, c) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 04c59bbdffc..c7b001bfb11 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1205,7 +1205,6 @@ static DWORD check_mf_sample_(const char *file, int line, IMFSample *sample, con timestamp = 0xdeadbeef; hr = IMFSample_GetSampleTime(sample, &timestamp); ok_(file, line)(hr == S_OK, "GetSampleTime returned %#lx\n", hr); - todo_wine_if(expect->todo_time && (timestamp == expect->todo_time || expect->todo_time == -1)) ok_(file, line)(llabs(timestamp - expect->sample_time) <= 50, "got sample time %I64d\n", timestamp); @@ -3711,7 +3710,7 @@ static void test_h264_decoder(void) const struct sample_desc expect_output_sample_i420 = { .attributes = output_sample_attributes, - .sample_time = 333667, .sample_duration = 333667, .todo_time = 1334666 /* with VA-API */, + .sample_time = 333667, .sample_duration = 333667, .buffer_count = 1, .buffers = &output_buffer_desc_i420, }; @@ -4037,26 +4036,13 @@ static void test_h264_decoder_concat_streams(void) { .attributes = output_sample_attributes + 0, .sample_time = 0, .sample_duration = 400000, - .todo_duration = 333666, - .buffer_count = 1, .buffers = output_buffer_desc + 0, - }, - { - .attributes = output_sample_attributes + 0, - .sample_time = 400000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 26, - .todo_time = -1, .todo_duration = 333666, - }, - { - .attributes = output_sample_attributes + 0, - .sample_time = 11200000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 1, - .todo_time = -1, .todo_duration = 333666, + .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 29, }, { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 29, - .todo_time = -1, .todo_duration = 333666, .todo_length = TRUE, + .todo_length = TRUE, }, { .attributes = output_sample_attributes + 0, diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8eeeb52fd60..97289f69a4d 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -53,6 +53,7 @@ struct h264_decoder IMFAttributes *attributes; IMFAttributes *output_attributes; + UINT64 sample_time; IMFMediaType *input_type; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; @@ -700,8 +701,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, struct h264_decoder *decoder = impl_from_IMFTransform(iface); struct wg_format wg_format; UINT32 sample_size; + LONGLONG duration; IMFSample *sample; - UINT64 frame_size; + UINT64 frame_size, frame_rate; GUID subtype; DWORD size; HRESULT hr; @@ -748,8 +750,20 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, sample, sample_size, &wg_format, &samples->dwStatus))) + { wg_sample_queue_flush(decoder->wg_sample_queue, false); + if (FAILED(IMFMediaType_GetUINT64(decoder->input_type, &MF_MT_FRAME_RATE, &frame_rate))) + frame_rate = (UINT64)30000 << 32 | 1001; + + duration = (UINT64)10000000 * (UINT32)frame_rate / (frame_rate >> 32); + if (FAILED(IMFSample_SetSampleTime(sample, decoder->sample_time))) + WARN("Failed to set sample time\n"); + if (FAILED(IMFSample_SetSampleDuration(sample, duration))) + WARN("Failed to set sample duration\n"); + decoder->sample_time += duration; + } + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) { samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 559e8f976d2..d0f94ed7649 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -342,9 +342,6 @@ NTSTATUS wg_transform_create(void *args) */ transform->input_max_length = 16; transform->output_plane_align = 15; - if (!(element = create_element("h264parse", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; /* fallthrough */ case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_AUDIO_MPEG4:

1 0

Rémi Bernon : winegstreamer: Use an IMFMediaType for the internal stream type.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 8caaca177e7b3545296a099a0dd43a375cb13cdf URL: https://gitlab.winehq.org/wine/wine/-/commit/8caaca177e7b3545296a099a0dd43a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 13:39:33 2023 +0200 winegstreamer: Use an IMFMediaType for the internal stream type. --- dlls/winegstreamer/h264_decoder.c | 93 +++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : mf/tests: Add H264 decoder tests with concatenated streams.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 6184ac8c9fa0b201ca7c20ee01d3b54abb6a7512 URL: https://gitlab.winehq.org/wine/wine/-/commit/6184ac8c9fa0b201ca7c20ee01d3b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 10:01:32 2023 +0200 mf/tests: Add H264 decoder tests with concatenated streams. --- dlls/mf/tests/h264data-1.bin | Bin 0 -> 1597 bytes dlls/mf/tests/h264data-2.bin | Bin 0 -> 1717 bytes dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/resource.rc | 18 ++++ dlls/mf/tests/transform.c | 243 ++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 248 insertions(+), 14 deletions(-)

1 0

Rémi Bernon : user32: Remove now unused virtual screen helpers.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 46d276188e306104eb60c113f40372d8cc9c7976 URL: https://gitlab.winehq.org/wine/wine/-/commit/46d276188e306104eb60c113f40372… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:56:30 2023 +0200 user32: Remove now unused virtual screen helpers. --- dlls/user32/sysparams.c | 39 +-------------------------------------- dlls/user32/user_private.h | 3 --- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c7bd702726a..e7c7ce350e4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -160,43 +160,6 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A /* Helper functions to retrieve monitors info */ -static BOOL CALLBACK get_virtual_screen_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - RECT *virtual_rect = (RECT *)lp; - - UnionRect( virtual_rect, virtual_rect, rect ); - return TRUE; -} - -RECT get_virtual_screen_rect(void) -{ - RECT rect = {0}; - - NtUserEnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); - return rect; -} - -static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - RECT *primary_rect = (RECT *)lp; - - if (!rect->top && !rect->left && rect->right && rect->bottom) - { - *primary_rect = *rect; - return FALSE; - } - - return TRUE; -} - -RECT get_primary_monitor_rect(void) -{ - RECT rect = {0}; - - NtUserEnumDisplayMonitors( 0, NULL, get_primary_monitor_proc, (LPARAM)&rect ); - return rect; -} - HDC get_display_dc(void) { EnterCriticalSection( &display_dc_section ); @@ -235,7 +198,7 @@ static void release_display_device_init_mutex( HANDLE mutex ) } /* Wait until graphics driver is loaded by explorer */ -void wait_graphics_driver_ready(void) +static void wait_graphics_driver_ready(void) { static BOOL ready = FALSE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 430ac826f7e..c3f877758c1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -55,10 +55,7 @@ extern HANDLE render_synthesized_format( UINT format, UINT from ) DECLSPEC_HIDDE extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern HDC get_display_dc(void) DECLSPEC_HIDDEN; extern void release_display_dc( HDC hdc ) DECLSPEC_HIDDEN; -extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; -extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; -extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern HPEN SYSCOLOR_GetPen( INT index ) DECLSPEC_HIDDEN;

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 May 2023