Commit 5b54dac3 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

winedbg: Use macros when manipulating variants.

parent 07502a06
...@@ -466,10 +466,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) ...@@ -466,10 +466,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue)
sub_type.id = fcp->ChildId[i]; sub_type.id = fcp->ChildId[i];
if (!types_get_info(&sub_type, TI_GET_VALUE, &variant)) if (!types_get_info(&sub_type, TI_GET_VALUE, &variant))
continue; continue;
switch (variant.n1.n2.vt) switch (V_VT(&variant))
{ {
case VT_I4: ok = (val_int == variant.n1.n2.n3.lVal); break; case VT_I4: ok = (val_int == V_I4(&variant)); break;
default: WINE_FIXME("Unsupported variant type (%u)\n", variant.n1.n2.vt); default: WINE_FIXME("Unsupported variant type (%u)\n", V_VT(&variant));
} }
if (ok) if (ok)
{ {
......
...@@ -105,7 +105,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, ...@@ -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); if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name);
return FALSE; 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 /* 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 * know, if the value to be dereferenced lies in debuggee or
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment