[ros-diffs] [gadamopoulos] 50357: [undocuser.h] - gather several undocumented definitions for user32 that were defined in several different files, sometimes in the source, sometimes in headers and sometimes de...

Author: gadamopoulos
Date: Tue Jan 11 18:47:16 2011
New Revision: 50357

URL: http://svn.reactos.org/svn/reactos?rev=50357&view=rev
Log:
[undocuser.h]
- gather several undocumented definitions for user32 that were defined in several
different files, sometimes in the source, sometimes in headers and sometimes defined
several times here and there
This file should not contain internal user32 definitions but undocumented public
definitions

Added:
    trunk/reactos/include/reactos/undocuser.h   (with props)
Modified:
    trunk/reactos/dll/win32/user32/controls/icontitle.c
    trunk/reactos/dll/win32/user32/controls/listbox.c
    trunk/reactos/dll/win32/user32/include/controls.h
    trunk/reactos/dll/win32/user32/include/message.h
    trunk/reactos/dll/win32/user32/include/regcontrol.h
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/include/user32p.h
    trunk/reactos/dll/win32/user32/include/window.h
    trunk/reactos/dll/win32/user32/misc/desktop.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/dialog.c
    trunk/reactos/dll/win32/user32/windows/menu.c
    trunk/reactos/dll/win32/user32/windows/window.c
    trunk/reactos/include/psdk/windowsx.h
    trunk/reactos/include/psdk/winuser.h
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/caret.h
    trunk/reactos/subsystems/win32/win32k/include/object.h
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c
    trunk/reactos/subsystems/win32/win32k/pch.h

Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -22,11 +22,6 @@
 
 #include <wine/debug.h>
 
-#ifdef __REACTOS__
-#define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
-#define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772)
-#endif
-
 static BOOL bMultiLineTitle;
 static HFONT hIconTitleFont;
 
@@ -35,13 +30,13 @@
  */
 const struct builtin_class_descr ICONTITLE_builtin_class =
 {
-    (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */
-    0,                    /* style */
-    NULL,                 /* procA (winproc is Unicode only) */
-    IconTitleWndProc,     /* procW */
-    0,                    /* extra */
-    IDC_ARROW,            /* cursor */
-    0                     /* brush */
+    WC_ICONTITLE,     /* name */
+    0,                /* style */
+    NULL,             /* procA (winproc is Unicode only) */
+    IconTitleWndProc, /* procW */
+    0,                /* extra */
+    IDC_ARROW,        /* cursor */
+    0                 /* brush */
 };
 
 

Modified: trunk/reactos/dll/win32/user32/controls/listbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -37,17 +37,6 @@
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(listbox);
-
-/* Start of hack section -------------------------------- */
-
-#define WM_LBTRACKPOINT     0x0131
-#define WS_EX_DRAGDETECT    0x00000002L
-#define WM_BEGINDRAG        0x022C
-
-UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
-BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
-
-/* End of hack section -------------------------------- */
 
 /* Items array granularity */
 #define LB_ARRAY_GRANULARITY 16

Modified: trunk/reactos/dll/win32/user32/include/controls.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -1,13 +1,4 @@
 #pragma once
-
-/* Missing from Winuser.h */
-#define ES_COMBO        0x00000200   /* Undocumented. Parent is a combobox */
-#ifndef MAKEINTATOMA
-#define MAKEINTATOMA(atom)  ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
-#endif
-#ifndef WM_ISACTIVEICON
-#define WM_ISACTIVEICON         0x0035
-#endif
 
 #ifndef HBMMENU_CALLBACK
 #define HBMMENU_CALLBACK	((HBITMAP) -1)
@@ -45,11 +36,6 @@
 
 /* winuser.h */
 
-
-// I dont know where this goes
-
-#define LB_CARETON             0x01a3
-#define LB_CARETOFF            0x01a4
 
 /* combo box */
 
@@ -106,7 +92,6 @@
 #define LB_ADDSTRING_UPPER        0x1AC
 #define LB_ADDSTRING_LOWER        0x1AD
 
-#define DESKTOP_CLASS_ATOM   MAKEINTATOMA(32769)  /* Desktop */
 LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
 LRESULT WINAPI User32DefWindowProc(HWND,UINT,WPARAM,LPARAM,BOOL);
 BOOL WINAPI RegisterClientPFN(VOID);

Modified: trunk/reactos/dll/win32/user32/include/message.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -11,9 +11,6 @@
 BOOL FASTCALL MessageInit(VOID);
 VOID FASTCALL MessageCleanup(VOID);
 
-#define WM_ALTTABACTIVE         0x0029
-#define WM_SETVISIBLE           0x0009
-
 static __inline BOOL
 IsCallProcHandle(IN WNDPROC lpWndProc)
 {

Modified: trunk/reactos/dll/win32/user32/include/regcontrol.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/r…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -9,9 +9,6 @@
  * NOTES:
  */
 #pragma once
-
-#define IS_ATOM(x) \
-  (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
 
 /* Built-in class descriptor */
 struct builtin_class_descr

Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -33,6 +33,9 @@
 #include <win32k/ntuser.h>
 #include <win32k/callback.h>
 
+/* Undocumented user definitions*/
+#include <undocuser.h>
+
 /* WINE Headers */
 #include <wine/unicode.h>
 
@@ -47,60 +50,9 @@
                            (GetWin32ClientInfo()->pDeskInfo &&
GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId)))
 
 /* Temporarily in here for now. */
-typedef struct _USERAPIHOOKINFO
-{
-  DWORD m_size;
-  LPCWSTR m_dllname1;
-  LPCWSTR m_funname1;
-  LPCWSTR m_dllname2;
-  LPCWSTR m_funname2;
-} USERAPIHOOKINFO,*PUSERAPIHOOKINFO;
-
-typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD);
-
-typedef struct _UAHOWP
-{
-  BYTE*  MsgBitArray;
-  DWORD  Size;
-} UAHOWP, *PUAHOWP;
-
-typedef struct tagUSERAPIHOOK
-{
-  DWORD   size;
-  WNDPROC DefWindowProcA;
-  WNDPROC DefWindowProcW;
-  UAHOWP  DefWndProcArray;
-  FARPROC GetScrollInfo;
-  FARPROC SetScrollInfo;
-  FARPROC EnableScrollBar;
-  FARPROC AdjustWindowRectEx;
-  FARPROC SetWindowRgn;
-  WNDPROC_OWP PreWndProc;
-  WNDPROC_OWP PostWndProc;
-  UAHOWP  WndProcArray;
-  WNDPROC_OWP PreDefDlgProc;
-  WNDPROC_OWP PostDefDlgProc;
-  UAHOWP  DlgProcArray;
-  FARPROC GetSystemMetrics;
-  FARPROC SystemParametersInfoA;
-  FARPROC SystemParametersInfoW;
-  FARPROC ForceResetUserApiHook;
-  FARPROC DrawFrameControl;
-  FARPROC DrawCaption;
-  FARPROC MDIRedrawFrame;
-  FARPROC GetRealWindowOwner;
-} USERAPIHOOK, *PUSERAPIHOOK;
-
-typedef enum _UAPIHK
-{
-  uahLoadInit,
-  uahStop,
-  uahShutdown
-} UAPIHK, *PUAPIHK;
 
 extern RTL_CRITICAL_SECTION gcsUserApiHook;
 extern USERAPIHOOK guah;
-typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info);
 BOOL FASTCALL BeginIfHookedUserApiHook(VOID);
 BOOL FASTCALL EndUserApiHook(VOID);
 BOOL FASTCALL IsInsideUserApiHook(VOID);

Modified: trunk/reactos/dll/win32/user32/include/user32p.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -26,6 +26,9 @@
 #include "winsta.h"
 #include "ntwrapper.h"
 
+#define IS_ATOM(x) \
+  (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
+
 /* One/Two Param Functions */
 #define NtUserMsqSetWakeMask(dwWaitMask) \
   (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_GETINPUTEVENT)

Modified: trunk/reactos/dll/win32/user32/include/window.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -12,8 +12,6 @@
 
 #define NUM_SYSCOLORS 31
 
-#define IS_ATOM(x) \
-  (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
 
 #define UserHasAnyFrameStyle(Style, ExStyle)                                   \
   (((Style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) ||                    \

Modified: trunk/reactos/dll/win32/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -20,7 +20,7 @@
 #if 0 // Kept for referencing.
 const struct builtin_class_descr DESKTOP_builtin_class =
 {
-  (LPCWSTR) DESKTOP_CLASS_ATOM,   /* name */
+  WC_DESKTOP,           /* name */
   CS_DBLCLKS,           /* style */
   NULL,                 /* procA (winproc is Unicode only) */
   (WNDPROC) DesktopWndProc,       /* procW */

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -15,13 +15,6 @@
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
-#ifndef WM_SETVISIBLE
-#define WM_SETVISIBLE 9
-#endif
-#ifndef WM_QUERYDROPOBJECT
-#define WM_QUERYDROPOBJECT  0x022B
-#endif
 
 LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active);
 LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect);

Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -39,17 +39,11 @@
 
 #define DF_END  0x0001
 #define DF_OWNERENABLED 0x0002
-#define CW_USEDEFAULT16 ((short)0x8000)
 #define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR))
 #define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE)
 #define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO,
(LONG_PTR)(info))
 #define GET_WORD(ptr)  (*(WORD *)(ptr))
 #define GET_DWORD(ptr) (*(DWORD *)(ptr))
-#define MAKEINTATOMA(atom)  ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
-#define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
-#define DIALOG_CLASS_ATOMA   MAKEINTATOMA(32770)  /* Dialog */
-#define DIALOG_CLASS_ATOMW   MAKEINTATOMW(32770)  /* Dialog */
-
 void WINAPI WinPosActivateOtherWindow(HWND hwnd);
 
 /* INTERNAL STRUCTS **********************************************************/
@@ -118,7 +112,7 @@
  */
 const struct builtin_class_descr DIALOG_builtin_class =
 {
-    DIALOG_CLASS_ATOMW,       /* name */
+    WC_DIALOG,       /* name */
     CS_SAVEBITS | CS_DBLCLKS, /* style  */
     (WNDPROC) DefDlgProcA,    /* procA */
     (WNDPROC) DefDlgProcW,    /* procW */
@@ -632,7 +626,7 @@
     switch(GET_WORD(p))
     {
         case 0x0000:
-            result->className = DIALOG_CLASS_ATOMW;
+            result->className = WC_DIALOG;
             p++;
             break;
         case 0xffff:

Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -65,11 +65,6 @@
 #define MENU_BAR_ITEMS_SPACE (12)
 #define SEPARATOR_HEIGHT (5)
 #define MENU_TAB_SPACE (8)
-
-#define MAKEINTATOMA(atom)  ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
-#define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
-#define POPUPMENU_CLASS_ATOMA   MAKEINTATOMA(32768)  /* PopupMenu */
-#define POPUPMENU_CLASS_ATOMW   MAKEINTATOMW(32768)  /* PopupMenu */
 
 typedef struct
 {
@@ -86,7 +81,7 @@
  */
 const struct builtin_class_descr POPUPMENU_builtin_class =
 {
-    POPUPMENU_CLASS_ATOMW,                     /* name */
+    WC_MENU,                     /* name */
     CS_SAVEBITS | CS_DBLCLKS,                  /* style  */
     (WNDPROC) NULL,                            /* FIXME - procA */
     (WNDPROC) PopupMenuWndProcW,               /* FIXME - procW */
@@ -1626,7 +1621,7 @@
     if( y < info.rcMonitor.top ) y = info.rcMonitor.top;
 
     /* NOTE: In Windows, top menu popup is not owned. */
-    MenuInfo.Wnd = CreateWindowExW( 0, POPUPMENU_CLASS_ATOMW, NULL,
+    MenuInfo.Wnd = CreateWindowExW( 0, WC_MENU, NULL,
                                   WS_POPUP, x, y, width, height,
                                   hwndOwner, 0, (HINSTANCE) GetWindowLongPtrW(hwndOwner,
GWLP_HINSTANCE),
                                  (LPVOID) MenuInfo.Self);

Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -17,8 +17,6 @@
 
 LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active);
 void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT
*id );
-
-#define CW_USEDEFAULT16 0x00008000
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/include/psdk/windowsx.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windowsx.h?re…
==============================================================================
--- trunk/reactos/include/psdk/windowsx.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windowsx.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -1,7 +1,6 @@
 #ifndef _WINDOWSX_H
 #define _WINDOWSX_H
 
-#define WM_CTLCOLOR 25
 #define Button_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
 #define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETCHECK,0,0))
 #define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETSTATE,0,0))

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -18,7 +18,6 @@
 #endif
 
 
-#define WC_DIALOG MAKEINTATOM(0x8002)
 #define FALT	16
 #define FCONTROL	8
 #define FNOINVERT	2
@@ -300,9 +299,6 @@
 #define ES_LOWERCASE 16
 #define ES_MULTILINE 4
 #define ES_NOHIDESEL 256
-#ifdef _WINE
-#define ES_COMBO 0x200   /* Undocumented. Parent is a combobox */
-#endif
 #define ES_NUMBER 0x2000
 #define ES_OEMCONVERT 0x400
 #define ES_PASSWORD 32
@@ -390,7 +386,6 @@
 #define WS_EX_COMPOSITED 0x2000000 /* XP */
 #define WS_EX_CONTEXTHELP 0x400
 #define WS_EX_CONTROLPARENT 0x10000
-#define WS_EX_DRAGDETECT 0x00000002L
 #define WS_EX_DLGMODALFRAME 1
 #define WS_EX_LAYERED 0x80000   /* w2k */
 #define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */
@@ -870,8 +865,6 @@
 #endif
 #define QS_SENDMESSAGE 64
 #define QS_TIMER 16
-/* Extra (undocumented) queue wake bits - see "Undoc. Windows" */
-#define QS_SMRESULT 0x8000
 
 #define USER_TIMER_MAXIMUM  2147483647
 #define USER_TIMER_MINIMUM  10
@@ -1213,10 +1206,6 @@
 #define SWP_NOSENDCHANGING 1024
 #define SWP_DEFERERASE 8192
 #define SWP_ASYNCWINDOWPOS  16384
-/* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE 0x0800
-#define SWP_NOCLIENTMOVE 0x1000
-#define SWP_STATECHANGED 0x8000
 
 #define HSHELL_WINDOWCREATED 1
 #define HSHELL_WINDOWDESTROYED 2
@@ -1617,8 +1606,6 @@
 #define WM_GETFONT 49
 #define WM_SETHOTKEY 50
 #define WM_GETHOTKEY 51
-#define WM_ISACTIVEICON 53
-#define WM_QUERYPARKICON 54
 #define WM_QUERYDRAGICON 55
 #define WM_COMPAREITEM 57
 #if (WINVER >= 0x0500)
@@ -1673,7 +1660,6 @@
 #define WM_NCXBUTTONDBLCLK 173
 #endif /* (_WIN32_WINNT >= 0x0500) */
 
-#define WM_KEYF1 0x004d
 #define WM_KEYFIRST 256
 #define WM_KEYDOWN 256
 #define WM_KEYUP 257
@@ -1707,7 +1693,6 @@
 #define WM_VSCROLL 277
 #define WM_INITMENU 278
 #define WM_INITMENUPOPUP 279
-#define WM_SYSTIMER 280
 #define WM_MENUSELECT 287
 #define WM_MENUCHAR 288
 #define WM_ENTERIDLE 289
@@ -1727,15 +1712,6 @@
 #endif /* _WIN32_WCE */
 #endif /* (WINVER >= 0x0500) */
 
-/* D&D messages */
-#define WM_DROPOBJECT	    0x022A
-#define WM_QUERYDROPOBJECT  0x022B
-#define WM_BEGINDRAG	    0x022C
-#define WM_DRAGLOOP	    0x022D
-#define WM_DRAGSELECT	    0x022E
-#define WM_DRAGMOVE	    0x022F
-
-#define WM_CTLCOLOR 25
 #define WM_CTLCOLORMSGBOX 306
 #define WM_CTLCOLOREDIT 307
 #define WM_CTLCOLORLISTBOX 308
@@ -1746,7 +1722,6 @@
 #define MN_GETHMENU 481
 #define WM_MOUSEFIRST 512
 #define WM_MOUSEMOVE 512
-#define WM_LBTRACKPOINT 0x0131
 #define WM_LBUTTONDOWN 513
 #define WM_LBUTTONUP 514
 #define WM_LBUTTONDBLCLK 515

Added: trunk/reactos/include/reactos/undocuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.…
==============================================================================
--- trunk/reactos/include/reactos/undocuser.h (added)
+++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -1,0 +1,175 @@
+#ifndef _UNDOCUSER_H
+#define _UNDOCUSER_H
+
+/* Built in class atoms */
+#define WC_MENU       (MAKEINTATOM(0x8000))
+#define WC_DESKTOP    (MAKEINTATOM(0x8001))
+#define WC_DIALOG     (MAKEINTATOM(0x8002))
+#define WC_SWITCH     (MAKEINTATOM(0x8003))
+#define WC_ICONTITLE  (MAKEINTATOM(0x8004))
+
+/* Non SDK Styles */
+#define ES_COMBO 0x200 /* Parent is a combobox */
+#define WS_MAXIMIZED  WS_MAXIMIZE
+#define WS_MINIMIZED  WS_MINIMIZE
+
+/* Non SDK ExStyles */
+#define WS_EX_DRAGDETECT               0x00000002
+#define WS_EX_MAKEVISIBLEWHENUNGHOSTED 0x00000800
+#define WS_EX_FORCELEGACYRESIZENCMETR  0x00800000
+#define WS_EX_UISTATEACTIVE            0x04000000
+#define WS_EX_REDIRECTED               0x20000000
+#define WS_EX_UISTATEKBACCELHIDDEN     0x40000000
+#define WS_EX_UISTATEFOCUSRECTHIDDEN   0x80000000
+#define WS_EX_SETANSICREATOR           0x80000000 // For WNDS_ANSICREATOR
+
+/* Non SDK Window Message types. */
+#define WM_SETVISIBLE      0x00000009
+#define WM_CTLCOLOR        0x00000019
+#define WM_ALTTABACTIVE    0x00000029
+#define WM_ISACTIVEICON    0x00000035
+#define WM_QUERYPARKICON   0x00000036
+#define WM_CLIENTSHUTDOWN  0x0000003B
+#define WM_COPYGLOBALDATA  0x00000049
+#define WM_LOGONNOTIFY     0x0000004c
+#define WM_KEYF1           0x0000004d
+#define WM_SYSTIMER        0x00000118
+#define WM_LBTRACKPOINT    0x00000131
+#define LB_CARETON         0x000001a3
+#define LB_CARETOFF        0x000001a4
+#define WM_DROPOBJECT	   0x0000022A
+#define WM_QUERYDROPOBJECT 0x0000022B
+#define WM_BEGINDRAG       0x0000022C
+#define WM_DRAGLOOP	       0x0000022D
+#define WM_DRAGSELECT	   0x0000022E
+#define WM_DRAGMOVE	       0x0000022F
+#define WM_POPUPSYSTEMMENU 0x00000313
+#define WM_CBT             0x000003FF // ReactOS only.
+#define WM_MAXIMUM         0x0001FFFF
+
+/* Non SDK DCE types.*/
+#define DCX_USESTYLE     0x00010000
+#define DCX_KEEPCLIPRGN  0x00040000
+#define DCX_KEEPLAYOUT   0x40000000
+#define DCX_PROCESSOWNED 0x80000000
+
+/* Caret timer ID */
+#define IDCARETTIMER (0xffff)
+
+/* SetWindowPos undocumented flags */
+#define SWP_NOCLIENTSIZE 0x0800
+#define SWP_NOCLIENTMOVE 0x1000
+#define SWP_STATECHANGED 0x8000
+
+/* Non SDK Queue state flags. */
+#define QS_SMRESULT 0x8000 /* see "Undoc. Windows" */
+
+//
+// Definitions used by WM_CLIENTSHUTDOWN
+//
+// Client Shutdown messages
+#define MCS_SHUTDOWNTIMERS  1
+#define MCS_QUERYENDSESSION 2
+// Client Shutdown returns
+#define MCSR_GOODFORSHUTDOWN  1
+#define MCSR_SHUTDOWNFINISHED 2
+#define MCSR_DONOTSHUTDOWN    3
+
+//
+// Definitions used by WM_LOGONNOTIFY
+//
+#define LN_START_TASK_MANAGER 0x4
+#define LN_LOCK_WORKSTATION   0x5
+#define LN_UNLOCK_WORKSTATION 0x6
+#define LN_MESSAGE_BEEP       0x9
+
+#define CW_USEDEFAULT16 ((short)0x8000)
+
+#define SBRG_SCROLLBAR     0 /* the scrollbar itself */
+#define SBRG_TOPRIGHTBTN   1 /* the top or right button */
+#define SBRG_PAGEUPRIGHT   2 /* the page up or page right region */
+#define SBRG_SCROLLBOX     3 /* the scroll box */
+#define SBRG_PAGEDOWNLEFT  4 /* the page down or page left region */
+#define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */
+
+
+BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
+UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
+DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR);
+BOOL WINAPI SetDeskWallPaper(LPCSTR);
+VOID WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
+void WINAPI CalcChildScroll(HWND, INT);
+BOOL WINAPI RegisterLogonProcess(DWORD,BOOL);
+DWORD WINAPI GetAppCompatFlags(HTASK hTask);
+DWORD WINAPI GetAppCompatFlags2(HTASK hTask);
+LONG WINAPI CsrBroadcastSystemMessageExW(DWORD dwflags,
+                                         LPDWORD lpdwRecipients,
+                                         UINT uiMessage,
+                                         WPARAM wParam,
+                                         LPARAM lParam,
+                                         PBSMINFO pBSMInfo);
+BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl);
+HWND WINAPI GetTaskmanWindow(VOID);
+HWND WINAPI GetProgmanWindow(VOID);
+
+//
+// User api hook
+//
+
+typedef struct _USERAPIHOOKINFO
+{
+  DWORD m_size;
+  LPCWSTR m_dllname1;
+  LPCWSTR m_funname1;
+  LPCWSTR m_dllname2;
+  LPCWSTR m_funname2;
+} USERAPIHOOKINFO,*PUSERAPIHOOKINFO;
+
+typedef enum _UAPIHK
+{
+  uahLoadInit,
+  uahStop,
+  uahShutdown
+} UAPIHK, *PUAPIHK;
+
+typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info);
+
+typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD);
+
+typedef struct _UAHOWP
+{
+  BYTE*  MsgBitArray;
+  DWORD  Size;
+} UAHOWP, *PUAHOWP;
+
+typedef struct tagUSERAPIHOOK
+{
+  DWORD   size;
+  WNDPROC DefWindowProcA;
+  WNDPROC DefWindowProcW;
+  UAHOWP  DefWndProcArray;
+  FARPROC GetScrollInfo;
+  FARPROC SetScrollInfo;
+  FARPROC EnableScrollBar;
+  FARPROC AdjustWindowRectEx;
+  FARPROC SetWindowRgn;
+  WNDPROC_OWP PreWndProc;
+  WNDPROC_OWP PostWndProc;
+  UAHOWP  WndProcArray;
+  WNDPROC_OWP PreDefDlgProc;
+  WNDPROC_OWP PostDefDlgProc;
+  UAHOWP  DlgProcArray;
+  FARPROC GetSystemMetrics;
+  FARPROC SystemParametersInfoA;
+  FARPROC SystemParametersInfoW;
+  FARPROC ForceResetUserApiHook;
+  FARPROC DrawFrameControl;
+  FARPROC DrawCaption;
+  FARPROC MDIRedrawFrame;
+  FARPROC GetRealWindowOwner;
+} USERAPIHOOK, *PUSERAPIHOOK;
+
+BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah);
+BOOL WINAPI UnregisterUserApiHook(VOID);
+
+#endif

Propchange: trunk/reactos/include/reactos/undocuser.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -465,19 +465,6 @@
 #define WNDS2_SMALLICONFROMWMQUERYDRAG  0X20000000
 #define WNDS2_SHELLHOOKREGISTERED       0X40000000
 #define WNDS2_WMCREATEMSGPROCESSED      0X80000000
-
-/* Non SDK ExStyles */
-#define WS_EX_MAKEVISIBLEWHENUNGHOSTED 0x00000800
-#define WS_EX_FORCELEGACYRESIZENCMETR  0x00800000
-#define WS_EX_UISTATEACTIVE            0x04000000
-#define WS_EX_REDIRECTED               0X20000000
-#define WS_EX_UISTATEKBACCELHIDDEN     0X40000000
-#define WS_EX_UISTATEFOCUSRECTHIDDEN   0X80000000
-#define WS_EX_SETANSICREATOR           0x80000000 // For WNDS_ANSICREATOR
-
-/* Non SDK Styles */
-#define WS_MAXIMIZED  WS_MAXIMIZE
-#define WS_MINIMIZED  WS_MINIMIZE
 
 /* ExStyles2 */
 #define WS_EX2_CLIPBOARDLISTENER        0X00000001
@@ -859,29 +846,6 @@
   DWORD dwDispatchCount;
   SHAREDINFO siClient;
 } USERCONNECT, *PUSERCONNECT;
