From: Jacek Caban <jacek@codeweavers.com>
Subject: [PATCH 7/7] kernelbase: Move Beep.
Message-Id: <7ee46e1b-f0b1-c75f-9880-f03374fa38cc@codeweavers.com>
Date: Tue, 22 Sep 2020 16:48:25 +0200

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---
  dlls/kernel32/console.c         | 12 ------------
  dlls/kernel32/kernel32.spec     |  2 +-
  dlls/kernelbase/console.c       | 13 +++++++++++++
  dlls/kernelbase/kernelbase.spec |  2 +-
  4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 24f86a9e516..19a58f259ee 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -68,18 +68,6 @@ HWND WINAPI GetConsoleWindow(void)
 }
 
 
-/***********************************************************************
- *           Beep   (KERNEL32.@)
- */
-BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )
-{
-    /* FIXME: we should not require a console to be attached */
-    DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle,
-                     IOCTL_CONDRV_BEEP, NULL, 0, NULL, 0, NULL, NULL );
-    return TRUE;
-}
-
-
 /******************************************************************
  *		OpenConsoleW            (KERNEL32.@)
  *
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 33767cd4473..4b09f359b97 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -195,7 +195,7 @@
 # @ stub BasepFreeActivationContextActivationBlock
 # @ stub BasepFreeAppCompatData
 # @ stub BasepMapModuleHandle
-@ stdcall Beep(long long)
+@ stdcall -import Beep(long long)
 @ stdcall BeginUpdateResourceA(str long)
 @ stdcall BeginUpdateResourceW(wstr long)
 @ stdcall BindIoCompletionCallback(long ptr long)
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index f46d2b76563..4555cccca13 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -1656,6 +1656,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS
     return ret;
 }
 
+
+/***********************************************************************
+ *           Beep   (kernelbase.@)
+ */
+BOOL WINAPI Beep( DWORD frequency, DWORD duration )
+{
+    /* FIXME: we should not require a console to be attached */
+    console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle,
+                   IOCTL_CONDRV_BEEP, NULL, 0, NULL, 0, NULL );
+    return TRUE;
+}
+
+
 static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HANDLE signal,
                                      DWORD flags, HANDLE *process )
 {
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index dd74e9d6e9e..1ba1c52b21a 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -93,7 +93,7 @@
 # @ stub BasepCopyFileCallback
 # @ stub BasepCopyFileExW
 # @ stub BasepNotifyTrackingService
-@ stdcall Beep(long long) kernel32.Beep
+@ stdcall Beep(long long)
 @ stub BemCopyReference
 @ stub BemCreateContractFrom
 @ stub BemCreateReference