From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81721 invoked by alias); 20 Sep 2019 02:19:08 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 81669 invoked by uid 9996); 20 Sep 2019 02:19:08 -0000 Date: Fri, 20 Sep 2019 02:19:00 -0000 Message-ID: <20190920021908.81667.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: console: Revive Win7 compatibility. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: bbc625da81076bf31ea77af346d368fd221c4079 X-Git-Newrev: 1a44ad03e0f723e9479d090c43444bce2798a35d X-SW-Source: 2019-q3/txt/msg00079.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1a44ad03e0f723e9479d090c43444bce2798a35d commit 1a44ad03e0f723e9479d090c43444bce2798a35d Author: Takashi Yano Date: Thu Sep 19 05:49:55 2019 +0900 Cygwin: console: Revive Win7 compatibility. - The commit fca4cda7a420d7b15ac217d008527e029d05758e broke Win7 compatibility. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler.h | 6 ++++++ winsup/cygwin/fhandler_console.cc | 6 ------ winsup/cygwin/select.cc | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 4efb6a4..d5aa573 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -43,6 +43,12 @@ details. */ #define O_TMPFILE_FILE_ATTRS (FILE_ATTRIBUTE_TEMPORARY | FILE_ATTRIBUTE_HIDDEN) +/* Buffer size for ReadConsoleInput() and PeekConsoleInput(). */ +/* Per MSDN, max size of buffer required is below 64K. */ +/* (65536 / sizeof (INPUT_RECORD)) is 3276, however, + ERROR_NOT_ENOUGH_MEMORY occurs in win7 if this value is used. */ +#define INREC_SIZE 2048 + extern const char *windows_device_names[]; extern struct __cygwin_perfile *perfile_table; #define __fmode (*(user_data->fmode_ptr)) diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 709b825..86c39db 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -499,9 +499,6 @@ fhandler_console::process_input_message (void) termios *ti = &(get_ttyp ()->ti); - /* Per MSDN, max size of buffer required is below 64K. */ -#define INREC_SIZE (65536 / sizeof (INPUT_RECORD)) - fhandler_console::input_states stat = input_processing; DWORD total_read, i; INPUT_RECORD input_rec[INREC_SIZE]; @@ -1165,9 +1162,6 @@ fhandler_console::ioctl (unsigned int cmd, void *arg) return -1; case FIONREAD: { - /* Per MSDN, max size of buffer required is below 64K. */ -#define INREC_SIZE (65536 / sizeof (INPUT_RECORD)) - DWORD n; int ret = 0; INPUT_RECORD inp[INREC_SIZE]; diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index ed8c98d..e701442 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -1209,7 +1209,6 @@ peek_pty_slave (select_record *s, bool from_select) { if (ptys->is_line_input ()) { -#define INREC_SIZE (65536 / sizeof (INPUT_RECORD)) INPUT_RECORD inp[INREC_SIZE]; DWORD n; PeekConsoleInput (ptys->get_handle (), inp, INREC_SIZE, &n);