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

Moved some more 16-bit USER functions to the corresponding 16-bit 

files.
This commit is contained in:
Alexandre Julliard 2004-12-08 14:15:24 +00:00
parent 56ef1fec30
commit d646c7ed32
8 changed files with 287 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/user/kbd16.c
View File

@ -184,3 +184,26 @@ 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 );
}

26
dlls/user/mouse16.c
View File

@ -76,3 +76,29 @@ 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" );
}

238
dlls/user/user16.c
View File

@ -28,6 +28,9 @@
#include "win.h"
#include "winproc.h"
#include "cursoricon.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(user);
/* handle to handle 16 conversions */
#define HANDLE_16(h32) (LOWORD(h32))
@ -98,6 +101,25 @@ static BOOL CALLBACK draw_state_callback( HDC hdc, LPARAM lparam, WPARAM wparam,
}
/**********************************************************************
* InitApp (USER.5)
*/
INT16 WINAPI InitApp16( HINSTANCE16 hInstance )
{
/* Create task message queue */
return (InitThreadInput16( 0, 0 ) != 0);
}
/***********************************************************************
* ExitWindows (USER.7)
*/
BOOL16 WINAPI ExitWindows16( DWORD dwReturnCode, UINT16 wReserved )
{
return ExitWindowsEx( EWX_LOGOFF, 0xffffffff );
}
/***********************************************************************
* ClipCursor (USER.16)
*/
@ -114,6 +136,20 @@ BOOL16 WINAPI ClipCursor16( const RECT16 *rect )
}
/***********************************************************************
* GetCursorPos (USER.17)
*/
BOOL16 WINAPI GetCursorPos16( POINT16 *pt )
{
POINT pos;
if (!pt) return 0;
GetCursorPos(&pos);
pt->x = pos.x;
pt->y = pos.y;
return 1;
}
/***********************************************************************
* SetCursor (USER.69)
*/
@ -122,6 +158,16 @@ HCURSOR16 WINAPI SetCursor16(HCURSOR16 hCursor)
return HCURSOR_16(SetCursor(HCURSOR_32(hCursor)));
}
/***********************************************************************
* SetCursorPos (USER.70)
*/
void WINAPI SetCursorPos16( INT16 x, INT16 y )
{
SetCursorPos( x, y );
}
/***********************************************************************
* ShowCursor (USER.71)
*/
@ -234,6 +280,60 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
}
/**************************************************************************
* CloseClipboard (USER.138)
*/
BOOL16 WINAPI CloseClipboard16(void)
{
return CloseClipboard();
}
/**************************************************************************
* EmptyClipboard (USER.139)
*/
BOOL16 WINAPI EmptyClipboard16(void)
{
return EmptyClipboard();
}
/**************************************************************************
* CountClipboardFormats (USER.143)
*/
INT16 WINAPI CountClipboardFormats16(void)
{
return CountClipboardFormats();
}
/**************************************************************************
* EnumClipboardFormats (USER.144)
*/
UINT16 WINAPI EnumClipboardFormats16( UINT16 id )
{
return EnumClipboardFormats( id );
}
/**************************************************************************
* RegisterClipboardFormat (USER.145)
*/
UINT16 WINAPI RegisterClipboardFormat16( LPCSTR name )
{
return RegisterClipboardFormatA( name );
}
/**************************************************************************
* GetClipboardFormatName (USER.146)
*/
INT16 WINAPI GetClipboardFormatName16( UINT16 id, LPSTR buffer, INT16 maxlen )
{
return GetClipboardFormatNameA( id, buffer, maxlen );
}
/**********************************************************************
* CreateMenu (USER.151)
*/
@ -355,6 +455,40 @@ HBITMAP16 WINAPI LoadBitmap16(HINSTANCE16 hInstance, LPCSTR name)
}
/***********************************************************************
* GetSystemMetrics (USER.179)
*/
INT16 WINAPI GetSystemMetrics16( INT16 index )
{
return GetSystemMetrics( index );
}
/*************************************************************************
* GetSysColor (USER.180)
*/
COLORREF WINAPI GetSysColor16( INT16 index )
{
return GetSysColor( index );
}
/*************************************************************************
* SetSysColors (USER.181)
*/
VOID WINAPI SetSysColors16( INT16 count, const INT16 *list16, const COLORREF *values )
{
INT i, *list;
if ((list = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*list) )))
{
for (i = 0; i < count; i++) list[i] = list16[i];
SetSysColors( count, list, values );
HeapFree( GetProcessHeap(), 0, list );
}
}
/***********************************************************************
* GrayString (USER.185)
*/
@ -395,6 +529,15 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc,
}
/**************************************************************************
* IsClipboardFormatAvailable (USER.193)
*/
BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat )
{
return IsClipboardFormatAvailable( wFormat );
}
/***********************************************************************
* TabbedTextOut (USER.196)
*/
@ -464,6 +607,27 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
return ret;
}
/***********************************************************************
* GetSystemDebugState (USER.231)
*/
WORD WINAPI GetSystemDebugState16(void)
{
return 0; /* FIXME */
}
/***********************************************************************
* ExitWindowsExec (USER.246)
*/
BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
{
TRACE("Should run the following in DOS-mode: \"%s %s\"\n",
lpszExe, lpszParams);
return ExitWindowsEx( EWX_LOGOFF, 0xffffffff );
}
/***********************************************************************
* GetCursor (USER.247)
*/
@ -473,6 +637,15 @@ HCURSOR16 WINAPI GetCursor16(void)
}
/**********************************************************************
* GetAsyncKeyState (USER.249)
*/
INT16 WINAPI GetAsyncKeyState16( INT16 key )
{
return GetAsyncKeyState( key );
}
/**********************************************************************
* GetMenuState (USER.250)
*/
@ -591,6 +764,44 @@ void WINAPI SignalProc16( HANDLE16 hModule, UINT16 code,
}
/***********************************************************************
* SetEventHook (USER.321)
*
* Used by Turbo Debugger for Windows
*/
FARPROC16 WINAPI SetEventHook16(FARPROC16 lpfnEventHook)
{
FIXME("(lpfnEventHook=%p): stub\n", lpfnEventHook);
return 0;
}
/**********************************************************************
* EnableHardwareInput (USER.331)
*/
BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
{
FIXME("(%d) - stub\n", bEnable);
return TRUE;
}
/***********************************************************************
* IsUserIdle (USER.333)
*/
BOOL16 WINAPI IsUserIdle16(void)
{
if ( GetAsyncKeyState( VK_LBUTTON ) & 0x8000 )
return FALSE;
if ( GetAsyncKeyState( VK_RBUTTON ) & 0x8000 )
return FALSE;
if ( GetAsyncKeyState( VK_MBUTTON ) & 0x8000 )
return FALSE;
/* Should check for screen saver activation here ... */
return TRUE;
}
/**********************************************************************
* IsMenu (USER.358)
*/
@ -667,6 +878,16 @@ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon, LPICONINFO16 iconinfo)
return ret;
}
/***********************************************************************
* FinalUserInit (USER.400)
*/
void WINAPI FinalUserInit16( void )
{
/* FIXME: Should chain to FinalGdiInit */
}
/***********************************************************************
* CreateCursor (USER.406)
*/
@ -1027,6 +1248,23 @@ void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
}
/***********************************************************************
* ChangeDisplaySettings (USER.620)
*/
LONG WINAPI ChangeDisplaySettings16( LPDEVMODEA devmode, DWORD flags )
{
return ChangeDisplaySettingsA( devmode, flags );
}
/***********************************************************************
* EnumDisplaySettings (USER.621)
*/
BOOL16 WINAPI EnumDisplaySettings16( LPCSTR name, DWORD n, LPDEVMODEA devmode )
{
return EnumDisplaySettingsA( name, n, devmode );
}
/**********************************************************************
* DrawFrameControl (USER.656)
*/

72
windows/clipboard.c
View File

@ -237,22 +237,6 @@ UINT WINAPI RegisterClipboardFormatA(LPCSTR FormatName)
}
/**************************************************************************
* RegisterClipboardFormat (USER.145)
*/
UINT16 WINAPI RegisterClipboardFormat16(LPCSTR FormatName)
{
UINT wFormatID = 0;
TRACE("%s\n", debugstr_a(FormatName));
if (USER_Driver.pRegisterClipboardFormat)
wFormatID = USER_Driver.pRegisterClipboardFormat(FormatName);
return wFormatID;
}
/**************************************************************************
* RegisterClipboardFormatW (USER32.@)
*/
@ -265,17 +249,6 @@ UINT WINAPI RegisterClipboardFormatW(LPCWSTR formatName)
}
/**************************************************************************
* GetClipboardFormatName (USER.146)
*/
INT16 WINAPI GetClipboardFormatName16(UINT16 wFormat, LPSTR retStr, INT16 maxlen)
{
TRACE("%04x,%p,%d\n", wFormat, retStr, maxlen);
return GetClipboardFormatNameA(wFormat, retStr, maxlen);
}
/**************************************************************************
* GetClipboardFormatNameA (USER32.@)
*/
@ -329,15 +302,6 @@ BOOL WINAPI OpenClipboard( HWND hWnd )
}
/**************************************************************************
* CloseClipboard (USER.138)
*/
BOOL16 WINAPI CloseClipboard16(void)
{
return CloseClipboard();
}
/**************************************************************************
* CloseClipboard (USER32.@)
*/
@ -369,15 +333,6 @@ BOOL WINAPI CloseClipboard(void)
}
/**************************************************************************
* EmptyClipboard (USER.139)
*/
BOOL16 WINAPI EmptyClipboard16(void)
{
return EmptyClipboard();
}
/**************************************************************************
* EmptyClipboard (USER32.@)
* Empties and acquires ownership of the clipboard
@ -599,15 +554,6 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData)
}
/**************************************************************************
* CountClipboardFormats (USER.143)
*/
INT16 WINAPI CountClipboardFormats16(void)
{
return CountClipboardFormats();
}
/**************************************************************************
* CountClipboardFormats (USER32.@)
*/
@ -623,15 +569,6 @@ INT WINAPI CountClipboardFormats(void)
}
/**************************************************************************
* EnumClipboardFormats (USER.144)
*/
UINT16 WINAPI EnumClipboardFormats16(UINT16 wFormat)
{
return EnumClipboardFormats(wFormat);
}
/**************************************************************************
* EnumClipboardFormats (USER32.@)
*/
@ -657,15 +594,6 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat)
}
/**************************************************************************
* IsClipboardFormatAvailable (USER.193)
*/
BOOL16 WINAPI IsClipboardFormatAvailable16(UINT16 wFormat)
{
return IsClipboardFormatAvailable(wFormat);
}
/**************************************************************************
* IsClipboardFormatAvailable (USER32.@)
*/

