From d74eced5d5773ae7b311b8e9ad585fc69bda0f51 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 30 May 2002 07:45:30 +0000 Subject: * autoload.cc: Replace autoload statments for ZwXXX by NtXXX. Drop ZwQuerySystemInformation since NtQuerySystemInformation was already available. * fhandler_proc.cc (format_proc_uptime): Replace call to ZwQuerySystemInformation by call to NtQuerySystemInformation. (format_proc_stat): Ditto. * fhandler_process.cc (format_process_stat): Replace call to ZwQueryInformationProcess by call to NtQueryInformationProcess. (get_process_state): Ditto. (get_mem_values): Ditto. Replace call to ZwQueryVirtualMemory by call to NtQueryVirtualMemory. * ntdll.h: Cleanup. Drop ZwQuerySystemInformation since NtQuerySystemInformation was already available. Replace declarations of ZwXXX functions by declarations of NtXXX. * pinfo.cc (winpids::enumNT): Replace call to ZwQuerySystemInformation by call to NtQuerySystemInformation. --- winsup/cygwin/fhandler_proc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/fhandler_proc.cc') diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index b0799a00a..3a8990bb7 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -419,7 +419,7 @@ format_proc_uptime (char *destbuf, size_t maxsize) unsigned long long uptime = 0ULL, idle_time = 0ULL; SYSTEM_PROCESSOR_TIMES spt; - NTSTATUS ret = ZwQuerySystemInformation (SystemProcessorTimes, (PVOID) &spt, + NTSTATUS ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) &spt, sizeof spt, NULL); if (!ret && GetLastError () == ERROR_PROC_NOT_FOUND) uptime = GetTickCount() / 10; @@ -459,15 +459,15 @@ format_proc_stat (char *destbuf, size_t maxsize) SYSTEM_PROCESSOR_TIMES spt; SYSTEM_PERFORMANCE_INFORMATION spi; SYSTEM_TIME_OF_DAY_INFORMATION stodi; - ret = ZwQuerySystemInformation (SystemProcessorTimes, + ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) &spt, sizeof spt, NULL); if (ret == STATUS_SUCCESS) - ret = ZwQuerySystemInformation (SystemPerformanceInformation, + ret = NtQuerySystemInformation (SystemPerformanceInformation, (PVOID) &spi, sizeof spi, NULL); if (ret == STATUS_SUCCESS) - ret = ZwQuerySystemInformation (SystemTimeOfDayInformation, + ret = NtQuerySystemInformation (SystemTimeOfDayInformation, (PVOID) &stodi, sizeof stodi, NULL); if (ret != STATUS_SUCCESS) -- cgit v1.2.3