April 2023 - Wine-Commits - list.winehq.org

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

Eric Pouech : winedbg: Improve size management in watch command.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: f01ce56a4935449be0bfbb994eb904c84363c90e URL: https://gitlab.winehq.org/wine/wine/-/commit/f01ce56a4935449be0bfbb994eb904… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 17 18:43:53 2023 +0200 winedbg: Improve size management in watch command. - support 8 byte targets - default to CPU pointer size if size isn't present nor supported. - detect unaligned requests Signed-off-by: Eric Pouech <eric.pouech(a)codeweavers.com> --- programs/winedbg/break.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index c9abb737487..8001ba1707b 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -398,7 +398,7 @@ void break_check_delayed_bp(void) void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { int num; - DWORD64 l = 4; + DWORD l = ADDRSIZE; if (!lvalue->in_debuggee) { @@ -409,21 +409,30 @@ void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) &lvalue->addr); if (num == -1) return; + /* FIXME: this validation part should be moved to CPU backends (likely in a new method) */ if (lvalue->type.id != dbg_itype_none) { - if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l)) + DWORD64 l64; + if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l64)) { - switch (l) + /* Only allow size of a power of 2, smaller than CPU's pointer size. + * (Validation is done by CPU backend with insert_Xpoint method) + */ + if (!(l64 & (l64 - 1)) && l64 <= l) + l = l64; + else + dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to %lu\n", l64, l); + /* most CPUs request watch address to be aligned on length */ + if (lvalue->addr.Offset & (l - 1)) { - case 4: case 2: case 1: break; - default: - dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to 4\n", l); - break; + dbg_printf("Watchpoint on unaligned address is not supported\n"); + dbg_curr_process->bp[num].refcount = 0; + return; } } - else dbg_printf("Cannot get watch size, defaulting to 4\n"); + else dbg_printf("Cannot get watch size, defaulting to %lu\n", l); } - dbg_curr_process->bp[num].w.len = (DWORD)l - 1; + dbg_curr_process->bp[num].w.len = l - 1; if (!get_watched_value(num, &dbg_curr_process->bp[num].w.oldval)) {

1 0

