nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

New piece of Windows infrastructure: winhandl.c takes Plink's

Browse Source 
thread-based approach to stdin and stdout, wraps it in a halfway
sensible API, and makes it a globally available service across all
network tools.

There is no direct functionality enhancement from this checkin:
winplink.c now talks to the new API instead of doing it all
internally, but does nothing different as a result.

However, this should lay the groundwork for several diverse pieces
of work in future: pipe-based ProxyCommand on Windows, a serial port
back end, and (hopefully) a pipe-based means of communicating with
Pageant, which should have sensible blocking behaviour and hence
permit asynchronous agent requests and decrypt-on-demand.

[originally from svn r6797]
This commit is contained in:
Simon Tatham
2006-08-25 22:10:16 +00:00
parent 6104963b9b
commit 291533d3f9
6 changed files with 614 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
windows/window.c
View File

@ -816,8 +816,29 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
term_set_focus(term, GetForegroundWindow() == hwnd);
UpdateWindow(hwnd);
if (GetMessage(&msg, NULL, 0, 0) == 1) {
while (msg.message != WM_QUIT) {
while (1) {
HANDLE *handles;
int nhandles, n;
handles = handle_get_events(&nhandles);
n = MsgWaitForMultipleObjects(nhandles, handles, FALSE, INFINITE,
QS_ALLINPUT);
if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {
handle_got_event(handles[n - WAIT_OBJECT_0]);
sfree(handles);
continue;
}
sfree(handles);
if (GetMessage(&msg, NULL, 0, 0) != 1)
break;
do {
if (msg.message == WM_QUIT)
goto finished; /* two-level break */
if (!(IsWindow(logbox) && IsDialogMessage(logbox, &msg)))
DispatchMessage(&msg);
/* Send the paste buffer if there's anything to send */
@ -826,23 +847,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
* we've delayed, reading the socket, writing, and repainting
* the window.
*/
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
continue;
} while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE));
/* The messages seem unreliable; especially if we're being tricky */
term_set_focus(term, GetForegroundWindow() == hwnd);
/* The messages seem unreliable; especially if we're being tricky */
term_set_focus(term, GetForegroundWindow() == hwnd);
net_pending_errors();
/* There's no point rescanning everything in the message queue
* so we do an apparently unnecessary wait here
*/
WaitMessage();
if (GetMessage(&msg, NULL, 0, 0) != 1)
break;
}
net_pending_errors();
}
finished:
cleanup_exit(msg.wParam); /* this doesn't return... */
return msg.wParam; /* ... but optimiser doesn't know */
}