February 2023 - Wine-commits

Alexandre Julliard : oledlg: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 3485d4de1d436c8519224e39d57c3dcbaa4939a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3485d4de1d436c8519224e39d57c3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:26:38 2023 +0100 oledlg: Use standard va_list instead of __ms_va_list. --- dlls/oledlg/oledlg_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 33e62f64935..c568610b0c9 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -207,7 +207,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, args[1] = (DWORD_PTR)objecttype; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, - resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args); + resstrW, 0, 0, (WCHAR*)&str, 0, (va_list *)args); RemoveMenu(hMenu, uPos, MF_BYPOSITION); InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING, idmin, str); @@ -247,7 +247,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, args[0] = (DWORD_PTR)objecttype; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, - resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args); + resstrW, 0, 0, (WCHAR*)&str, 0, (va_list *)args); InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_POPUP|MF_STRING, (UINT_PTR)submenu, str); HeapFree(GetProcessHeap(), 0, str);

1 0

Alexandre Julliard : setupapi: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: d3a9fa181cbf81f6b920d6ddc3760e78d1d18601 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3a9fa181cbf81f6b920d6ddc3760e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:26:51 2023 +0100 setupapi: Use standard va_list instead of __ms_va_list. --- dlls/setupapi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 5a0eadcb760..6515027484a 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -73,7 +73,7 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) args[1] = (DWORD_PTR)unknown; } FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - format, 0, 0, message, ARRAY_SIZE(message), (__ms_va_list*)args); + format, 0, 0, message, ARRAY_SIZE(message), (va_list *)args); SetDlgItemTextW(hwnd, IDC_FILENEEDED, message); LoadStringW(SETUPAPI_hInstance, IDS_INFO, message, ARRAY_SIZE(message));

1 0

Alexandre Julliard : wineusb.sys: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 2528482aef060919f798f7b7c0c46b83e00c4072 URL: https://gitlab.winehq.org/wine/wine/-/commit/2528482aef060919f798f7b7c0c46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:27:03 2023 +0100 wineusb.sys: Use standard va_list instead of __ms_va_list. --- dlls/wineusb.sys/wineusb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index f965241d59e..801393cacf6 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -331,11 +331,11 @@ struct string_buffer static void WINAPIV append_id(struct string_buffer *buffer, const WCHAR *format, ...) { - __ms_va_list args; + va_list args; WCHAR *string; int len; - __ms_va_start(args, format); + va_start(args, format); len = _vsnwprintf(NULL, 0, format, args) + 1; if (!(string = ExAllocatePool(PagedPool, (buffer->len + len) * sizeof(WCHAR)))) @@ -354,7 +354,7 @@ static void WINAPIV append_id(struct string_buffer *buffer, const WCHAR *format, buffer->string = string; buffer->len += len; - __ms_va_end(args); + va_end(args); } static void get_device_id(const struct usb_device *device, struct string_buffer *buffer)

1 0

