Merge MinGW differences
This commit is contained in:
@ -124,6 +124,8 @@ extern "C" {
|
||||
#define BSM_NETDRIVER 2
|
||||
#define BSM_VXDS 1
|
||||
#define BROADCAST_QUERY_DENY 1112363332
|
||||
#define ENUM_CURRENT_SETTINGS ((DWORD)-1)
|
||||
#define ENUM_REGISTRY_SETTINGS ((DWORD)-2)
|
||||
#define DM_BITSPERPEL 0x40000
|
||||
#define DM_PELSWIDTH 0x80000
|
||||
#define DM_PELSHEIGHT 0x100000
|
||||
@ -305,6 +307,11 @@ extern "C" {
|
||||
#define SS_WHITEFRAME 9
|
||||
#define SS_WHITERECT 6
|
||||
#define SS_USERITEM 10
|
||||
#define SS_TYPEMASK 0x0000001FL
|
||||
#define SS_ENDELLIPSIS 0x00004000L
|
||||
#define SS_PATHELLIPSIS 0x00008000L
|
||||
#define SS_WORDELLIPSIS 0x0000C000L
|
||||
#define SS_ELLIPSISMASK 0x0000C000L
|
||||
#define DS_3DLOOK 4
|
||||
#define DS_ABSALIGN 1
|
||||
#define DS_CENTER 0x800
|
||||
@ -322,13 +329,18 @@ extern "C" {
|
||||
#define WS_EX_ACCEPTFILES 16
|
||||
#define WS_EX_APPWINDOW 0x40000
|
||||
#define WS_EX_CLIENTEDGE 512
|
||||
#define WS_EX_COMPOSITED 0x2000000 /* XP */
|
||||
#define WS_EX_CONTEXTHELP 0x400
|
||||
#define WS_EX_CONTROLPARENT 0x10000
|
||||
#define WS_EX_DLGMODALFRAME 1
|
||||
#define WS_EX_LAYERED 0x80000 /* w2k */
|
||||
#define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */
|
||||
#define WS_EX_LEFT 0
|
||||
#define WS_EX_LEFTSCROLLBAR 0x4000
|
||||
#define WS_EX_LTRREADING 0
|
||||
#define WS_EX_MDICHILD 64
|
||||
#define WS_EX_NOACTIVATE 0x8000000 /* w2k */
|
||||
#define WS_EX_NOINHERITLAYOUT 0x100000 /* w2k */
|
||||
#define WS_EX_NOPARENTNOTIFY 4
|
||||
#define WS_EX_OVERLAPPEDWINDOW 0x300
|
||||
#define WS_EX_PALETTEWINDOW 0x188
|
||||
@ -939,6 +951,7 @@ extern "C" {
|
||||
#define HWND_TOP ((HWND)0)
|
||||
#define HWND_TOPMOST ((HWND)(-1))
|
||||
#define HWND_DESKTOP (HWND)0
|
||||
#define HWND_MESSAGE ((HWND)(-3)) /* w2k */
|
||||
#define RDW_ERASE 4
|
||||
#define RDW_FRAME 1024
|
||||
#define RDW_INTERNALPAINT 2
|
||||
@ -1064,6 +1077,7 @@ extern "C" {
|
||||
#define SPI_SETPOWEROFFTIMEOUT 82
|
||||
#define SPI_SETSCREENREADER 71
|
||||
#define SPI_SETSCREENSAVEACTIVE 17
|
||||
#define SPI_SETSCREENSAVERRUNNING 97
|
||||
#define SPI_SETSCREENSAVETIMEOUT 15
|
||||
#define SPI_SETSERIALKEYS 63
|
||||
#define SPI_SETSHOWSOUNDS 57
|
||||
@ -1858,6 +1872,8 @@ extern "C" {
|
||||
#define MOD_ON_KEYUP 2048
|
||||
#define MOD_RIGHT 16384
|
||||
#define MOD_LEFT 32768
|
||||
#define LLKHF_ALTDOWN 0x00000020
|
||||
|
||||
#ifndef RC_INVOKED
|
||||
typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
|
||||
typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
|
||||
@ -1873,6 +1889,7 @@ typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM);
|
||||
typedef BOOL(CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
|
||||
typedef BOOL(CALLBACK *WNDENUMPROC)(HWND,LPARAM);
|
||||
typedef BOOL(CALLBACK *ENUMWINDOWSPROC)(HWND,LPARAM);
|
||||
typedef BOOL(CALLBACK* MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
|
||||
typedef BOOL(CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM);
|
||||
typedef BOOL(CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM);
|
||||
typedef NAMEENUMPROCA DESKTOPENUMPROCA;
|
||||
@ -2537,6 +2554,14 @@ typedef struct tagMONITORINFO {
|
||||
RECT rcWork;
|
||||
DWORD dwFlags;
|
||||
} MONITORINFO,*LPMONITORINFO;
|
||||
typedef struct tagKBDLLHOOKSTRUCT {
|
||||
DWORD vkCode;
|
||||
DWORD scanCode;
|
||||
DWORD flags;
|
||||
DWORD time;
|
||||
DWORD dwExtraInfo;
|
||||
} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
|
||||
|
||||
|
||||
#define AnsiToOem CharToOemA
|
||||
#define OemToAnsi OemToCharA
|
||||
@ -2710,6 +2735,7 @@ UINT WINAPI EnumClipboardFormats(UINT);
|
||||
BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
|
||||
BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
|
||||
BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM);
|
||||
BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
|
||||
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
|
||||
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
|
||||
int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
|
||||
|
Reference in New Issue
Block a user