September 2020 - Wine-commits

Alexandre Julliard : makefiles: Define WINE_UNIX_LIB when building Unix libraries.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: 0b9c7eb295f568ffb1ec856bef2a99727a313736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9c7eb295f568ffb1ec856b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 18 15:05:44 2020 +0200 makefiles: Define WINE_UNIX_LIB when building Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index b7c26492eb..b3dd03645f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2384,6 +2384,7 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi strarray_add( &ret, strmake( "-I%s", make->include_paths.str[i] )); strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); + if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &ret, "-DWINE_UNIX_LIB" ); return ret; }

1 0

Alexandre Julliard : include: Don't use IsBadStringPtr in debug functions for Unix libraries.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: 2eed0cdb8f860d37f4efa631719a0a9ae4f721e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eed0cdb8f860d37f4efa631… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 18 15:13:19 2020 +0200 include: Don't use IsBadStringPtr in debug functions for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 44 -------------------------------------------- include/wine/debug.h | 4 ++++ 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 22d328b1ce..62b2ca1346 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3201,50 +3201,6 @@ BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) } -/************************************************************* - * IsBadStringPtrA - * - * IsBadStringPtrA replacement for ntdll, to catch exception in debug traces. - */ -BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) -{ - if (!str) return TRUE; - __TRY - { - volatile const char *p = str; - while (p != str + max) if (!*p++) break; - } - __EXCEPT_SYSCALL - { - return TRUE; - } - __ENDTRY - return FALSE; -} - - -/************************************************************* - * IsBadStringPtrW - * - * IsBadStringPtrW replacement for ntdll, to catch exception in debug traces. - */ -BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) -{ - if (!str) return TRUE; - __TRY - { - volatile const WCHAR *p = str; - while (p != str + max) if (!*p++) break; - } - __EXCEPT_SYSCALL - { - return TRUE; - } - __ENDTRY - return FALSE; -} - - /*********************************************************************** * virtual_uninterrupted_read_memory * diff --git a/include/wine/debug.h b/include/wine/debug.h index 912d61a90a..e064aaefb8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -225,7 +225,9 @@ static inline const char *wine_dbgstr_an( const char *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef WINE_UNIX_LIB if (IsBadStringPtrA( str, n )) return "(invalid)"; +#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = '"'; while (n-- > 0 && dst <= buffer + sizeof(buffer) - 9) @@ -267,7 +269,9 @@ static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef WINE_UNIX_LIB if (IsBadStringPtrW( str, n )) return "(invalid)"; +#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = 'L'; *dst++ = '"';

1 0

Piotr Caban : msasn1: Fix buffer allocations.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: d101fdb4499e174498c6378d1e47950113795009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d101fdb4499e174498c6378d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 18 14:30:23 2020 +0200 msasn1: Fix buffer allocations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index d151362905..fc867e7b81 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -56,7 +56,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, if (!encoder || !decoder || !freemem || !size) return module; - module = heap_alloc(sizeof(module)); + module = heap_alloc(sizeof(*module)); if (module) { module->nModuleName = magic; @@ -103,7 +103,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod if (!module || !encoder) return ASN1_ERR_BADARGS; - enc = heap_alloc(sizeof(enc)); + enc = heap_alloc(sizeof(*enc)); if (!enc) { return ASN1_ERR_MEMORY; @@ -153,7 +153,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod if (!module || !decoder) return ASN1_ERR_BADARGS; - dec = heap_alloc(sizeof(dec)); + dec = heap_alloc(sizeof(*dec)); if (!dec) { return ASN1_ERR_MEMORY;

1 0

Kevin Puetz : oleaut32/tests: Reformat test_dump_typelib.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: e556df2db5fb92316a67c8573fca9fbaf452c5c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e556df2db5fb92316a67c857… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 17 18:24:16 2020 -0500 oleaut32/tests: Reformat test_dump_typelib. Always print initializer for funcs[] array, even when empty Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 99 +++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e556df2db5fb92316a67…

1 0

Kevin Puetz : oleaut32/tests: Fix expect_wstr_acpval(...,NULL).
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: b43041d79af94e92c78f1897a6e4c95a4686b8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43041d79af94e92c78f1897… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 17 18:24:17 2020 -0500 oleaut32/tests: Fix expect_wstr_acpval(...,NULL). A NULL expected value is always a test failure, but printing the unexpected "wrong" value is more helpful than crashing. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3d5aeb0a26..6f68a201ba 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -53,7 +53,7 @@ { \ CHAR buf[260]; \ expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ - ok(strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ + ok(value && strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ } #define ole_expect(expr, expect) { \

1 0

Kevin Puetz : widl: All VARDESC fields of TKIND_UNION should have oInst=0.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: wine Branch: master Commit: 44ccc4f638a3b216bddb1bebbe98cae9b3921197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ccc4f638a3b216bddb1beb… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 17 18:24:18 2020 -0500 widl: All VARDESC fields of TKIND_UNION should have oInst=0. Also fix uninitialized value in this field for TKIND_DISPATCH. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7cfe9e146c..23d1dd8652 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1746,11 +1746,12 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typeinfo->datawidth += var_datawidth; break; case TKIND_UNION: - typedata[4] = typeinfo->datawidth; + typedata[4] = 0; typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth); break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ + typedata[4] = 0; typeinfo->datawidth = pointer_size; break; default:

1 0

Isabella Bosia : vkd3d-shader: Print oC registers as o in versions >= 4.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: vkd3d Branch: master Commit: 171f25e6a55478ddc18d9edc2013799ce7dba443 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=171f25e6a55478ddc18d9ed… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:14:43 2020 +0100 vkd3d-shader: Print oC registers as o in versions >= 4. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d86a84a..02abbf9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -700,7 +700,9 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, break; case VKD3DSPR_COLOROUT: - shader_addline(buffer, "oC"); + shader_addline(buffer, "o"); + if (!shader_ver_ge(shader_version, 4, 0)) + shader_addline(buffer, "C"); break; case VKD3DSPR_DEPTHOUT:

1 0

Isabella Bosia : vkd3d-shader: Print abs(x) as |x|.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: vkd3d Branch: master Commit: cf02e942eb7a5cf6f53c333ee5f3b34b2e3c1708 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf02e942eb7a5cf6f53c333… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:14:44 2020 +0100 vkd3d-shader: Print abs(x) as |x|. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 02abbf9..1e1f819 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1033,7 +1033,7 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "!"); if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) - shader_addline(buffer, "abs("); + shader_addline(buffer, "|"); shader_dump_register(buffer, &param->reg, shader_version); @@ -1051,8 +1051,8 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer, case VKD3DSPSM_X2NEG: shader_addline(buffer, "_x2"); break; case VKD3DSPSM_DZ: shader_addline(buffer, "_dz"); break; case VKD3DSPSM_DW: shader_addline(buffer, "_dw"); break; - case VKD3DSPSM_ABSNEG: shader_addline(buffer, ")"); break; - case VKD3DSPSM_ABS: shader_addline(buffer, ")"); break; + case VKD3DSPSM_ABSNEG: + case VKD3DSPSM_ABS: /* handled later */ break; default: shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier); } @@ -1076,6 +1076,8 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer, swizzle_chars[swizzle_z], swizzle_chars[swizzle_w]); } } + if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) + shader_addline(buffer, "|"); } static void shader_dump_ins_modifiers(struct vkd3d_string_buffer *buffer,

1 0

Isabella Bosia : vkd3d-shader: Make shader_dump_data_type print the type 4 times.
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: vkd3d Branch: master Commit: b27eac1cb53db90296e033541c3c5018a88abd5d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b27eac1cb53db90296e0335… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:14:45 2020 +0100 vkd3d-shader: Make shader_dump_data_type print the type 4 times. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 1e1f819..587c85c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -530,21 +530,24 @@ static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d { static const char *const data_type_names[] = { - /* VKD3D_DATA_FLOAT */ "(float)", - /* VKD3D_DATA_INT */ "(int)", - /* VKD3D_DATA_RESOURCE */ "(resource)", - /* VKD3D_DATA_SAMPLER */ "(sampler)", - /* VKD3D_DATA_UAV */ "(uav)", - /* VKD3D_DATA_UINT */ "(uint)", - /* VKD3D_DATA_UNORM */ "(unorm)", - /* VKD3D_DATA_SNORM */ "(snorm)", - /* VKD3D_DATA_OPAQUE */ "(opaque)", + /* VKD3D_DATA_FLOAT */ "float", + /* VKD3D_DATA_INT */ "int", + /* VKD3D_DATA_RESOURCE */ "resource", + /* VKD3D_DATA_SAMPLER */ "sampler", + /* VKD3D_DATA_UAV */ "uav", + /* VKD3D_DATA_UINT */ "uint", + /* VKD3D_DATA_UNORM */ "unorm", + /* VKD3D_DATA_SNORM */ "snorm", + /* VKD3D_DATA_OPAQUE */ "opaque", }; + const char *name; if (type <= ARRAY_SIZE(data_type_names)) - shader_addline(buffer, "%s", data_type_names[type]); + name = data_type_names[type]; else - shader_addline(buffer, "(unknown)"); + name = "unknown"; + + shader_addline(buffer, "(%s,%s,%s,%s)", name, name, name, name); } static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer,

1 0

Zebediah Figura : vkd3d: Print VK_MEMORY_HEAP_MULTI_INSTANCE_BIT in debug_vk_memory_heap_flags().
by Alexandre Julliard 18 Sep '20

18 Sep '20

Module: vkd3d Branch: master Commit: 1165ad3f0089e8675f9fa45b5b3cfa6f0ea0738f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1165ad3f0089e8675f9fa45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 17 22:44:22 2020 -0500 vkd3d: Print VK_MEMORY_HEAP_MULTI_INSTANCE_BIT in debug_vk_memory_heap_flags(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 7abfd42..f9f2663 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -699,11 +699,12 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) { - char buffer[50]; + char buffer[80]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } FLAG_TO_STR(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + FLAG_TO_STR(VK_MEMORY_HEAP_MULTI_INSTANCE_BIT) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags);

1 0