Eric Pouech : winedbg: Replace wine_dbgstr_longlong with I64 width modifier.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 07502a064671be9d68ee93f90e76e9bb14ff65dc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=07502a064671be9d68ee93f90...

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;
         }