From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 1866C385E83D; Tue,  6 Jul 2021 14:05:32 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1866C385E83D
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Revert "Cygwin: console: Fix garbled input for
 non-ASCII chars."
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 1b242c12aa7f34d89d57023f3c33f5f88d89d476
X-Git-Newrev: bc184284cb5f8c1aaba3647025f5b40578220d2a
Message-Id: <20210706140532.1866C385E83D@sourceware.org>
Date: Tue,  6 Jul 2021 14:05:32 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Tue, 06 Jul 2021 14:05:32 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=bc184284cb5f8c1aaba3647025f5b40578220d2a

commit bc184284cb5f8c1aaba3647025f5b40578220d2a
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Jul 6 16:04:22 2021 +0200

    Revert "Cygwin: console: Fix garbled input for non-ASCII chars."
    
    This reverts commit 1b242c12aa7f34d89d57023f3c33f5f88d89d476.

Diff:
---
 winsup/cygwin/fhandler_console.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 76689c674..b3eae6a5a 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -213,7 +213,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
       switch (cygwait (p->input_handle, (DWORD) 0))
 	{
 	case WAIT_OBJECT_0:
-	  ReadConsoleInputW (p->input_handle,
+	  ReadConsoleInputA (p->input_handle,
 			     input_rec, INREC_SIZE, &total_read);
 	  break;
 	case WAIT_TIMEOUT:
@@ -326,7 +326,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
 	}
       if (total_read)
 	/* Write back input records other than interrupt. */
-	WriteConsoleInputW (p->input_handle, input_rec, total_read, &n);
+	WriteConsoleInput (p->input_handle, input_rec, total_read, &n);
 skip_writeback:
       ReleaseMutex (p->input_mutex);
       cygwait (40);