November 2021 - Wine-Devel - list.winehq.org

Re: [PATCH] ucrtbase: Later printf width specifiers should override earlier ones

by Andrew Eikum

Thanks, David. I've resent the patches squashed together and with the added ucrtbase tests. Andrew On Mon, Nov 08, 2021 at 07:06:26PM +0800, David Gow wrote: > In ucrtbase (but not in msvcrt), when a printf format specifier has two > width specifiers (both a '*' and an explicit number), only the latter > should take effect. (In msvcrt, the width of one is combined with the > other). > > This patch builds on the prior patch which implements the msvcrt > behaviour, and needs to be applied on top of it: > msvcrt: The '*' character should be interpreted as the beginning of the width specification[1,2] > > It also supercedes the previous (incorrect) patch which used the > ucrtbase behaviour on msvcrt as well: > msvcrt: printf: Later width specifiers should override earlier ones[3] > > For further details, see [4], [5], and [6]. > > [1]: https://source.winehq.org/patches/data/218904 > [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200009.html > [3]: https://www.winehq.org/pipermail/wine-devel/2021-November/200040.html > [4]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html > [5]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 > [6]: https://www.winehq.org/pipermail/wine-devel/2021-November/200063.html > > Signed-off-by: David Gow <david(a)davidgow.net>

Nov. 8, 2021

[PATCH] msvcrt: Better handle multiple width specifiers

by Andrew Eikum

Includes feedback from David Gow <david(a)davidgow.net> and Piotr Caban. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/msvcrt/printf.h | 9 ++++++++- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ dlls/ucrtbase/tests/printf.c | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..c34479c5688 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + } + +#if _MSVCR_VER >= 140 + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; +#endif + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..010cad0ab8f 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,18 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==11, "r = %d\n", r); + ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 4f20ccff9a4..51a54426bc4 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -845,6 +845,24 @@ static void test_printf_fp(void) } } +static void test_printf_width_specification(void) +{ + int r; + char buffer[20]; + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%0*2d", 1, 3); + ok(r == 2, "r = %d\n", r); + ok(!strcmp(buffer, "03"), "buffer wrong, got=%s\n", buffer); + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%*0d", 1, 2); + ok(r == 1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "buffer wrong, got=%s\n", buffer); + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "% *2d", 0, 7); + ok(r == 2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "buffer wrong, got=%s\n", buffer); +} + START_TEST(printf) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -862,4 +880,5 @@ START_TEST(printf) test_printf_c99(); test_printf_natural_string(); test_printf_fp(); + test_printf_width_specification(); } -- 2.33.1

Nov. 8, 2021

[PATCH 2/2] ntdll: Make syscall dispatcher properly restore X16 and X17 in ARM64.

by Jinoh Kang

