Jacek Caban : kernel32: Move Beep() to kernelbase.
Alexandre Julliard
julliard at winehq.org
Tue Sep 22 15:46:42 CDT 2020
Module: wine
Branch: master
Commit: e8e1f1e634634a05aaed8e5d0fad9d72da499e02
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8e1f1e634634a05aaed8e5d0fad9d72da499e02
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Sep 22 16:48:25 2020 +0200
kernel32: Move Beep() to kernelbase.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 24f86a9e51..19a58f259e 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 33767cd447..4b09f359b9 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 cc9d88acf4..ce041020a3 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -1658,6 +1658,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 dd74e9d6e9..1ba1c52b21 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
More information about the wine-cvs
mailing list