Jacek Caban : kernel32: Move FlushConsoleInputBuffer to kernelbase.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ea8fa3174cba57df1120438724ddb8d41442c2ea
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ea8fa3174cba57df112043872...

Author: Jacek Caban 
Date:   Thu Oct 15 18:19:49 2020 +0200

kernel32: Move FlushConsoleInputBuffer to kernelbase.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/kernel32/console.c         | 9 ---------
 dlls/kernel32/kernel32.spec     | 2 +-
 dlls/kernelbase/console.c       | 9 +++++++++
 dlls/kernelbase/kernelbase.spec | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index f9d24f5c885..4b74c1183ca 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -148,15 +148,6 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void)
 }

-/***********************************************************************
- *            FlushConsoleInputBuffer   (KERNEL32.@)
- */
-BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle )
-{
-    return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL );
-}
-
-
 /***********************************************************************
  *            SetConsoleTitleA   (KERNEL32.@)
  */
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 08a64955123..79964c7a9b3 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -517,7 +517,7 @@
 @ stdcall -import FlsFree(long)
 @ stdcall -import FlsGetValue(long)
 @ stdcall -import FlsSetValue(long ptr)
-@ stdcall FlushConsoleInputBuffer(long)
+@ stdcall -import FlushConsoleInputBuffer(long)
 @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers
 @ stdcall -import FlushInstructionCache(long long long)
 @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index d073b77eaa3..345241a44fd 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -1704,6 +1704,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer,
 }

+/***********************************************************************
+ *            FlushConsoleInputBuffer   (kernelbase.@)
+ */
+BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle )
+{
+    return console_ioctl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL );
+}
+
+
 /***********************************************************************
  *           Beep   (kernelbase.@)
  */
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index e55194f2041..9c7babde7fd 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -381,7 +381,7 @@
 @ stdcall FlsFree(long)
 @ stdcall FlsGetValue(long)
 @ stdcall FlsSetValue(long ptr)
-@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer
+@ stdcall FlushConsoleInputBuffer(long)
 @ stdcall FlushFileBuffers(long)
 @ stdcall FlushInstructionCache(long long long)
 @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers