Changes since version 1.41.0:
* doc: fix code highlighting (Darshan Sen)
* test: move to ASSERT_NULL and ASSERT_NOT_NULL test macros (tjarlama)
* zos: build in ascii code page (Shuowang (Wayne) Zhang)
* zos: don't use nanosecond timestamp fields (Shuowang (Wayne) Zhang)
* zos: introduce zoslib (Shuowang (Wayne) Zhang)
* zos: use strnlen() from zoslib (Shuowang (Wayne) Zhang)
* zos: use nanosleep() from zoslib (Shuowang (Wayne) Zhang)
* zos: use __getargv() from zoslib to get exe path (Shuowang (Wayne) Zhang)
* zos: treat __rfim_utok as binary (Shuowang (Wayne) Zhang)
* zos: use execvpe() to set environ explictly (Shuowang (Wayne) Zhang)
* zos: use custom proctitle implementation (Shuowang (Wayne) Zhang)
* doc: add instructions for building on z/OS (Shuowang (Wayne) Zhang)
* linux,udp: enable full ICMP error reporting (Ondřej Surý)
* test: fix test-udp-send-unreachable (Ondřej Surý)
* include: fix typo in documentation (Tobias Nießen)
* chore: use for(;;) instead of while (Yash Ladha)
* test: remove string + int warning on udp-pummel (Juan José Arboleda)
* cmake: fix linker flags (Zhao Zhili)
* test: fix stack-use-after-scope (Zhao Zhili)
* unix: expose thread_stack_size() internally (Brandon Cheng)
* darwin: use RLIMIT_STACK for fsevents pthread (Brandon Cheng)
* darwin: abort on pthread_attr_init fail (Brandon Cheng)
* benchmark: remove unreachable code (Matvii Hodovaniuk)
* macos: fix memleaks in uv__get_cpu_speed (George Zhao)
* Make Thread Sanitizer aware of file descriptor close in uv__close() (Ondřej
Surý)
* darwin: fix iOS compilation and functionality (Hayden)
* linux: work around copy_file_range() cephfs bug (Ben Noordhuis)
* zos: implement uv_get_constrained_memory() (Shuowang (Wayne) Zhang)
* zos: fix uv_get_free_memory() (Shuowang (Wayne) Zhang)
* zos: use CVTRLSTG to get total memory accurately (Shuowang (Wayne) Zhang)
* ibmi: Handle interface names longer than 10 chars (Kevin Adler)
* docs: update read-the-docs version of sphinx (Jameson Nash)
* unix: refactor uv_try_write (twosee)
* linux-core: add proper divide by zero assert (yiyuaner)
* misc: remove unnecessary _GNU_SOURCE macros (Darshan Sen)
* test: log to stdout to conform TAP spec (bbara)
* win,fs: fix C4090 warning with MSVC (SeverinLeonhardt)
* build: some systems provide dlopen() in libc (Andy Fiddaman)
* include: add EOVERFLOW status code mapping (Darshan Sen)
* unix,fs: use uv__load_relaxed and uv__store_relaxed (Darshan Sen)
* win: fix string encoding issue of uv_os_gethostname (Eagle Liang)
* unix,process: add uv__write_errno helper function (Ricky Zhou)
* Re-merge "unix,stream: clear read/write states on close/eof" (Jameson Nash)
* unix,core: fix errno handling in uv__getpwuid_r (Darshan Sen)
* errors: map ESOCKTNOSUPPORT errno (Ryan Liptak)
* doc: uv_read_stop always succeeds (Simon Kissane)
* inet: fix inconsistent return value of inet_ntop6 (twosee)
* darwin: fix -Wsometimes-uninitialized warning (twosee)
* stream: introduce uv_try_write2 function (twosee)
* poll,win: UV_PRIORITIZED option should not assert (twosee)
* src: DragonFlyBSD has mmsghdr struct too (David Carlier)
* cleanup,win: Remove _WIN32 guards on threadpool (James M Snell)
* freebsd: fix an incompatible pointer type warning (Darshan Sen)
* core: Correct the conditionals for {cloexec,nonblock}_ioctl (Ali Mohammad
Pur)
* win,tcp: make uv_close work more like unix (Jameson Nash)
* doc: more accurate list of valid send_handle's (twosee)
* win,tcp: translate system errors correctly (twosee)
* unix: implement cpu_relax() on ppc64 (Ben Noordhuis)
* docs: move list of project links under PR control (Jameson Nash)
* test: wrong pointer arithmetic multiplier (Erkhes N)
* doc: switch discussion forum to github (Jameson Nash)
* idna: fix OOB read in punycode decoder (Ben Noordhuis)
* build: make sure -fvisibility=hidden is set (Santiago Gimeno)
* illumos: event ports to epoll (tjarlama)
* illumos,tty: UV_TTY_MODE_IO waits for 4 bytes (Joshua M. Clulow)
* doc: add vtjnash GPG ID (Jameson Nash)
* linux: read CPU model information on ppc (Richard Lau)
* darwin: fix uv_barrier race condition (Guilherme Íscaro)
* unix,stream: fix loop hang after uv_shutdown (Jameson Nash)
* doc,udp: note that suggested_size is 1 max-sized dgram (Ryan Liptak)
* mingw: fix building for ARM/AArch64 (Martin Storsjö)
* unix: strnlen is not available on Solaris 10 (Claes Nästén)
* sunos: restore use of event ports (Andy Fiddaman)
* sunos,cmake: use thread-safe errno (Andy Fiddaman)
-----BEGIN PGP SIGNATURE-----
iQJGBAABCAAwFiEErq0KS2hnZ3UaDkrvNKJfsSgkZRQFAmD2OHUSHHZ0am5hc2hA
Z21haWwuY29tAAoJEDSiX7EoJGUU6XsQAJqkq5qV54EEFQAIf/AV9e4pt5uua2iF
bTyExNGyty5TW4OCytSxakLWS/9lN5vQo6/bjeUEfhq8a1BmLzJq5Nnmc8ntlYM6
n89vZSRjgLNwQ2WuRV9akCMTPYydeJc6RboEjTDVlWtSr4QDCwK+fKgaMil+9uow
Y8biEme/vIcpJNOE3IdhivUoS1Hl1PJrVbhJapHBQ6j4xf8CIrFBwn9qF0IX+Ngp
9xZVvJFXQkZzqLqkHeMasGCp+hmQDnAiXKO3vbUJbeVwoCukDYmVG8Pb3H3RIyo9
yZkdBpOZ1GEmnPY766IkArThM+/WBWTgz6pTOl59Zx0Wa5Dmr8ASUiauE/EEARS4
v/QUQA13MS8cgOBhmPjrLQ9Kv6HPvLuZSjshEJz4RdL8aSThoQ7Om+AlR679wnyK
vlcfNLoh+Jw1zCWKWO6c5BiqcB/8J/JPT2N0vMmT6+RZ8AiqyjGpBw+t1HeBkdW5
CPJX06CXk7vsvCKbw4w8i8Xl40zm9yws5tO7ukG/lkmB5EUKhMe1z/5pTAWoFJV/
srs6S+g3xmJ1oBeytjjEra/iJji/6jQ/oLbYeA+mvBxV5+hu7Mtnpzl0vWKrN5M2
ewxOvJJtggT1V2WcVqYLmHdZpug+pspG6Uwm6/TG/379IFot3O4OjPZ8wlrLgaNt
PU0FlUDCxyvT
=gkXG
-----END PGP SIGNATURE-----
Merge tag 'v1.42.0' into merge_1.42.0
PR-URL: https://github.com/libuv/libuv/pull/3245
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
313 lines
9.9 KiB
C
313 lines
9.9 KiB
C
/* Copyright libuv project contributors. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifdef _WIN32
|
|
|
|
#include "uv.h"
|
|
#include "task.h"
|
|
|
|
#include <errno.h>
|
|
#include <io.h>
|
|
#include <string.h>
|
|
#include <windows.h>
|
|
|
|
#define ESC "\x1b"
|
|
#define EUR_UTF8 "\xe2\x82\xac"
|
|
#define EUR_UNICODE 0x20AC
|
|
|
|
|
|
const char* expect_str = NULL;
|
|
ssize_t expect_nread = 0;
|
|
|
|
static void dump_str(const char* str, ssize_t len) {
|
|
ssize_t i;
|
|
for (i = 0; i < len; i++) {
|
|
fprintf(stderr, "%#02x ", *(str + i));
|
|
}
|
|
}
|
|
|
|
static void print_err_msg(const char* expect, ssize_t expect_len,
|
|
const char* found, ssize_t found_len) {
|
|
fprintf(stderr, "expect ");
|
|
dump_str(expect, expect_len);
|
|
fprintf(stderr, ", but found ");
|
|
dump_str(found, found_len);
|
|
fprintf(stderr, "\n");
|
|
}
|
|
|
|
static void tty_alloc(uv_handle_t* ttyin_fd, size_t size, uv_buf_t* buf) {
|
|
buf->base = malloc(size);
|
|
ASSERT_NOT_NULL(buf->base);
|
|
buf->len = size;
|
|
}
|
|
|
|
static void tty_read(uv_stream_t* tty_in, ssize_t nread, const uv_buf_t* buf) {
|
|
if (nread > 0) {
|
|
if (nread != expect_nread) {
|
|
fprintf(stderr, "expected nread %ld, but found %ld\n",
|
|
(long)expect_nread, (long)nread);
|
|
print_err_msg(expect_str, expect_nread, buf->base, nread);
|
|
ASSERT(FALSE);
|
|
}
|
|
if (strncmp(buf->base, expect_str, nread) != 0) {
|
|
print_err_msg(expect_str, expect_nread, buf->base, nread);
|
|
ASSERT(FALSE);
|
|
}
|
|
uv_close((uv_handle_t*) tty_in, NULL);
|
|
} else {
|
|
ASSERT(nread == 0);
|
|
}
|
|
}
|
|
|
|
static void make_key_event_records(WORD virt_key, DWORD ctr_key_state,
|
|
BOOL is_wsl, INPUT_RECORD* records) {
|
|
# define KEV(I) records[(I)].Event.KeyEvent
|
|
BYTE kb_state[256] = {0};
|
|
WCHAR buf[2];
|
|
int ret;
|
|
|
|
records[0].EventType = records[1].EventType = KEY_EVENT;
|
|
KEV(0).bKeyDown = TRUE;
|
|
KEV(1).bKeyDown = FALSE;
|
|
KEV(0).wVirtualKeyCode = KEV(1).wVirtualKeyCode = virt_key;
|
|
KEV(0).wRepeatCount = KEV(1).wRepeatCount = 1;
|
|
KEV(0).wVirtualScanCode = KEV(1).wVirtualScanCode =
|
|
MapVirtualKeyW(virt_key, MAPVK_VK_TO_VSC);
|
|
KEV(0).dwControlKeyState = KEV(1).dwControlKeyState = ctr_key_state;
|
|
if (ctr_key_state & LEFT_ALT_PRESSED) {
|
|
kb_state[VK_LMENU] = 0x01;
|
|
}
|
|
if (ctr_key_state & RIGHT_ALT_PRESSED) {
|
|
kb_state[VK_RMENU] = 0x01;
|
|
}
|
|
if (ctr_key_state & LEFT_CTRL_PRESSED) {
|
|
kb_state[VK_LCONTROL] = 0x01;
|
|
}
|
|
if (ctr_key_state & RIGHT_CTRL_PRESSED) {
|
|
kb_state[VK_RCONTROL] = 0x01;
|
|
}
|
|
if (ctr_key_state & SHIFT_PRESSED) {
|
|
kb_state[VK_SHIFT] = 0x01;
|
|
}
|
|
ret = ToUnicode(virt_key, KEV(0).wVirtualScanCode, kb_state, buf, 2, 0);
|
|
if (ret == 1) {
|
|
if(!is_wsl &&
|
|
((ctr_key_state & LEFT_ALT_PRESSED) ||
|
|
(ctr_key_state & RIGHT_ALT_PRESSED))) {
|
|
/*
|
|
* If ALT key is pressed, the UnicodeChar value of the keyup event is
|
|
* set to 0 on nomal console. Emulate this behavior.
|
|
* See https://github.com/Microsoft/console/issues/320
|
|
*/
|
|
KEV(0).uChar.UnicodeChar = buf[0];
|
|
KEV(1).uChar.UnicodeChar = 0;
|
|
} else{
|
|
/*
|
|
* In WSL UnicodeChar is normally set. This behavior cause #2111.
|
|
*/
|
|
KEV(0).uChar.UnicodeChar = KEV(1).uChar.UnicodeChar = buf[0];
|
|
}
|
|
} else {
|
|
KEV(0).uChar.UnicodeChar = KEV(1).uChar.UnicodeChar = 0;
|
|
}
|
|
# undef KEV
|
|
}
|
|
|
|
TEST_IMPL(tty_duplicate_vt100_fn_key) {
|
|
int r;
|
|
uv_os_fd_t ttyin_fd;
|
|
uv_tty_t tty_in;
|
|
uv_loop_t* loop;
|
|
INPUT_RECORD records[2];
|
|
DWORD written;
|
|
|
|
loop = uv_default_loop();
|
|
|
|
/* Make sure we have an FD that refers to a tty */
|
|
ttyin_fd = CreateFileA("conin$",
|
|
GENERIC_READ | GENERIC_WRITE,
|
|
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
|
NULL,
|
|
OPEN_EXISTING,
|
|
FILE_ATTRIBUTE_NORMAL,
|
|
NULL);
|
|
ASSERT(ttyin_fd != INVALID_HANDLE_VALUE);
|
|
ASSERT(UV_TTY == uv_guess_handle(ttyin_fd));
|
|
|
|
r = uv_tty_init(uv_default_loop(), &tty_in, ttyin_fd, 1); /* Readable. */
|
|
ASSERT(r == 0);
|
|
ASSERT(uv_is_readable((uv_stream_t*) &tty_in));
|
|
ASSERT(!uv_is_writable((uv_stream_t*) &tty_in));
|
|
|
|
r = uv_read_start((uv_stream_t*)&tty_in, tty_alloc, tty_read);
|
|
ASSERT(r == 0);
|
|
|
|
expect_str = ESC"[[A";
|
|
expect_nread = strlen(expect_str);
|
|
|
|
/* Turn on raw mode. */
|
|
r = uv_tty_set_mode(&tty_in, UV_TTY_MODE_RAW);
|
|
ASSERT(r == 0);
|
|
|
|
/*
|
|
* Send F1 keystrokes. Test of issue cause by #2114 that vt100 fn key
|
|
* duplicate.
|
|
*/
|
|
make_key_event_records(VK_F1, 0, TRUE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == ARRAY_SIZE(records));
|
|
|
|
uv_run(loop, UV_RUN_DEFAULT);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
TEST_IMPL(tty_duplicate_alt_modifier_key) {
|
|
int r;
|
|
uv_os_fd_t ttyin_fd;
|
|
uv_tty_t tty_in;
|
|
uv_loop_t* loop;
|
|
INPUT_RECORD records[2];
|
|
INPUT_RECORD alt_records[2];
|
|
DWORD written;
|
|
|
|
loop = uv_default_loop();
|
|
|
|
/* Make sure we have an FD that refers to a tty */
|
|
ttyin_fd = CreateFileA("conin$",
|
|
GENERIC_READ | GENERIC_WRITE,
|
|
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
|
NULL,
|
|
OPEN_EXISTING,
|
|
FILE_ATTRIBUTE_NORMAL,
|
|
NULL);
|
|
ASSERT(ttyin_fd != INVALID_HANDLE_VALUE);
|
|
ASSERT(UV_TTY == uv_guess_handle(ttyin_fd));
|
|
|
|
r = uv_tty_init(uv_default_loop(), &tty_in, ttyin_fd, 1); /* Readable. */
|
|
ASSERT(r == 0);
|
|
ASSERT(uv_is_readable((uv_stream_t*) &tty_in));
|
|
ASSERT(!uv_is_writable((uv_stream_t*) &tty_in));
|
|
|
|
r = uv_read_start((uv_stream_t*)&tty_in, tty_alloc, tty_read);
|
|
ASSERT(r == 0);
|
|
|
|
expect_str = ESC"a"ESC"a";
|
|
expect_nread = strlen(expect_str);
|
|
|
|
/* Turn on raw mode. */
|
|
r = uv_tty_set_mode(&tty_in, UV_TTY_MODE_RAW);
|
|
ASSERT(r == 0);
|
|
|
|
/* Emulate transmission of M-a at normal console */
|
|
make_key_event_records(VK_MENU, 0, TRUE, alt_records);
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[0], 1, &written);
|
|
ASSERT(written == 1);
|
|
make_key_event_records(L'A', LEFT_ALT_PRESSED, FALSE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == 2);
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[1], 1, &written);
|
|
ASSERT(written == 1);
|
|
|
|
/* Emulate transmission of M-a at WSL(#2111) */
|
|
make_key_event_records(VK_MENU, 0, TRUE, alt_records);
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[0], 1, &written);
|
|
ASSERT(written == 1);
|
|
make_key_event_records(L'A', LEFT_ALT_PRESSED, TRUE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == 2);
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[1], 1, &written);
|
|
ASSERT(written == 1);
|
|
|
|
uv_run(loop, UV_RUN_DEFAULT);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
TEST_IMPL(tty_composing_character) {
|
|
int r;
|
|
uv_os_fd_t ttyin_fd;
|
|
uv_tty_t tty_in;
|
|
uv_loop_t* loop;
|
|
INPUT_RECORD records[2];
|
|
INPUT_RECORD alt_records[2];
|
|
DWORD written;
|
|
|
|
loop = uv_default_loop();
|
|
|
|
/* Make sure we have an FD that refers to a tty */
|
|
ttyin_fd = CreateFileA("conin$",
|
|
GENERIC_READ | GENERIC_WRITE,
|
|
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
|
NULL,
|
|
OPEN_EXISTING,
|
|
FILE_ATTRIBUTE_NORMAL,
|
|
NULL);
|
|
ASSERT(ttyin_fd != INVALID_HANDLE_VALUE);
|
|
ASSERT(UV_TTY == uv_guess_handle(ttyin_fd));
|
|
|
|
r = uv_tty_init(uv_default_loop(), &tty_in, ttyin_fd, 1); /* Readable. */
|
|
ASSERT(r == 0);
|
|
ASSERT(uv_is_readable((uv_stream_t*) &tty_in));
|
|
ASSERT(!uv_is_writable((uv_stream_t*) &tty_in));
|
|
|
|
r = uv_read_start((uv_stream_t*)&tty_in, tty_alloc, tty_read);
|
|
ASSERT(r == 0);
|
|
|
|
expect_str = EUR_UTF8;
|
|
expect_nread = strlen(expect_str);
|
|
|
|
/* Turn on raw mode. */
|
|
r = uv_tty_set_mode(&tty_in, UV_TTY_MODE_RAW);
|
|
ASSERT(r == 0);
|
|
|
|
/* Emulate EUR inputs by LEFT ALT+NUMPAD ASCII KeyComos */
|
|
make_key_event_records(VK_MENU, 0, FALSE, alt_records);
|
|
alt_records[1].Event.KeyEvent.uChar.UnicodeChar = EUR_UNICODE;
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[0], 1, &written);
|
|
make_key_event_records(VK_NUMPAD0, LEFT_ALT_PRESSED, FALSE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == ARRAY_SIZE(records));
|
|
make_key_event_records(VK_NUMPAD1, LEFT_ALT_PRESSED, FALSE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == ARRAY_SIZE(records));
|
|
make_key_event_records(VK_NUMPAD2, LEFT_ALT_PRESSED, FALSE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == ARRAY_SIZE(records));
|
|
make_key_event_records(VK_NUMPAD8, LEFT_ALT_PRESSED, FALSE, records);
|
|
WriteConsoleInputW(ttyin_fd, records, ARRAY_SIZE(records), &written);
|
|
ASSERT(written == ARRAY_SIZE(records));
|
|
WriteConsoleInputW(ttyin_fd, &alt_records[1], 1, &written);
|
|
|
|
uv_run(loop, UV_RUN_DEFAULT);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
|
|
typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
|
|
|
|
#endif /* ifndef _WIN32 */
|