Sync to trunk r39350.

[reactos.git] / reactos / include / psdk / winuser.h

diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index e935c7c..36aa155 100644 (file)
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -592,8 +592,8 @@ extern "C" {
 #define RT_RCDATA MAKEINTRESOURCE(10)
 #define RT_MESSAGETABLE MAKEINTRESOURCE(11)
 #define DIFFERENCE 11
-#define RT_GROUP_CURSOR MAKEINTRESOURCE((DWORD)RT_CURSOR+DIFFERENCE)
-#define RT_GROUP_ICON MAKEINTRESOURCE((DWORD)RT_ICON+DIFFERENCE)
+#define RT_GROUP_CURSOR MAKEINTRESOURCE((ULONG_PTR)RT_CURSOR+DIFFERENCE)
+#define RT_GROUP_ICON MAKEINTRESOURCE((ULONG_PTR)RT_ICON+DIFFERENCE)
 #define RT_VERSION MAKEINTRESOURCE(16)
 #define RT_DLGINCLUDE MAKEINTRESOURCE(17)
 #define RT_PLUGPLAY MAKEINTRESOURCE(19)
@@ -1999,6 +1999,7 @@ extern "C" {
 #define DCX_EXCLUDERGN 64
 #define DCX_INTERSECTRGN 128
 #define DCX_VALIDATE 0x200000
+#define DCX_USESTYLE 0x00010000
 #define DCX_EXCLUDEUPDATE   0x100
 #define GMDI_GOINTOPOPUPS 2
 #define GMDI_USEDISABLED 1
@@ -2811,13 +2812,13 @@ typedef struct tagCOMPAREITEMSTRUCT {
        UINT    CtlID;
        HWND    hwndItem;
        UINT    itemID1;
-       DWORD   itemData1;
+       ULONG_PTR       itemData1;
        UINT    itemID2;
-       DWORD   itemData2;
+       ULONG_PTR       itemData2;
        DWORD   dwLocaleId;
 } COMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT;
 typedef struct tagCOPYDATASTRUCT {
-       DWORD dwData;
+       ULONG_PTR dwData;
        DWORD cbData;
        PVOID lpData;
 } COPYDATASTRUCT,*PCOPYDATASTRUCT;
@@ -2855,7 +2856,7 @@ typedef struct tagDELETEITEMSTRUCT {
        UINT CtlID;
        UINT itemID;
        HWND hwndItem;
-       UINT itemData;
+       ULONG_PTR itemData;
 } DELETEITEMSTRUCT,*PDELETEITEMSTRUCT,*LPDELETEITEMSTRUCT;
 #pragma pack(push,2)
 typedef struct {
@@ -2893,7 +2894,7 @@ typedef struct tagDRAWITEMSTRUCT {
        HWND hwndItem;
        HDC     hDC;
        RECT rcItem;
-       DWORD itemData;
+       ULONG_PTR itemData;
 } DRAWITEMSTRUCT,*LPDRAWITEMSTRUCT,*PDRAWITEMSTRUCT;
 typedef struct {
        UINT cbSize;
@@ -2927,7 +2928,7 @@ typedef struct _ICONINFO {
 } ICONINFO,*PICONINFO;
 typedef struct tagNMHDR {
        HWND hwndFrom;
-       UINT idFrom;
+       UINT_PTR idFrom;
        UINT code;
 } NMHDR,*LPNMHDR;
 typedef struct _WNDCLASSA {
@@ -2991,7 +2992,7 @@ typedef struct tagMENUITEMINFOA {
        HMENU hSubMenu;
        HBITMAP hbmpChecked;
        HBITMAP hbmpUnchecked;
-       DWORD dwItemData;
+       ULONG_PTR dwItemData;
        LPSTR dwTypeData;
        UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
@@ -3008,7 +3009,7 @@ typedef struct tagMENUITEMINFOW {
        HMENU hSubMenu;
        HBITMAP hbmpChecked;
        HBITMAP hbmpUnchecked;
-       DWORD dwItemData;
+       ULONG_PTR dwItemData;
        LPWSTR dwTypeData;
        UINT cch;
 #if (_WIN32_WINNT >= 0x0500)
@@ -3049,7 +3050,7 @@ typedef struct tagHELPINFO {
        int iContextType;
        int iCtrlId;
        HANDLE hItemHandle;
-       DWORD dwContextId;
+       DWORD_PTR dwContextId;
        POINT MousePos;
 } HELPINFO,*LPHELPINFO;
 typedef void(CALLBACK *MSGBOXCALLBACK)(LPHELPINFO);
@@ -3061,7 +3062,7 @@ typedef struct {
        LPCSTR lpszCaption;
        DWORD dwStyle;
        LPCSTR lpszIcon;
-       DWORD dwContextHelpId;
+       DWORD_PTR dwContextHelpId;
        MSGBOXCALLBACK lpfnMsgBoxCallback;
        DWORD dwLanguageId;
 } MSGBOXPARAMSA,*PMSGBOXPARAMSA,*LPMSGBOXPARAMSA;
@@ -3073,7 +3074,7 @@ typedef struct {
        LPCWSTR lpszCaption;
        DWORD dwStyle;
        LPCWSTR lpszIcon;
-       DWORD dwContextHelpId;
+       DWORD_PTR dwContextHelpId;
        MSGBOXCALLBACK lpfnMsgBoxCallback;
        DWORD dwLanguageId;
 } MSGBOXPARAMSW,*PMSGBOXPARAMSW,*LPMSGBOXPARAMSW;
@@ -3107,14 +3108,14 @@ typedef struct tagICONMETRICSA {
        int iVertSpacing;
        int iTitleWrap;
        LOGFONTA lfFont;
-} ICONMETRICSA,*LPICONMETRICSA;
+} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA;
 typedef struct tagICONMETRICSW {
        UINT cbSize;
        int iHorzSpacing;
        int iVertSpacing;
        int iTitleWrap;
        LOGFONTW lfFont;
-} ICONMETRICSW,*LPICONMETRICSW;
+} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW;
 #endif /*  NOGDI */
 typedef struct tagMINIMIZEDMETRICS {
        UINT cbSize;
@@ -3226,7 +3227,7 @@ typedef struct tagMOUSEHOOKSTRUCT {
        POINT pt;
        HWND hwnd;
        UINT wHitTestCode;
-       DWORD dwExtraInfo;
+       ULONG_PTR dwExtraInfo;
 } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
 #if ( _WIN32_WINNT >= 0x0500 )
 #ifdef __cplusplus
@@ -3312,13 +3313,13 @@ typedef struct tagMEASUREITEMSTRUCT {
        UINT itemID;
        UINT itemWidth;
        UINT itemHeight;
-       DWORD itemData;
+       ULONG_PTR itemData;
 } MEASUREITEMSTRUCT,*PMEASUREITEMSTRUCT,*LPMEASUREITEMSTRUCT;
 typedef struct tagDROPSTRUCT {
        HWND hwndSource;
        HWND hwndSink;
        DWORD wFmt;
-       DWORD dwData;
+       ULONG_PTR dwData;
        POINT ptDrop;
        DWORD dwControlData;
 } DROPSTRUCT,*PDROPSTRUCT,*LPDROPSTRUCT;
@@ -3457,7 +3458,7 @@ typedef struct tagKBDLLHOOKSTRUCT {
        DWORD scanCode;
        DWORD flags;
        DWORD time;
-       DWORD dwExtraInfo;
+       ULONG_PTR dwExtraInfo;
 } KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT;
 typedef struct tagMSLLHOOKSTRUCT
 {
@@ -3743,12 +3744,12 @@ BOOL WINAPI DestroyWindow(HWND);
 #define DialogBoxW(i,t,p,f) DialogBoxParamW(i,t,p,f,0)
 #define DialogBoxIndirectA(i,t,p,f) DialogBoxIndirectParamA(i,t,p,f,0)
 #define DialogBoxIndirectW(i,t,p,f) DialogBoxIndirectParamW(i,t,p,f,0)
-int WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-LONG WINAPI DispatchMessageA(const MSG*);
-LONG WINAPI DispatchMessageW(const MSG*);
+INT_PTR WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
+LRESULT WINAPI DispatchMessageA(const MSG*);
+LRESULT WINAPI DispatchMessageW(const MSG*);
 int WINAPI DlgDirListA(HWND,LPSTR,int,int,UINT);
 int WINAPI DlgDirListW(HWND,LPWSTR,int,int,UINT);
 int WINAPI DlgDirListComboBoxA(HWND,LPSTR,int,int,UINT);
@@ -3758,7 +3759,7 @@ BOOL WINAPI DlgDirSelectComboBoxExW(HWND,LPWSTR,int,int);
 BOOL WINAPI DlgDirSelectExA(HWND,LPSTR,int,int);
 BOOL WINAPI DlgDirSelectExW(HWND,LPWSTR,int,int);
 BOOL WINAPI DragDetect(HWND,POINT);
-DWORD WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR);
+DWORD WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR);
 BOOL WINAPI DrawAnimatedRects(HWND,int,LPCRECT,LPCRECT);
 BOOL WINAPI DrawCaption(HWND,HDC,LPCRECT,UINT);
 BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
@@ -3781,7 +3782,7 @@ BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT);
 BOOL WINAPI EnableScrollBar(HWND,UINT,UINT);
 BOOL WINAPI EnableWindow(HWND,BOOL);
 BOOL WINAPI EndDeferWindowPos(HDWP);
-BOOL WINAPI EndDialog(HWND,int);
+BOOL WINAPI EndDialog(HWND,INT_PTR);
 BOOL WINAPI EndMenu(void);
 BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
 #if (_WIN32_WINNT >= 0x0500)
@@ -3838,8 +3839,8 @@ BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
 DWORD WINAPI GetClassLongA(HWND,int);
 DWORD WINAPI GetClassLongW(HWND,int);
 #ifdef _WIN64
-LONG_PTR WINAPI GetClassLongPtrA(HWND,int);
-LONG_PTR WINAPI GetClassLongPtrW(HWND,int);
+ULONG_PTR WINAPI GetClassLongPtrA(HWND,int);
+ULONG_PTR WINAPI GetClassLongPtrW(HWND,int);
 #else
 #define GetClassLongPtrA GetClassLongA
 #define GetClassLongPtrW GetClassLongW
@@ -3900,7 +3901,7 @@ int WINAPI GetMenuStringA(HMENU,UINT,LPSTR,int,UINT);
 int WINAPI GetMenuStringW(HMENU,UINT,LPWSTR,int,UINT);
 BOOL WINAPI GetMessageA(LPMSG,HWND,UINT,UINT);
 BOOL WINAPI GetMessageW(LPMSG,HWND,UINT,UINT);
-LONG WINAPI GetMessageExtraInfo(void);
+LPARAM WINAPI GetMessageExtraInfo(void);
 DWORD WINAPI GetMessagePos(void);
 LONG WINAPI GetMessageTime(void);
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
@@ -3996,8 +3997,8 @@ BOOL WINAPI InSendMessage(void);
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 DWORD WINAPI InSendMessageEx(LPVOID);
 #endif
-BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
 BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
 BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,LPCMENUITEMINFOW);
 INT WINAPI InternalGetWindowText(HWND,LPWSTR,INT);
@@ -4035,8 +4036,8 @@ BOOL WINAPI IsWindowVisible(HWND);
 BOOL WINAPI IsWinEventHookInstalled(DWORD);
 #endif
 BOOL WINAPI IsZoomed(HWND);
-VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
-BOOL WINAPI KillTimer(HWND,UINT);
+VOID WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
+BOOL WINAPI KillTimer(HWND,UINT_PTR);
 HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
 HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
 HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
@@ -4077,8 +4078,8 @@ int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
 int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
 int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
 int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
-BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
 HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
 HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
 HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
@@ -4148,14 +4149,14 @@ BOOL WINAPI ScreenToClient(HWND,LPPOINT);
 BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT);
 BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
 int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
-LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
-LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
+LRESULT WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
+LRESULT WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
 #if (_WIN32_WINNT >= 0x0403)
 UINT WINAPI SendInput(UINT,LPINPUT,int);
 #endif
 LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
-BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
+BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
+BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
 LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
 LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
 LRESULT WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
@@ -4213,7 +4214,7 @@ DWORD WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD);
 #define SetSysModalWindow(h) (NULL)
 BOOL WINAPI SetSystemCursor(HCURSOR,DWORD);
 BOOL WINAPI SetThreadDesktop(HDESK);
-UINT WINAPI SetTimer(HWND,UINT,UINT,TIMERPROC);
+UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
 BOOL WINAPI SetUserObjectInformationA(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectInformationW(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
@@ -4292,8 +4293,8 @@ BOOL WINAPI WaitMessage(void);
 HWND WINAPI WindowFromDC(HDC hDC);
 HWND WINAPI WindowFromPoint(POINT);
 UINT WINAPI WinExec(LPCSTR,UINT);
-BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD);
-BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD);
+BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR);
+BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR);
 int WINAPIV wsprintfA(LPSTR,LPCSTR,...);
 int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
 int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);
@@ -4483,8 +4484,8 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
 #define WinHelp WinHelpW
 #define wsprintf wsprintfW
 #define wvsprintf wvsprintfW
-#ifndef NOGDI
-typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
+#if defined(_WINGDI_) && !defined(NOGDI)
+typedef ICONMETRICSW ICONMETRICS;
 typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsW
 #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
@@ -4652,7 +4653,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #define wsprintf wsprintfA
 #define wvsprintf wvsprintfA
 #if defined(_WINGDI_) && !defined(NOGDI)
-typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
+typedef ICONMETRICSA ICONMETRICS;
 typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsA
 #define ChangeDisplaySettingsEx ChangeDisplaySettingsExA