#1448: fix Wine support due to missing rtlIpv6AddressToStringA

giampaolo · Mar 5, 2019 · f832aa7 · f832aa7
1 parent 3621689
commit f832aa7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -7,6 +7,8 @@
 **Bug fixes**
 
 - 1329_: [AIX] psutil doesn't compile on AIX 6.1.  (patch by Arnon Yaari)
+- 1448_: [Windows] crash on import due to rtlIpv6AddressToStringA not available
+  on Wine.
 
 5.6.0
 =====

diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
@@ -1565,7 +1565,8 @@ psutil_net_connections(PyObject *self, PyObject *args) {
 
     // TCP IPv6
     if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1))
+            (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1) &&
+            (psutil_rtlIpv6AddressToStringA != NULL))
     {
         table = NULL;
         py_conn_tuple = NULL;
@@ -1715,7 +1716,8 @@ psutil_net_connections(PyObject *self, PyObject *args) {
     // UDP IPv6
 
     if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1))
+            (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1) &&
+            (psutil_rtlIpv6AddressToStringA != NULL))
     {
         table = NULL;
         py_conn_tuple = NULL;

diff --git a/psutil/arch/windows/global.c b/psutil/arch/windows/global.c
@@ -95,11 +95,6 @@ psutil_loadlibs() {
     if (! psutil_rtlIpv4AddressToStringA)
         return 1;
 
-    psutil_rtlIpv6AddressToStringA = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "RtlIpv6AddressToStringA");
-    if (! psutil_rtlIpv6AddressToStringA)
-        return 1;
-
     // minimum requirement: Win XP SP3
     psutil_GetExtendedTcpTable = psutil_GetProcAddressFromLib(
         "iphlpapi.dll", "GetExtendedTcpTable");
@@ -130,6 +125,10 @@ psutil_loadlibs() {
     /*
      * Optional.
      */
+    // not available on Wine
+    psutil_rtlIpv6AddressToStringA = psutil_GetProcAddressFromLib(
+        "ntdll.dll", "RtlIpv6AddressToStringA");
+
     // minimum requirement: Win Vista
     psutil_GetTickCount64 = psutil_GetProcAddress(
         "kernel32", "GetTickCount64");