Today, __wine_syscall_dispatcher clobbers X16 and X17 registers even if `syscall_frame->restore_flags` has CONTEXT_INTEGER set. This is because they are used as scratch registers for restoring SP and PC, which cannot be loaded directly from memory or other architectural state. signal_set_full_context bypasses this clobbering behaviour by relying on kernel instead to fully restore the context. Specifically, it raises SIGUSR2, of which handler moves everything to the sigcontext and returns implicitly via the sigreturn() Unix system call. However, this approach is not generic and also error-prone: the signal_set_full_context implementation now differs from other architectures by abruptly switching to the specified context instead of taking the proper path of returning via the syscall dispatcher. Fix this by splitting the ARM64 syscall dispatcher's returning behaviour into a fast path and a slow path. - If CONTEXT_INTEGER is not set, the dispatcher takes the fast path: the X16 and X17 registers are clobbered as usual. - If X16 == PC and X17 == SP, the dispatcher also takes the fast path: it can safely use X16 and X17 without corrupting the thread state, since those two registers already have the desired values. - Otherwise, the dispatcher takes the slow path: it raises SIGUSR2 and does full context restore in the signal handler. Also, modify ARM64 signal_set_full_context to match that of other architectures. The function will let the dispatcher choose either path as appropriate. Performance impact is expected to be negligible (if any) when CONTEXT_INTEGER is unset (the usual case), since the number of instructions executed is left unchanged for this case. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 57 ++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index da5739b6f1c..c5db2e7de64 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -327,6 +327,10 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON /*********************************************************************** * syscall_frame_fixup_for_fastpath * + * Fixes up the given syscall frame such that the syscall dispatcher + * can return via the fast path if CONTEXT_INTEGER is set in + * restore_flags. + * * Clobbers the frame's X16 and X17 register values. */ static void syscall_frame_fixup_for_fastpath( struct syscall_frame *frame ) @@ -426,7 +430,8 @@ NTSTATUS signal_set_full_context( CONTEXT *context ) { NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); - if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) raise( SIGUSR2 ); + if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + arm64_thread_data()->syscall_frame->restore_flags |= CONTEXT_INTEGER; return status; } @@ -1172,6 +1177,17 @@ void signal_init_process(void) } +/*********************************************************************** + * syscall_dispatcher_return_slowpath + */ +void DECLSPEC_HIDDEN syscall_dispatcher_return_slowpath( void ) +{ + raise( SIGUSR2 ); + + /* should not be reached */ + abort_thread( 0 ); +} + /*********************************************************************** * call_init_thunk */ @@ -1312,13 +1328,28 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldr x16, [x16, x20, lsl 3]\n\t" "blr x16\n\t" "mov sp, x22\n" - "3:\tldp x18, x19, [sp, #0x90]\n\t" + "3:\tldr w16, [sp, #0x10c]\n\t" /* frame->restore_flags */ + "tbz x16, #1, 1f\n\t" /* CONTEXT_INTEGER */ + "ldp x6, x7, [sp, #0x80]\n\t" /* frame->x[16..17] */ + "ldp x8, x9, [sp, #0xf8]\n\t" /* frame->sp, frame->pc */ + "eor x6, x6, x9\n\t" /* frame->x16 == frame->pc? */ + "eor x7, x7, x8\n\t" /* frame->x17 == frame->sp? */ + "orr x6, x6, x7\n\t" + "cbnz x6, 5f\n\t" /* take slowpath if unequal */ + "ldp x0, x1, [sp, #0x00]\n\t" + "ldp x2, x3, [sp, #0x10]\n\t" + "ldp x4, x5, [sp, #0x20]\n\t" + "ldp x6, x7, [sp, #0x30]\n\t" + "ldp x8, x9, [sp, #0x40]\n\t" + "ldp x10, x11, [sp, #0x50]\n\t" + "ldp x12, x13, [sp, #0x60]\n\t" + "ldp x14, x15, [sp, #0x70]\n" + "1:\tldp x18, x19, [sp, #0x90]\n\t" "ldp x20, x21, [sp, #0xa0]\n\t" "ldp x22, x23, [sp, #0xb0]\n\t" "ldp x24, x25, [sp, #0xc0]\n\t" "ldp x26, x27, [sp, #0xd0]\n\t" "ldp x28, x29, [sp, #0xe0]\n\t" - "ldr w16, [sp, #0x10c]\n\t" /* frame->restore_flags */ "tbz x16, #2, 1f\n\t" /* CONTEXT_FLOATING_POINT */ "ldp q0, q1, [sp, #0x130]\n\t" "ldp q2, q3, [sp, #0x150]\n\t" @@ -1336,19 +1367,10 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldp q26, q27, [sp, #0x2d0]\n\t" "ldp q28, q29, [sp, #0x2f0]\n\t" "ldp q30, q31, [sp, #0x310]\n\t" - "ldr w9, [sp, #0x128]\n\t" - "msr FPCR, x9\n\t" - "ldr w9, [sp, #0x12c]\n\t" - "msr FPSR, x9\n" - "1:\ttbz x16, #1, 1f\n\t" /* CONTEXT_INTEGER */ - "ldp x0, x1, [sp, #0x00]\n\t" - "ldp x2, x3, [sp, #0x10]\n\t" - "ldp x4, x5, [sp, #0x20]\n\t" - "ldp x6, x7, [sp, #0x30]\n\t" - "ldp x8, x9, [sp, #0x40]\n\t" - "ldp x10, x11, [sp, #0x50]\n\t" - "ldp x12, x13, [sp, #0x60]\n\t" - "ldp x14, x15, [sp, #0x70]\n" + "ldr w17, [sp, #0x128]\n\t" + "msr FPCR, x17\n\t" + "ldr w17, [sp, #0x12c]\n\t" + "msr FPSR, x17\n" "1:\tldp x16, x17, [sp, #0x100]\n\t" "msr NZCV, x17\n\t" "ldp x30, x17, [sp, #0xf0]\n\t" @@ -1360,7 +1382,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov sp, x0\n\t" "mov x0, x1\n\t" - "b 3b" ) + "b 3b\n" + "5:\tbl " __ASM_NAME("syscall_dispatcher_return_slowpath") ) /*********************************************************************** -- 2.33.1

Nov. 8, 2021

[PATCH 1/2] ntdll: Explicitly clobber X16/X17 registers on ARM64 syscall return.

by Jinoh Kang

Synchronize syscall_frame to match the actual state on syscall return. This is required for a follow-up patch that addresses incorrect behaviour of __wine_syscall_dispatcher, specifically unconditional clobbering of X16 and X17 registers, while minimizing the performance impact. (Hence the "fastpath") Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index fa402a7a83e..da5739b6f1c 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -324,6 +324,17 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } +/*********************************************************************** + * syscall_frame_fixup_for_fastpath + * + * Clobbers the frame's X16 and X17 register values. + */ +static void syscall_frame_fixup_for_fastpath( struct syscall_frame *frame ) +{ + frame->x[16] = frame->pc; + frame->x[17] = frame->sp; +} + /*********************************************************************** * save_context * @@ -686,6 +697,7 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a frame->x[3] = arg3; frame->x[4] = (ULONG64)func; frame->restore_flags |= CONTEXT_CONTROL | CONTEXT_INTEGER; + syscall_frame_fixup_for_fastpath( frame ); return status; } @@ -718,6 +730,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context frame->lr = lr; frame->sp = sp; frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL; + syscall_frame_fixup_for_fastpath( frame ); return status; } @@ -757,6 +770,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.restore_flags = CONTEXT_INTEGER; callback_frame.frame.syscall_table = frame->syscall_table; callback_frame.frame.prev_frame = frame; + syscall_frame_fixup_for_fastpath( &callback_frame.frame ); arm64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -1187,6 +1201,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; frame->syscall_table = KeServiceDescriptorTable; + syscall_frame_fixup_for_fastpath( frame ); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); -- 2.33.1

Nov. 8, 2021

[PATCH] riched20: Check font_cache in select_style() too.

by Serge Gautherie

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Like the other release_font_cache() calls. Addendum to wine-4.14-26-g6f1cc1f. ReactOS-Bug: https://jira.reactos.org/browse/CORE-17843 --- dlls/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 917a5bd..266bb93 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -429,7 +429,7 @@ void select_style( ME_Context *c, ME_Style *s ) c->orig_font = NULL; } - if (c->current_style) + if (c->current_style && c->current_style->font_cache) { release_font_cache( c->current_style->font_cache ); c->current_style->font_cache = NULL; -- 2.10.0.windows.1

Nov. 8, 2021

[PATCH] riched20: Check font_cache in select_style() too. --- Like the other release_font_cache() calls.

by Serge Gautherie

Addendum to wine-4.14-26-g6f1cc1f. ReactOS-Bug: https://jira.reactos.org/browse/CORE-17843 --- dlls/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 917a5bd..266bb93 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -429,7 +429,7 @@ void select_style( ME_Context *c, ME_Style *s ) c->orig_font = NULL; } - if (c->current_style) + if (c->current_style && c->current_style->font_cache) { release_font_cache( c->current_style->font_cache ); c->current_style->font_cache = NULL; -- 2.10.0.windows.1

Nov. 8, 2021

Re: [PATCH 2/4] ddraw/tests: Port test_filling_convention to ddraw.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101435 Your paranoid android. === w864 (32 bit report) === ddraw: ddraw1.c:8279: Test failed: Got unexpected color 0x00000000. ddraw1.c:8283: Test failed: Got unexpected color 0x00000000. ddraw1.c:8346: Test failed: Got unexpected color 0x00000000. ddraw1.c:8348: Test failed: Got unexpected color 0x00000000. === w1064 (32 bit report) === ddraw: ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x1, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x2, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x3, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x4, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 7. === w1064_tsign (32 bit report) === ddraw: ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 0. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 1. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x1, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x2, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x3, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 4x4, case 2. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 3. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 4. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 5. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x5, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x5, case 6. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x1, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x1, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x2, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x2, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x3, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x3, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 2x4, case 7. ddraw1.c:14874: Test failed: Got unexpected colour 000000ff, 3x4, case 7. === w864 (32 bit report) === ddraw: ddraw7.c:18676: Test failed: Got unexpected color 0x00000040. === debiant2 (32 bit Chinese:China report) === Report validation errors: ddraw2: Timeout === debiant2 (build log) === WineRunWineTest.pl:error: The task timed out

Nov. 8, 2021

Re: [PATCH 5/5] win32u: Don't use free_region in alloc_region.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Nov. 8, 2021

[PATCH 6/6] mfreadwrite/tests: Add a native I420 video media type attributes test.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 36 ++++++++++++++++++++- dlls/mfreadwrite/tests/resource.rc | 3 ++ dlls/mfreadwrite/tests/test-40x36-i420.avi | Bin 0 -> 66320 bytes 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 dlls/mfreadwrite/tests/test-40x36-i420.avi diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 9d2e17de4f1..a219eecce36 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1651,6 +1651,27 @@ static void test_media_types(void) }, }; + static const GUID unknown_attribute = {0xc496f370,0x2f8b,0x4f51,{0xae,0x46,0x9c,0xfc,0x1b,0xc8,0x2a,0x47}}; + static const struct media_type_desc video_40x36_i420_desc = + { + .items = + { + {.key = &MF_MT_MAJOR_TYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFMediaType_Video}}, + {.key = &MF_MT_SUBTYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFVideoFormat_I420}}, + {.key = &MF_MT_ALL_SAMPLES_INDEPENDENT, .value = {.vt = VT_UI4, .ulVal = 1}}, + {.key = &MF_MT_FIXED_SIZE_SAMPLES, .value = {.vt = VT_UI4, .ulVal = 1}, .todo_missing = TRUE}, + {.key = &MF_MT_SAMPLE_SIZE, .value = {.vt = VT_UI4, .ulVal = 40 * 36}, .todo_missing = TRUE}, + {.key = &MF_MT_DEFAULT_STRIDE, .value = {.vt = VT_UI4, .ulVal = 40}, .todo_missing = TRUE}, + {.key = &MF_MT_FRAME_RATE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (30ull << 32) | 1ull}}}, + {.key = &MF_MT_FRAME_SIZE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (40ull << 32) | 36ull}}}, + {.key = &MF_MT_INTERLACE_MODE, .value = {.vt = VT_UI4, .ulVal = MFVideoInterlace_MixedInterlaceOrProgressive}, .optional = TRUE /* > win7 */, .todo_missing = TRUE}, + {.key = &MF_MT_INTERLACE_MODE, .value = {.vt = VT_UI4, .ulVal = MFVideoInterlace_Progressive}, .optional = TRUE /* <= win7 */, .todo_missing = TRUE}, + {.key = &MF_MT_PIXEL_ASPECT_RATIO, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (1ull << 32) | 1ull}}, .todo_missing = TRUE}, + {.key = &MF_MT_TIMESTAMP_CAN_BE_DTS, .value = {.vt = VT_UI4, .ulVal = 1}, .optional = TRUE /* <= win7 */}, + {.key = &unknown_attribute, .value = {.vt = VT_UI4, .ulVal = 12}}, + }, + }; + struct test_audio_format { GUID subtype; @@ -1689,6 +1710,11 @@ static void test_media_types(void) {.subtype = MFVideoFormat_NV12, .current = &video_40x36_h264_nv12_desc, .actual = &video_48x48_h264_nv12_desc}, {.subtype = MFVideoFormat_I420, .current = &video_40x36_h264_i420_desc, .actual = &video_48x48_h264_i420_desc}, }; + struct test_video_format test_i420_formats[] = + { + {.subtype = MFVideoFormat_NV12}, + {.subtype = MFVideoFormat_I420, .current = &video_40x36_i420_desc, .actual = &video_40x36_i420_desc}, + }; struct test_media_type tests[] = { @@ -1710,6 +1736,12 @@ static void test_media_types(void) .video_formats = test_h264_formats, .video_format_count = ARRAY_SIZE(test_h264_formats), }, + { + .resource = "test-40x36-i420.avi", + .native = &video_40x36_i420_desc, + .video_formats = test_i420_formats, + .video_format_count = ARRAY_SIZE(test_i420_formats), + }, }; struct test_audio_format audio_format; @@ -1839,8 +1871,10 @@ static void test_media_types(void) hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &video_format.subtype); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, NULL, media_type); - ok(hr == S_OK, "Failed setting current media type %u, hr %#x.\n", j, hr); + if (video_format.current) ok(hr == S_OK, "Failed setting current media type %u, hr %#x.\n", j, hr); + else ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Succeeded setting current media type %u, hr %#x.\n", j, hr); IMFMediaType_Release(media_type); + if (hr != S_OK) continue; hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &media_type); ok(hr == S_OK, "Failed to get current mediatype, hr %#x.\n", hr); diff --git a/dlls/mfreadwrite/tests/resource.rc b/dlls/mfreadwrite/tests/resource.rc index 5ae9636d671..3f32c2abc30 100644 --- a/dlls/mfreadwrite/tests/resource.rc +++ b/dlls/mfreadwrite/tests/resource.rc @@ -26,3 +26,6 @@ test-48000.wav RCDATA test-48000.wav /* @makedep: test-40x36-h264.mp4 */ test-40x36-h264.mp4 RCDATA test-40x36-h264.mp4 + +/* @makedep: test-40x36-i420.avi */ +test-40x36-i420.avi RCDATA test-40x36-i420.avi diff --git a/dlls/mfreadwrite/tests/test-40x36-i420.avi b/dlls/mfreadwrite/tests/test-40x36-i420.avi new file mode 100644 index 0000000000000000000000000000000000000000..fde02cb07c7fffe8c4fadcd69addbb066a67e86f GIT binary patch literal 66320 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 WqD`Gsv>z`j+V-CnZQk#z_Wu9`QWzTm literal 0 HcmV?d00001 -- 2.33.1

