From 57754bdb296b05a6e081c3e6727cef55a4f7fe68 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Thu, 11 Jun 2015 17:54:39 +0200 Subject: [PATCH] msvcr: Add _getche_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 25 ++++++++++++++++++------- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 49b9232ebc7..002ed362125 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -892,7 +892,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 80e46e0f693..7b06c5ff74e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1240,7 +1240,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dba67521a7c..64eb2f54f69 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1238,7 +1238,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c45f4472ecf..0bef364f150 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -566,7 +566,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6948d029d59..fafed02dcd7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -543,7 +543,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 8801fc054b2..ed8b728c56a 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -216,18 +216,29 @@ int CDECL _putch(int c) return c; } +/********************************************************************* + * _getche_nolock (MSVCR80.@) + */ +int CDECL _getche_nolock(void) +{ + int retval; + retval = _getch_nolock(); + if (retval != MSVCRT_EOF) + retval = _putch_nolock(retval); + return retval; +} + /********************************************************************* * _getche (MSVCRT.@) */ int CDECL _getche(void) { - int retval; - LOCK_CONSOLE; - retval = _getch(); - if (retval != MSVCRT_EOF) - retval = _putch(retval); - UNLOCK_CONSOLE; - return retval; + int ret; + + LOCK_CONSOLE; + ret = _getche_nolock(); + UNLOCK_CONSOLE; + return ret; } /*********************************************************************