[PATCH 1/3] programs/winedbg: get rid of dbg_outputW helper
Eric Pouech
eric.pouech at gmail.com
Wed Mar 2 09:52:48 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
programs/winedbg/debugger.h | 1 -
programs/winedbg/memory.c | 6 +-----
programs/winedbg/winedbg.c | 7 -------
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index 0cc2f8b7a6c..b7dcde201d8 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -501,7 +501,6 @@ extern BOOL types_is_integral_type(const struct dbg_lvalue*);
extern BOOL types_is_float_type(const struct dbg_lvalue*);
/* winedbg.c */
-extern void dbg_outputW(const WCHAR* buffer, int len);
extern const char* dbg_W2A(const WCHAR* buffer, unsigned len);
#ifdef __GNUC__
extern int WINAPIV dbg_printf(const char* format, ...) __attribute__((format (printf,1,2)));
diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c
index faa5ac9ddcb..208526739e2 100644
--- a/programs/winedbg/memory.c
+++ b/programs/winedbg/memory.c
@@ -641,7 +641,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format)
{
unsigned size;
dbg_lgint_t res = types_extract_as_lgint(lvalue, &size, NULL);
- WCHAR wch;
switch (format)
{
@@ -658,10 +657,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format)
return;
case 'u':
- wch = (WCHAR)(res & 0xFFFF);
- dbg_printf("%d = '", wch);
- dbg_outputW(&wch, 1);
- dbg_printf("'");
+ dbg_printf("%d = '%lc'", (WCHAR)(res & 0xFFFF), (WCHAR)(res & 0xFFFF));
return;
case 'i':
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 89fb265fc93..dc6355be4cd 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -135,13 +135,6 @@ const char* dbg_W2A(const WCHAR* buffer, unsigned len)
return ansi;
}
-void dbg_outputW(const WCHAR* buffer, int len)
-{
- const char* ansi = dbg_W2A(buffer, len);
- if (ansi) dbg_outputA(ansi, strlen(ansi));
- /* FIXME: should CP_ACP be GetConsoleCP()? */
-}
-
int WINAPIV dbg_printf(const char* format, ...)
{
static char buf[4*1024];
More information about the wine-devel
mailing list