Removed input.h, queue.h, spy.h and sysmetrics.h and moved their
contents to user.h.
Moved message.h and winproc.h to dlls/user.
diff --git a/include/input.h b/include/input.h
deleted file mode 100644
index ab657ce..0000000
--- a/include/input.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * USER input header file
- * Copyright 1997 David Faure
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_INPUT_H
-#define __WINE_INPUT_H
-
-#include "windef.h"
-
-extern BYTE InputKeyStateTable[256];
-extern BYTE AsyncKeyStateTable[256];
-
-#endif /* __WINE_INPUT_H */
-
diff --git a/include/message.h b/include/message.h
deleted file mode 100644
index c1b3111..0000000
--- a/include/message.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Message definitions
- *
- * Copyright 1993 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_MESSAGE_H
-#define __WINE_MESSAGE_H
-
-#include "windef.h"
-#include "wine/windef16.h"
-#include "winproc.h"
-
-/* message.c */
-extern BOOL MSG_process_raw_hardware_message( MSG *msg, ULONG_PTR extra_info, HWND hwnd_filter,
- UINT first, UINT last, BOOL remove );
-extern BOOL MSG_process_cooked_hardware_message( MSG *msg, ULONG_PTR extra_info, BOOL remove );
-extern void MSG_JournalPlayBackMsg(void);
-
-/* sendmsg.c */
-extern BOOL MSG_peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, int flags );
-
-/* timer.c */
-extern void TIMER_RemoveWindowTimers( HWND hwnd );
-extern void TIMER_RemoveThreadTimers(void);
-extern BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, HWINDOWPROC hProc );
-
-#endif /* __WINE_MESSAGE_H */
diff --git a/include/queue.h b/include/queue.h
deleted file mode 100644
index c4b74c4..0000000
--- a/include/queue.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Message queues definitions
- *
- * Copyright 1993 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_QUEUE_H
-#define __WINE_QUEUE_H
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "thread.h"
-
-struct received_message_info;
-struct hook16_queue_info;
-
-/* Message queue */
-typedef struct tagMESSAGEQUEUE
-{
- HQUEUE16 self; /* Handle to self (was: reserved) */
- HANDLE server_queue; /* Handle to server-side queue */
- DWORD recursion_count; /* Counter to prevent infinite SendMessage recursion */
- HHOOK hook; /* Current hook */
- struct received_message_info *receive_info; /* Info about message being currently received */
- struct hook16_queue_info *hook16_info; /* Opaque pointer for 16-bit hook support */
-
- DWORD GetMessageTimeVal; /* Value for GetMessageTime */
- DWORD GetMessagePosVal; /* Value for GetMessagePos */
- DWORD GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */
-
- HCURSOR cursor; /* current cursor */
- INT cursor_count; /* cursor show count */
-} MESSAGEQUEUE;
-
-
-#define MAX_SENDMSG_RECURSION 64
-
-/* Message queue management methods */
-extern MESSAGEQUEUE *QUEUE_Current(void);
-extern void QUEUE_DeleteMsgQueue(void);
-
-#endif /* __WINE_QUEUE_H */
diff --git a/include/spy.h b/include/spy.h
deleted file mode 100644
index cbbb38f..0000000
--- a/include/spy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Message Logging functions
- *
- * Copyright 1994 Bob Amstadt
- * Copyright 1995 Alex Korobka
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_SPY_H
-#define __WINE_SPY_H
-
-#include "windef.h"
-
-#define SPY_DISPATCHMESSAGE16 0x0100
-#define SPY_DISPATCHMESSAGE 0x0101
-#define SPY_SENDMESSAGE16 0x0102
-#define SPY_SENDMESSAGE 0x0103
-#define SPY_DEFWNDPROC16 0x0104
-#define SPY_DEFWNDPROC 0x0105
-
-#define SPY_RESULT_OK16 0x0000
-#define SPY_RESULT_OK 0x0001
-#define SPY_RESULT_INVALIDHWND16 0x0002
-#define SPY_RESULT_INVALIDHWND 0x0003
-#define SPY_RESULT_DEFWND16 0x0004
-#define SPY_RESULT_DEFWND 0x0005
-
-
-extern const char *SPY_GetMsgName( UINT msg, HWND hWnd );
-extern const char *SPY_GetVKeyName(WPARAM wParam);
-extern void SPY_EnterMessage( INT iFlag, HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam );
-extern void SPY_ExitMessage( INT iFlag, HWND hwnd, UINT msg,
- LRESULT lReturn, WPARAM wParam, LPARAM lParam );
-extern int SPY_Init(void);
-
-#endif /* __WINE_SPY_H */
diff --git a/include/sysmetrics.h b/include/sysmetrics.h
deleted file mode 100644
index 9804785..0000000
--- a/include/sysmetrics.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * System metrics definitions
- *
- * Copyright 1994 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_SYSMETRICS_H
-#define __WINE_SYSMETRICS_H
-
-extern void SYSMETRICS_Init(void); /* sysmetrics.c */
-extern INT SYSMETRICS_Set( INT index, INT value ); /* sysmetrics.c */
-extern void SYSCOLOR_Init(void); /* syscolor.c */
-extern void SYSPARAMS_GetDoubleClickSize( INT *width, INT *height );
-extern INT SYSPARAMS_GetMouseButtonSwap( void );
-
-/* Wine extensions */
-#define SM_WINE_BPP (SM_CMETRICS+1) /* screen bpp */
-#define SM_WINE_CMETRICS SM_WINE_BPP
-
-#endif /* __WINE_SYSMETRICS_H */
diff --git a/include/user.h b/include/user.h
index 7ae1da8..2e7dcf9 100644
--- a/include/user.h
+++ b/include/user.h
@@ -142,9 +142,26 @@
extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );
extern BOOL HOOK_IsHooked( INT id );
+/* input.c */
+extern BYTE InputKeyStateTable[256];
+extern BYTE AsyncKeyStateTable[256];
+
/* syscolor.c */
+extern void SYSCOLOR_Init(void);
extern HPEN SYSCOLOR_GetPen( INT index );
+/* sysmetrics.c */
+extern void SYSMETRICS_Init(void);
+extern INT SYSMETRICS_Set( INT index, INT value );
+
+/* Wine extensions */
+#define SM_WINE_BPP (SM_CMETRICS+1) /* screen bpp */
+#define SM_WINE_CMETRICS SM_WINE_BPP
+
+/* sysparams.c */
+extern void SYSPARAMS_GetDoubleClickSize( INT *width, INT *height );
+extern INT SYSPARAMS_GetMouseButtonSwap( void );
+
extern HPALETTE WINAPI SelectPalette( HDC hDC, HPALETTE hPal, BOOL bForceBackground );
extern DWORD USER16_AlertableWait;
diff --git a/include/win.h b/include/win.h
index 3a356c2..d73fbdc 100644
--- a/include/win.h
+++ b/include/win.h
@@ -24,7 +24,6 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
-#include "winproc.h"
#include "winuser.h"
#include "wine/windef16.h"
@@ -42,7 +41,7 @@
HWND parent; /* Window parent */
HWND owner; /* Window owner */
struct tagCLASS *class; /* Window class */
- HWINDOWPROC winproc; /* Window procedure */
+ WNDPROC winproc; /* Window procedure */
DWORD dwMagic; /* Magic number (must be WND_MAGIC) */
DWORD tid; /* Owner thread id */
HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */
@@ -137,14 +136,4 @@
extern BOOL FOCUS_MouseActivate( HWND hwnd );
-/* Classes functions */
-struct tagCLASS; /* opaque structure */
-struct builtin_class_descr;
-extern ATOM CLASS_RegisterBuiltinClass( const struct builtin_class_descr *descr );
-extern struct tagCLASS *CLASS_AddWindow( ATOM atom, HINSTANCE inst, WINDOWPROCTYPE type,
- INT *winExtra, WNDPROC *winproc,
- DWORD *style, struct tagDCE **dce );
-extern void CLASS_RemoveWindow( struct tagCLASS *cls );
-extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
-
#endif /* __WINE_WIN_H */
diff --git a/include/winproc.h b/include/winproc.h
deleted file mode 100644
index a8bc080..0000000
--- a/include/winproc.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Window procedure callbacks definitions
- *
- * Copyright 1996 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_WINPROC_H
-#define __WINE_WINPROC_H
-
-#include "windef.h"
-#include "wine/winbase16.h"
-#include "winnls.h"
-
-typedef enum
-{
- WIN_PROC_INVALID,
- WIN_PROC_16,
- WIN_PROC_32A,
- WIN_PROC_32W
-} WINDOWPROCTYPE;
-
-typedef enum
-{
- WIN_PROC_CLASS,
- WIN_PROC_WINDOW,
- WIN_PROC_TIMER
-} WINDOWPROCUSER;
-
-typedef void *HWINDOWPROC; /* Really a pointer to a WINDOWPROC */
-
-typedef struct
-{
- WPARAM16 wParam;
- LPARAM lParam;
- LRESULT lResult;
-} MSGPARAM16;
-
-typedef struct
-{
- WPARAM wParam;
- LPARAM lParam;
- LRESULT lResult;
-} MSGPARAM;
-
-extern BOOL WINPROC_Init(void);
-extern WNDPROC16 WINPROC_GetProc( HWINDOWPROC proc, WINDOWPROCTYPE type );
-extern BOOL WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
- WINDOWPROCTYPE type, WINDOWPROCUSER user );
-extern void WINPROC_FreeProc( HWINDOWPROC proc, WINDOWPROCUSER user );
-extern WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc );
-
-extern INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam,
- LPARAM *plparam );
-extern INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM *pwparam,
- LPARAM *plparam );
-extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16,
- UINT *pmsg32, WPARAM *pwparam32,
- LPARAM *plparam );
-extern INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16,
- UINT *pmsg32, WPARAM *pwparam32,
- LPARAM *plparam );
-extern INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32,
- WPARAM wParam32, UINT16 *pmsg16,
- WPARAM16 *pwparam16, LPARAM *plparam );
-extern INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32,
- WPARAM wParam32, UINT16 *pmsg16,
- WPARAM16 *pwparam16, LPARAM *plparam );
-extern LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam, LRESULT result );
-extern void WINPROC_UnmapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam );
-extern LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam, LRESULT result );
-extern LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam, LRESULT result );
-extern void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam, MSGPARAM16* pm16 );
-extern void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam,
- LPARAM lParam, MSGPARAM16* pm16 );
-
-/* map a Unicode string to a 16-bit pointer */
-inline static SEGPTR map_str_32W_to_16( LPCWSTR str )
-{
- LPSTR ret;
- INT len;
-
- if (!HIWORD(str)) return (SEGPTR)LOWORD(str);
- len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
- if ((ret = HeapAlloc( GetProcessHeap(), 0, len )))
- WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
- return MapLS(ret);
-}
-
-/* unmap a Unicode string that was converted to a 16-bit pointer */
-inline static void unmap_str_32W_to_16( SEGPTR str )
-{
- if (!HIWORD(str)) return;
- HeapFree( GetProcessHeap(), 0, MapSL(str) );
- UnMapLS( str );
-}
-
-/* map a 16-bit pointer to a Unicode string */
-inline static LPWSTR map_str_16_to_32W( SEGPTR str )
-{
- LPWSTR ret;
- INT len;
-
- if (!HIWORD(str)) return (LPWSTR)(ULONG_PTR)LOWORD(str);
- len = MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, NULL, 0 );
- if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
- MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, ret, len );
- return ret;
-}
-
-/* unmap a 16-bit pointer that was converted to a Unicode string */
-inline static void unmap_str_16_to_32W( LPCWSTR str )
-{
- if (HIWORD(str)) HeapFree( GetProcessHeap(), 0, (void *)str );
-}
-
-#endif /* __WINE_WINPROC_H */
