user32: Don't include ntuser_private.h.

dlls/user32/controls.h

@@ -21,8 +21,7 @@
 #ifndef __WINE_CONTROLS_H
 #define __WINE_CONTROLS_H
 
-#include "winuser.h"
-#include "../win32u/ntuser_private.h"
+#include "ntuser.h"
 
 extern LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN;
 extern LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN;

dlls/user32/dialog.c

@@ -39,6 +39,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(dialog);
 
 
+#define DIALOG_CLASS_ATOM    MAKEINTATOM(32770)  /* Dialog */
+
   /* Dialog control information */
 typedef struct
 {

dlls/user32/user_private.h

@@ -25,21 +25,14 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "../win32u/ntuser_private.h"
+#include "ntuser.h"
 #include "winreg.h"
-#include "winternl.h"
-#include "hidusage.h"
 #include "wine/heap.h"
 
 #define GET_WORD(ptr)  (*(const WORD *)(ptr))
 #define GET_DWORD(ptr) (*(const DWORD *)(ptr))
 #define GET_LONG(ptr) (*(const LONG *)(ptr))
 
-#define WINE_MOUSE_HANDLE       ((HANDLE)1)
-#define WINE_KEYBOARD_HANDLE    ((HANDLE)2)
-
-struct received_message_info;
-
 /* data to store state for A/W mappings of WM_CHAR */
 struct wm_char_mapping_data
 {
@@ -47,11 +40,6 @@ struct wm_char_mapping_data
     MSG  get_msg;
 };
 
-static inline struct user_thread_info *get_user_thread_info(void)
-{
-    return (struct user_thread_info *)NtCurrentTeb()->Win32ClientInfo;
-}
-
 extern HMODULE user32_module DECLSPEC_HIDDEN;
 
 extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid,

dlls/user32/win.c

@@ -121,6 +121,13 @@ BOOL is_desktop_window( HWND hwnd )
 }
 
 
+/* check if hwnd is a broadcast magic handle */
+static inline BOOL is_broadcast( HWND hwnd )
+{
+    return hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST;
+}
+
+
 /***********************************************************************
  *           WIN_IsCurrentProcess
  *

dlls/user32/win.h

@@ -21,14 +21,7 @@
 #ifndef __WINE_WIN_H
 #define __WINE_WIN_H
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-
 #include "user_private.h"
-#include "wine/server_protocol.h"
 
   /* Window functions */
 extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN;

dlls/win32u/ntuser_private.h

@@ -26,7 +26,6 @@
 #include "wine/list.h"
 
 
-#define WM_SYSTIMER         0x0118
 #define WM_POPUPSYSTEMMENU  0x0313
 
 enum system_timer_id
@@ -205,15 +204,6 @@ struct scroll_bar_win_data
 #define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771)  /* WinSwitch */
 #define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772)  /* IconTitle */
 
-/* message spy definitions */
-
-#define SPY_DISPATCHMESSAGE       0x0100
-#define SPY_SENDMESSAGE           0x0101
-#define SPY_DEFWNDPROC            0x0102
-
-#define SPY_RESULT_OK             0x0001
-#define SPY_RESULT_DEFWND         0x0002
-
 /* info about the message currently being received by the current thread */
 struct received_message_info
 {

include/ntuser.h

@@ -267,6 +267,14 @@ struct unpack_dde_message_params
 #define NTUSER_DPI_PER_MONITOR_AWARE_V2   0x00000022
 #define NTUSER_DPI_PER_UNAWARE_GDISCALED  0x40006010
 
+/* message spy definitions */
+#define SPY_DISPATCHMESSAGE  0x0100
+#define SPY_SENDMESSAGE      0x0101
+#define SPY_DEFWNDPROC       0x0102
+
+#define SPY_RESULT_OK      0x0001
+#define SPY_RESULT_DEFWND  0x0002
+
 /* NtUserMessageCall codes */
 enum
 {
@@ -456,6 +464,8 @@ enum wine_internal_message
 #define IME_INTERNAL_ACTIVATE   0x17
 #define IME_INTERNAL_DEACTIVATE 0x18
 
+#define WM_SYSTIMER  0x0118
+
 /* the various structures that can be sent in messages, in platform-independent layout */
 struct packed_CREATESTRUCTW
 {