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

dlls/user/kbd16.c

@@ -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 );
+}

dlls/user/mouse16.c

@@ -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" );
+}

dlls/user/user16.c

@@ -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)
  */
@@ -115,6 +137,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)
  */
 HCURSOR16 WINAPI SetCursor16(HCURSOR16 hCursor)
@@ -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)
  */
@@ -356,6 +456,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)
  */
 BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc,
@@ -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)
  */
@@ -474,6 +638,15 @@ HCURSOR16 WINAPI GetCursor16(void)
 
 
 /**********************************************************************
+ *		GetAsyncKeyState (USER.249)
+ */
+INT16 WINAPI GetAsyncKeyState16( INT16 key )
+{
+    return GetAsyncKeyState( key );
+}
+
+
+/**********************************************************************
  *         GetMenuState    (USER.250)
  */
 UINT16 WINAPI GetMenuState16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags )
@@ -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)
  */

windows/clipboard.c

@@ -238,22 +238,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.@)
  */
 UINT WINAPI RegisterClipboardFormatW(LPCWSTR formatName)
@@ -266,17 +250,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.@)
  */
 INT WINAPI GetClipboardFormatNameA(UINT wFormat, LPSTR retStr, INT maxlen)
@@ -330,15 +303,6 @@ BOOL WINAPI OpenClipboard( HWND hWnd )
 
 
 /**************************************************************************
- *		CloseClipboard (USER.138)
- */
-BOOL16 WINAPI CloseClipboard16(void)
-{
-    return CloseClipboard();
-}
-
-
-/**************************************************************************
  *		CloseClipboard (USER32.@)
  */
 BOOL WINAPI CloseClipboard(void)
@@ -370,15 +334,6 @@ BOOL WINAPI CloseClipboard(void)
 
 
 /**************************************************************************
- *		EmptyClipboard (USER.139)
- */
-BOOL16 WINAPI EmptyClipboard16(void)
-{
-    return EmptyClipboard();
-}
-
-
-/**************************************************************************
  *		EmptyClipboard (USER32.@)
  * Empties and acquires ownership of the clipboard
  */
@@ -600,15 +555,6 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData)
 
 
 /**************************************************************************
- *		CountClipboardFormats (USER.143)
- */
-INT16 WINAPI CountClipboardFormats16(void)
-{
-    return CountClipboardFormats();
-}
-
-
-/**************************************************************************
  *		CountClipboardFormats (USER32.@)
  */
 INT WINAPI CountClipboardFormats(void)
@@ -624,15 +570,6 @@ INT WINAPI CountClipboardFormats(void)
 
 
 /**************************************************************************
- *		EnumClipboardFormats (USER.144)
- */
-UINT16 WINAPI EnumClipboardFormats16(UINT16 wFormat)
-{
-    return EnumClipboardFormats(wFormat);
-}
-
-
-/**************************************************************************
  *		EnumClipboardFormats (USER32.@)
  */
 UINT WINAPI EnumClipboardFormats(UINT wFormat)
@@ -658,15 +595,6 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat)
 
 
 /**************************************************************************
- *		IsClipboardFormatAvailable (USER.193)
- */
-BOOL16 WINAPI IsClipboardFormatAvailable16(UINT16 wFormat)
-{
-    return IsClipboardFormatAvailable(wFormat);
-}
-
-
-/**************************************************************************
  *		IsClipboardFormatAvailable (USER32.@)
  */
 BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat)

windows/input.c

@@ -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)
@@ -387,21 +382,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.@)
  */
 void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
@@ -421,48 +401,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.@)
  */
 BOOL WINAPI SwapMouseButton( BOOL fSwap )
@@ -474,20 +412,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.@)
  */
 BOOL WINAPI GetCursorPos( POINT *pt )
@@ -516,15 +440,6 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci )
 
 
 /***********************************************************************
- *		SetCursorPos (USER.70)
- */
-void WINAPI SetCursorPos16( INT16 x, INT16 y )
-{
-    SetCursorPos( x, y );
-}
-
-
-/***********************************************************************
  *		SetCursorPos (USER32.@)
  */
 BOOL WINAPI SetCursorPos( INT x, INT y )
@@ -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.@)
  *

windows/syscolor.c

@@ -183,15 +183,6 @@ void SYSCOLOR_Init(void)
 
 
 /*************************************************************************
- *		GetSysColor (USER.180)
- */
-COLORREF WINAPI GetSysColor16( INT16 nIndex )
-{
-    return GetSysColor (nIndex);
-}
-
-
-/*************************************************************************
  *		GetSysColor (USER32.@)
  */
 COLORREF WINAPI GetSysColor( INT nIndex )
@@ -204,31 +195,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.@)
  */
 BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,

windows/sysmetrics.c

@@ -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"
@@ -257,15 +256,6 @@ INT SYSMETRICS_Set( INT index, INT value )
 
 
 /***********************************************************************
- *		GetSystemMetrics (USER.179)
- */
-INT16 WINAPI GetSystemMetrics16( INT16 index )
-{
-    return (INT16)GetSystemMetrics(index);
-}
-
-
-/***********************************************************************
  *		GetSystemMetrics (USER32.@)
  */
 INT WINAPI GetSystemMetrics( INT index )

windows/user.c

@@ -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
  */
@@ -187,14 +175,6 @@ void WIN_RestoreWndsLock( int ipreviousLocks )
 }
 
 /***********************************************************************
- *		FinalUserInit (USER.400)
- */
-void WINAPI FinalUserInit16( void )
-{
-    /* FIXME: Should chain to FinalGdiInit now. */
-}
-
-/***********************************************************************
  *		SignalProc32 (USER.391)
  *		UserSignalProc (USER32.@)
  *
@@ -275,26 +255,6 @@ WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
 }
 
 /***********************************************************************
- *		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)
  */
 static HANDLE *USER_GetProcessHandleList(void)
@@ -496,14 +456,6 @@ LONG WINAPI ChangeDisplaySettingsW( LPDEVMODEW devmode, DWORD flags )
 }
 
 /***********************************************************************
- *		ChangeDisplaySettings (USER.620)
- */
-LONG WINAPI ChangeDisplaySettings16( LPDEVMODEA devmode, DWORD flags )
-{
-	return ChangeDisplaySettingsA(devmode, flags);
-}
-
-/***********************************************************************
  *		ChangeDisplaySettingsExA (USER32.@)
  */
 LONG WINAPI ChangeDisplaySettingsExA(
@@ -571,17 +523,6 @@ BOOL WINAPI EnumDisplaySettingsA(LPCSTR name,DWORD n,LPDEVMODEA devmode)
 }
 
 /***********************************************************************
- *		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.@)
  */
 BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum,
@@ -658,17 +599,6 @@ BOOL WINAPI EnumDisplayDevicesW(
 }
 
 /***********************************************************************
- *		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)
  */
 DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wParam3)
@@ -693,14 +623,6 @@ DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wPa
 }
 
 /***********************************************************************
- *		GetSystemDebugState (USER.231)
- */
-WORD WINAPI GetSystemDebugState16(void)
-{
-    return 0;  /* FIXME */
-}
-
-/***********************************************************************
  *		RegisterLogonProcess (USER32.@)
  */
 DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) {