Eric Pouech : winedbg: Make pid and tid internal variables DWORDs.

[Alexandre Julliard]

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

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Tue Dec  7 18:45:33 2021 +0100

winedbg: Make pid and tid internal variables DWORDs.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 programs/winedbg/debugger.h   | 4 ++--
 programs/winedbg/stack.c      | 2 +-
 programs/winedbg/tgt_active.c | 6 +++---
 programs/winedbg/winedbg.c    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index 837384c21a8..1d3156bf8a3 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -245,9 +245,9 @@ struct be_process_io
 };
 
 extern	struct dbg_process*	dbg_curr_process;
-extern	DWORD_PTR	        dbg_curr_pid;
+extern	DWORD	                dbg_curr_pid;
 extern	struct dbg_thread*	dbg_curr_thread;
-extern	DWORD_PTR	        dbg_curr_tid;
+extern	DWORD	                dbg_curr_tid;
 extern  dbg_ctx_t               dbg_context;
 extern  BOOL                    dbg_interactiveP;
 extern  HANDLE                  dbg_houtput;
diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c
index 34ca6c985be..34089bcde04 100644
--- a/programs/winedbg/stack.c
+++ b/programs/winedbg/stack.c
@@ -409,7 +409,7 @@ static void backtrace_all(void)
                 dbg_active_wait_for_first_exception();
             }
 
-            dbg_printf("\nBacktracing for thread %04x in process %04Ix (%s):\n",
+            dbg_printf("\nBacktracing for thread %04x in process %04x (%s):\n",
                        entry.th32ThreadID, dbg_curr_pid,
                        dbg_W2A(dbg_curr_process->imageName, -1));
             backtrace_tid(dbg_curr_process, entry.th32ThreadID);
diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c
index 0993bddc985..70ad7e8b437 100644
--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@@ -370,7 +370,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de)
         size = ARRAY_SIZE(u.buffer);
         if (!QueryFullProcessImageNameW( dbg_curr_process->handle, 0, u.buffer, &size ))
         {
-            swprintf( u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid);
+            swprintf(u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid);
         }
 
         WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n",
@@ -537,12 +537,12 @@ static void dbg_resume_debuggee(DWORD cont)
         if (dbg_curr_thread)
         {
             if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context))
-                dbg_printf("Cannot set ctx on %04Ix\n", dbg_curr_tid);
+                dbg_printf("Cannot set ctx on %04x\n", dbg_curr_tid);
         }
     }
     dbg_interactiveP = FALSE;
     if (!ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, cont))
-        dbg_printf("Cannot continue on %04Ix (%08x)\n", dbg_curr_tid, cont);
+        dbg_printf("Cannot continue on %04x (%08x)\n", dbg_curr_tid, cont);
 }
 
 static void wait_exception(void)
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 803a26f1e55..283b126ba84 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -77,8 +77,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg);
 
 struct dbg_process*	dbg_curr_process = NULL;
 struct dbg_thread*	dbg_curr_thread = NULL;
-DWORD_PTR	        dbg_curr_tid = 0;
-DWORD_PTR	        dbg_curr_pid = 0;
+DWORD	                dbg_curr_tid = 0;
+DWORD	                dbg_curr_pid = 0;
 dbg_ctx_t               dbg_context;
 BOOL    	        dbg_interactiveP = FALSE;
 HANDLE                  dbg_houtput = 0;
@@ -569,7 +569,7 @@ void dbg_start_interactive(const char* filename, HANDLE hFile)
 
     if (dbg_curr_process)
     {
-        dbg_printf("WineDbg starting on pid %04Ix\n", dbg_curr_pid);
+        dbg_printf("WineDbg starting on pid %04x\n", dbg_curr_pid);
         if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception();
     }