dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@lag.net-20080706223221-k0hzhvsayzmw6w3e] 

patch from Mark Hammond to use win32gui instead of win32ui, to avoid
a dependency on MFC. only affects windows.
This commit is contained in:
Robey Pointer 2008-07-06 15:32:21 -07:00
parent abf891af0b
commit 60c46d7b7c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paramiko/win_pageant.py
View File

@ -32,7 +32,8 @@ import array
_has_win32all = False _has_win32all = False
_has_ctypes = False _has_ctypes = False
try: try:
import win32ui # win32gui is preferred over win32ui to avoid MFC dependencies
import win32gui
_has_win32all = True _has_win32all = True
except ImportError: except ImportError:
try: try:
@ -52,9 +53,9 @@ win32con_WM_COPYDATA = 74
def _get_pageant_window_object(): def _get_pageant_window_object():
if _has_win32all: if _has_win32all:
try: try:
hwnd = win32ui.FindWindow('Pageant', 'Pageant') hwnd = win32gui.FindWindow('Pageant', 'Pageant')
return hwnd return hwnd
except win32ui.error: except win32gui.error:
pass pass
elif _has_ctypes: elif _has_ctypes:
# Return 0 if there is no Pageant window. # Return 0 if there is no Pageant window.
@ -98,7 +99,9 @@ def _query_pageant(msg):
cds = struct.pack("LLP", _AGENT_COPYDATA_ID, char_buffer_size, char_buffer_address) cds = struct.pack("LLP", _AGENT_COPYDATA_ID, char_buffer_size, char_buffer_address)
if _has_win32all: if _has_win32all:
response = hwnd.SendMessage(win32con_WM_COPYDATA, cds) # win32gui.SendMessage should also allow the same pattern as
# ctypes, but let's keep it like this for now...
response = win32gui.SendMessage(hwnd, win32con_WM_COPYDATA, len(cds), cds)
elif _has_ctypes: elif _has_ctypes:
_buf = array.array('B', cds) _buf = array.array('B', cds)
_addr, _size = _buf.buffer_info() _addr, _size = _buf.buffer_info()