-
-//
-// Non SDK Window Message types.
-//
-#define WM_CLIENTSHUTDOWN 59
-#define WM_COPYGLOBALDATA 73
-#define WM_SYSTIMER 280
-#define WM_POPUPSYSTEMMENU 787
-#define WM_CBT 1023 // ReactOS only.
-#define WM_MAXIMUM 0x0001FFFF
-
-//
-// Non SDK DCE types.
-//
-#define DCX_USESTYLE     0x00010000
-#define DCX_KEEPCLIPRGN  0x00040000
-#define DCX_KEEPLAYOUT   0x40000000
-#define DCX_PROCESSOWNED 0x80000000
-
-//
-// Non SDK Queue message types.
-//
-#define QS_SMRESULT      0x8000
 
 DWORD
 NTAPI

Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -2,8 +2,6 @@
 
 #include <include/win32.h>
 #include <include/window.h>
-
-#define IDCARETTIMER (0xffff)
 
 BOOL FASTCALL
 co_IntDestroyCaret(PTHREADINFO Win32Thread);

Modified: trunk/reactos/subsystems/win32/win32k/include/object.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Tue Jan 11
18:47:16 2011
@@ -66,8 +66,6 @@
    SINGLE_LIST_ENTRY Entry;
    PVOID obj;
 } USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY;
-
-#include <malloc.h>
 
 #define USER_ASSERT(exp,file,line) \
     if (!(exp)) {RtlAssert(#exp,(PVOID)file,line,"");}

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jan 11 18:47:16
2011
@@ -14,9 +14,6 @@
 
 #define NDEBUG
 #include <debug.h>
-
-/* dialog resources appear to pass this in 16 bits, handle them properly */
-#define CW_USEDEFAULT16 (0x8000)
 
 #define POINT_IN_RECT(p, r) (((r.bottom >= p.y) && (r.top <=
p.y))&&((r.left <= p.x )&&( r.right >= p.x )))
 

Modified: trunk/reactos/subsystems/win32/win32k/pch.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Tue Jan 11 18:47:16 2011
@@ -62,12 +62,14 @@
 #include <win32k/ntgdibad.h>
 #include <ntgdi.h>
 
+/* Undocumented user definitions */
+#include <undocuser.h>
+
 /* Internal Win32K Header */
 #include "include/win32kp.h"
 
 /* Undocumented stuff */
 typedef DRIVEROBJ *PDRIVEROBJ;
-#define WM_SYSTIMER 280
 #ifndef M_PI
 #define M_PI 3.14159265358979323846f
 #define M_PI_2 1.57079632679489661923