119
windows/input.c
View File

@ -39,8 +39,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/server.h"
#include "win.h"
#include "message.h"
@ -53,7 +51,6 @@ WINE_DECLARE_DEBUG_CHANNEL(keyboard);
WINE_DECLARE_DEBUG_CHANNEL(win);
WINE_DEFAULT_DEBUG_CHANNEL(event);
static BOOL InputEnabled = TRUE;
static BOOL SwappedButtons;
BYTE InputKeyStateTable[256];
@ -341,8 +338,6 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size )
{
UINT i;
if (!InputEnabled) return 0;
for (i = 0; i < count; i++, inputs++)
{
switch(inputs->type)
@ -386,21 +381,6 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan,
}
/***********************************************************************
* 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 (USER32.@)
*/
@ -420,48 +400,6 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
}
/***********************************************************************
* 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" );
}
/**********************************************************************
* EnableHardwareInput (USER.331)
*/
BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
{
BOOL16 bOldState = InputEnabled;
FIXME_(event)("(%d) - stub\n", bEnable);
InputEnabled = bEnable;
return bOldState;
}
/***********************************************************************
* SwapMouseButton (USER.186)
*/
BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
{
BOOL16 ret = SwappedButtons;
SwappedButtons = fSwap;
return ret;
}
/***********************************************************************
* SwapMouseButton (USER32.@)
*/
@ -473,20 +411,6 @@ BOOL WINAPI SwapMouseButton( BOOL fSwap )
}
/***********************************************************************
* GetCursorPos (USER.17)
*/
BOOL16 WINAPI GetCursorPos16( POINT16 *pt )
{
POINT pos;
if (!pt) return 0;
GetCursorPos(&pos);
pt->x = pos.x;
pt->y = pos.y;
return 1;
}
/***********************************************************************
* GetCursorPos (USER32.@)
*/
@ -515,15 +439,6 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci )
}
/***********************************************************************
* SetCursorPos (USER.70)
*/
void WINAPI SetCursorPos16( INT16 x, INT16 y )
{
SetCursorPos( x, y );
}
/***********************************************************************
* SetCursorPos (USER32.@)
*/
@ -609,32 +524,6 @@ SHORT WINAPI GetAsyncKeyState(INT nKey)
return retval;
}
/**********************************************************************
* GetAsyncKeyState (USER.249)
*/
INT16 WINAPI GetAsyncKeyState16(INT16 nKey)
{
return GetAsyncKeyState(nKey);
}
/***********************************************************************
* IsUserIdle (USER.333)
*/
BOOL16 WINAPI IsUserIdle16(void)
{
if ( GetAsyncKeyState( VK_LBUTTON ) & 0x8000 )
return FALSE;
if ( GetAsyncKeyState( VK_RBUTTON ) & 0x8000 )
return FALSE;
if ( GetAsyncKeyState( VK_MBUTTON ) & 0x8000 )
return FALSE;
/* Should check for screen saver activation here ... */
return TRUE;
}
/**********************************************************************
* VkKeyScanA (USER32.@)
@ -767,14 +656,6 @@ UINT WINAPI GetKBCodePage(void)
return GetOEMCP();
}
/****************************************************************************
* GetKeyboardLayoutName (USER.477)
*/
INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
{
return GetKeyboardLayoutNameA(pwszKLID);
}
/***********************************************************************
* GetKeyboardLayout (USER32.@)
*

34
windows/syscolor.c
View File

@ -182,15 +182,6 @@ void SYSCOLOR_Init(void)
}
/*************************************************************************
* GetSysColor (USER.180)
*/
COLORREF WINAPI GetSysColor16( INT16 nIndex )
{
return GetSysColor (nIndex);
}
/*************************************************************************
* GetSysColor (USER32.@)
*/
@ -203,31 +194,6 @@ COLORREF WINAPI GetSysColor( INT nIndex )
}
/*************************************************************************
* SetSysColors (USER.181)
*/
VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
const COLORREF *lpColorValues )
{
int i;
for (i = 0; i < nChanges; i++)
{
SYSCOLOR_SetColor( lpSysColor[i], lpColorValues[i] );
}
/* Send WM_SYSCOLORCHANGE message to all windows */
SendMessageTimeoutW( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0,
SMTO_ABORTIFHUNG, 2000, NULL );
/* Repaint affected portions of all visible windows */
RedrawWindow( GetDesktopWindow(), NULL, 0,
RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
}
/*************************************************************************
* SetSysColors (USER32.@)
*/

10
windows/sysmetrics.c
View File

@ -27,7 +27,6 @@
#include "winbase.h"
#include "winreg.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
#include "winerror.h"
#include "user.h"
@ -256,15 +255,6 @@ INT SYSMETRICS_Set( INT index, INT value )
}
/***********************************************************************
* GetSystemMetrics (USER.179)
*/
INT16 WINAPI GetSystemMetrics16( INT16 index )
{
return (INT16)GetSystemMetrics(index);
}
/***********************************************************************
* GetSystemMetrics (USER32.@)
*/

