October 2022 - Wine-Commits

Daniel Lehman : kernel32/tests: Add tests for CancelSynchronousIo.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 3a4674f2568c53b4ff64379abc227ec211a18dc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a4674f2568c53b4ff64379abc227e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 kernel32/tests: Add tests for CancelSynchronousIo. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7fa3c313d47..55890cc9172 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -37,6 +37,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); +static BOOL (WINAPI *pCancelSynchronousIo)(HANDLE handle); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); @@ -4202,6 +4203,108 @@ static void test_exit_process_async(void) CloseHandle(server); } +static DWORD CALLBACK synchronousIoThreadMain(void *arg) +{ + HANDLE pipe; + BOOL ret; + + pipe = arg; + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %lu\n", GetLastError()); + return 0; +} + +static DWORD CALLBACK synchronousIoThreadMain2(void *arg) +{ + OVERLAPPED ov; + HANDLE pipe; + BOOL ret; + + pipe = arg; + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, &ov); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %lu\n", GetLastError()); + ret = WaitForSingleObject(ov.hEvent, 1000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", ret); + CloseHandle(ov.hEvent); + return 0; +} + +static void test_CancelSynchronousIo(void) +{ + BOOL res; + DWORD wait; + HANDLE file; + HANDLE pipe; + HANDLE thread; + + /* bogus values */ + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo((HANDLE)0xdeadbeef); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, + "In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(GetCurrentThread()); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + + /* synchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain, pipe, 0, NULL); + /* wait for I/O to start, which transitions the pipe handle from signaled to nonsignaled state. */ + while ((wait = WaitForSingleObject(pipe, 0)) == WAIT_OBJECT_0) Sleep(1); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError()); + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(thread); + todo_wine + { + ok(res, "CancelSynchronousIo failed with error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "In CancelSynchronousIo failure, expected 0xdeadbeef got %ld\n", GetLastError()); + } + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + CancelIoEx(pipe, NULL); + wait = WaitForSingleObject(thread, 1000); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", wait); + CloseHandle(thread); + CloseHandle(pipe); + + /* asynchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain2, pipe, 0, NULL); + /* wait for I/O to start, which transitions the pipe handle from signaled to nonsignaled state. */ + while ((wait = WaitForSingleObject(pipe, 0)) == WAIT_OBJECT_0) Sleep(1); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError()); + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(thread); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(file); + CloseHandle(pipe); +} + START_TEST(pipe) { char **argv; @@ -4212,6 +4315,7 @@ START_TEST(pipe) pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); hmod = GetModuleHandleA("kernel32.dll"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + pCancelSynchronousIo = (void *) GetProcAddress(hmod, "CancelSynchronousIo"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); @@ -4282,4 +4386,5 @@ START_TEST(pipe) test_nowait(PIPE_TYPE_MESSAGE); test_GetOverlappedResultEx(); test_exit_process_async(); + test_CancelSynchronousIo(); }

1 0

Daniel Lehman : ntdll: Add NtCancelSynchronousIoFile stub.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 05d00d5e78b02b10d19ddc8e6310e9b3d84b19b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/05d00d5e78b02b10d19ddc8e6310e9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 ntdll: Add NtCancelSynchronousIoFile stub. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/pipe.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 9 +++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/file.c | 18 ++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 7 files changed, 186 insertions(+)

1 0

David Kahurani : xmllite/writer: Null terminate duplicated strings.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 556b3981b7aab37dcc184ff8c4682f5d079f8be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/556b3981b7aab37dcc184ff8c4682f… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Oct 10 16:01:23 2022 +0300 xmllite/writer: Null terminate duplicated strings. Strings are not being "partially duplicated", but duplicated with explicit length. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index c4f9ed2f440..065716f7e8c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -250,7 +250,6 @@ static struct element *pop_element(xmlwriter *writer) static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len) { - size_t size; WCHAR *ret; if (!str) @@ -259,9 +258,12 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len if (len == -1) len = lstrlenW(str); - size = (len + 1) * sizeof(WCHAR); - ret = writer_alloc(writer, size); - if (ret) memcpy(ret, str, size); + ret = writer_alloc(writer, (len + 1) * sizeof(WCHAR)); + if (ret) + { + memcpy(ret, str, len * sizeof(WCHAR)); + ret[len] = 0; + } return ret; }

