From 4a864f71cdc887d95265a612ef7dcdf558b0c2c0 Mon Sep 17 00:00:00 2001
From: David Campey <campey@gmail.com>
Date: Fri, 19 Mar 2010 12:33:50 +0200
Subject: [PATCH] pid_alive() now works under Windows64
---
src/gajim.py | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/gajim.py b/src/gajim.py
index 3b4f7af9ed..dd62fcd052 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -250,7 +250,7 @@ def pid_alive():
if os.name == 'nt':
try:
from ctypes import (windll, c_ulong, c_int, Structure, c_char)
- from ctypes import (POINTER, pointer, )
+ from ctypes import (POINTER, pointer, sizeof)
except Exception:
return True
@@ -267,26 +267,26 @@ def pid_alive():
('dwFlags', c_ulong, ),
('szExeFile', c_char*512, ),
]
- def __init__(self):
- super(PROCESSENTRY32, self).__init__(self, 512+9*4)
- k = windll.kernel32
- k.CreateToolhelp32Snapshot.argtypes = c_ulong, c_ulong,
- k.CreateToolhelp32Snapshot.restype = c_int
- k.Process32First.argtypes = c_int, POINTER(PROCESSENTRY32),
- k.Process32First.restype = c_int
- k.Process32Next.argtypes = c_int, POINTER(PROCESSENTRY32),
- k.Process32Next.restype = c_int
+ kernel = windll.kernel32
+ kernel.CreateToolhelp32Snapshot.argtypes = c_ulong, c_ulong,
+ kernel.CreateToolhelp32Snapshot.restype = c_int
+ kernel.Process32First.argtypes = c_int, POINTER(PROCESSENTRY32),
+ kernel.Process32First.restype = c_int
+ kernel.Process32Next.argtypes = c_int, POINTER(PROCESSENTRY32),
+ kernel.Process32Next.restype = c_int
def get_p(pid_):
- h = k.CreateToolhelp32Snapshot(2, 0) # TH32CS_SNAPPROCESS
- assert h > 0, 'CreateToolhelp32Snapshot failed'
- b = pointer(PROCESSENTRY32())
- f3 = k.Process32First(h, b)
+ TH32CS_SNAPPROCESS = 2
+ CreateToolhelp32Snapshot = kernel.CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)
+ assert CreateToolhelp32Snapshot > 0, 'CreateToolhelp32Snapshot failed'
+ pe32 = PROCESSENTRY32()
+ pe32.dwSize = sizeof( PROCESSENTRY32 )
+ f3 = kernel.Process32First(CreateToolhelp32Snapshot, pointer(pe32))
while f3:
- if b.contents.th32ProcessID == pid_:
- return b.contents.szExeFile
- f3 = k.Process32Next(h, b)
+ if pe32.th32ProcessID == pid_:
+ return pe32.szExeFile
+ f3 = kernel.Process32Next(CreateToolhelp32Snapshot, pointer(pe32))
if get_p(pid) in ('python.exe', 'gajim.exe'):
return True
--
GitLab