procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(w32_system_process_attributes): If the process does not exist, return nil.

Browse source
This commit is contained in:
Eli Zaretskii 2008-08-09 19:05:54 +00:00
parent 3af03101a7
commit 754a2d1380
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2008-08-09 Eli Zaretskii <eliz@gnu.org>
* w32.c (w32_system_process_attributes): If the process does not
exist, return nil.
* w32.c: Include thelp32.h, psapi.h and coding.h.
(_MEMORYSTATUSEX, _PROCESS_MEMORY_COUNTERS_EX): New struct
declarations.

8
src/w32.c
View file

@ -3642,6 +3642,7 @@ w32_system_process_attributes (pid)
Lisp_Object cmd_str, decoded_cmd, tem;
HANDLE h_snapshot, h_proc;
DWORD proc_id;
int found_proc = 0;
char uname[UNLEN+1], gname[GNLEN+1], domain[1025];
DWORD ulength = sizeof (uname), dlength = sizeof (domain), trash;
DWORD glength = sizeof (gname);
@ -3701,6 +3702,7 @@ w32_system_process_attributes (pid)
attrs = Fcons (Fcons (Qthcount,
make_fixnum_or_float (pe.cntThreads)),
attrs);
found_proc = 1;
break;
}
}
@ -3708,6 +3710,12 @@ w32_system_process_attributes (pid)
CloseHandle (h_snapshot);
}
if (!found_proc)
{
UNGCPRO;
return Qnil;
}
h_proc = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
FALSE, proc_id);
/* If we were denied a handle to the process, try again after