ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winedbg: Added support for printing WCHAR in print_typed_basic.

This commit is contained in:
Eric Pouech 2011-03-15 21:18:21 +01:00 committed by Alexandre Julliard
parent b14e4e5841
commit acac3cced4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/winedbg/memory.c
View File

@ -29,6 +29,7 @@
#include "debugger.h" #include "debugger.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(winedbg); WINE_DEFAULT_DEBUG_CHANNEL(winedbg);
@ -393,18 +394,23 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue)
dbg_printf("%Lf", val_real); dbg_printf("%Lf", val_real);
break; break;
case btChar: case btChar:
case btWChar:
/* sometimes WCHAR is defined as btChar with size = 2, so discrimate
* Ansi/Unicode based on size, not on basetype
*/
if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return;
/* FIXME: should do the same for a Unicode character (size == 2) */
print_char: print_char:
if (size == 1 && (val_int < 0x20 || val_int > 0x80)) if (size == 1 && isprint((char)val_int))
dbg_printf("%d", (int)val_int); dbg_printf("'%c'", (char)val_int);
else if (size == 2) else if (size == 2 && isprintW((WCHAR)val_int))
{ {
WCHAR wch = (WCHAR)val_int; WCHAR wch = (WCHAR)val_int;
dbg_printf("'");
dbg_outputW(&wch, 1); dbg_outputW(&wch, 1);
dbg_printf("'");
} }
else else
dbg_printf("'%c'", (char)val_int); dbg_printf("%d", (int)val_int);
break; break;
case btBool: case btBool:
if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return;