Alexandre Julliard : winedbg: Fix incorrect pointer casts.

Alexandre Julliard julliard at winehq.org
Fri Dec 14 11:57:13 CST 2018


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Dec 14 18:20:23 2018 +0100

winedbg: Fix incorrect pointer casts.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/winedbg/be_i386.c    | 3 +--
 programs/winedbg/db_disasm.c  | 2 +-
 programs/winedbg/info.c       | 2 +-
 programs/winedbg/tgt_active.c | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c
index 3a2b91a..9656244 100644
--- a/programs/winedbg/be_i386.c
+++ b/programs/winedbg/be_i386.c
@@ -770,8 +770,7 @@ static BOOL be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* p
         if (size != 0) return FALSE;
         if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE;
         if (ch != (unsigned char)0xCC)
-            WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n",
-                       ch, (unsigned long)addr);
+            WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr);
         ch = (unsigned char)val;
         if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE;
         break;
diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c
index f57f009..41b1da2 100644
--- a/programs/winedbg/db_disasm.c
+++ b/programs/winedbg/db_disasm.c
@@ -1230,7 +1230,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in
 	       } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) {
 		  dbg_printf("(invalid destination)");
 	       } else {
-                   db_task_printsym((unsigned long)a1, 0);
+                   db_task_printsym((ULONG_PTR)a1, 0);
                }
 	    }
 	    else
diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index c965759..72c57a2 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -984,7 +984,7 @@ void info_win32_exception(void)
         dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset);
         break;
     case AddrMode1632:
-        dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset);
+        dbg_printf(" in segmented 32-bit code (%04x:%08x)", addr.Segment, (unsigned) addr.Offset);
         break;
     default: dbg_printf(" bad address");
     }
diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c
index f632ca0..5385d0e 100644
--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@@ -301,7 +301,7 @@ static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr,
                 snprintfW(buffer, bufsz, pcspid, dbg_curr_pid);
         }
         else
-            snprintfW(buffer, bufsz, dlladdr, (unsigned long)mod_addr);
+            snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr);
     }
 }
 




More information about the wine-cvs mailing list