78
windows/user.c
View File

@ -115,18 +115,6 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )
}
/**********************************************************************
* InitApp (USER.5)
*/
INT16 WINAPI InitApp16( HINSTANCE16 hInstance )
{
/* Create task message queue */
if ( !InitThreadInput16( 0, 0 ) ) return 0;
return 1;
}
/***********************************************************************
* USER_Lock
*/
@ -186,14 +174,6 @@ void WIN_RestoreWndsLock( int ipreviousLocks )
_EnterSysLevel( &USER_SysLevel );
}
/***********************************************************************
* FinalUserInit (USER.400)
*/
void WINAPI FinalUserInit16( void )
{
/* FIXME: Should chain to FinalGdiInit now. */
}
/***********************************************************************
* SignalProc32 (USER.391)
* UserSignalProc (USER32.@)
@ -274,26 +254,6 @@ WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
return 0;
}
/***********************************************************************
* ExitWindows (USER.7)
*/
BOOL16 WINAPI ExitWindows16( DWORD dwReturnCode, UINT16 wReserved )
{
return ExitWindowsEx( EWX_LOGOFF, 0xffffffff );
}
/***********************************************************************
* ExitWindowsExec (USER.246)
*/
BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
{
TRACE("Should run the following in DOS-mode: \"%s %s\"\n",
lpszExe, lpszParams);
return ExitWindowsEx( EWX_LOGOFF, 0xffffffff );
}
/***********************************************************************
* USER_GetProcessHandleList(Internal)
*/
@ -495,14 +455,6 @@ LONG WINAPI ChangeDisplaySettingsW( LPDEVMODEW devmode, DWORD flags )
return ChangeDisplaySettingsExW(NULL,devmode,NULL,flags,NULL);
}
/***********************************************************************
* ChangeDisplaySettings (USER.620)
*/
LONG WINAPI ChangeDisplaySettings16( LPDEVMODEA devmode, DWORD flags )
{
return ChangeDisplaySettingsA(devmode, flags);
}
/***********************************************************************
* ChangeDisplaySettingsExA (USER32.@)
*/
@ -570,17 +522,6 @@ BOOL WINAPI EnumDisplaySettingsA(LPCSTR name,DWORD n,LPDEVMODEA devmode)
return EnumDisplaySettingsExA(name, n, devmode, 0);
}
/***********************************************************************
* EnumDisplaySettings (USER.621)
*/
BOOL16 WINAPI EnumDisplaySettings16(
LPCSTR name, /* [in] huh? */
DWORD n, /* [in] nth entry in display settings list*/
LPDEVMODEA devmode /* [out] devmode for that setting */
) {
return (BOOL16)EnumDisplaySettingsA(name, n, devmode);
}
/***********************************************************************
* EnumDisplaySettingsExA (USER32.@)
*/
@ -657,17 +598,6 @@ BOOL WINAPI EnumDisplayDevicesW(
return TRUE;
}
/***********************************************************************
* SetEventHook (USER.321)
*
* Used by Turbo Debugger for Windows
*/
FARPROC16 WINAPI SetEventHook16(FARPROC16 lpfnEventHook)
{
FIXME("(lpfnEventHook=%08x): stub\n", (UINT)lpfnEventHook);
return NULL;
}
/***********************************************************************
* UserSeeUserDo (USER.216)
*/
@ -692,14 +622,6 @@ DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wPa
}
}
/***********************************************************************
* GetSystemDebugState (USER.231)
*/
WORD WINAPI GetSystemDebugState16(void)
{
return 0; /* FIXME */
}
/***********************************************************************
* RegisterLogonProcess (USER32.@)
*/