diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-10-31 04:25:37 -0700 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-10-31 04:25:37 -0700 |
| commit | 78edf15ef7b5a91dee24d3f730ea5953bbbf7058 (patch) | |
| tree | bb7dd2bad526bea3fa76bf67a2f84ec90fc8e850 | |
| parent | 0f9cdc9baaec3fffe7f2c8278997084a243e381c (diff) | |
| download | psutil-78edf15ef7b5a91dee24d3f730ea5953bbbf7058.tar.gz | |
refactoring
| -rw-r--r-- | psutil/arch/windows/process_info.c | 6 | ||||
| -rwxr-xr-x | psutil/tests/test_misc.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c index 9144fcf8..dff706ed 100644 --- a/psutil/arch/windows/process_info.c +++ b/psutil/arch/windows/process_info.c @@ -87,16 +87,14 @@ psutil_get_process_data(DWORD pid, http://www.drdobbs.com/embracing-64-bit-windows/184401966 */ SIZE_T size = 0; -#ifndef _WIN64 - static __NtQueryInformationProcess NtWow64QueryInformationProcess64 = NULL; - static _NtWow64ReadVirtualMemory64 NtWow64ReadVirtualMemory64 = NULL; -#endif HANDLE hProcess = NULL; LPCVOID src; WCHAR *buffer = NULL; #ifdef _WIN64 LPVOID ppeb32 = NULL; #else + static __NtQueryInformationProcess NtWow64QueryInformationProcess64 = NULL; + static _NtWow64ReadVirtualMemory64 NtWow64ReadVirtualMemory64 = NULL; PVOID64 src64; BOOL weAreWow64; BOOL theyAreWow64; diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index 8fcee12a..7e42876e 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -719,7 +719,7 @@ class TestScripts(PsutilTestCase): def test_procsmem(self): if 'uss' not in psutil.Process().memory_full_info()._fields: raise self.skipTest("not supported") - self.assert_stdout('procsmem.py', stderr=DEVNULL) + self.assert_stdout('procsmem.py') def test_killall(self): self.assert_syntax('killall.py') |