1 0

Zebediah Figura : include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 303ce66cef72d33d429dd6a51962fb23567b602a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/303ce66cef72d33d429dd6a51962f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 23 14:55:01 2021 -0600 include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW. The default for MinGW is always ms_printf rather than gnu_printf, but if we are using ucrtbase or ANSI stdio, we want gnu_printf. --- include/private/vkd3d_common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 9a2de265..78a15c19 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -54,7 +54,11 @@ static inline size_t align(size_t addr, size_t alignment) #ifdef __GNUC__ # define VKD3D_NORETURN __attribute__((noreturn)) -# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# ifdef __MINGW_PRINTF_FORMAT +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args))) +# else +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# endif # define VKD3D_UNUSED __attribute__((unused)) # define VKD3D_UNREACHABLE __builtin_unreachable() #else

1 0

Alexandre Julliard : Wine release 7.19
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: website Branch: master Commit: d06c85defe246e8be11c91396b63b801c4a7eaf0 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/d06c85defe246e8be11c91396b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:39:33 2022 +0200 Wine release 7.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022101401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022101401.xml b/news/en/2022101401.xml new file mode 100644 index 00000000..361026e6 --- /dev/null +++ b/news/en/2022101401.xml @@ -0,0 +1,16 @@ +<news> +<date>October 14, 2022</date> +<title>Wine 7.19 Released</title> +<body> + The Wine development release 7.19 is now available. + <a href="{$root}/announce/7.19">What's new</a> in this release: +<ul> + <li>Support for storing DOS attributes on disk.</li> + <li>Bundled vkd3d upgraded to version 1.5.</li> + <li>Support for MPEG-4 audio format.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.19 : Alexandre Julliard : Release 7.19
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: refs/tags/wine-7.19 Tag: 304bddfa3a32af2368b11ce12771ea4e68ce8948 URL: https://gitlab.winehq.org/wine/wine/-/tags/304bddfa3a32af2368b11ce12771ea4e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19

1 0

Alexandre Julliard : Release 7.19.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: e3f00bf7c944f1cde6151fde969f2b49649c3de7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3f00bf7c944f1cde6151fde969f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19. --- ANNOUNCE | 678 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 360 insertions(+), 338 deletions(-)

1 0

Henri Verbeet : wined3d: Handle VKD3D_SHADER_RESOURCE_DATA_MIXED in wined3d_data_type_from_vkd3d().
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: 00187d64f07e02c438f6a8fcdf4df76ecd2a699a URL: https://gitlab.winehq.org/wine/wine/-/commit/00187d64f07e02c438f6a8fcdf4df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 12 14:55:39 2022 +0200 wined3d: Handle VKD3D_SHADER_RESOURCE_DATA_MIXED in wined3d_data_type_from_vkd3d(). --- dlls/wined3d/shader_spirv.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 42be7541d67..fe1cc03e9f4 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -25,6 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); static const struct wined3d_shader_backend_ops spirv_shader_backend_vk; +static const struct vkd3d_shader_compile_option spirv_compile_options[] = +{ + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, +}; + struct shader_spirv_resource_bindings { struct vkd3d_shader_resource_binding *bindings; @@ -266,8 +271,8 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con info.source.size = shader_desc->byte_code_size; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - info.options = NULL; - info.option_count = 0; + info.options = spirv_compile_options; + info.option_count = ARRAY_SIZE(spirv_compile_options); info.log_level = VKD3D_SHADER_LOG_WARNING; info.source_name = NULL; @@ -596,6 +601,8 @@ static enum wined3d_data_type wined3d_data_type_from_vkd3d(enum vkd3d_shader_res return WINED3D_DATA_UINT; case VKD3D_SHADER_RESOURCE_DATA_FLOAT: return WINED3D_DATA_FLOAT; + case VKD3D_SHADER_RESOURCE_DATA_MIXED: + return WINED3D_DATA_UINT; default: FIXME("Unhandled resource data type %#x.\n", t); return WINED3D_DATA_FLOAT; @@ -703,8 +710,8 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, info.source.size = shader->byte_code_size; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - info.options = NULL; - info.option_count = 0; + info.options = spirv_compile_options; + info.option_count = ARRAY_SIZE(spirv_compile_options); info.log_level = VKD3D_SHADER_LOG_WARNING; info.source_name = NULL;

