November 2021 - Wine-commits

Eric Pouech : winedbg: Use wide-char string literals.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 14781c718372816730bb439f3a40a3527038b6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14781c718372816730bb439f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:09 2021 +0100 winedbg: Use wide-char string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 21 +++++++-------------- programs/winedbg/tgt_active.c | 10 +++------- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/types.c | 30 ++++++++++-------------------- programs/winedbg/winedbg.c | 3 +-- 5 files changed, 23 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14781c718372816730bb…

1 0

Eric Pouech : winedbg: Use I width modifier for DWORD_PTR printf's args.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: d65edd04ccce575dd8308d2fe85295ac8fdd916a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65edd04ccce575dd8308d2f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:16 2021 +0100 winedbg: Use I width modifier for DWORD_PTR printf's args. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/break.c | 2 +- programs/winedbg/expr.c | 4 ++-- programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/info.c | 14 +++++++------- programs/winedbg/memory.c | 4 ++-- programs/winedbg/stack.c | 2 +- programs/winedbg/symbol.c | 8 ++++---- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/types.c | 2 +- programs/winedbg/winedbg.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65edd04ccce575dd830…

1 0

Eric Pouech : winedbg: Print 'module+disp' instead of 'func+disp' when the address is after the function.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: a29a8a317ae9a82d5d360d3b52a491150d50da9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29a8a317ae9a82d5d360d3b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:22 2021 +0100 winedbg: Print 'module+disp' instead of 'func+disp' when the address is after the function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 2490b7cf7e2..4128606c9a9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -583,28 +583,42 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line) { char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; - void* lin = memory_to_linear_addr(addr); + DWORD_PTR lin = (DWORD_PTR)memory_to_linear_addr(addr); DWORD64 disp64; DWORD disp; + IMAGEHLP_MODULE im; print_bare_address(addr); si->SizeOfStruct = sizeof(*si); si->MaxNameLen = 256; - if (!SymFromAddr(dbg_curr_process->handle, (DWORD_PTR)lin, &disp64, si)) return; - dbg_printf(" %s", si->Name); - if (disp64) dbg_printf("+0x%I64x", disp64); + im.SizeOfStruct = 0; + if (SymFromAddr(dbg_curr_process->handle, lin, &disp64, si) && disp64 < si->Size) + { + dbg_printf(" %s", si->Name); + if (disp64) dbg_printf("+0x%I64x", disp64); + } + else + { + im.SizeOfStruct = sizeof(im); + if (!SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) return; + dbg_printf(" %s", im.ModuleName); + if (lin > im.BaseOfImage) + dbg_printf("+0x%Ix", lin - im.BaseOfImage); + } if (with_line) { IMAGEHLP_LINE64 il; - IMAGEHLP_MODULE im; il.SizeOfStruct = sizeof(il); - if (SymGetLineFromAddr64(dbg_curr_process->handle, (DWORD_PTR)lin, &disp, &il)) + if (SymGetLineFromAddr64(dbg_curr_process->handle, lin, &disp, &il)) dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); - im.SizeOfStruct = sizeof(im); - if (SymGetModuleInfo(dbg_curr_process->handle, (DWORD_PTR)lin, &im)) - dbg_printf(" in %s", im.ModuleName); + if (im.SizeOfStruct == 0) /* don't display again module if address is in module+disp form */ + { + im.SizeOfStruct = sizeof(im); + if (SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) + dbg_printf(" in %s", im.ModuleName); + } } }

1 0

