- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Check for index buffer location zero.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 333fdf7c74815f2ea84a117f18aaf7aa0ebbc2a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/333fdf7c74815f2ea84a117f18aaf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:07:38 2023 +1000 vkd3d: Check for index buffer location zero. VK_EXT_robustness2 does not support null index buffers so we only warn and return immediately. --- libs/vkd3d/command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f9bd5311..2662ec04 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4653,6 +4653,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics WARN("Ignoring NULL index buffer view.\n"); return; } + if (!view->BufferLocation) + { + WARN("Ignoring index buffer location 0.\n"); + return; + } vk_procs = &list->device->vk_procs;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle uppercase regset names in register().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: 0cea4d352e5f04fe6837702b91ce993928a37566 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0cea4d352e5f04fe6837702b91ce9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 16 19:38:58 2023 +0200 vkd3d-shader/hlsl: Handle uppercase regset names in register(). --- libs/vkd3d-shader/hlsl.y | 2 +- tests/cbuffer.shader_test | 21 +++++++++++++++++++-- tests/uav.shader_test | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2eed17af..c9c9495b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1014,7 +1014,7 @@ static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) FIXME("Unsupported register reservation syntax.\n"); return reservation; } - reservation.reg_type = reg_string[0]; + reservation.reg_type = ascii_tolower(reg_string[0]); return reservation; } diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 9cf42d9d..86e03607 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -1,3 +1,21 @@ +% Uppercase register set names +[pixel shader] +cbuffer Constants : register(B1) +{ +}; +Texture2D tex : register(T1); +float4 foo : register(C0); + +float4 main() : sv_target +{ + return foo; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + [pixel shader] // Test empty constant buffer. cbuffer Constants : register(b1) @@ -16,7 +34,6 @@ uniform 0 float4 1.0 2.0 3.0 4.0 draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) - % SM1 buffer offset allocation follows different rules than SM4. % Those would have to be tested separately. [require] @@ -611,7 +628,7 @@ float4 main() : sv_target cbuffer buffer { float4 foo : packoffset(c0); - Texture2D tex : register(t1); + Texture2D tex : register(T1); } float4 main() : sv_target diff --git a/tests/uav.shader_test b/tests/uav.shader_test index 0c690f8e..f0eade4d 100644 --- a/tests/uav.shader_test +++ b/tests/uav.shader_test @@ -121,6 +121,20 @@ float4 main() : sv_target1 draw quad probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) +% Uppercase register set name +[pixel shader] +RWTexture2D<float4> u : register(U3); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[test] +draw quad +probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) + % Test that we can declare and use an array of UAVs. [uav 2]

1 0

Zebediah Figura : vkd3d-shader/spirv: Do not declare resources as multisampled if the sample count is 1.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: d8ef0c69a817d059b1d4fc62520131eed80aba29 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8ef0c69a817d059b1d4fc6252013… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 14:37:18 2023 -0500 vkd3d-shader/spirv: Do not declare resources as multisampled if the sample count is 1. It is illegal to match a SPIR-V multisampled resource to a Vulkan resource which is not multisampled. Vulkan considers a resource to be multisampled if its sample count is greater than 1 (and SPIR-V does not care about the sample count). This fixes validation errors in the case where the sample count does actually match the resource. In order to provide correct behaviour when there is a mismatch, or when the sample count is missing, we will need yet another additional interface. In the absence of that it seems best to provide a best guess. This fixes a validation error with the not-yet-committed merge request 135, when the d3d11 runner is run through Wine with the Vulkan backend. --- libs/vkd3d-shader/spirv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 73510f8b..ec4e1d1d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6039,6 +6039,7 @@ static void spirv_compiler_emit_dcl_resource(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_resource_type resource_type = semantic->resource_type; uint32_t flags = instruction->flags; /* We don't distinguish between APPEND and COUNTER UAVs. */ @@ -6046,8 +6047,13 @@ static void spirv_compiler_emit_dcl_resource(struct spirv_compiler *compiler, if (flags) FIXME("Unhandled UAV flags %#x.\n", flags); + if (resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMS && semantic->sample_count == 1) + resource_type = VKD3D_SHADER_RESOURCE_TEXTURE_2D; + else if (resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY && semantic->sample_count == 1) + resource_type = VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY; + spirv_compiler_emit_resource_declaration(compiler, &semantic->resource, - semantic->resource_type, semantic->resource_data_type[0], 0, false); + resource_type, semantic->resource_data_type[0], 0, false); } static void spirv_compiler_emit_dcl_resource_raw(struct spirv_compiler *compiler, @@ -8046,7 +8052,7 @@ static void spirv_compiler_emit_ld(struct spirv_compiler *compiler, image_operands[image_operand_count++] = spirv_compiler_emit_texel_offset(compiler, instruction, image.resource_type_info); } - if (multisample) + if (multisample && image.resource_type_info->ms) { operands_mask |= SpvImageOperandsSampleMask; image_operands[image_operand_count++] = spirv_compiler_emit_load_src(compiler,

1 0

Nikolay Sivov : vkd3d-shader: Consistently pass location structure by pointer.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: vkd3d Branch: master Commit: dfe923ea1d805c5554ef08419a358039b9b170da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfe923ea1d805c5554ef08419a358… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 14 09:02:14 2023 +0200 vkd3d-shader: Consistently pass location structure by pointer. --- libs/vkd3d-shader/hlsl.c | 37 ++++----- libs/vkd3d-shader/hlsl.h | 13 ++-- libs/vkd3d-shader/hlsl.y | 157 ++++++++++++++++++++------------------- libs/vkd3d-shader/hlsl_codegen.c | 54 +++++++------- 4 files changed, 132 insertions(+), 129 deletions(-)

1 0

Stefan Dösinger : d3dx9: Use __VA_ARGS__ instead of GCCs named variadics.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 54890fe3c4898ebb14280852867eb7d27d5730e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/54890fe3c4898ebb14280852867eb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 16:01:53 2023 +0300 d3dx9: Use __VA_ARGS__ instead of GCCs named variadics. MSVC doesn't support "name...". --- dlls/d3dx9_36/d3dx9_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index ce5abfcc735..34ce272de1a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -401,9 +401,9 @@ void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store) DECLSPEC struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; -#define SET_D3D_STATE_(manager, device, method, args...) (manager ? manager->lpVtbl->method(manager, args) \ - : device->lpVtbl->method(device, args)) -#define SET_D3D_STATE(base_effect, args...) SET_D3D_STATE_(base_effect->manager, base_effect->device, args) +#define SET_D3D_STATE_(manager, device, method, ...) (manager ? manager->lpVtbl->method(manager, __VA_ARGS__) \ + : device->lpVtbl->method(device, __VA_ARGS__)) +#define SET_D3D_STATE(base_effect, ...) SET_D3D_STATE_(base_effect->manager, base_effect->device, __VA_ARGS__) HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type,

1 0

Stefan Dösinger : d3dx9/tests: Use __VA_ARGS__ instead of GCCs named variadics.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 9e99c6f66d236101a084b6a3a24c98b5c8677fe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e99c6f66d236101a084b6a3a24c98… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 16:02:38 2023 +0300 d3dx9/tests: Use __VA_ARGS__ instead of GCCs named variadics. --- dlls/d3dx9_36/tests/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b5231d10795..0e0efb38aaa 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5167,8 +5167,8 @@ static void test_isparameterused_children(unsigned int line, ID3DXEffect *effect } } -#define test_isparameterused_param_with_children(args...) \ - test_isparameterused_param_with_children_(__LINE__, args) +#define test_isparameterused_param_with_children(...) \ + test_isparameterused_param_with_children_(__LINE__, __VA_ARGS__) static void test_isparameterused_param_with_children_(unsigned int line, ID3DXEffect *effect, ID3DXEffect *effect2, D3DXHANDLE tech, const char *name, BOOL expected_result) { @@ -6597,8 +6597,8 @@ static const DWORD test_effect_shared_parameters_blob[] = 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, }; -#define test_effect_shared_vs_arr_compare_helper(args...) \ - test_effect_shared_vs_arr_compare_helper_(__LINE__, args) +#define test_effect_shared_vs_arr_compare_helper(...) \ + test_effect_shared_vs_arr_compare_helper_(__LINE__, __VA_ARGS__) static void test_effect_shared_vs_arr_compare_helper_(unsigned int line, ID3DXEffect *effect, D3DXHANDLE param_child, struct IDirect3DVertexShader9 *vshader1, unsigned int element, BOOL todo) @@ -6618,8 +6618,8 @@ static void test_effect_shared_vs_arr_compare_helper_(unsigned int line, ID3DXEf IDirect3DVertexShader9_Release(vshader2); } -#define test_effect_shared_parameters_compare_vconst(args...) \ - test_effect_shared_parameters_compare_vconst_(__LINE__, args) +#define test_effect_shared_parameters_compare_vconst(...) \ + test_effect_shared_parameters_compare_vconst_(__LINE__, __VA_ARGS__) static void test_effect_shared_parameters_compare_vconst_(unsigned int line, IDirect3DDevice9 *device, unsigned int index, const D3DXVECTOR4 *expected_fvect, BOOL todo) {

1 0

Mohamad Al-Jaf : include: Add windows.graphics.capture.interop.idl file.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 0b4dc016b9ffd7382dcaed68767b243d6ed5ef9b URL: https://gitlab.winehq.org/wine/wine/-/commit/0b4dc016b9ffd7382dcaed68767b24… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 16 20:38:53 2023 -0400 include: Add windows.graphics.capture.interop.idl file. Needed for PyWinRT. --- include/Makefile.in | 1 + include/windows.graphics.capture.interop.idl | 34 ++++++++++++++++++++++++++++ include/wtypes.idl | 2 ++ 3 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 54d6dca234d..7a6e5d62763 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -817,6 +817,7 @@ SOURCES = \ windows.gaming.ui.idl \ windows.globalization.idl \ windows.graphics.capture.idl \ + windows.graphics.capture.interop.idl \ windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ diff --git a/include/windows.graphics.capture.interop.idl b/include/windows.graphics.capture.interop.idl new file mode 100644 index 00000000000..83c7158cf2c --- /dev/null +++ b/include/windows.graphics.capture.interop.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.ui.composition.idl"; +import "windows.graphics.capture.idl"; +import "sdkddkver.h"; + +[ + uuid(3628e81b-3cac-4c60-b7f4-23ce0e0c3356) +] +interface IGraphicsCaptureItemInterop : IUnknown +{ + HRESULT CreateForWindow([in] HWND window, [in] REFIID iid, [out, iid_is(iid)] void **result); + HRESULT CreateForMonitor([in] HMONITOR monitor, [in] REFIID iid, [out, iid_is(iid)] void **result); +} diff --git a/include/wtypes.idl b/include/wtypes.idl index 5a09ed717cb..0db3a397d41 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -563,6 +563,7 @@ typedef [unique] RemotableHandle *wireHFONT; typedef [unique] RemotableHandle *wireHICON; typedef [unique] RemotableHandle *wireHMENU; typedef [unique] RemotableHandle *wireHWND; +typedef [unique] RemotableHandle *wireHMONITOR; cpp_quote("#if 0") /* for IDL only (C/C++ defs are in windef.h) */ DECLARE_WIREM_HANDLE(HACCEL); @@ -572,6 +573,7 @@ DECLARE_WIREM_HANDLE(HFONT); DECLARE_WIREM_HANDLE(HICON); DECLARE_WIREM_HANDLE(HMENU); DECLARE_WIREM_HANDLE(HWND); +DECLARE_WIREM_HANDLE(HMONITOR); typedef HICON HCURSOR;

1 0

Eric Pouech : winedbg: Let 'break symbol : line' command work again.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: fd87ddfae795b438addc463366a7f8d03fe4f750 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd87ddfae795b438addc463366a7f8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Apr 17 18:43:53 2023 +0200 winedbg: Let 'break symbol : line' command work again. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/break.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 6cff37eb886..88c8eef20ab 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -340,8 +340,17 @@ void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) if (bkln.addr.Offset) break_add_break(&bkln.addr, TRUE, swbp); else - dbg_printf("Unknown line number\n" - "(either out of file, or no code at given line number)\n"); + { + /* winedbg's lexer can't tell in 'break foo : 3' whether foo shall be interpreted + * as a debuggee symbol or as a debuggee source file. + * Try now symbol since source file failed. + */ + if (filename) + break_add_break_from_id(filename, lineno, swbp); + else + dbg_printf("Unknown line number\n" + "(either out of file, or no code at given line number)\n"); + } } /***********************************************************************

1 0

Eric Pouech : dbghelp: Use source file path as stored in debug info format.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 812b4b1ca35319c317141587bb0ed8e3af9e014b URL: https://gitlab.winehq.org/wine/wine/-/commit/812b4b1ca35319c317141587bb0ed8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Apr 17 18:43:53 2023 +0200 dbghelp: Use source file path as stored in debug info format. Currently, dbghelp returns the source file either: - in DOS format when native module option isn't enabled - as stored in debug info format otherwise This used to work for PE modules inside ELF shared libraries but is broken since evolution to REAL modules. This generates several issues: - winedbg does not always set the native module option when calling dbghelp for source file related functions, leading to heterogenous output to user - some dbghelp function rely on matching source paths, hence leading to errors in winedbg when mixing the two formats for the same source file. Introduce a new Wine only dbghelp option to return the source paths as they are stored inside debug information format, and activate it unconditionaly inside winedbg. This fixes some failure cases of command 'break <NN>' in winedbg. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 7 +++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 2 +- include/dbghelp.h | 4 ++++ programs/winedbg/winedbg.c | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 3341bea442e..d3003fc44d2 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -68,6 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); unsigned dbghelp_options = SYMOPT_UNDNAME; BOOL dbghelp_opt_native = FALSE; BOOL dbghelp_opt_real_path = FALSE; +BOOL dbghelp_opt_source_actual_path = FALSE; SYSTEM_INFO sysinfo; static struct process* process_first /* = NULL */; @@ -619,6 +620,10 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) old = dbghelp_opt_real_path; dbghelp_opt_real_path = value; break; + case SYMOPT_EX_WINE_SOURCE_ACTUAL_PATH: + old = dbghelp_opt_source_actual_path; + dbghelp_opt_source_actual_path = value; + break; default: FIXME("Unsupported option %d with value %d\n", option, value); } @@ -638,6 +643,8 @@ BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) return dbghelp_opt_native; case SYMOPT_EX_WINE_MODULE_REAL_PATH: return dbghelp_opt_real_path; + case SYMOPT_EX_WINE_SOURCE_ACTUAL_PATH: + return dbghelp_opt_source_actual_path; default: FIXME("Unsupported option %d\n", option); } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9a9773269af..7ba10447771 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -112,6 +112,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_real_path DECLSPEC_HIDDEN; +extern BOOL dbghelp_opt_source_actual_path DECLSPEC_HIDDEN; extern SYSTEM_INFO sysinfo DECLSPEC_HIDDEN; /* FIXME: this could be optimized later on by using relative offsets and smaller integral sizes */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e3352761c53..5579d79bf48 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1882,7 +1882,7 @@ static BOOL get_line_from_function(struct module_pair* pair, struct symt_functio if (found_dli) { BOOL ret; - if (dbghelp_opt_native) + if (dbghelp_opt_source_actual_path) { /* Return native file paths when using winedbg */ ret = internal_line_set_nameA(pair->pcs, intl, (char*)source_get(pair->effective, dli->u.source_file), FALSE); diff --git a/include/dbghelp.h b/include/dbghelp.h index fda8fefa35f..84fa7e10595 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1098,8 +1098,12 @@ typedef enum SYMOPT_EX_MAX, #ifdef __WINESRC__ + /* Include ELF/Mach-O modules in module operations */ SYMOPT_EX_WINE_NATIVE_MODULES = 1000, + /* Return the Unix actual path of loaded module */ SYMOPT_EX_WINE_MODULE_REAL_PATH, + /* Return the raw source file path from debug info (not always mapped to DOS) */ + SYMOPT_EX_WINE_SOURCE_ACTUAL_PATH, #endif } IMAGEHLP_EXTENDED_OPTIONS; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 9815ed4a046..e7ba6afa2e4 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -722,6 +722,8 @@ int main(int argc, char** argv) SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS | SYMOPT_INCLUDE_32BIT_MODULES); + SymSetExtendedOption(SYMOPT_EX_WINE_SOURCE_ACTUAL_PATH, TRUE); + if (argc && !strcmp(argv[0], "--auto")) { switch (dbg_active_auto(argc, argv))

1 0

Eric Pouech : winedbg: Simplify watch command implementation.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: adde76fabd548171013b84396051e6f018a4cafe URL: https://gitlab.winehq.org/wine/wine/-/commit/adde76fabd548171013b84396051e6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 17 18:43:53 2023 +0200 winedbg: Simplify watch command implementation. This also correctly initialize some lvalue. Context of the bug has changed, but the underlying issue remained the same. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39495 Signed-off-by: Eric Pouech <eric.pouech(a)codeweavers.com> --- programs/winedbg/break.c | 39 +-------------------------------------- programs/winedbg/dbg.y | 6 ++---- programs/winedbg/debugger.h | 3 +-- 3 files changed, 4 insertions(+), 44 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 88c8eef20ab..c9abb737487 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -395,7 +395,7 @@ void break_check_delayed_bp(void) * * Add a watchpoint. */ -static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) +void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { int num; DWORD64 l = 4; @@ -436,43 +436,6 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) dbg_printf("\n"); } -/****************************************************************** - * break_add_watch_from_lvalue - * - * Adds a watch point from an address (stored in a lvalue) - */ -void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue,BOOL is_write) -{ - struct dbg_lvalue lval; - - types_extract_as_address(lvalue, &lval.addr); - lval.type.id = dbg_itype_none; - - break_add_watch(&lval, is_write); -} - -/*********************************************************************** - * break_add_watch_from_id - * - * Add a watchpoint from a symbol name - */ -void break_add_watch_from_id(const char *name, BOOL is_write) -{ - struct dbg_lvalue lvalue; - - switch (symbol_get_lvalue(name, -1, &lvalue, TRUE)) - { - case sglv_found: - break_add_watch(&lvalue, is_write); - break; - case sglv_unknown: - dbg_printf("Unable to add watchpoint\n"); - break; - case sglv_aborted: /* user aborted symbol lookup */ - break; - } -} - /*********************************************************************** * break_delete_xpoint * diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index f46e665e6b9..a7336c34206 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -248,10 +248,8 @@ break_command: ; watch_command: - tWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, TRUE); } - | tWATCH identifier { break_add_watch_from_id($2, TRUE); } - | tRWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, FALSE); } - | tRWATCH identifier { break_add_watch_from_id($2, FALSE); } + tWATCH expr_lvalue { break_add_watch(&$2, TRUE); } + | tRWATCH expr_lvalue { break_add_watch(&$2, FALSE); } ; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c3a0be02984..234b34aa083 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -331,8 +331,7 @@ extern BOOL break_add_break(const ADDRESS64* addr, BOOL verbose, BOO extern BOOL break_add_break_from_lvalue(const struct dbg_lvalue* value, BOOL swbp); extern void break_add_break_from_id(const char* name, int lineno, BOOL swbp); extern void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp); -extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue, BOOL is_write); -extern void break_add_watch_from_id(const char* name, BOOL is_write); +extern void break_add_watch(const struct dbg_lvalue* value, BOOL is_write); extern void break_check_delayed_bp(void); extern void break_delete_xpoint(int num); extern void break_delete_xpoints_from_module(DWORD64 base);

1 0