Attachment 83891 Details for Bug 66060 – Fixed remaining issues

[patch] Fixed remaining issues

0001-Fixed-remaining-issues.patch (text/plain), 4.37 KB, created by Ralf Habacker on 2013-08-09 14:15:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2013-08-09 14:15:33 UTC

Size: 4.37 KB

patch

obsolete

>From f9c4ee900222c2ed46778a67ce58a3ad9aa12e73 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Fri, 9 Aug 2013 16:14:35 +0200
>Subject: [PATCH] Fixed remaining issues.
>
>---
> dbus/dbus-sysdeps-win.c |   69 ++++++++++++++++++++++++++++++-----------------
> 1 Datei geÃ¤ndert, 44 Zeilen hinzugefÃ¼gt(+), 25 Zeilen entfernt(-)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 6f3f262..dab6b1e 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -121,27 +121,33 @@ static ProcAllocateAndGetTcpExtTableFromStack lpfnAllocateAndGetTcpExTableFromSt
>  * but is the only way to do this in older XP versions.
>  * @return true if the procedures could be loaded
>  */
>-static BOOL load_ex_ip_helper_procedures(void)
>+static BOOL
>+load_ex_ip_helper_procedures(void)
> {
>-    HMODULE hModule = LoadLibrary ("iphlpapi.dll");
>-    if (hModule == NULL)
>-      {
>-        _dbus_verbose ("could not load iphlpapi.dll\n");
>-        return FALSE;
>-      }
>-
>-    lpfnAllocateAndGetTcpExTableFromStack = (ProcAllocateAndGetTcpExtTableFromStack)GetProcAddress (hModule, "AllocateAndGetTcpExTableFromStack");
>-    if (lpfnAllocateAndGetTcpExTableFromStack == NULL)
>-      {
>-        _dbus_verbose ("could not find function AllocateAndGetTcpExTableFromStack in iphlpapi.dll\n");
>-        return FALSE;
>-      }
>+  HMODULE hModule = LoadLibrary ("iphlpapi.dll");
>+  if (hModule == NULL)
>+    {
>+      _dbus_verbose ("could not load iphlpapi.dll\n");
>+      return FALSE;
>+    }
> 
>-    return TRUE;
>+  lpfnAllocateAndGetTcpExTableFromStack = (ProcAllocateAndGetTcpExtTableFromStack)GetProcAddress (hModule, "AllocateAndGetTcpExTableFromStack");
>+  if (lpfnAllocateAndGetTcpExTableFromStack == NULL)
>+    {
>+      _dbus_verbose ("could not find function AllocateAndGetTcpExTableFromStack in iphlpapi.dll\n");
>+      return FALSE;
>+    }
>+  return TRUE;
> }
> 
>-
>-dbus_pid_t get_pid_from_extended_tcp_table(int peer_port)
>+/**
>+ * get pid from localhost tcp connection using peer_port
>+ * This function is available on WinXP >= SP3
>+ * @param peer_port peers tcp port
>+ * @return process id or 0 if connection has not been found
>+ */
>+static dbus_pid_t
>+get_pid_from_extended_tcp_table(int peer_port)
> {
>   dbus_pid_t result;
>   DWORD errorCode, size, i;
>@@ -157,6 +163,11 @@ dbus_pid_t get_pid_from_extended_tcp_table(int peer_port)
>           return 0;
>         }
>     }
>+  else
>+    {
>+      _dbus_verbose ("unexpected error returned from GetExtendedTcpTable %d\n", errorCode);
>+      return 0;
>+    }
> 
>   if ((errorCode = GetExtendedTcpTable (tcp_table, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>     {
>@@ -176,12 +187,20 @@ dbus_pid_t get_pid_from_extended_tcp_table(int peer_port)
>          result = p->dwOwningPid;
>     }
> 
>-  _dbus_verbose ("got pid %d\n", (int)result);
>   dbus_free (tcp_table);
>+  _dbus_verbose ("got pid %d\n", (int)result);
>   return result;
> }
> 
>-dbus_pid_t get_pid_from_tcp_ex_table(int peer_port)
>+/**
>+ * get pid from localhost tcp connection using peer_port
>+ * This function is available on all WinXP versions, but
>+ * not in wine (version <= 1.6.0)
>+ * @param peer_port peers tcp port
>+ * @return process id or 0 if connection has not been found
>+ */
>+static dbus_pid_t
>+get_pid_from_tcp_ex_table(int peer_port)
> {
>   dbus_pid_t result;
>   DWORD errorCode, i;
>@@ -215,8 +234,8 @@ dbus_pid_t get_pid_from_tcp_ex_table(int peer_port)
>           break;
>         }
>     }
>-  if (tcp_table)
>-      HeapFree (GetProcessHeap(), 0, tcp_table);
>+
>+  HeapFree (GetProcessHeap(), 0, tcp_table);
>   _dbus_verbose ("got pid %d\n", (int)result);
>   return result;
> }
>@@ -242,7 +261,7 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
>     {
>       struct sockaddr_in *s = (struct sockaddr_in *) &addr;
>       peer_port = ntohs (s->sin_port);
>-      is_localhost = (htonl (s->sin_addr.s_addr) == INADDR_LOOPBACK);
>+      is_localhost = (ntohl (s->sin_addr.s_addr) == INADDR_LOOPBACK);
>     }
>   else if (addr.ss_family == AF_INET6)
>     {
>@@ -274,12 +293,12 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
>       return 0;
>     }
> 
>-  _dbus_verbose ("\n");
>+  _dbus_verbose ("trying to get peers pid");
> 
>-  result = get_pid_from_extended_tcp_table(peer_port);
>+  result = get_pid_from_extended_tcp_table (peer_port);
>   if (result > 0)
>       return result;
>-  result = get_pid_from_tcp_ex_table(peer_port);
>+  result = get_pid_from_tcp_ex_table (peer_port);
>   return result;
> }
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 66060: 82667 | 82670 | 83797 | 83832 | 83843 | 83844 | 83862 | 83863 | 83864 | 83865 | 83866 | 83891

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.