Moved remaining messaging definitions to user_private.h and removed

dlls/user/combo.c

@@ -44,7 +44,7 @@
 #include "winuser.h"
 #include "wine/winuser16.h"
 #include "wine/unicode.h"
-#include "message.h"
+#include "user_private.h"
 #include "win.h"
 #include "controls.h"
 #include "winreg.h"

dlls/user/cursoricon.c

@@ -64,7 +64,6 @@
 #include "module.h"
 #include "wine/debug.h"
 #include "user_private.h"
-#include "message.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 WINE_DECLARE_DEBUG_CHANNEL(icon);

dlls/user/defwnd.c

@@ -34,7 +34,6 @@
 #include "user_private.h"
 #include "controls.h"
 #include "winpos.h"
-#include "message.h"
 #include "wine/unicode.h"
 #include "wine/winuser16.h"
 #include "wine/server.h"

dlls/user/edit.c

@@ -58,7 +58,6 @@
 #include "wine/unicode.h"
 #include "controls.h"
 #include "local.h"
-#include "message.h"
 #include "user_private.h"
 #include "wine/debug.h"
 

dlls/user/hook.c

@@ -72,7 +72,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "winerror.h"
-#include "message.h"
 #include "win.h"
 #include "user_private.h"
 #include "wine/server.h"

dlls/user/hook16.c

@@ -28,7 +28,6 @@
 #include "winuser.h"
 #include "wownt32.h"
 #include "wine/winuser16.h"
-#include "message.h"
 #include "win.h"
 #include "user_private.h"
 #include "winproc.h"

dlls/user/input.c

@@ -40,7 +40,6 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "wine/server.h"
-#include "message.h"
 #include "user_private.h"
 #include "winternl.h"
 #include "wine/debug.h"

dlls/user/listbox.c

@@ -44,7 +44,7 @@
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
-#include "message.h"
+#include "user_private.h"
 #include "controls.h"
 #include "wine/debug.h"
 

dlls/user/mdi.c

@@ -95,7 +95,6 @@
 #include "wine/unicode.h"
 #include "win.h"
 #include "controls.h"
-#include "message.h"
 #include "user_private.h"
 #include "wine/debug.h"
 #include "dlgs.h"

dlls/user/message.c

@@ -34,7 +34,6 @@
 #include "dde.h"
 #include "wine/unicode.h"
 #include "wine/server.h"
-#include "message.h"
 #include "user_private.h"
 #include "win.h"
 #include "winpos.h"
@@ -50,6 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(key);
 #define WM_NCMOUSELAST  (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST))
 
 #define MAX_PACK_COUNT 4
+#define MAX_SENDMSG_RECURSION  64
 
 #define SYS_TIMER_RATE  55   /* min. timer rate in ms (actually 54.925)*/
 

dlls/user/message.h

-/*
- * 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 <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/windef16.h"
-
-#define MAX_SENDMSG_RECURSION  64
-
-/* message.c */
-extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid,
-                                               UINT msg, WPARAM wparam, LPARAM lparam,
-                                               UINT flags, UINT timeout, PDWORD_PTR res_ptr );
-
-/* spy.c */
-#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);
-
-/* check if hwnd is a broadcast magic handle */
-inline static BOOL is_broadcast( HWND hwnd )
-{
-    return (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST);
-}
-
-#endif  /* __WINE_MESSAGE_H */

dlls/user/msg16.c

@@ -21,7 +21,6 @@
 #include "wine/winuser16.h"
 #include "wownt32.h"
 #include "winerror.h"
-#include "message.h"
 #include "win.h"
 #include "user_private.h"
 #include "winproc.h"

dlls/user/scroll.c

@@ -38,7 +38,6 @@
 #include "win.h"
 #include "wine/debug.h"
 #include "user_private.h"
-#include "message.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(scroll);
 

dlls/user/spy.c

@@ -32,7 +32,6 @@
 #include "win.h"
 #include "user_private.h"
 #include "wine/debug.h"
-#include "message.h"
 #include "winnls.h"
 #include "commctrl.h"
 #include "commdlg.h"

dlls/user/user_main.c

@@ -29,7 +29,6 @@
 #include "wine/winuser16.h"
 
 #include "controls.h"
-#include "message.h"
 #include "user_private.h"
 #include "win.h"
 #include "wine/debug.h"

dlls/user/user_private.h

@@ -146,6 +146,12 @@ static inline struct user_thread_info *get_user_thread_info(void)
     return (struct user_thread_info *)NtCurrentTeb()->Win32ClientInfo;
 }
 
+/* check if hwnd is a broadcast magic handle */
+static inline BOOL is_broadcast( HWND hwnd )
+{
+    return (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST);
+}
+
 extern HMODULE user32_module;
 extern DWORD USER16_AlertableWait;
 extern HBRUSH SYSCOLOR_55AABrush;
@@ -153,12 +159,38 @@ extern HBRUSH SYSCOLOR_55AABrush;
 extern BOOL CLIPBOARD_ReleaseOwner(void);
 extern BOOL FOCUS_MouseActivate( HWND hwnd );
 extern BOOL HOOK_IsHooked( INT id );
+extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid,
+                                               UINT msg, WPARAM wparam, LPARAM lparam,
+                                               UINT flags, UINT timeout, PDWORD_PTR res_ptr );
 extern void SYSCOLOR_Init(void);
 extern HPEN SYSCOLOR_GetPen( INT index );
 extern void SYSPARAMS_Init(void);
 extern void USER_CheckNotLock(void);
 extern BOOL USER_IsExitingThread( DWORD tid );
 
+/* message spy definitions */
+
+#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);
+
 /* HANDLE16 <-> HANDLE conversions */
 #define HCURSOR_16(h32)    (LOWORD(h32))
 #define HICON_16(h32)      (LOWORD(h32))

dlls/user/win.c

@@ -36,7 +36,6 @@
 #include "user_private.h"
 #include "controls.h"
 #include "cursoricon.h"
-#include "message.h"
 #include "winpos.h"
 #include "winerror.h"
 #include "wine/debug.h"

dlls/user/winpos.c

@@ -35,7 +35,6 @@
 #include "controls.h"
 #include "user_private.h"
 #include "win.h"
-#include "message.h"
 #include "winpos.h"
 #include "wine/debug.h"
 

dlls/user/winproc.c

@@ -35,7 +35,6 @@
 #include "controls.h"
 #include "win.h"
 #include "winproc.h"
-#include "message.h"
 #include "user_private.h"
 #include "thread.h"
 #include "dde.h"

windows/user.c

@@ -35,7 +35,6 @@
 #include "win.h"
 #include "controls.h"
 #include "cursoricon.h"
-#include "message.h"
 #include "local.h"
 #include "wine/debug.h"