1 0

Rémi Bernon : winegstreamer: Support MPEG4 (AAC) compressed audio format.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: 4199bb7fab8e2e2eb0bea844733787f517e693d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4199bb7fab8e2e2eb0bea844733787… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 12:45:14 2022 +0200 winegstreamer: Support MPEG4 (AAC) compressed audio format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 --- dlls/winegstreamer/mfplat.c | 48 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/quartz_parser.c | 2 ++ dlls/winegstreamer/unixlib.h | 7 ++++++ dlls/winegstreamer/wg_format.c | 34 +++++++++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 2 ++ dlls/winegstreamer/wm_reader.c | 4 ++++ 6 files changed, 97 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 9e6a43a3414..d7d6810965e 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -550,6 +550,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) switch (format->major_type) { case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: @@ -618,6 +619,51 @@ 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) +{ + /* 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… + */ + typedef struct + { + WORD wPayloadType; + WORD wAudioProfileLevelIndication; + WORD wStructType; + WORD wReserved1; + DWORD dwReserved2; + } HEAACWAVEINFO; + typedef struct + { + HEAACWAVEINFO wfInfo; + BYTE pbAudioSpecificConfig[1]; + } HEAACWAVEFORMAT; + + BYTE buffer[64]; + HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer; + UINT32 codec_data_size; + + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, buffer, sizeof(buffer), &codec_data_size))) + { + FIXME("Codec data is not set.\n"); + return; + } + + 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; + } + + 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.codec_data_len = codec_data_size; + memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); +} + static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { UINT64 frame_rate, frame_size; @@ -781,6 +827,8 @@ 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)) + mf_media_type_to_wg_format_audio_mpeg4(type, format); else mf_media_type_to_wg_format_audio(type, &subtype, format); } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 55e5988e880..9369b529642 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -359,6 +359,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) } break; + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: FIXME("Format %u not implemented!\n", format->major_type); @@ -528,6 +529,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool switch (format->major_type) { + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: FIXME("Format %u not implemented!\n", format->major_type); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 8e6c5e4cc0e..9c53ecbfbc3 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -37,6 +37,7 @@ struct wg_format WG_MAJOR_TYPE_UNKNOWN = 0, WG_MAJOR_TYPE_AUDIO, WG_MAJOR_TYPE_AUDIO_MPEG1, + WG_MAJOR_TYPE_AUDIO_MPEG4, WG_MAJOR_TYPE_AUDIO_WMA, WG_MAJOR_TYPE_VIDEO, WG_MAJOR_TYPE_VIDEO_CINEPAK, @@ -70,6 +71,12 @@ struct wg_format uint32_t channels; } audio_mpeg1; struct + { + uint32_t payload_type; + uint32_t codec_data_len; + unsigned char codec_data[64]; + } audio_mpeg4; + struct { uint32_t version; uint32_t bitrate; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index b67c820dd71..7f28b4d2c90 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -346,6 +346,37 @@ static GstCaps *wg_format_to_caps_audio_mpeg1(const struct wg_format *format) return caps; } +static GstCaps *wg_format_to_caps_audio_mpeg4(const struct wg_format *format) +{ + GstBuffer *buffer; + GstCaps *caps; + + if (!(caps = gst_caps_new_empty_simple("audio/mpeg"))) + return NULL; + + gst_caps_set_simple(caps, "mpegversion", G_TYPE_INT, 4, NULL); + + switch (format->u.audio_mpeg4.payload_type) + { + case 0: gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "raw", NULL); break; + case 1: gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "adts", NULL); break; + case 2: gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "adif", NULL); break; + case 3: gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "loas", NULL); break; + } + + /* FIXME: Use gst_codec_utils_aac_caps_set_level_and_profile from GStreamer pbutils library */ + + if (format->u.audio_mpeg4.codec_data_len) + { + buffer = gst_buffer_new_and_alloc(format->u.audio_mpeg4.codec_data_len); + gst_buffer_fill(buffer, 0, format->u.audio_mpeg4.codec_data, format->u.audio_mpeg4.codec_data_len); + gst_caps_set_simple(caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); + gst_buffer_unref(buffer); + } + + return caps; +} + static GstCaps *wg_format_to_caps_audio(const struct wg_format *format) { GstAudioChannelPosition positions[32]; @@ -533,6 +564,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) return wg_format_to_caps_audio(format); case WG_MAJOR_TYPE_AUDIO_MPEG1: return wg_format_to_caps_audio_mpeg1(format); + case WG_MAJOR_TYPE_AUDIO_MPEG4: + return wg_format_to_caps_audio_mpeg4(format); case WG_MAJOR_TYPE_AUDIO_WMA: return wg_format_to_caps_audio_wma(format); case WG_MAJOR_TYPE_VIDEO: @@ -554,6 +587,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) switch (a->major_type) { case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: GST_FIXME("Format %u not implemented!", a->major_type); diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 486562fdff6..34b8d25c2e5 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -424,6 +424,7 @@ NTSTATUS wg_transform_create(void *args) goto out; /* fallthrough */ case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) @@ -474,6 +475,7 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index e68e0a7d0ca..55d98671931 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1555,6 +1555,8 @@ static const char *get_major_type_string(enum wg_major_type type) return "audio"; case WG_MAJOR_TYPE_AUDIO_MPEG1: return "mpeg1-audio"; + case WG_MAJOR_TYPE_AUDIO_MPEG4: + return "mpeg4-audio"; case WG_MAJOR_TYPE_AUDIO_WMA: return "wma"; case WG_MAJOR_TYPE_VIDEO: @@ -1971,6 +1973,7 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface, break; case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: @@ -2010,6 +2013,7 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o break; case WG_MAJOR_TYPE_AUDIO_MPEG1: + case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264:

1 0

Henri Verbeet : wined3d: Use the supplied context in wined3d_device_context_blt().
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: b3b2a5599454d2e8373819271a883981f09ef73c URL: https://gitlab.winehq.org/wine/wine/-/commit/b3b2a5599454d2e8373819271a8839… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 12 14:55:39 2022 +0200 wined3d: Use the supplied context in wined3d_device_context_blt(). Applications calling wined3d_device_context_resolve_sub_resource() on a deferred context would instead get this scheduled on the immediate context. Worse, because the original call was intended for a deferred context, we'd do this without taking the mutex required for immediate contexts, potentially corrupting the command stream. --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c76a50ea6ae..f385394497b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4168,8 +4168,8 @@ HRESULT CDECL wined3d_device_context_blt(struct wined3d_device_context *context, return E_NOTIMPL; } - wined3d_device_context_emit_blt_sub_resource(&dst_texture->resource.device->cs->c, &dst_texture->resource, - dst_sub_resource_idx, &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); + wined3d_device_context_emit_blt_sub_resource(context, &dst_texture->resource, dst_sub_resource_idx, + &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); if (dst_texture->dirty_regions) wined3d_texture_add_dirty_region(dst_texture, dst_sub_resource_idx, &dst_box);

1 0