Commit 6c8e3a85 authored by Alexandre Julliard's avatar Alexandre Julliard

user32: Move a few 16-bit user functions to user16.c where they belong.

parent e4815a9b
......@@ -209,34 +209,3 @@ INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState,
{
return ToAscii( virtKey, scanCode, lpKeyState, lpChar, flags );
}
/***********************************************************************
* MessageBeep (USER.104)
*/
void WINAPI MessageBeep16( UINT16 i )
{
MessageBeep( i );
}
/***********************************************************************
* keybd_event (USER.289)
*/
void WINAPI keybd_event16( CONTEXT86 *context )
{
DWORD dwFlags = 0;
if (HIBYTE(context->Eax) & 0x80) dwFlags |= KEYEVENTF_KEYUP;
if (HIBYTE(context->Ebx) & 0x01) dwFlags |= KEYEVENTF_EXTENDEDKEY;
keybd_event( LOBYTE(context->Eax), LOBYTE(context->Ebx),
dwFlags, MAKELONG(LOWORD(context->Esi), LOWORD(context->Edi)) );
}
/****************************************************************************
* GetKeyboardLayoutName (USER.477)
*/
INT16 WINAPI GetKeyboardLayoutName16( LPSTR name )
{
return GetKeyboardLayoutNameA( name );
}
......@@ -77,29 +77,3 @@ VOID WINAPI MOUSE_Disable(VOID)
{
DefMouseEventProc = 0;
}
/***********************************************************************
* SwapMouseButton (USER.186)
*/
BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
{
return SwapMouseButton( fSwap );
}
/***********************************************************************
* mouse_event (USER.299)
*/
void WINAPI mouse_event16( CONTEXT86 *context )
{
mouse_event( LOWORD(context->Eax), LOWORD(context->Ebx), LOWORD(context->Ecx),
LOWORD(context->Edx), MAKELONG(context->Esi, context->Edi) );
}
/***********************************************************************
* GetMouseEventProc (USER.337)
*/
FARPROC16 WINAPI GetMouseEventProc16(void)
{
HMODULE16 hmodule = GetModuleHandle16("USER");
return GetProcAddress16( hmodule, "mouse_event" );
}
......@@ -428,6 +428,15 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
}
/***********************************************************************
* MessageBeep (USER.104)
*/
void WINAPI MessageBeep16( UINT16 i )
{
MessageBeep( i );
}
/**************************************************************************
* CloseClipboard (USER.138)
*/
......@@ -677,6 +686,15 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc,
}
/***********************************************************************
* SwapMouseButton (USER.186)
*/
BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
{
return SwapMouseButton( fSwap );
}
/**************************************************************************
* IsClipboardFormatAvailable (USER.193)
*/
......@@ -999,6 +1017,31 @@ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
/***********************************************************************
* keybd_event (USER.289)
*/
void WINAPI keybd_event16( CONTEXT86 *context )
{
DWORD dwFlags = 0;
if (HIBYTE(context->Eax) & 0x80) dwFlags |= KEYEVENTF_KEYUP;
if (HIBYTE(context->Ebx) & 0x01) dwFlags |= KEYEVENTF_EXTENDEDKEY;
keybd_event( LOBYTE(context->Eax), LOBYTE(context->Ebx),
dwFlags, MAKELONG(LOWORD(context->Esi), LOWORD(context->Edi)) );
}
/***********************************************************************
* mouse_event (USER.299)
*/
void WINAPI mouse_event16( CONTEXT86 *context )
{
mouse_event( LOWORD(context->Eax), LOWORD(context->Ebx), LOWORD(context->Ecx),
LOWORD(context->Edx), MAKELONG(context->Esi, context->Edi) );
}
/***********************************************************************
* GetClipCursor (USER.309)
*/
void WINAPI GetClipCursor16( RECT16 *rect )
......@@ -1053,6 +1096,16 @@ BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
/***********************************************************************
* GetMouseEventProc (USER.337)
*/
FARPROC16 WINAPI GetMouseEventProc16(void)
{
HMODULE16 hmodule = GetModuleHandle16("USER");
return GetProcAddress16( hmodule, "mouse_event" );
}
/***********************************************************************
* IsUserIdle (USER.333)
*/
BOOL16 WINAPI IsUserIdle16(void)
......@@ -1678,6 +1731,15 @@ SEGPTR WINAPI AnsiPrev16( LPCSTR start, SEGPTR current )
}
/****************************************************************************
* GetKeyboardLayoutName (USER.477)
*/
INT16 WINAPI GetKeyboardLayoutName16( LPSTR name )
{
return GetKeyboardLayoutNameA( name );
}
/***********************************************************************
* FormatMessage (USER.606)
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment