September 2022 - Wine-commits

Eric Pouech : dbghelp: Don't load invalid records for global symbol stream.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 908004c3a96fd6eba2c1bb81e79183c4318cfc53 URL: https://gitlab.winehq.org/wine/wine/-/commit/908004c3a96fd6eba2c1bb81e79183… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 12:14:00 2022 +0200 dbghelp: Don't load invalid records for global symbol stream. Only load records that are listed in global hash file when handling the global symbol stream. Do the same thing for the public symbols. When using MS linker in incremental mode: - old variable definitions are kept in the (DBI) global symbol stream along side the new definition - but only the latest (valid) definition is referenced from the hash table Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 338 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 194 insertions(+), 144 deletions(-)

1 0

Eric Pouech : dbghelp: Improve de-duping global symbols information (PDB).
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 1c5eadb4823edc62a9b6ee8815b7947ea0a3e35c URL: https://gitlab.winehq.org/wine/wine/-/commit/1c5eadb4823edc62a9b6ee8815b794… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 12:14:01 2022 +0200 dbghelp: Improve de-duping global symbols information (PDB). We have dups in global / file static variables definition: - between compiland stream and global (DBI) stream (we need to de-dup these) - still adding variables only present global DBI stream - keeping in mind, we need to keep: + two variables of different names at same address (aliasing) + variables of same name at different addresses (MS linker generate those) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index aa5b0613a10..a5b688bae17 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1768,7 +1768,7 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, struct symt_block* block, const char* name, unsigned segment, unsigned offset, - unsigned symtype, BOOL is_local, BOOL in_tls, BOOL force) + unsigned symtype, BOOL is_local, BOOL in_tls, BOOL dontcheck) { if (name && *name) { @@ -1784,13 +1784,38 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, codeview_get_type(symtype, FALSE), name); return; } - if (force || in_tls || !symt_find_symbol_at(msc_dbg->module, loc.offset)) + if (!dontcheck && !in_tls) { - symt_new_global_variable(msc_dbg->module, compiland, - name, is_local, loc, 0, - codeview_get_type(symtype, FALSE)); + /* Check that we don't add twice the same variable */ + struct hash_table_iter hti; + void* ptr; + struct symt_ht* sym; + + hash_table_iter_init(&msc_dbg->module->ht_symbols, &hti, name); + while ((ptr = hash_table_iter_up(&hti))) + { + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); + if (symt_check_tag(&sym->symt, SymTagData) && !strcmp(sym->hash_elt.name, name)) + { + struct symt_data* symdata = (struct symt_data*)&sym->symt; + if (symdata->kind == (is_local ? DataIsFileStatic : DataIsGlobal) && + symdata->u.var.kind == loc.kind && + symdata->u.var.offset == loc.offset && + symdata->container == &compiland->symt) + { + /* We don't compare types yet... Unfortunately, they are not + * always the same typeid... it'd require full type equivalence + * (eg: we've seen 'int* foo' <> 'int[4] foo') + */ + return; + } + } + } } - } + if (is_local ^ (compiland != NULL)) FIXME("Unsupported construct\n"); + symt_new_global_variable(msc_dbg->module, compiland, name, is_local, loc, 0, + codeview_get_type(symtype, FALSE)); + } } struct cv_local_info

1 0

Alexandre Julliard : wmvcore/tests: Reduce the number of printed todos.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 967c39fa51357ea50f5876d4e06f59787f0aeff9 URL: https://gitlab.winehq.org/wine/wine/-/commit/967c39fa51357ea50f5876d4e06f59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 14:13:04 2022 +0200 wmvcore/tests: Reduce the number of printed todos. --- dlls/wmvcore/tests/wmvcore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 06e1852c8c0..aacff6f7bda 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3422,6 +3422,8 @@ START_TEST(wmvcore) if(hr != S_OK) return; + winetest_mute_threshold = 3; /* FIXME: thread tests print too many "got wrong thread" todos */ + test_wmreader_interfaces(); test_wmsyncreader_interfaces(); test_wmwriter_interfaces();

1 0

Alexandre Julliard : gdiplus: Get the compositing mode directly from the graphics object.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: fe7df461189e59e0e6d54a83ad3903f1fd93aa01 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7df461189e59e0e6d54a83ad3903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 14:44:35 2022 +0200 gdiplus: Get the compositing mode directly from the graphics object. GdipGetCompositingMode() fails when the object is busy, which happens when flushing changes in GdipReleaseDC(). Fixes a test crash on Gitlab CI. --- dlls/gdiplus/graphics.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a9f7a464ce3..fca66c8654b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -418,9 +418,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - CompositingMode comp_mode; - - GdipGetCompositingMode(graphics, &comp_mode); + CompositingMode comp_mode = graphics->compmode; for (y=0; y<src_height; y++) {

1 0

Jacek Caban : winevulkan: Pass VkVariable to ConversionFunction constructor.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: c39a71e3cded3c927bfa83882562e2683e12074e URL: https://gitlab.winehq.org/wine/wine/-/commit/c39a71e3cded3c927bfa83882562e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 18:18:12 2022 +0200 winevulkan: Pass VkVariable to ConversionFunction constructor. --- dlls/winevulkan/make_vulkan | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c0377ca9f17..87985f4296c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1395,16 +1395,10 @@ class VkMember(VkVariable): elif self.is_handle() or self.is_generic_handle(): direction = Direction.INPUT - operand = self.type_info["data"] - if self.is_dynamic_array(): - conversions.append(ConversionFunction(False, True, direction, operand)) - elif self.is_static_array(): - conversions.append(ConversionFunction(True, False, direction, operand)) - else: - conversions.append(ConversionFunction(False, False, direction, operand)) + conversions.append(ConversionFunction(self, direction)) if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), operand)) + conversions.append(FreeFunction(self.is_dynamic_array(), self.type_info["data"])) return conversions @@ -1526,20 +1520,20 @@ class VkParam(VkVariable): if not self.needs_conversion() and not self.needs_unwrapping(): return - operand = self.struct if self.is_struct() else self.handle - # Input functions require win to host conversion. if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, operand) + self.input_conv = ConversionFunction(self, Direction.INPUT) # Output functions require host to win conversion. if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, operand) + self.output_conv = ConversionFunction(self, Direction.OUTPUT) + # Dynamic arrays, but also some normal structs (e.g. VkCommandBufferBeginInfo) need memory # allocation and thus some cleanup. if self.is_dynamic_array() or self.struct.needs_free(): - self.free_func = FreeFunction(self.is_dynamic_array(), operand) + self.free_func = FreeFunction(self.is_dynamic_array(), + self.struct if self.is_struct() else self.handle) def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -2068,12 +2062,12 @@ class VkStruct(Sequence): class ConversionFunction(object): - def __init__(self, array, dyn_array, direction, operand): - self.array = array + def __init__(self, variable, direction): self.direction = direction - self.dyn_array = dyn_array - self.operand = operand - self.type = operand.name + self.array = variable.is_static_array() + self.dyn_array = variable.is_dynamic_array() + self.operand = variable.struct if variable.is_struct() else variable.handle + self.type = variable.type self._set_name()

1 0

Jacek Caban : winevulkan: Separate 32-bit and 64-bit conversion functions.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 1f1713b07ef4da66c39816a872fa102cddb37151 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f1713b07ef4da66c39816a872fa10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 27 22:47:18 2022 +0200 winevulkan: Separate 32-bit and 64-bit conversion functions. --- dlls/winevulkan/make_vulkan | 210 ++++----- dlls/winevulkan/vulkan_thunks.c | 996 ++++++++++++++++++++++++---------------- 2 files changed, 697 insertions(+), 509 deletions(-)

1 0

Alex Henrie : winegstreamer: Fix memory leak in get_available_media_type (Coverity).
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 1be02b2b60faf41d3fd9a8fbcf386cb21b6db4e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1be02b2b60faf41d3fd9a8fbcf386c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 28 10:19:02 2022 -0600 winegstreamer: Fix memory leak in get_available_media_type (Coverity). --- dlls/winegstreamer/resampler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index a9c9ae32e8a..87c76274085 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -269,15 +269,15 @@ static HRESULT get_available_media_type(DWORD index, IMFMediaType **type, BOOL o const GUID *subtype; HRESULT hr; - if (FAILED(hr = MFCreateMediaType(&media_type))) - return hr; - *type = NULL; if (index >= (output ? 2 : 1) * ARRAY_SIZE(audio_formats)) return MF_E_NO_MORE_TYPES; subtype = audio_formats[index % ARRAY_SIZE(audio_formats)]; + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) goto done; if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, subtype)))

1 0

Paul Gofman : winex11.drv: Do not skip taskbar and pager for app window.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: cb87c14fecad5a73ebd3aad8c88fab9648675f3d URL: https://gitlab.winehq.org/wine/wine/-/commit/cb87c14fecad5a73ebd3aad8c88fab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 27 18:43:04 2022 -0500 winex11.drv: Do not skip taskbar and pager for app window. --- dlls/winex11.drv/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a7030f69759..c0c6e779772 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -998,7 +998,8 @@ void update_net_wm_states( struct x11drv_win_data *data ) new_state |= (1 << NET_WM_STATE_ABOVE); if (!data->add_taskbar) { - if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) + if (data->skip_taskbar || (ex_style & WS_EX_NOACTIVATE) + || (ex_style & WS_EX_TOOLWINDOW && !(ex_style & WS_EX_APPWINDOW))) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); else if (!(ex_style & WS_EX_APPWINDOW) && NtUserGetWindowRelative( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR);

1 0

Giovanni Mascellani : include: Add missing vkd3d_shader_compile() transformations and chained structures.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: vkd3d Branch: master Commit: 73cf9dee8a75c348697656353b5a2c3e6e1b5807 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73cf9dee8a75c348697656353b5a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 28 15:27:28 2022 +0200 include: Add missing vkd3d_shader_compile() transformations and chained structures. --- include/vkd3d_shader.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 088f3e63..7178ac5f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1552,6 +1552,12 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * * This version of vkd3d-shader supports the following transformations: * - VKD3D_SHADER_SOURCE_DXBC_TPF to VKD3D_SHADER_TARGET_SPIRV_BINARY + * - VKD3D_SHADER_SOURCE_DXBC_TPF to VKD3D_SHADER_TARGET_SPIRV_TEXT + * (if vkd3d was compiled with SPIRV-Tools) + * - VKD3D_SHADER_SOURCE_DXBC_TPF to VKD3D_SHADER_TARGET_D3D_ASM + * - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_D3D_ASM + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_BYTECODE * * Supported transformations can also be detected at runtime with the functions * vkd3d_shader_get_supported_source_types() and @@ -1560,9 +1566,11 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * Depending on the source and target types, this function may support the * following chained structures: * - vkd3d_shader_interface_info + * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_spirv_domain_shader_target_info * - vkd3d_shader_spirv_target_info * - vkd3d_shader_transform_feedback_info + * - vkd3d_shader_hlsl_source_info * * \param compile_info A chained structure containing compilation parameters. *

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_new_float_constant() helper.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: vkd3d Branch: master Commit: 4c5fd9c7b96e45a769bd21f1b6adcf2469083431 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c5fd9c7b96e45a769bd21f1b6adc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:50:04 2022 -0500 vkd3d-shader/hlsl: Introduce a hlsl_new_float_constant() helper. --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c4848632..cb1fd14a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -915,6 +915,17 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ return c; } +struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *c; + + if ((c = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, HLSL_TYPE_FLOAT), loc))) + c->value[0].f = f; + + return c; +} + struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, const struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b9dfc9cd..c5bd9b79 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -758,6 +758,8 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *no struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); +struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, + float f, const struct vkd3d_shader_location *loc); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc); struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4c9b912c..565a551d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3981,10 +3981,8 @@ primary_expr: { struct hlsl_ir_constant *c; - if (!(c = hlsl_alloc(ctx, sizeof(*c)))) + if (!(c = hlsl_new_float_constant(ctx, $1, &@1))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_get_scalar_type(ctx, HLSL_TYPE_FLOAT), @1); - c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; }

1 0