From 21a99664aedb12e06de6d5f6e5c76ad4811e6587 Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 9 Mar 2013 18:34:59 -0800 Subject: [PATCH] uv: Upgrade to 5462dab --- deps/uv/src/win/pipe.c | 2 +- deps/uv/src/win/tcp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/uv/src/win/pipe.c b/deps/uv/src/win/pipe.c index 2436b036f9..0fb70eae32 100644 --- a/deps/uv/src/win/pipe.c +++ b/deps/uv/src/win/pipe.c @@ -915,7 +915,7 @@ static void uv_pipe_queue_read(uv_loop_t* loop, uv_pipe_t* handle) { } else { memset(&req->overlapped, 0, sizeof(req->overlapped)); if (handle->flags & UV_HANDLE_EMULATE_IOCP) { - req->overlapped.hEvent = (HANDLE) ((DWORD) req->event_handle | 1); + req->overlapped.hEvent = (HANDLE) ((uintptr_t) req->event_handle | 1); } /* Do 0-read */ diff --git a/deps/uv/src/win/tcp.c b/deps/uv/src/win/tcp.c index 7158216131..c3ef6533d5 100644 --- a/deps/uv/src/win/tcp.c +++ b/deps/uv/src/win/tcp.c @@ -113,7 +113,8 @@ static int uv_tcp_set_socket(uv_loop_t* loop, uv_tcp_t* handle, non_ifs_lsp = uv_tcp_non_ifs_lsp_ipv4; } - if (pSetFileCompletionNotificationModes && !non_ifs_lsp) { + if (pSetFileCompletionNotificationModes && + !(handle->flags & UV_HANDLE_EMULATE_IOCP) && !non_ifs_lsp) { if (pSetFileCompletionNotificationModes((HANDLE) socket, FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_COMPLETION_PORT_ON_SUCCESS)) {