ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved keyboard.c to dlls/user/kbd16.c. 

Keyboard, mouse and display drivers are 16-bit only.
This commit is contained in:
Alexandre Julliard 2004-09-01 22:47:48 +00:00
parent 9f331f489f
commit 80bba3bd61
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/user/Makefile.in
View File

@ -24,7 +24,6 @@ C_SRCS = \
$(TOPOBJDIR)/windows/dialog.c \
$(TOPOBJDIR)/windows/driver.c \
$(TOPOBJDIR)/windows/input.c \
$(TOPOBJDIR)/windows/keyboard.c \
$(TOPOBJDIR)/windows/mdi.c \
$(TOPOBJDIR)/windows/message.c \
$(TOPOBJDIR)/windows/msgbox.c \
@ -53,7 +52,6 @@ C_SRCS = \
dde/server.c \
desktop.c \
dialog16.c \
display.c \
edit.c \
exticon.c \
focus.c \
@ -64,7 +62,6 @@ C_SRCS = \
menu.c \
message.c \
misc.c \
mouse.c \
msg16.c \
painting.c \
property.c \
@ -79,7 +76,10 @@ C_SRCS = \
C_SRCS16 = \
bidi16.c \
comm16.c \
display.c \
hook16.c \
kbd16.c \
mouse16.c \
network.c \
user16.c \
wnd16.c

24
windows/keyboard.c → dlls/user/kbd16.c
View File

@ -31,11 +31,9 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "win.h"
#include "user.h"
#include "message.h"
#include "wine/debug.h"
#include "winerror.h"
#include "wine/winuser16.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
@ -107,13 +105,10 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
/**********************************************************************
* OemKeyScan (KEYBOARD.128)
* OemKeyScan (USER32.@)
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
DWORD WINAPI OemKeyScan16(WORD wOemChar)
{
TRACE("(%d)\n", wOemChar);
return wOemChar;
return OemKeyScan( wOemChar );
}
/**********************************************************************
@ -189,14 +184,3 @@ void WINAPI MessageBeep16( UINT16 i )
{
MessageBeep( i );
}
/***********************************************************************
* MessageBeep (USER32.@)
*/
BOOL WINAPI MessageBeep( UINT i )
{
BOOL active = TRUE;
SystemParametersInfoA( SPI_GETBEEP, 0, &active, FALSE );
if (active) USER_Driver.pBeep();
return TRUE;
}

2
dlls/user/keyboard.drv.spec
View File

@ -16,7 +16,7 @@
100 pascal ScreenSwitchEnable(word) ScreenSwitchEnable16
#126 pascal GetTableSeg
#127 pascal NewTable
128 pascal OemKeyScan(word) OemKeyScan
128 pascal OemKeyScan(word) OemKeyScan16
129 pascal -ret16 VkKeyScan(word) VkKeyScan16
130 pascal -ret16 GetKeyboardType(word) GetKeyboardType16
131 pascal -ret16 MapVirtualKey(word word) MapVirtualKey16

12
dlls/user/message.c
View File

@ -2413,6 +2413,18 @@ BOOL WINAPI SetMessageQueue( INT size )
}
/***********************************************************************
* MessageBeep (USER32.@)
*/
BOOL WINAPI MessageBeep( UINT i )
{
BOOL active = TRUE;
SystemParametersInfoA( SPI_GETBEEP, 0, &active, FALSE );
if (active) USER_Driver.pBeep();
return TRUE;
}
/**********************************************************************
* AttachThreadInput (USER32.@)
*

0
dlls/user/mouse.c → dlls/user/mouse16.c
View File

9
windows/input.c
View File

@ -689,6 +689,15 @@ WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl)
return -1;
}
/**********************************************************************
* OemKeyScan (USER32.@)
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
{
TRACE("(%d)\n", wOemChar);
return wOemChar;
}
/******************************************************************************
* GetKeyboardType (USER32.@)
*/