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

winedbg: Use Unicode APIs for process/thread enumeration. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-03-18 17:25:30 +01:00 committed by Alexandre Julliard
parent 0046d6eccc
commit fd886c726d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/winedbg/info.c
View File

@ -565,7 +565,7 @@ void info_win32_processes(void)
} }
} }
static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry) static BOOL get_process_name(DWORD pid, PROCESSENTRY32W* entry)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
@ -573,9 +573,9 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry)
if (snap != INVALID_HANDLE_VALUE) if (snap != INVALID_HANDLE_VALUE)
{ {
entry->dwSize = sizeof(*entry); entry->dwSize = sizeof(*entry);
if (Process32First(snap, entry)) if (Process32FirstW(snap, entry))
while (!(ret = (entry->th32ProcessID == pid)) && while (!(ret = (entry->th32ProcessID == pid)) &&
Process32Next(snap, entry)); Process32NextW(snap, entry));
CloseHandle(snap); CloseHandle(snap);
} }
return ret; return ret;
@ -607,18 +607,18 @@ void info_win32_threads(void)
*/ */
if (entry.th32OwnerProcessID != lastProcessId) if (entry.th32OwnerProcessID != lastProcessId)
{ {
PROCESSENTRY32 pcs_entry; PROCESSENTRY32W pcs_entry;
const char* exename; const WCHAR* exename;
p = dbg_get_process(entry.th32OwnerProcessID); p = dbg_get_process(entry.th32OwnerProcessID);
if (p) if (p)
exename = dbg_W2A(p->imageName, -1); exename = p->imageName;
else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry)) else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry))
exename = pcs_entry.szExeFile; exename = pcs_entry.szExeFile;
else else
exename = ""; exename = L"";
dbg_printf("%08lx%s %s\n", dbg_printf("%08lx%s %ls\n",
entry.th32OwnerProcessID, p ? " (D)" : "", exename); entry.th32OwnerProcessID, p ? " (D)" : "", exename);
lastProcessId = entry.th32OwnerProcessID; lastProcessId = entry.th32OwnerProcessID;
} }