Alexandre Julliard : include: Add some CHPE definitions.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 6e348640c57e15c92277a8c5f79a606dc8909a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e348640c57e15c92277a8c5f79a60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 17:45:06 2023 +0200 include: Add some CHPE definitions. --- include/winnt.h | 159 +++++++++++++++++++++++++++++++++++++++++----------- tools/winedump/pe.c | 17 +++--- 2 files changed, 136 insertions(+), 40 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 15c254fbcff..a905507c0d4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2497,39 +2497,41 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 /* These are the settings of the Machine field. */ -#define IMAGE_FILE_MACHINE_UNKNOWN 0 -#define IMAGE_FILE_MACHINE_TARGET_HOST 0x0001 -#define IMAGE_FILE_MACHINE_I860 0x014d -#define IMAGE_FILE_MACHINE_I386 0x014c -#define IMAGE_FILE_MACHINE_R3000 0x0162 -#define IMAGE_FILE_MACHINE_R4000 0x0166 -#define IMAGE_FILE_MACHINE_R10000 0x0168 -#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 -#define IMAGE_FILE_MACHINE_ALPHA 0x0184 -#define IMAGE_FILE_MACHINE_SH3 0x01a2 -#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 -#define IMAGE_FILE_MACHINE_SH3E 0x01a4 -#define IMAGE_FILE_MACHINE_SH4 0x01a6 -#define IMAGE_FILE_MACHINE_SH5 0x01a8 -#define IMAGE_FILE_MACHINE_ARM 0x01c0 -#define IMAGE_FILE_MACHINE_THUMB 0x01c2 -#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 -#define IMAGE_FILE_MACHINE_ARM64 0xaa64 -#define IMAGE_FILE_MACHINE_AM33 0x01d3 -#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 -#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 -#define IMAGE_FILE_MACHINE_IA64 0x0200 -#define IMAGE_FILE_MACHINE_MIPS16 0x0266 -#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 -#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366 -#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466 -#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 -#define IMAGE_FILE_MACHINE_TRICORE 0x0520 -#define IMAGE_FILE_MACHINE_CEF 0x0cef -#define IMAGE_FILE_MACHINE_EBC 0x0ebc -#define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_M32R 0x9041 -#define IMAGE_FILE_MACHINE_CEE 0xc0ee +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_TARGET_HOST 0x0001 +#define IMAGE_FILE_MACHINE_I386 0x014c +#define IMAGE_FILE_MACHINE_R3000 0x0162 +#define IMAGE_FILE_MACHINE_R4000 0x0166 +#define IMAGE_FILE_MACHINE_R10000 0x0168 +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 +#define IMAGE_FILE_MACHINE_ALPHA 0x0184 +#define IMAGE_FILE_MACHINE_SH3 0x01a2 +#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 +#define IMAGE_FILE_MACHINE_SH3E 0x01a4 +#define IMAGE_FILE_MACHINE_SH4 0x01a6 +#define IMAGE_FILE_MACHINE_SH5 0x01a8 +#define IMAGE_FILE_MACHINE_ARM 0x01c0 +#define IMAGE_FILE_MACHINE_THUMB 0x01c2 +#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 +#define IMAGE_FILE_MACHINE_AM33 0x01d3 +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 +#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 +#define IMAGE_FILE_MACHINE_IA64 0x0200 +#define IMAGE_FILE_MACHINE_MIPS16 0x0266 +#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 +#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 +#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366 +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466 +#define IMAGE_FILE_MACHINE_TRICORE 0x0520 +#define IMAGE_FILE_MACHINE_CEF 0x0cef +#define IMAGE_FILE_MACHINE_EBC 0x0ebc +#define IMAGE_FILE_MACHINE_CHPE_X86 0x3a64 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_M32R 0x9041 +#define IMAGE_FILE_MACHINE_ARM64EC 0xa641 +#define IMAGE_FILE_MACHINE_ARM64X 0xa64e +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_MACHINE_CEE 0xc0ee #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 @@ -3788,6 +3790,97 @@ typedef PIMAGE_DYNAMIC_RELOCATION32_V2 PIMAGE_DYNAMIC_RELOCATION_V2; #define IMAGE_DYNAMIC_RELOCATION_GUARD_SWITCHTABLE_BRANCH 5 #define IMAGE_DYNAMIC_RELOCATION_ARM64X 6 +typedef struct _IMAGE_CHPE_METADATA_X86 +{ + ULONG Version; + ULONG CHPECodeAddressRangeOffset; + ULONG CHPECodeAddressRangeCount; + ULONG WowA64ExceptionHandlerFunctionPointer; + ULONG WowA64DispatchCallFunctionPointer; + ULONG WowA64DispatchIndirectCallFunctionPointer; + ULONG WowA64DispatchIndirectCallCfgFunctionPointer; + ULONG WowA64DispatchRetFunctionPointer; + ULONG WowA64DispatchRetLeafFunctionPointer; + ULONG WowA64DispatchJumpFunctionPointer; + ULONG CompilerIATPointer; + ULONG WowA64RdtscFunctionPointer; + ULONG unknown[4]; +} IMAGE_CHPE_METADATA_X86, *PIMAGE_CHPE_METADATA_X86; + +typedef struct _IMAGE_CHPE_RANGE_ENTRY +{ + union + { + ULONG StartOffset; + struct + { + ULONG NativeCode : 1; + ULONG AddressBits : 31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + ULONG Length; +} IMAGE_CHPE_RANGE_ENTRY, *PIMAGE_CHPE_RANGE_ENTRY; + +typedef struct _IMAGE_ARM64EC_METADATA +{ + ULONG Version; + ULONG CodeMap; + ULONG CodeMapCount; + ULONG CodeRangesToEntryPoints; + ULONG RedirectionMetadata; + ULONG __os_arm64x_dispatch_call_no_redirect; + ULONG __os_arm64x_dispatch_ret; + ULONG __os_arm64x_dispatch_call; + ULONG __os_arm64x_dispatch_icall; + ULONG __os_arm64x_dispatch_icall_cfg; + ULONG AlternateEntryPoint; + ULONG AuxiliaryIAT; + ULONG CodeRangesToEntryPointsCount; + ULONG RedirectionMetadataCount; + ULONG GetX64InformationFunctionPointer; + ULONG SetX64InformationFunctionPointer; + ULONG ExtraRFETable; + ULONG ExtraRFETableSize; + ULONG __os_arm64x_dispatch_fptr; + ULONG AuxiliaryIATCopy; +} IMAGE_ARM64EC_METADATA; + +typedef struct _IMAGE_ARM64EC_REDIRECTION_ENTRY +{ + ULONG Source; + ULONG Destination; +} IMAGE_ARM64EC_REDIRECTION_ENTRY; + +typedef struct _IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT +{ + ULONG StartRva; + ULONG EndRva; + ULONG EntryPoint; +} IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT; + +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL 0 +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE 1 +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA 2 + +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_2BYTES 1 +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_4BYTES 2 +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_8BYTES 3 + +typedef struct _IMAGE_DVRT_ARM64X_FIXUP_RECORD +{ + USHORT Offset : 12; + USHORT Type : 2; + USHORT Size : 2; +} IMAGE_DVRT_ARM64X_FIXUP_RECORD, *PIMAGE_DVRT_ARM64X_FIXUP_RECORD; + +typedef struct _IMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD +{ + USHORT Offset : 12; + USHORT Type : 2; + USHORT Sign : 1; + USHORT Scale : 1; +} IMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD, *PIMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD; + typedef struct _IMAGE_FUNCTION_ENTRY { DWORD StartingAddress; DWORD EndingAddress; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f9ae75fadb2..40e45d144e9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -43,7 +43,6 @@ const char *get_machine_str(int mach) switch (mach) { case IMAGE_FILE_MACHINE_UNKNOWN: return "Unknown"; - case IMAGE_FILE_MACHINE_I860: return "i860"; case IMAGE_FILE_MACHINE_I386: return "i386"; case IMAGE_FILE_MACHINE_R3000: return "R3000"; case IMAGE_FILE_MACHINE_R4000: return "R4000"; @@ -56,6 +55,10 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; + case IMAGE_FILE_MACHINE_ALPHA64: return "Alpha64"; + case IMAGE_FILE_MACHINE_CHPE_X86: return "CHPE-x86"; + case IMAGE_FILE_MACHINE_ARM64EC: return "ARM64EC"; + case IMAGE_FILE_MACHINE_ARM64X: return "ARM64X"; } return "???"; } @@ -2196,16 +2199,16 @@ static void dump_dynamic_relocs_arm64x( const IMAGE_BASE_RELOCATION *base_reloc, rel++; switch (type) { - case 0: /* zero-fill */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: printf( " off %04x zero-fill %u bytes\n", offset, 1 << arg ); break; - case 1: /* set value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: printf( " off %04x set %u bytes value ", offset, 1 << arg ); for (i = (1 << arg ) / sizeof(USHORT); i > 0; i--) printf( "%04x", rel[i - 1] ); rel += (1 << arg) / sizeof(USHORT); printf( "\n" ); break; - case 2: /* add value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: printf( " off %04x add offset ", offset ); if (arg & 1) printf( "-" ); printf( "%08x\n", (UINT)*rel++ * ((arg & 2) ? 8 : 4) ); @@ -2408,14 +2411,14 @@ static BOOL get_alt_header( void ) rel++; switch (type) { - case 0: /* zero-fill */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: memset( page + offset, 0, 1 << arg ); break; - case 1: /* set value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: memcpy( page + offset, rel, 1 << arg ); rel += (1 << arg) / sizeof(USHORT); break; - case 2: /* add value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: val = (unsigned int)*rel++ * ((arg & 2) ? 8 : 4); if (arg & 1) val = -val; *(int *)(page + offset) += val;

1 0

Alexandre Julliard : winedump: Dump hybrid metadata also for i386 CHPE modules.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: fe693a70476c0ed3624f8545e2333a68fa9d5be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe693a70476c0ed3624f8545e2333a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 17:49:51 2023 +0200 winedump: Dump hybrid metadata also for i386 CHPE modules. --- tools/winedump/pe.c | 242 +++++++++++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 109 deletions(-)

1 0