Eric Pouech : winedbg: Replace wine_dbgstr_longlong with I64 width modifier.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 07502a064671be9d68ee93f90e76e9bb14ff65dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=07502a064671be9d68ee93f9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:28 2021 +0100 winedbg: Replace wine_dbgstr_longlong with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/break.c | 7 +++---- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/info.c | 6 +++--- programs/winedbg/types.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 03f7bdf5a2f..d22dd7ac074 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -402,8 +402,7 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { case 4: case 2: case 1: break; default: - dbg_printf("Unsupported length (%s) for watch-points, defaulting to 4\n", - wine_dbgstr_longlong(l)); + dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to 4\n", l); break; } } @@ -752,8 +751,8 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) case be_xpoint_watch_write: dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); print_address(addr, TRUE); - dbg_printf(" new value %s\n", - wine_dbgstr_longlong(dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval)); + dbg_printf(" new value %I64x\n", + dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); } return FALSE; } diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b578ac289e1..0fb27023957 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1420,7 +1420,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) return packet_error; } - TRACE("%Iu => %s\n", reg, wine_dbgstr_longlong(cpu_register(gdbctx, &ctx, reg))); + TRACE("%Iu => %I64x\n", reg, cpu_register(gdbctx, &ctx, reg)); packet_reply_open(gdbctx); packet_reply_register_hex_to(gdbctx, &ctx, reg); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 23d87bbb006..07b2a5acc8b 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -168,9 +168,9 @@ struct info_modules static void module_print_info(const struct info_module *module, BOOL is_embedded) { - dbg_printf("%*.*s-%*.*s\t%-16s%s\n", - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage), - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage + module->mi.ImageSize), + dbg_printf("%*.*I64x-%*.*I64x\t%-16s%s\n", + ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage, + ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage + module->mi.ImageSize, is_embedded ? "\\" : get_symtype_str(&module->mi), module->name); } diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index c091420ed50..9d98a136428 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -83,7 +83,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, } if (size > sizeof(rtn)) { - WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); + WINE_ERR("Size too large (%I64x)\n", size); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); return rtn; }

1 0

Eric Pouech : winedbg: Use macros when manipulating variants.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 5b54dac338c85562941e67462913fddcf613bc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b54dac338c85562941e6746… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:34 2021 +0100 winedbg: Use macros when manipulating variants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 6 +++--- programs/winedbg/symbol.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 4128606c9a9..9000d0126c7 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -466,10 +466,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) sub_type.id = fcp->ChildId[i]; if (!types_get_info(&sub_type, TI_GET_VALUE, &variant)) continue; - switch (variant.n1.n2.vt) + switch (V_VT(&variant)) { - case VT_I4: ok = (val_int == variant.n1.n2.n3.lVal); break; - default: WINE_FIXME("Unsupported variant type (%u)\n", variant.n1.n2.vt); + case VT_I4: ok = (val_int == V_I4(&variant)); break; + default: WINE_FIXME("Unsupported variant type (%u)\n", V_VT(&variant)); } if (ok) { diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 856cc86c8f4..a3b9cb38995 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -105,7 +105,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name); return FALSE; } - else if (v.n1.n2.vt & VT_BYREF) + else if (V_ISBYREF(&v)) { /* FIXME: this won't work for pointers or arrays, as we don't always * know, if the value to be dereferenced lies in debuggee or

1 0

Eric Pouech : winedbg: Get size of underlying integral types in enums.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 16fb9640d72be2bbd1b1764434798a5315d4fbcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=16fb9640d72be2bbd1b17644… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:40 2021 +0100 winedbg: Get size of underlying integral types in enums. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 10 +++++----- programs/winedbg/types.c | 4 ++-- programs/winedbg/winedbg.c | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 9000d0126c7..b736d06a67e 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -439,11 +439,8 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) { BOOL ok = FALSE; - /* FIXME: it depends on underlying type for enums - * (not supported yet in dbghelp) - * Assuming 4 as for an int - */ - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, 4, TRUE, &val_int)) return; + if (!types_get_info(&type, TI_GET_LENGTH, &size64) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, size64, TRUE, &val_int)) return; if (types_get_info(&type, TI_GET_CHILDRENCOUNT, &count)) { @@ -468,7 +465,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) continue; switch (V_VT(&variant)) { + case VT_I1: ok = (val_int == V_I1(&variant)); break; + case VT_I2: ok = (val_int == V_I2(&variant)); break; case VT_I4: ok = (val_int == V_I4(&variant)); break; + case VT_I8: ok = (val_int == V_I8(&variant)); break; default: WINE_FIXME("Unsupported variant type (%u)\n", V_VT(&variant)); } if (ok) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9d98a136428..354c97e5d70 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -114,8 +114,8 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagEnum: - /* FIXME: we don't handle enum size */ - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, sizeof(unsigned), s = FALSE, &rtn)) + if (!types_get_info(&type, TI_GET_LENGTH, &size) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagFunctionType: diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 45a7edfb309..0d4a38b2d83 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -44,7 +44,6 @@ * - type management: * + some bits of internal types are missing (like type casts and the address * operator) - * + the type for an enum's value is always inferred as int (winedbg & dbghelp) * + most of the code implies that sizeof(void*) = sizeof(int) * + all computations should be made on long long * o expr computations are in int:s

1 0

Eric Pouech : winedbg: Use debuggee pointer size when extracting typed value.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: c8006d07eb3211981411cc98c79428b31bc7b506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8006d07eb3211981411cc98… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:46 2021 +0100 winedbg: Use debuggee pointer size when extracting typed value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 3 ++- programs/winedbg/winedbg.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 354c97e5d70..5e9188ccc6e 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -105,7 +105,8 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, if (issigned) *issigned = s; break; case SymTagPointerType: - if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, sizeof(void*), s = FALSE, &rtn)) + if (!types_get_info(&type, TI_GET_LENGTH, &size) || + !dbg_curr_process->be_cpu->fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagArrayType: diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0d4a38b2d83..55801536a79 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -44,7 +44,6 @@ * - type management: * + some bits of internal types are missing (like type casts and the address * operator) - * + most of the code implies that sizeof(void*) = sizeof(int) * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes

1 0

Eric Pouech : winedbg: Protect against incorrect integer size in be_cpu.fetch_integer() method.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 0ed49fabc3cae185a610ee973d4b0c75877812d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed49fabc3cae185a610ee97… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:52 2021 +0100 winedbg: Protect against incorrect integer size in be_cpu.fetch_integer() method. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 3 ++- programs/winedbg/be_arm64.c | 3 ++- programs/winedbg/be_i386.c | 3 ++- programs/winedbg/be_x86_64.c | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index fa25ce8dd2b..3bf5771439c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1834,7 +1834,8 @@ static int be_arm_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 9ceb9291d54..d7611ba75de 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -231,7 +231,8 @@ static int be_arm64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 08d0841a208..e7a1dd9d460 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -780,7 +780,8 @@ static int be_i386_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index c2839cf4097..4920bf2d0ca 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -702,8 +702,8 @@ static int be_x86_64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) - return FALSE; + /* size must fit in ret and be a power of two */ + if (size > sizeof(*ret) || (size & (size - 1))) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same

