Eric Pouech : winedbg: Use macros when manipulating variants.
Alexandre Julliard
julliard at winehq.org
Fri Nov 26 15:46:28 CST 2021
Module: wine
Branch: master
Commit: 5b54dac338c85562941e67462913fddcf613bc9e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b54dac338c85562941e67462913fddcf613bc9e
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Fri Nov 26 17:30:34 2021 +0100
winedbg: Use macros when manipulating variants.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at 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
More information about the wine-cvs
mailing list