nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Revamp Windows pending_netevent using toplevel callbacks.

Browse Source 
This greatly simplifies the process of calling select_result() from
the top level after receiving WM_NETEVENT.

[originally from svn r10024]
This commit is contained in:
Simon Tatham 2013-08-17 16:06:35 +00:00
parent d35a41f6ba
commit 9d5903b163
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
windows/window.c
View File

@ -104,10 +104,6 @@ static int offset_width, offset_height;
static int was_zoomed = 0; static int was_zoomed = 0;
static int prev_rows, prev_cols; static int prev_rows, prev_cols;
static int pending_netevent = 0;
static WPARAM pend_netevent_wParam = 0;
static LPARAM pend_netevent_lParam = 0;
static void enact_pending_netevent(void);
static void flash_window(int mode); static void flash_window(int mode);
static void sys_cursor_update(void); static void sys_cursor_update(void);
static int get_fullscreen_rect(RECT * ss); static int get_fullscreen_rect(RECT * ss);
@ -140,6 +136,12 @@ static struct {
enum { SYSMENU, CTXMENU }; enum { SYSMENU, CTXMENU };
static HMENU savedsess_menu; static HMENU savedsess_menu;
struct wm_netevent_params {
/* Used to pass data to wm_netevent_callback */
WPARAM wParam;
LPARAM lParam;
};
Conf *conf; /* exported to windlg.c */ Conf *conf; /* exported to windlg.c */
static void conf_cache_data(void); static void conf_cache_data(void);
@ -871,9 +873,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
/* The messages seem unreliable; especially if we're being tricky */ /* The messages seem unreliable; especially if we're being tricky */
term_set_focus(term, GetForegroundWindow() == hwnd); term_set_focus(term, GetForegroundWindow() == hwnd);
if (pending_netevent)
enact_pending_netevent();
} }
finished: finished:
@ -1120,19 +1119,11 @@ void cmdline_error(char *fmt, ...)
/* /*
* Actually do the job requested by a WM_NETEVENT * Actually do the job requested by a WM_NETEVENT
*/ */
static void enact_pending_netevent(void) static void wm_netevent_callback(void *vctx)
{ {
static int reentering = 0; struct wm_netevent_params *params = (struct wm_netevent_params *)vctx;
extern int select_result(WPARAM, LPARAM); select_result(params->wParam, params->lParam);
sfree(vctx);
if (reentering)
return; /* don't unpend the pending */
pending_netevent = FALSE;
reentering = 1;
select_result(pend_netevent_wParam, pend_netevent_lParam);
reentering = 0;
} }
/* /*
@ -2688,19 +2679,20 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
} }
return 0; return 0;
case WM_NETEVENT: case WM_NETEVENT:
/* Notice we can get multiple netevents, FD_READ, FD_WRITE etc {
* but the only one that's likely to try to overload us is FD_READ. /*
* This means buffering just one is fine. * To protect against re-entrancy when Windows's recv()
*/ * immediately triggers a new WSAAsyncSelect window
if (pending_netevent) * message, we don't call select_result directly from this
enact_pending_netevent(); * handler but instead wait until we're back out at the
* top level of the message loop.
pending_netevent = TRUE; */
pend_netevent_wParam = wParam; struct wm_netevent_params *params =
pend_netevent_lParam = lParam; snew(struct wm_netevent_params);
if (WSAGETSELECTEVENT(lParam) != FD_READ) params->wParam = wParam;
enact_pending_netevent(); params->lParam = lParam;
queue_toplevel_callback(wm_netevent_callback, params);
}
return 0; return 0;
case WM_SETFOCUS: case WM_SETFOCUS:
term_set_focus(term, TRUE); term_set_focus(term, TRUE);

5
windows/winstuff.h
View File

@ -240,6 +240,11 @@ GLOBAL void *logctx;
#define FILTER_DYNLIB_FILES ("Dynamic Library Files (*.dll)\0*.dll\0" \ #define FILTER_DYNLIB_FILES ("Dynamic Library Files (*.dll)\0*.dll\0" \
"All Files (*.*)\0*\0\0\0") "All Files (*.*)\0*\0\0\0")
/*
* Exports from winnet.c.
*/
extern int select_result(WPARAM, LPARAM);
/* /*
* winnet.c dynamically loads WinSock 2 or WinSock 1 depending on * winnet.c dynamically loads WinSock 2 or WinSock 1 depending on
* what it can get, which means any WinSock routines used outside * what it can get, which means any WinSock routines used outside