From f92478c0fb900491deb35c7bad7cd6c6ac1e9f8c Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 24 Jul 2008 07:05:49 +0000 Subject: * win32/win32.c (overlapped_socket_io): avoid warnings. * thread_win32.c (ubf_handle): refactoring. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread_win32.c | 8 ++++---- win32/win32.c | 27 ++++++++++++++++----------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69def25996..c80795ba04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 24 16:05:02 2008 NAKAMURA Usaku + + * win32/win32.c (overlapped_socket_io): avoid warnings. + + * thread_win32.c (ubf_handle): refactoring. + Thu Jul 24 07:01:13 2008 Nobuyoshi Nakada * ext/win32ole/win32ole.c: got rid of improper casts. diff --git a/thread_win32.c b/thread_win32.c index 68d993a0b2..9241d274b0 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -519,17 +519,17 @@ native_thread_apply_priority(rb_thread_t *th) static void ubf_handle(void *ptr) { - static int checked = 0; typedef BOOL (WINAPI *cancel_io_func_t)(HANDLE); static cancel_io_func_t cancel_func = NULL; rb_thread_t *th = (rb_thread_t *)ptr; thread_debug("ubf_handle: %p\n", th); - if (!checked) { + if (!cancel_func) { cancel_func = (cancel_io_func_t)GetProcAddress(GetModuleHandle("kernel32"), "CancelSynchronousIo"); - checked = 1; + if (!cancel_func) + cancel_func = (cancel_io_func_t)-1; } - if (cancel_func) + if (cancel_func != (cancel_io_func_t)-1) cancel_func((HANDLE)th->thread_id); w32_set_event(th->native_thread_data.interrupt_event); diff --git a/win32/win32.c b/win32/win32.c index dea612e038..f71a56a0de 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2448,6 +2448,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags, }); } else { + DWORD size; wbuf.len = len; wbuf.buf = buf; memset(&wol, 0, sizeof(wol)); @@ -2456,29 +2457,33 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags, if (input) { flg = flags; if (addr && addrlen) - ret = WSARecvFrom(s, &wbuf, 1, &r, &flg, addr, addrlen, &wol, - NULL); + ret = WSARecvFrom(s, &wbuf, 1, &size, &flg, addr, addrlen, + &wol, NULL); else - ret = WSARecv(s, &wbuf, 1, &r, &flg, &wol, NULL); + ret = WSARecv(s, &wbuf, 1, &size, &flg, &wol, NULL); } else { if (addr && addrlen) - ret = WSASendTo(s, &wbuf, 1, &r, flags, addr, *addrlen, &wol, - NULL); + ret = WSASendTo(s, &wbuf, 1, &size, flags, addr, *addrlen, + &wol, NULL); else - ret = WSASend(s, &wbuf, 1, &r, flags, &wol, NULL); + ret = WSASend(s, &wbuf, 1, &size, flags, &wol, NULL); } - err = WSAGetLastError(); }); - if (ret == SOCKET_ERROR && err == WSA_IO_PENDING) { + if (ret != SOCKET_ERROR) { + r = size; + } + else if ((err = WSAGetLastError()) == WSA_IO_PENDING) { switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) { case WAIT_OBJECT_0: RUBY_CRITICAL( - ret = WSAGetOverlappedResult(s, &wol, &r, TRUE, &flg) + ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg) ); - if (ret) + if (ret) { + r = size; break; + } /* thru */ default: errno = map_errno(err); @@ -2490,7 +2495,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags, break; } } - else if (ret == SOCKET_ERROR) { + else { errno = map_errno(err); r = -1; } -- cgit v1.2.3