diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-20 08:21:21 -0800 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-20 08:21:21 -0800 |
| commit | 5e4df5f0333a76406c119dd50893b298b72d96c7 (patch) | |
| tree | eb4e7f630ba9471d8b7c77dde5f3147d6480cf3a | |
| parent | 8f70a95ffd1b8db9e61461c28d148ffa08ff7881 (diff) | |
| download | psutil-5e4df5f0333a76406c119dd50893b298b72d96c7.tar.gz | |
proper typedef redefinition
| -rw-r--r-- | psutil/arch/windows/ntextapi.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h index ae090a15..719c5836 100644 --- a/psutil/arch/windows/ntextapi.h +++ b/psutil/arch/windows/ntextapi.h @@ -417,14 +417,13 @@ typedef NTSTATUS (NTAPI *_NtSetInformationProcess)( DWORD ProcessInformationLength ); -typedef DWORD (_stdcall * NTQSI_PROC) - (int, PVOID, ULONG, PULONG); +typedef PSTR (NTAPI * _RtlIpv4AddressToStringA)( + struct in_addr *Addr, + PSTR S); -typedef PSTR (NTAPI * _RtlIpv4AddressToStringA) - (struct in_addr *, PSTR); - -typedef PSTR (NTAPI * _RtlIpv6AddressToStringA) - (struct in6_addr *, PSTR); +typedef PSTR (NTAPI * _RtlIpv6AddressToStringA)( + struct in6_addr *Addr, + PSTR P); typedef DWORD (WINAPI * _GetExtendedTcpTable)( PVOID pTcpTable, @@ -447,7 +446,8 @@ typedef DWORD (WINAPI * _GetExtendedUdpTable)( typedef DWORD (CALLBACK *_GetActiveProcessorCount)( WORD GroupNumber); -typedef ULONGLONG (CALLBACK *_GetTickCount64)(void); +typedef ULONGLONG (CALLBACK *_GetTickCount64)( + void); typedef NTSTATUS (NTAPI *_NtQueryObject)( HANDLE Handle, @@ -458,11 +458,11 @@ typedef NTSTATUS (NTAPI *_NtQueryObject)( ); typedef NTSTATUS (NTAPI *_NtWow64ReadVirtualMemory64)( - IN HANDLE ProcessHandle, - IN PVOID64 BaseAddress, - OUT PVOID Buffer, - IN ULONG64 Size, - OUT PULONG64 NumberOfBytesRead); + HANDLE ProcessHandle, + PVOID64 BaseAddress, + PVOID Buffer, + ULONG64 Size, + PULONG64 NumberOfBytesRead); /* * ================================================================ @@ -503,8 +503,7 @@ _GetTickCount64 \ _NtQueryObject \ psutil_NtQueryObject; -// XXX: just an alias; probably unnecessary -_NtQueryInformationProcess \ +_NtQueryInformationProcess \ // XXX: just an alias; probably unnecessary psutil_NtWow64QueryInformationProcess64; _NtWow64ReadVirtualMemory64 \ |