Add support for PyPy on Windows (#1686)

2 files changed, 9 insertions, 5 deletions

diff --git a/psutil/arch/windows/cpu.c b/psutil/arch/windows/cpu.c
index 9a22e149..18f32e59 100644
--- a/psutil/arch/windows/cpu.c
+++ b/psutil/arch/windows/cpu.c
@@ -50,8 +50,10 @@ psutil_cpu_times(PyObject *self, PyObject *args) {
     double idle, kernel, user, system;
     FILETIME idle_time, kernel_time, user_time;
 
-    if (!GetSystemTimes(&idle_time, &kernel_time, &user_time))
-        return PyErr_SetFromWindowsErr(0);
+    if (!GetSystemTimes(&idle_time, &kernel_time, &user_time)) {
+        PyErr_SetFromWindowsErr(0);
+        return NULL;
+    }
 
     idle = (double)((HI_T * idle_time.dwHighDateTime) + \
                    (LO_T * idle_time.dwLowDateTime));
@@ -384,8 +386,10 @@ psutil_cpu_freq(PyObject *self, PyObject *args) {
     // Allocate size.
     size = ncpus * sizeof(PROCESSOR_POWER_INFORMATION);
     pBuffer = (BYTE*)LocalAlloc(LPTR, size);
-    if (! pBuffer)
-        return PyErr_SetFromWindowsErr(0);
+    if (! pBuffer) {
+        PyErr_SetFromWindowsErr(0);
+        return NULL;
+    }
 
     // Syscall.
     ret = CallNtPowerInformation(
diff --git a/psutil/arch/windows/wmi.c b/psutil/arch/windows/wmi.c
index b790c08e..42a70df7 100644
--- a/psutil/arch/windows/wmi.c
+++ b/psutil/arch/windows/wmi.c
@@ -96,7 +96,7 @@ psutil_init_loadavg_counter(PyObject *self, PyObject *args) {
     Py_RETURN_NONE;
 
 error:
-    PyErr_SetExcFromWindowsErr(PyExc_OSError, 0);
+    PyErr_SetFromWindowsErr(0);
     return NULL;
 }