April 2021 - Wine-devel - list.winehq.org

[PATCH v2] winegstreamer: Poll gst_pad_query_duration before converting from byte length.
by Connor McAdams 26 Apr '21

26 Apr '21

Wait to query the pad duration until after caps are received, and poll gst_pad_query_duration a few times before giving up and trying to get duration by converting from byte-length. Fixes a bug in Fallout: New Vegas where the duration value is incorrect and causes the audio to loop. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5529321490e..e07fb7510ac 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1499,9 +1499,21 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static LONGLONG query_duration(GstPad *pad) { gint64 duration, byte_length; + unsigned int i; if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) return duration / 100; + /* + * Sometimes we query duration too early, try again a few times before + * giving up and trying to convert from byte length. If the duration can't + * be found after 50ms, we probably have a bigger issue. + */ + for (i = 0; i < 10; ++i) + { + g_usleep(5000); + if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) + return duration / 100; + } WARN("Failed to query time duration; trying to convert from byte length.\n"); @@ -1553,9 +1565,9 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s { struct wg_parser_stream *stream = parser->streams[i]; - stream->duration = query_duration(stream->their_src); while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); + stream->duration = query_duration(stream->their_src); if (parser->error) { pthread_mutex_unlock(&parser->mutex); -- 2.25.1

2 1

[PATCH] windowscodecs: Add stub for DdsFrameEncode.
by Ziqing Hui 26 Apr '21

26 Apr '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 234 ++++++++++++++++++++++++++++++++- 1 file changed, 231 insertions(+), 3 deletions(-)

2 1

[PATCH] mscoree: Initialize parsed_config_file private_path.
by Rémi Bernon 26 Apr '21

26 Apr '21

In case of error we may free uninitialized pointer otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The free happens in free_parsed_config_file, which is called unconditionnally after parse_config_file / parsed_config_stream. dlls/mscoree/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 38f304f3df8..b6aa647d876 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -617,6 +617,7 @@ static const struct ISAXErrorHandlerVtbl ConfigFileHandlerErrorVtbl = static void init_config(parsed_config_file *config) { list_init(&config->supported_runtimes); + config->private_path = NULL; } static HRESULT parse_config(VARIANT input, parsed_config_file *result) -- 2.31.0

2 1

[PATCH] advapi32: Introduce QueryTraceA()
by David Koolhoven 26 Apr '21

26 Apr '21

Provide QueryTraceA() to programs which need it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50992 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d5235c6adb9..1b7a83d347a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -603,7 +603,7 @@ @ stdcall -import QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall -import QueryServiceStatus(long ptr) @ stdcall -import QueryServiceStatusEx (long long ptr long ptr) -# @ stub QueryTraceA +@ stdcall QueryTraceA(int64 str ptr) @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUserServiceName # @ stub QueryUsersOnEncryptedFile diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index c01955e22d5..22e5a3f9d59 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -673,6 +673,15 @@ ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_ return ERROR_SUCCESS; } +/****************************************************************************** + * QueryTraceA [ADVAPI32.@] + */ +ULONG WINAPI QueryTraceA( TRACEHANDLE handle, LPCSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("%s %s %p: stub\n", wine_dbgstr_longlong(handle), debugstr_a(sessionname), properties); + return ERROR_WMI_INSTANCE_NOT_FOUND; +} + /****************************************************************************** * QueryTraceW [ADVAPI32.@] */ -- 2.19.1

1 0

[PATCH] windows.globalization: Fix an incorrect sizeof (Coverity).
by Sven Baars 26 Apr '21

26 Apr '21

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/windows.globalization/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 1c41e77d41b..b124f79c644 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -183,7 +183,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_GetMany(IVectorView_HSTRING *ifa TRACE("iface %p, start_index %#x, items %p, count %p.\n", iface, start_index, items, count); - memset(items, 0, items_size * sizeof(HSTRING *)); + memset(items, 0, items_size * sizeof(*items)); for (i = start_index; i < impl->count && i < start_index + items_size; ++i) if (FAILED(hr = WindowsDuplicateString(impl->values[i], items + i - start_index))) -- 2.30.0.335.ge6362826a0

3 5

[PATCH] winegstreamer: Poll gst_pad_query_duration before converting from byte length.
by Connor McAdams 26 Apr '21

26 Apr '21

Poll gst_pad_query_duration a few times before giving up and trying to get duration by converting from byte-length. Fixes a bug in Fallout: New Vegas where the duration value is incorrect and causes the audio to loop. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5529321490e..391b0b26532 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1499,9 +1499,21 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static LONGLONG query_duration(GstPad *pad) { gint64 duration, byte_length; + unsigned int i; if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) return duration / 100; + /* + * Sometimes we query duration too early, try again a few times before + * giving up and trying to convert from byte length. If the duration can't + * be found after 50ms, we probably have a bigger issue. + */ + for (i = 0; i < 10; ++i) + { + g_usleep(5000); + if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) + return duration / 100; + } WARN("Failed to query time duration; trying to convert from byte length.\n"); -- 2.25.1

1 1

[PATCH v7 1/4] kernel32/tests: Test renaming a file/directory to a different casing of itself or existing target.
by Gabriel Ivăncescu 26 Apr '21

26 Apr '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/file.c | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5deed96..bb05188 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1954,6 +1954,7 @@ static void test_MoveFileA(void) char tempdir[MAX_PATH]; char source[MAX_PATH], dest[MAX_PATH]; static const char prefix[] = "pfx"; + WIN32_FIND_DATAA find_data; HANDLE hfile; HANDLE hmapfile; DWORD ret; @@ -2023,9 +2024,72 @@ static void test_MoveFileA(void) ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); lstrcatA(tempdir, "Remove Me"); + + /* test renaming a file "Remove Me" to itself but in lowercase "me" */ + lstrcpyA(source, tempdir); + tempdir[lstrlenA(tempdir) - 2] = 'm'; + + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %s\n", source); + CloseHandle(hfile); + + ret = MoveFileA(source, tempdir); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + + /* test renaming another file "Remove Be" to "Remove Me", which replaces the existing "Remove me" */ + tempdir[lstrlenA(tempdir) - 2] = 'B'; + + hfile = CreateFileA(tempdir, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %s\n", tempdir); + CloseHandle(hfile); + + ret = MoveFileA(tempdir, source); + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "MoveFileA: expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ret = MoveFileExA(tempdir, source, MOVEFILE_REPLACE_EXISTING); + ok(ret, "MoveFileExA: failed, error %d\n", GetLastError()); + + tempdir[lstrlenA(tempdir) - 2] = 'm'; + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + ok(!lstrcmpA(strrchr(source, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on existing target file: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + + ret = DeleteFileA(tempdir); + ok(ret, "DeleteFileA: error %d\n", GetLastError()); + + /* now test a directory from "Remove me" to uppercase "Me" */ ret = CreateDirectoryA(tempdir, NULL); ok(ret == TRUE, "CreateDirectoryA failed\n"); + lstrcpyA(source, tempdir); + tempdir[lstrlenA(tempdir) - 2] = 'M'; + ret = MoveFileA(source, tempdir); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + lstrcpyA(source, dest); lstrcpyA(dest, tempdir); lstrcatA(dest, "\\wild?.*"); -- 2.30.0

4 8

[PATCH vkd3d 1/6] vkd3d-shader: Rename name_offset to name_bytecode_offset.
by Zebediah Figura 26 Apr '21

26 Apr '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3dc7a26b..0c755f46 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -136,9 +136,9 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - unsigned int reg_offset; - unsigned int name_offset; + + unsigned int name_bytecode_offset; }; struct hlsl_reg diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 1b5e8a27..2c07171b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1051,7 +1051,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ { LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - field->name_offset = buffer->count; + field->name_bytecode_offset = buffer->count; put_string(buffer, field->name); write_sm1_type(buffer, field->type, ctab_start); } @@ -1060,7 +1060,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - put_dword(buffer, (field->name_offset - ctab_start) * sizeof(*buffer->data)); + put_dword(buffer, (field->name_bytecode_offset - ctab_start) * sizeof(*buffer->data)); put_dword(buffer, (field->type->bytecode_offset - ctab_start) * sizeof(*buffer->data)); ++field_count; } -- 2.31.1

5 17

[PATCH 1/4] include: Always define u_* types in winsock.h.
by Zebediah Figura 26 Apr '21

26 Apr '21

All modules either build with msvcrt headers or define USE_WS_PREFIX now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/msvcrt/sys/types.h | 8 -------- include/winsock.h | 21 +++++---------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index b44aa386d44..47af7752a5d 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -46,14 +46,6 @@ typedef int _off_t; #define _OFF_T_DEFINED #endif -#ifndef _BSDTYPES_DEFINED -typedef unsigned char u_char; -typedef unsigned short u_short; -typedef unsigned int u_int; -typedef __msvcrt_ulong u_long; -#define _BSDTYPES_DEFINED -#endif - #define dev_t _dev_t #define ino_t _ino_t #define mode_t _mode_t diff --git a/include/winsock.h b/include/winsock.h index cafac1a1723..1d33d573329 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -114,28 +114,17 @@ #include <inaddr.h> -#ifdef USE_WS_PREFIX -typedef unsigned char WS_u_char; -typedef unsigned short WS_u_short; -typedef unsigned int WS_u_int; -typedef ULONG WS_u_long; -#elif (defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED) -/* MinGW doesn't define the u_xxx types */ -typedef unsigned char u_char; -typedef unsigned short u_short; -typedef unsigned int u_int; -typedef ULONG u_long; -#define _BSDTYPES_DEFINED -#else -#define u_long ULONG /* make sure we don't use the system u_long */ -#endif - #ifdef USE_WS_PREFIX # define WS(x) WS_##x #else # define WS(x) x #endif +typedef unsigned char WS(u_char); +typedef unsigned short WS(u_short); +typedef unsigned int WS(u_int); +typedef ULONG WS(u_long); + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -- 2.30.2

4 7

[PATCH v4 1/5] wined3d: Add VK_BUFFER_USAGE_VERTEX_BUFFER_BIT to the null buffer's usage.
by Jan Sikorski 26 Apr '21

26 Apr '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf4c37756a7..f3d7cff74bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -652,7 +652,7 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk vk_info = context_vk->vk_info; usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT - | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; + | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; -- 2.30.2

2 6