Merge numerous changes from ReactOS. Submitted by Filip Navara.
This commit is contained in:
@ -534,6 +534,7 @@ extern "C" {
|
||||
#define SB_RIGHT 7
|
||||
#define SB_BOTTOM 7
|
||||
#define SB_TOP 6
|
||||
#define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0)
|
||||
#define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
|
||||
#define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
|
||||
#ifndef XFree86Server
|
||||
@ -743,6 +744,9 @@ extern "C" {
|
||||
#define MB_NOFOCUS 0x00008000
|
||||
#define MB_TYPEMASK 15
|
||||
#define MB_TOPMOST 0x40000
|
||||
#if (WINVER >= 0x0500)
|
||||
#define MB_CANCELTRYCONTINUE 6
|
||||
#endif
|
||||
|
||||
#define IDOK 1
|
||||
#define IDCANCEL 2
|
||||
@ -1203,6 +1207,41 @@ extern "C" {
|
||||
#define SPI_SETTOGGLEKEYS 53
|
||||
#define SPI_SETWHEELSCROLLLINES 105
|
||||
#define SPI_SETWORKAREA 47
|
||||
#if (WINVER >= 0x0500)
|
||||
#define SPI_GETDESKWALLPAPER 115
|
||||
#define SPI_GETMOUSESPEED 112
|
||||
#define SPI_GETSCREENSAVERRUNNING 114
|
||||
#define SPI_GETACTIVEWINDOWTRACKING 0x1000
|
||||
#define SPI_GETACTIVEWNDTRKZORDER 0x100C
|
||||
#define SPI_GETCOMBOBOXANIMATION 0x1004
|
||||
#define SPI_GETCURSORSHADOW 0x101A
|
||||
#define SPI_GETGRADIENTCAPTIONS 0x1008
|
||||
#define SPI_GETHOTTRACKING 0x100E
|
||||
#define SPI_GETKEYBOARDCUES 0x100A
|
||||
#define SPI_GETLISTBOXSMOOTHSCROLLING 0x1006
|
||||
#define SPI_GETMENUANIMATION 0x1002
|
||||
#define SPI_GETMENUFADE 0x1012
|
||||
#define SPI_GETMENUUNDERLINES 0x100A
|
||||
#define SPI_GETSELECTIONFADE 0x1014
|
||||
#define SPI_GETTOOLTIPANIMATION 0x1016
|
||||
#define SPI_GETTOOLTIPFADE 0x1018
|
||||
#define SPI_SETACTIVEWINDOWTRACKING 0x1001
|
||||
#define SPI_SETACTIVEWNDTRKZORDER 0x100D
|
||||
#define SPI_SETCOMBOBOXANIMATION 0x1005
|
||||
#define SPI_SETCURSORSHADOW 0x101B
|
||||
#define SPI_SETGRADIENTCAPTIONS 0x1009
|
||||
#define SPI_SETHOTTRACKING 0x100F
|
||||
#define SPI_SETKEYBOARDCUES 0x100B
|
||||
#define SPI_SETLISTBOXSMOOTHSCROLLING 0x1007
|
||||
#define SPI_SETMENUANIMATION 0x1003
|
||||
#define SPI_SETMENUFADE 0x1013
|
||||
#define SPI_SETMENUUNDERLINES 0x100B
|
||||
#define SPI_SETMOUSESPEED 113
|
||||
#define SPI_SETSELECTIONFADE 0x1015
|
||||
#define SPI_SETTOOLTIPANIMATION 0x1017
|
||||
#define SPI_SETTOOLTIPFADE 0x1019
|
||||
#endif
|
||||
|
||||
#define SPIF_UPDATEINIFILE 1
|
||||
#define SPIF_SENDWININICHANGE 2
|
||||
#define SPIF_SENDCHANGE 2
|
||||
@ -1314,6 +1353,11 @@ extern "C" {
|
||||
#define WM_NCMBUTTONDBLCLK 169
|
||||
#define WM_NCMBUTTONDOWN 167
|
||||
#define WM_NCMBUTTONUP 168
|
||||
#if (_WIN32_WINNT >= 0x0500)
|
||||
#define WM_NCXBUTTONDOWN 171
|
||||
#define WM_NCXBUTTONUP 172
|
||||
#define WM_NCXBUTTONDBLCLK 173
|
||||
#endif
|
||||
#define WM_NCMOUSEMOVE 160
|
||||
#define WM_NCPAINT 133
|
||||
#define WM_NCRBUTTONDBLCLK 166
|
||||
@ -1394,7 +1438,14 @@ extern "C" {
|
||||
#define WM_MBUTTONDBLCLK 521
|
||||
#define WM_MOUSEWHEEL 522
|
||||
#define WM_MOUSEFIRST 512
|
||||
#if (_WIN32_WINNT >= 0x0500)
|
||||
#define WM_XBUTTONDOWN 523
|
||||
#define WM_XBUTTONUP 524
|
||||
#define WM_XBUTTONDBLCLK 525
|
||||
#define WM_MOUSELAST 525
|
||||
#else
|
||||
#define WM_MOUSELAST 522
|
||||
#endif
|
||||
#define WM_MOUSEHOVER 0x2A1
|
||||
#define WM_MOUSELEAVE 0x2A3
|
||||
#if (_WIN32_WINNT >= 0x0400)
|
||||
@ -1594,6 +1645,7 @@ extern "C" {
|
||||
#define DCX_CLIPSIBLINGS 16
|
||||
#define DCX_CLIPCHILDREN 8
|
||||
#define DCX_NORESETATTRS 4
|
||||
#define DCX_INTERSECTUPDATE 0x200
|
||||
#define DCX_LOCKWINDOWUPDATE 0x400
|
||||
#define DCX_EXCLUDERGN 64
|
||||
#define DCX_INTERSECTRGN 128
|
||||
@ -1813,6 +1865,10 @@ extern "C" {
|
||||
#define MK_SHIFT 4
|
||||
#define MK_CONTROL 8
|
||||
#define MK_MBUTTON 16
|
||||
#if(_WIN32_WINNT >= 0x0500)
|
||||
#define MK_XBUTTON1 32
|
||||
#define MK_XBUTTON2 64
|
||||
#endif
|
||||
#define TPM_CENTERALIGN 4
|
||||
#define TPM_LEFTALIGN 0
|
||||
#define TPM_RIGHTALIGN 8
|
||||
@ -1841,6 +1897,7 @@ extern "C" {
|
||||
#define HELP_QUIT 2
|
||||
#define HELP_SETCONTENTS 5
|
||||
#define HELP_SETINDEX 5
|
||||
#define HELP_SETWINPOS 0x203
|
||||
#define HELP_CONTEXTMENU 0xa
|
||||
#define HELP_FINDER 0xb
|
||||
#define HELP_WM_HELP 0xc
|
||||
@ -3147,7 +3204,8 @@ long WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
|
||||
long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
|
||||
long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
|
||||
#endif /* (_WIN32_WINNT >= 0x0501) */
|
||||
BOOL WINAPI CallMsgFilter(PMSG,int);
|
||||
BOOL WINAPI CallMsgFilterA(LPMSG,INT);
|
||||
BOOL WINAPI CallMsgFilterW(LPMSG,INT);
|
||||
LRESULT WINAPI CallNextHookEx(HHOOK,int,WPARAM,LPARAM);
|
||||
LRESULT WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
|
||||
LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
|
||||
@ -3388,7 +3446,6 @@ int WINAPI GetKeyNameTextA(LONG,LPSTR,int);
|
||||
int WINAPI GetKeyNameTextW(LONG,LPWSTR,int);
|
||||
SHORT WINAPI GetKeyState(int);
|
||||
HWND WINAPI GetLastActivePopup(HWND);
|
||||
DWORD WINAPI GetLastError(void);
|
||||
HMENU WINAPI GetMenu(HWND);
|
||||
LONG WINAPI GetMenuCheckMarkDimensions(void);
|
||||
DWORD WINAPI GetMenuContextHelpId(HMENU);
|
||||
@ -3503,6 +3560,7 @@ BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
|
||||
BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
|
||||
BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
|
||||
BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,LPCMENUITEMINFOW);
|
||||
INT WINAPI InternalGetWindowText(HWND,LPWSTR,INT);
|
||||
BOOL WINAPI IntersectRect(LPRECT,LPCRECT,LPCRECT);
|
||||
BOOL WINAPI InvalidateRect(HWND,LPCRECT,BOOL);
|
||||
BOOL WINAPI InvalidateRgn(HWND,HRGN,BOOL);
|
||||
@ -3722,7 +3780,8 @@ LONG_PTR WINAPI SetWindowLongPtrW(HWND,int,LONG_PTR);
|
||||
BOOL WINAPI SetWindowPlacement(HWND hWnd,const WINDOWPLACEMENT*);
|
||||
BOOL WINAPI SetWindowPos(HWND,HWND,int,int,int,int,UINT);
|
||||
int WINAPI SetWindowRgn(HWND,HRGN,BOOL);
|
||||
HOOKPROC WINAPI SetWindowsHookA(int,HOOKPROC);
|
||||
HHOOK WINAPI SetWindowsHookA(int,HOOKPROC);
|
||||
HHOOK WINAPI SetWindowsHookW(int,HOOKPROC);
|
||||
HHOOK WINAPI SetWindowsHookExA(int,HOOKPROC,HINSTANCE,DWORD);
|
||||
HHOOK WINAPI SetWindowsHookExW(int,HOOKPROC,HINSTANCE,DWORD);
|
||||
BOOL WINAPI SetWindowTextA(HWND,LPCSTR);
|
||||
@ -3828,6 +3887,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
|
||||
#define AppendMenu AppendMenuW
|
||||
#define BroadcastSystemMessage BroadcastSystemMessageW
|
||||
#define BroadcastSystemMessageEx BroadcastSystemMessageExW
|
||||
#define CallMsgFilter CallMsgFilterW
|
||||
#define CallWindowProc CallWindowProcW
|
||||
#define ChangeMenu ChangeMenuW
|
||||
#define CharLower CharLowerW
|
||||
@ -3992,6 +4052,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
|
||||
#define AppendMenu AppendMenuA
|
||||
#define BroadcastSystemMessage BroadcastSystemMessageA
|
||||
#define BroadcastSystemMessageEx BroadcastSystemMessageExA
|
||||
#define CallMsgFilter CallMsgFilterA
|
||||
#define CallWindowProc CallWindowProcA
|
||||
#define ChangeMenu ChangeMenuA
|
||||
#define CharLower CharLowerA
|
||||
|
Reference in New Issue
Block a user