Alexandre Julliard : ntdll: Consistently initialize x86-64 signal handlers.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: c0300913989379b19c20114352adb571cac1c177 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0300913989379b19c20114352adb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 16:57:16 2023 +0100 ntdll: Consistently initialize x86-64 signal handlers. Spotted by Eric Pouech. --- dlls/ntdll/unix/signal_x86_64.c | 48 ++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 80d39406ada..9cb5d8199d7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -812,7 +812,7 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex /*********************************************************************** * init_handler */ -static inline void init_handler( const ucontext_t *sigcontext ) +static inline ucontext_t *init_handler( void *sigcontext ) { #ifdef __linux__ if (fs32_sel) @@ -821,6 +821,7 @@ static inline void init_handler( const ucontext_t *sigcontext ) arch_prctl( ARCH_SET_FS, ((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb ); } #endif + return sigcontext; } @@ -845,8 +846,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex { CONTEXT *context = &xcontext->c; - init_handler( sigcontext ); - context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); @@ -1969,10 +1968,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; struct xcontext context; - ucontext_t *ucontext = sigcontext; + ucontext_t *ucontext = init_handler( sigcontext ); rec.ExceptionAddress = (void *)RIP_sig(ucontext); - save_context( &context, sigcontext ); + save_context( &context, ucontext ); switch(TRAP_sig(ucontext)) { @@ -2008,7 +2007,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (void *)RSP_sig(ucontext) ); if (!rec.ExceptionCode) { - leave_handler( sigcontext ); + leave_handler( ucontext ); return; } break; @@ -2016,7 +2015,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (EFL_sig(ucontext) & 0x00040000) { EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ - leave_handler( sigcontext ); + leave_handler( ucontext ); return; } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -2033,8 +2032,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } - if (handle_syscall_fault( sigcontext, &rec, &context.c )) return; - setup_raise_exception( sigcontext, &rec, &context ); + if (handle_syscall_fault( ucontext, &rec, &context.c )) return; + setup_raise_exception( ucontext, &rec, &context ); } @@ -2047,12 +2046,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; struct xcontext context; - ucontext_t *ucontext = sigcontext; + ucontext_t *ucontext = init_handler( sigcontext ); - if (handle_syscall_trap( sigcontext )) return; + if (handle_syscall_trap( ucontext )) return; rec.ExceptionAddress = (void *)RIP_sig(ucontext); - save_context( &context, sigcontext ); + save_context( &context, ucontext ); switch (TRAP_sig(ucontext)) { @@ -2068,7 +2067,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[0] = 0; break; } - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( ucontext, &rec, &context ); } @@ -2080,7 +2079,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; - ucontext_t *ucontext = sigcontext; + ucontext_t *ucontext = init_handler( sigcontext ); switch (siginfo->si_code) { @@ -2121,7 +2120,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[1] = FPU_sig(ucontext) ? FPU_sig(ucontext)->MxCsr : 0; if (CS_sig(ucontext) != cs64_sel) rec.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; } - setup_exception( sigcontext, &rec ); + setup_exception( ucontext, &rec ); } @@ -2132,12 +2131,16 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { + ucontext_t *ucontext = init_handler( sigcontext ); HANDLE handle; - if (!p__wine_ctrl_routine) return; - if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), - p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) - NtClose( handle ); + if (p__wine_ctrl_routine) + { + if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), + p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) + NtClose( handle ); + } + leave_handler( ucontext ); } @@ -2148,9 +2151,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { + ucontext_t *ucontext = init_handler( sigcontext ); EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( ucontext, &rec ); } @@ -2171,11 +2175,11 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *ucontext ) * * Handler for SIGUSR1, used to signal a thread that it got suspended. */ -static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) +static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { + ucontext_t *ucontext = init_handler( sigcontext ); struct xcontext context; - init_handler( ucontext ); if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs;

1 0

Alexandre Julliard : ntdll: Avoid a misleading indentation warning.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: bd739062d94f371a9e783db384fdc79890aaaee3 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd739062d94f371a9e783db384fdc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 18:28:56 2023 +0100 ntdll: Avoid a misleading indentation warning. --- dlls/ntdll/unix/dwarf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index 9acda7ca985..906366cf894 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -934,7 +934,7 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context, case DW_OP_eq: stack[sp-1] = (stack[sp-1] == stack[sp]); sp--; break; case DW_OP_ne: stack[sp-1] = (stack[sp-1] != stack[sp]); sp--; break; case DW_OP_skip: tmp = (short)dwarf_get_u2(&p); p += tmp; break; - case DW_OP_bra: tmp = (short)dwarf_get_u2(&p); if (!stack[sp--]) p += tmp; break; + case DW_OP_bra: tmp = (short)dwarf_get_u2(&p); if (!stack[sp--]) { p += tmp; } break; case DW_OP_GNU_encoded_addr: tmp = *p++; stack[++sp] = dwarf_get_ptr( &p, tmp, bases ); break; case DW_OP_regx: stack[++sp] = *(ULONG_PTR *)get_context_reg( context, dwarf_get_uleb128(&p) ); break; case DW_OP_bregx:

1 0

Paul Gofman : winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4().
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 98fb788212d499ec01495f3aadf7fb2e759d9491 URL: https://gitlab.winehq.org/wine/wine/-/commit/98fb788212d499ec01495f3aadf7fb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 3 18:48:03 2023 -0600 winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4(). --- dlls/winegstreamer/aac_decoder.c | 2 -- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/mfplat.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 8366ac7bb36..d79ede69c9d 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DECLARE_DEBUG_CHANNEL(winediag); -extern const GUID MFAudioFormat_RAW_AAC; - static struct { const GUID *const guid; diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 1e4aad32f44..5b4c01a3cd0 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -148,4 +148,6 @@ HRESULT aac_decoder_create(REFIID riid, void **ret); HRESULT h264_decoder_create(REFIID riid, void **ret); HRESULT video_processor_create(REFIID riid, void **ret); +extern const GUID MFAudioFormat_RAW_AAC; + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 34731a23e1e..032d352b7cc 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -863,7 +863,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless)) mf_media_type_to_wg_format_audio_wma(type, &subtype, format); - else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC)) + else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC) || IsEqualGUID(&subtype, &MFAudioFormat_RAW_AAC)) mf_media_type_to_wg_format_audio_mpeg4(type, format); else mf_media_type_to_wg_format_audio(type, &subtype, format);

1 0

Paul Gofman : winegstreamer: Fix getting codec data for raw aac.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: a646aa4433bf3bebbdf4242a1eda3bfae017c24d URL: https://gitlab.winehq.org/wine/wine/-/commit/a646aa4433bf3bebbdf4242a1eda3b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 14 14:05:00 2023 -0600 winegstreamer: Fix getting codec data for raw aac. --- dlls/winegstreamer/mfplat.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 032d352b7cc..d7c67de0fca 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -624,7 +624,7 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth); } -static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg_format *format) +static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { /* Audio specific config is stored at after HEAACWAVEINFO in MF_MT_USER_DATA * https://docs.microsoft.com/en-us/windows/win32/api/mmreg/ns-mmreg-heaacwave… @@ -646,6 +646,7 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg BYTE buffer[64]; HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer; UINT32 codec_data_size; + BOOL raw_aac; if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, buffer, sizeof(buffer), &codec_data_size))) { @@ -653,12 +654,18 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg return; } - codec_data_size -= min(codec_data_size, offsetof(HEAACWAVEFORMAT, pbAudioSpecificConfig)); + raw_aac = IsEqualGUID(subtype, &MFAudioFormat_RAW_AAC); + if (!raw_aac) + codec_data_size -= min(codec_data_size, offsetof(HEAACWAVEFORMAT, pbAudioSpecificConfig)); if (codec_data_size > sizeof(format->u.audio_mpeg4.codec_data)) { FIXME("Codec data needs %u bytes.\n", codec_data_size); return; } + if (raw_aac) + memcpy(format->u.audio_mpeg4.codec_data, buffer, codec_data_size); + else + memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG4; @@ -666,7 +673,6 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg format->u.audio_mpeg4.payload_type = -1; format->u.audio_mpeg4.codec_data_len = codec_data_size; - memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); } static enum wg_video_format mf_video_format_to_wg(const GUID *subtype) @@ -864,7 +870,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless)) mf_media_type_to_wg_format_audio_wma(type, &subtype, format); else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC) || IsEqualGUID(&subtype, &MFAudioFormat_RAW_AAC)) - mf_media_type_to_wg_format_audio_mpeg4(type, format); + mf_media_type_to_wg_format_audio_mpeg4(type, &subtype, format); else mf_media_type_to_wg_format_audio(type, &subtype, format); }

1 0

Paul Gofman : winegstreamer: Use default 0 for _AAC_PAYLOAD_TYPE if not set.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 31b3978c12bce7705f00771bf2b9f7c8bed7ffa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/31b3978c12bce7705f00771bf2b9f7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 14 14:08:31 2023 -0600 winegstreamer: Use default 0 for _AAC_PAYLOAD_TYPE if not set. --- dlls/winegstreamer/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index d7c67de0fca..4cd095fb82e 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -670,7 +670,7 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUI format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG4; if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AAC_PAYLOAD_TYPE, &format->u.audio_mpeg4.payload_type))) - format->u.audio_mpeg4.payload_type = -1; + format->u.audio_mpeg4.payload_type = 0; format->u.audio_mpeg4.codec_data_len = codec_data_size; }

