diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-21 10:48:15 -0800 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-21 10:48:15 -0800 |
| commit | 4beeca825cf6c2a796088c8a61a3c8378d7985c4 (patch) | |
| tree | 260318b3f96810c583de9e5e47177416e2f0f7fc | |
| parent | b29f0620f14ecfc1419387de04e283015d96ae31 (diff) | |
| download | psutil-4beeca825cf6c2a796088c8a61a3c8378d7985c4.tar.gz | |
move custom object defs from ntextapi.h to global.h
| -rw-r--r-- | psutil/arch/windows/global.h | 42 | ||||
| -rw-r--r-- | psutil/arch/windows/ntextapi.h | 45 |
2 files changed, 42 insertions, 45 deletions
diff --git a/psutil/arch/windows/global.h b/psutil/arch/windows/global.h index 378026db..7bf8b5ca 100644 --- a/psutil/arch/windows/global.h +++ b/psutil/arch/windows/global.h @@ -2,9 +2,12 @@ * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. + + * List of constants and objects that are globally available. */ #include <windows.h> +#include "ntextapi.h" extern int PSUTIL_WINVER; #define PSUTIL_WINDOWS_XP 51 @@ -19,3 +22,42 @@ extern int PSUTIL_WINVER; int psutil_load_globals(); PVOID psutil_GetProcAddress(LPCSTR libname, LPCSTR procname); PVOID psutil_GetProcAddressFromLib(LPCSTR libname, LPCSTR procname); + +_NtQuerySystemInformation \ + psutil_NtQuerySystemInformation; + +_NtQueryInformationProcess \ + psutil_NtQueryInformationProcess; + +_NtSetInformationProcess + psutil_NtSetInformationProcess; + +_WinStationQueryInformationW \ + psutil_WinStationQueryInformationW; + +_RtlIpv4AddressToStringA \ + psutil_rtlIpv4AddressToStringA; + +_RtlIpv6AddressToStringA \ + psutil_rtlIpv6AddressToStringA; + +_GetExtendedTcpTable \ + psutil_GetExtendedTcpTable; + +_GetExtendedUdpTable \ + psutil_GetExtendedUdpTable; + +_GetActiveProcessorCount \ + psutil_GetActiveProcessorCount; + +_GetTickCount64 \ + psutil_GetTickCount64; + +_NtQueryObject \ + psutil_NtQueryObject; + +_GetLogicalProcessorInformationEx \ + psutil_GetLogicalProcessorInformationEx; + +_RtlGetVersion \ + psutil_RtlGetVersion; diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h index 84c5a2e1..d6030caa 100644 --- a/psutil/arch/windows/ntextapi.h +++ b/psutil/arch/windows/ntextapi.h @@ -455,49 +455,4 @@ typedef NTSTATUS (WINAPI *_RtlGetVersion) ( PRTL_OSVERSIONINFOW lpVersionInformation ); -/* - * ================================================================ - * Custom psutil definitions for modules loaded at runtime. - * ================================================================ - */ - -_NtQuerySystemInformation \ - psutil_NtQuerySystemInformation; - -_NtQueryInformationProcess \ - psutil_NtQueryInformationProcess; - -_NtSetInformationProcess - psutil_NtSetInformationProcess; - -_WinStationQueryInformationW \ - psutil_WinStationQueryInformationW; - -_RtlIpv4AddressToStringA \ - psutil_rtlIpv4AddressToStringA; - -_RtlIpv6AddressToStringA \ - psutil_rtlIpv6AddressToStringA; - -_GetExtendedTcpTable \ - psutil_GetExtendedTcpTable; - -_GetExtendedUdpTable \ - psutil_GetExtendedUdpTable; - -_GetActiveProcessorCount \ - psutil_GetActiveProcessorCount; - -_GetTickCount64 \ - psutil_GetTickCount64; - -_NtQueryObject \ - psutil_NtQueryObject; - -_GetLogicalProcessorInformationEx \ - psutil_GetLogicalProcessorInformationEx; - -_RtlGetVersion \ - psutil_RtlGetVersion; - #endif // __NTEXTAPI_H__ |