diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-20 07:25:29 -0800 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-20 07:25:29 -0800 |
commit | 8f2f5b1e0754673ba9bac3018247bc8c8ac825bf (patch) | |
tree | 22f5d262d3aae9c7b38b328a330ec43fa4a38e87 | |
parent | aba261d95fcdd95594db7be28267e38cd30d0103 (diff) | |
download | psutil-8f2f5b1e0754673ba9bac3018247bc8c8ac825bf.tar.gz |
move struct around
-rw-r--r-- | psutil/arch/windows/ntextapi.h | 13 | ||||
-rw-r--r-- | psutil/arch/windows/process_info.c | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h index e94245a2..968be20a 100644 --- a/psutil/arch/windows/ntextapi.h +++ b/psutil/arch/windows/ntextapi.h @@ -338,6 +338,19 @@ typedef struct in6_addr { } IN6_ADDR, *PIN6_ADDR, FAR *LPIN6_ADDR; #endif +// http://msdn.microsoft.com/en-us/library/aa813741(VS.85).aspx +typedef struct { + BYTE Reserved1[16]; + PVOID Reserved2[5]; + UNICODE_STRING CurrentDirectoryPath; + PVOID CurrentDirectoryHandle; + UNICODE_STRING DllPath; + UNICODE_STRING ImagePathName; + UNICODE_STRING CommandLine; + LPCWSTR env; +} RTL_USER_PROCESS_PARAMETERS_, *PRTL_USER_PROCESS_PARAMETERS_; + + /* * ================================================================ * Type defs. diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c index 747fe5f0..b098de75 100644 --- a/psutil/arch/windows/process_info.c +++ b/psutil/arch/windows/process_info.c @@ -25,18 +25,6 @@ // but unfortunately not in a usable way. // ==================================================================== -// http://msdn.microsoft.com/en-us/library/aa813741(VS.85).aspx -typedef struct { - BYTE Reserved1[16]; - PVOID Reserved2[5]; - UNICODE_STRING CurrentDirectoryPath; - PVOID CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - LPCWSTR env; -} RTL_USER_PROCESS_PARAMETERS_, *PRTL_USER_PROCESS_PARAMETERS_; - // https://msdn.microsoft.com/en-us/library/aa813706(v=vs.85).aspx #ifdef _WIN64 typedef struct { @@ -128,7 +116,6 @@ typedef struct { } PEB64; #endif - #define PSUTIL_FIRST_PROCESS(Processes) ( \ (PSYSTEM_PROCESS_INFORMATION)(Processes)) #define PSUTIL_NEXT_PROCESS(Process) ( \ |