X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fbe6468ee26ff4c5df68d37d8b1b819e68d589a0..2733b5cbea482cab35d9318a4f8a7fbeb845668e:/windows/winsftp.c?ds=sidebyside diff --git a/windows/winsftp.c b/windows/winsftp.c index f0f0e304..f3c0a6fb 100644 --- a/windows/winsftp.c +++ b/windows/winsftp.c @@ -431,7 +431,7 @@ char *dir_file_cat(char *dir, char *file) * Be told what socket we're supposed to be using. */ static SOCKET sftp_ssh_socket = INVALID_SOCKET; -static HANDLE netevent = NULL; +static HANDLE netevent = INVALID_HANDLE_VALUE; char *do_select(SOCKET skt, int startup) { int events; @@ -481,17 +481,16 @@ int do_eventsel_loop(HANDLE other_event) handles = sresize(handles, nhandles+2, HANDLE); nallhandles = nhandles; - if (netevent) + if (netevent != INVALID_HANDLE_VALUE) handles[netindex = nallhandles++] = netevent; else netindex = -1; - if (other_event) + if (other_event != INVALID_HANDLE_VALUE) handles[otherindex = nallhandles++] = other_event; else otherindex = -1; - n = MsgWaitForMultipleObjects(nallhandles, handles, FALSE, ticks, - QS_POSTMESSAGE); + n = WaitForMultipleObjects(nallhandles, handles, FALSE, ticks); if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) { handle_got_event(handles[n - WAIT_OBJECT_0]); @@ -625,7 +624,7 @@ int ssh_sftp_loop_iteration(void) return 0; } else { - return do_eventsel_loop(NULL); + return do_eventsel_loop(INVALID_HANDLE_VALUE); } }