1 0

Paul Gofman : mf/tests: Add basic tests for raw aac decode.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: adbbe2596f3c2df41700d892a87796b48d6667d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/adbbe2596f3c2df41700d892a87796… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 14 14:09:50 2023 -0600 mf/tests: Add basic tests for raw aac decode. --- dlls/mf/tests/transform.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f1d7ffbc071..f806485df78 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -2223,7 +2223,7 @@ failed: CoUninitialize(); } -static void test_aac_decoder(void) +static void test_aac_decoder_subtype(const struct attribute_desc *input_type_desc) { const GUID *const class_id = &CLSID_MSAACDecMFT; const struct transform_info expect_mft_info = @@ -2313,19 +2313,6 @@ static void test_aac_decoder(void) /* more AAC decoder specific attributes from CODECAPI */ {0}, }; - const struct attribute_desc input_type_desc[] = - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio, .required = TRUE), - ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_AAC, .required = TRUE), - ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100, .required = TRUE), - ATTR_BLOB(MF_MT_USER_DATA, aac_codec_data, sizeof(aac_codec_data), .required = TRUE), - ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), - ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), - ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000), - ATTR_UINT32(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 41), - ATTR_UINT32(MF_MT_AAC_PAYLOAD_TYPE, 0), - {0}, - }; static const struct attribute_desc output_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio, .required = TRUE), @@ -2545,6 +2532,36 @@ failed: CoUninitialize(); } +static void test_aac_decoder(void) +{ + static const BYTE aac_raw_codec_data[] = {0x12, 0x08}; + static const struct attribute_desc raw_aac_input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio, .required = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_RAW_AAC1, .required = TRUE), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100, .required = TRUE), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_BLOB(MF_MT_USER_DATA, aac_raw_codec_data, sizeof(aac_raw_codec_data), .required = TRUE), + {0}, + }; + static const struct attribute_desc aac_input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio, .required = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_AAC, .required = TRUE), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100, .required = TRUE), + ATTR_BLOB(MF_MT_USER_DATA, aac_codec_data, sizeof(aac_codec_data), .required = TRUE), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000), + ATTR_UINT32(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 41), + ATTR_UINT32(MF_MT_AAC_PAYLOAD_TYPE, 0), + {0}, + }; + + test_aac_decoder_subtype(aac_input_type_desc); + test_aac_decoder_subtype(raw_aac_input_type_desc); +} + static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; static const ULONG wmaenc_block_size = 1487; static const ULONG wmadec_block_size = 0x2000;

1 0

Zebediah Figura : mfsrcsnk: Add missing DllGetClassObject() export.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: d85bc9f433496d02765727d445a459b7835b3bfc URL: https://gitlab.winehq.org/wine/wine/-/commit/d85bc9f433496d02765727d445a459… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 23:40:32 2023 -0600 mfsrcsnk: Add missing DllGetClassObject() export. --- dlls/mfsrcsnk/mfsrcsnk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfsrcsnk/mfsrcsnk.spec b/dlls/mfsrcsnk/mfsrcsnk.spec index ab9f2e4c207..485fba3bb31 100644 --- a/dlls/mfsrcsnk/mfsrcsnk.spec +++ b/dlls/mfsrcsnk/mfsrcsnk.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall MFCreateWAVEMediaSink(ptr ptr ptr)

1 0