Nov. 8, 2021

[PATCH 5/6] mfreadwrite/tests: Check media type attributes after reading a sample.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 157 +++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 051c7206e96..9d2e17de4f1 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1523,6 +1523,134 @@ static void test_media_types(void) }, }; + static const UINT32 actual_40x36_aperture[] = {0, 0, 40, 36}; + static const struct media_type_desc video_48x48_h264_nv12_desc = + { + .items = + { + {.key = &MF_MT_MAJOR_TYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFMediaType_Video}}, + {.key = &MF_MT_SUBTYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFVideoFormat_NV12}}, + {.key = &MF_MT_ALL_SAMPLES_INDEPENDENT, .value = {.vt = VT_UI4, .ulVal = 1}}, + {.key = &MF_MT_COMPRESSED, .value = {.vt = VT_UI4, .ulVal = 0}}, + {.key = &MF_MT_FIXED_SIZE_SAMPLES, .value = {.vt = VT_UI4, .ulVal = 1}, .todo_missing = TRUE}, + {.key = &MF_MT_SAMPLE_SIZE, .value = {.vt = VT_UI4, .ulVal = 48 * 48 * 3 / 2}, .todo_missing = TRUE}, + {.key = &MF_MT_AVG_BIT_ERROR_RATE, .value = {.vt = VT_UI4, .ulVal = 0}, .todo_missing = TRUE}, + {.key = &MF_MT_AVG_BITRATE, .value = {.vt = VT_UI4, .ulVal = 78904}, .todo_missing = TRUE}, + {.key = &MF_MT_DEFAULT_STRIDE, .value = {.vt = VT_UI4, .ulVal = 48}, .todo_missing = TRUE}, + {.key = &MF_MT_FRAME_RATE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (30ull << 32) | 1ull}}}, + {.key = &MF_MT_FRAME_SIZE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (48ull << 32) | 48ull}}, .todo_value = TRUE}, + {.key = &MF_MT_INTERLACE_MODE, .value = {.vt = VT_UI4, .ulVal = MFVideoInterlace_MixedInterlaceOrProgressive}, .todo_missing = TRUE}, + {.key = &MF_MT_PIXEL_ASPECT_RATIO, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (1ull << 32) | 1ull}}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_ROTATION, .value = {.vt = VT_UI4, .ulVal = 0}, .optional = TRUE /* <= win7 */}, + {.key = &MF_MT_YUV_MATRIX, .value = {.vt = VT_UI4, .ulVal = MFVideoTransferMatrix_BT601}, .todo_missing = TRUE}, + {.key = &MF_MT_TRANSFER_FUNCTION, .value = {.vt = VT_UI4, .ulVal = MFVideoTransFunc_709}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_NOMINAL_RANGE, .value = {.vt = VT_UI4, .ulVal = MFNominalRange_Wide}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_PRIMARIES, .value = {.vt = VT_UI4, .ulVal = MFVideoPrimaries_SMPTE170M}, .todo_missing = TRUE}, + { + .key = &MF_MT_GEOMETRIC_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + { + .key = &MF_MT_PAN_SCAN_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + { + .key = &MF_MT_MINIMUM_DISPLAY_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + }, + }; + static const struct media_type_desc video_48x48_h264_i420_desc = + { + .items = + { + {.key = &MF_MT_MAJOR_TYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFMediaType_Video}}, + {.key = &MF_MT_SUBTYPE, .value = {.vt = VT_CLSID, .puuid = (GUID *)&MFVideoFormat_I420}}, + {.key = &MF_MT_ALL_SAMPLES_INDEPENDENT, .value = {.vt = VT_UI4, .ulVal = 1}}, + {.key = &MF_MT_COMPRESSED, .value = {.vt = VT_UI4, .ulVal = 0}}, + {.key = &MF_MT_FIXED_SIZE_SAMPLES, .value = {.vt = VT_UI4, .ulVal = 1}, .todo_missing = TRUE}, + {.key = &MF_MT_SAMPLE_SIZE, .value = {.vt = VT_UI4, .ulVal = 48 * 48 * 3 / 2}, .todo_missing = TRUE}, + {.key = &MF_MT_AVG_BIT_ERROR_RATE, .value = {.vt = VT_UI4, .ulVal = 0}, .todo_missing = TRUE}, + {.key = &MF_MT_AVG_BITRATE, .value = {.vt = VT_UI4, .ulVal = 78904}, .todo_missing = TRUE}, + {.key = &MF_MT_DEFAULT_STRIDE, .value = {.vt = VT_UI4, .ulVal = 48}, .todo_missing = TRUE}, + {.key = &MF_MT_FRAME_RATE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (30ull << 32) | 1ull}}}, + {.key = &MF_MT_FRAME_SIZE, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (48ull << 32) | 48ull}}, .todo_value = TRUE}, + {.key = &MF_MT_INTERLACE_MODE, .value = {.vt = VT_UI4, .ulVal = MFVideoInterlace_MixedInterlaceOrProgressive}, .todo_missing = TRUE}, + {.key = &MF_MT_PIXEL_ASPECT_RATIO, .value = {.vt = VT_UI8, .uhVal = {.QuadPart = (1ull << 32) | 1ull}}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_ROTATION, .value = {.vt = VT_UI4, .ulVal = 0}, .optional = TRUE /* <= win7 */}, + {.key = &MF_MT_YUV_MATRIX, .value = {.vt = VT_UI4, .ulVal = MFVideoTransferMatrix_BT601}, .todo_missing = TRUE}, + {.key = &MF_MT_TRANSFER_FUNCTION, .value = {.vt = VT_UI4, .ulVal = MFVideoTransFunc_709}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_NOMINAL_RANGE, .value = {.vt = VT_UI4, .ulVal = MFNominalRange_Wide}, .todo_missing = TRUE}, + {.key = &MF_MT_VIDEO_PRIMARIES, .value = {.vt = VT_UI4, .ulVal = MFVideoPrimaries_SMPTE170M}, .todo_missing = TRUE}, + { + .key = &MF_MT_GEOMETRIC_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + { + .key = &MF_MT_PAN_SCAN_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + { + .key = &MF_MT_MINIMUM_DISPLAY_APERTURE, + .value = + { + .vt = VT_VECTOR|VT_UI1, + .caub = + { + .pElems = (BYTE *)actual_40x36_aperture, + .cElems = sizeof(actual_40x36_aperture), + } + }, + .todo_missing = TRUE, + }, + }, + }; + struct test_audio_format { GUID subtype; @@ -1535,6 +1663,7 @@ static void test_media_types(void) { GUID subtype; const struct media_type_desc *current; + const struct media_type_desc *actual; }; struct test_media_type @@ -1557,8 +1686,8 @@ static void test_media_types(void) struct test_video_format test_h264_formats[] = { - {.subtype = MFVideoFormat_NV12, .current = &video_40x36_h264_nv12_desc}, - {.subtype = MFVideoFormat_I420, .current = &video_40x36_h264_i420_desc}, + {.subtype = MFVideoFormat_NV12, .current = &video_40x36_h264_nv12_desc, .actual = &video_48x48_h264_nv12_desc}, + {.subtype = MFVideoFormat_I420, .current = &video_40x36_h264_i420_desc, .actual = &video_48x48_h264_i420_desc}, }; struct test_media_type tests[] = @@ -1588,6 +1717,8 @@ static void test_media_types(void) IMFMediaType *media_type; IMFSourceReader *reader; IMFByteStream *stream; + IMFSample *sample; + DWORD flags; HRESULT hr; int i, j; @@ -1658,6 +1789,17 @@ static void test_media_types(void) winetest_pop_context(); IMFMediaType_Release(media_type); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, NULL, &flags, NULL, &sample); + ok(hr == S_OK, "Failed to read sample, hr %#x\n", hr); + IMFSample_Release(sample); + + hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &media_type); + ok(hr == S_OK, "Failed to get current mediatype, hr %#x.\n", hr); + winetest_push_context("actual audio %u", j); + check_media_type_items(media_type, audio_format.current); + winetest_pop_context(); + IMFMediaType_Release(media_type); + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } @@ -1707,6 +1849,17 @@ static void test_media_types(void) winetest_pop_context(); IMFMediaType_Release(media_type); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &flags, NULL, &sample); + ok(hr == S_OK, "Failed to read sample, hr %#x\n", hr); + IMFSample_Release(sample); + + hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &media_type); + ok(hr == S_OK, "Failed to get current mediatype, hr %#x.\n", hr); + winetest_push_context("actual video %u", j); + check_media_type_items(media_type, video_format.actual); + winetest_pop_context(); + IMFMediaType_Release(media_type); + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } -- 2.33.1

Nov. 8, 2021