1 0

Eric Pouech : winedbg: Protect fetch_float() in CPU backends against buffer overflow.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 6cee83a665189fc99e91f18ffb80c23918b0aa6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cee83a665189fc99e91f18f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:58 2021 +0100 winedbg: Protect fetch_float() in CPU backends against buffer overflow. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 1 + programs/winedbg/be_arm64.c | 1 + programs/winedbg/be_i386.c | 1 + programs/winedbg/be_x86_64.c | 1 + 4 files changed, 4 insertions(+) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3bf5771439c..451eb50e772 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1859,6 +1859,7 @@ static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, d /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d7611ba75de..aaf6ecf0bb6 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -256,6 +256,7 @@ static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index e7a1dd9d460..3bb7b9b4240 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -805,6 +805,7 @@ static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 4920bf2d0ca..45c01a70594 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -727,6 +727,7 @@ static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp;

1 0

Gabriel Ivăncescu : nsiproxy: Move set_reply_ip_status to a family op.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 5e8bd4d38e4a2e45f9f043695e7563461bcf0ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8bd4d38e4a2e45f9f04369… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:02 2021 +0200 nsiproxy: Move set_reply_ip_status to a family op. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 955fdfdb979..a4ef02a4a10 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -210,6 +210,14 @@ static unsigned short null_chksum( BYTE *data, unsigned int count ) } #endif +static int ipv4_set_reply_ip_status( IP_STATUS ip_status, void *out ) +{ + struct nsiproxy_icmp_echo_reply *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + return sizeof(*reply); +} + static void ipv4_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) { int val; @@ -393,6 +401,7 @@ struct family_ops int icmp_protocol; void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); unsigned short (*chksum)( BYTE *data, unsigned int count ); + int (*set_reply_ip_status)( IP_STATUS ip_status, void *out ); void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); int (*reply_buffer_len)( int reply_len ); BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, @@ -407,6 +416,7 @@ static const struct family_ops ipv4 = IPPROTO_ICMP, ipv4_init_icmp_hdr, chksum, + ipv4_set_reply_ip_status, ipv4_set_socket_opts, ipv4_reply_buffer_len, ipv4_parse_ip_hdr, @@ -421,6 +431,7 @@ static const struct family_ops ipv4_linux_ping = IPPROTO_ICMP, ipv4_init_icmp_hdr, null_chksum, + ipv4_set_reply_ip_status, ipv4_linux_ping_set_socket_opts, ipv4_linux_ping_reply_buffer_len, ipv4_linux_ping_parse_ip_hdr, @@ -584,16 +595,6 @@ NTSTATUS icmp_send_echo( void *args ) return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } -static NTSTATUS set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) -{ - struct nsiproxy_icmp_echo_reply *reply = params->reply; - - memset( reply, 0, sizeof(*reply) ); - reply->status = ip_status; - params->reply_len = sizeof(*reply); - return STATUS_SUCCESS; -} - static int get_timeout( LARGE_INTEGER start, DWORD timeout ) { LARGE_INTEGER now, end; @@ -647,7 +648,8 @@ static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *par if (reply->data_size && msg.msg_flags & MSG_TRUNC) { free( reply_buf ); - return set_reply_ip_status( params, IP_GENERAL_FAILURE ); + params->reply_len = data->ops->set_reply_ip_status( IP_GENERAL_FAILURE, params->reply ); + return STATUS_SUCCESS; } sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &reply->addr ); @@ -703,10 +705,12 @@ NTSTATUS icmp_listen( void *args ) if (!ret) /* timeout */ { TRACE( "timeout\n" ); - return set_reply_ip_status( params, IP_REQ_TIMED_OUT ); + params->reply_len = data->ops->set_reply_ip_status( IP_REQ_TIMED_OUT, params->reply ); + return STATUS_SUCCESS; } /* ret < 0 */ - return set_reply_ip_status( params, errno_to_ip_status( errno ) ); + params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->reply ); + return STATUS_SUCCESS; } NTSTATUS icmp_cancel_listen( void *args )

1 0