From f2e6575a9093a39b1800d8b4c0cc5f85836dd8c2 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 22 Sep 2000 21:04:30 +0000
Subject: [PATCH] Added a few missing macros, types and prototypes.

---
 include/mmsystem.h |  3 ++-
 include/wingdi.h   | 32 +++++++++++++++++++++++++++++++-
 include/winuser.h  | 11 ++++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/include/mmsystem.h b/include/mmsystem.h
index 723df7df2ec..546305690a7 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -27,6 +27,7 @@ typedef LPCSTR		HPCSTR;         /* a huge version of LPCSTR */
    
 typedef WORD    VERSION;        /* major (high byte), minor (low byte) */
 
+typedef DWORD   MCIERROR;
 typedef UINT16	MMVERSION16;
 typedef UINT	MMVERSION;
 typedef UINT16	MCIDEVICEID16;
@@ -326,7 +327,7 @@ typedef struct wavehdr_tag {
 
     struct wavehdr_tag *lpNext;	/* reserved for driver */
     DWORD       reserved;	/* reserved for driver */
-} WAVEHDR, *LPWAVEHDR;
+} WAVEHDR, *PWAVEHDR, *NPWAVEHDR, *LPWAVEHDR;
 
 #define WHDR_DONE       0x00000001  /* done bit */
 #define WHDR_PREPARED   0x00000002  /* set if this header has been prepared */
diff --git a/include/wingdi.h b/include/wingdi.h
index 06659dfe385..a860b0111a5 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1667,6 +1667,36 @@ typedef struct
     DWORD        bV4GammaBlue;
 } BITMAPV4HEADER, *PBITMAPV4HEADER;
 
+typedef struct {
+    DWORD        bV5Size;
+    LONG         bV5Width;
+    LONG         bV5Height;
+    WORD         bV5Planes;
+    WORD         bV5BitCount;
+    DWORD        bV5Compression;
+    DWORD        bV5SizeImage;
+    LONG         bV5XPelsPerMeter;
+    LONG         bV5YPelsPerMeter;
+    DWORD        bV5ClrUsed;
+    DWORD        bV5ClrImportant;
+    DWORD        bV5RedMask;
+    DWORD        bV5GreenMask;
+    DWORD        bV5BlueMask;
+    DWORD        bV5AlphaMask;
+    DWORD        bV5CSType;
+    CIEXYZTRIPLE bV5Endpoints;
+    DWORD        bV5GammaRed;
+    DWORD        bV5GammaGreen;
+    DWORD        bV5GammaBlue;
+    DWORD        bV5Intent;
+    DWORD        bV5ProfileData;
+    DWORD        bV5ProfileSize;
+    DWORD        bV5Reserved;
+} BITMAPV5HEADER, *LPBITMAPV5HEADER, *PBITMAPV5HEADER;
+
+#define PROFILE_LINKED   'LINK'
+#define PROFILE_EMBEDDED 'MBED'
+
 
   /* biCompression */
 #define BI_RGB           0
@@ -1695,7 +1725,7 @@ typedef struct
 {
     BITMAPCOREHEADER bmciHeader;
     RGBTRIPLE        bmciColors[1];
-} BITMAPCOREINFO, *LPBITMAPCOREINFO;
+} BITMAPCOREINFO, *PBITMAPCOREINFO, *LPBITMAPCOREINFO;
 
 #define DIB_RGB_COLORS   0
 #define DIB_PAL_COLORS   1
diff --git a/include/winuser.h b/include/winuser.h
index 45f90fc4e01..d53c7ca14fb 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -636,6 +636,8 @@ typedef struct
 #define WM_COPYDATA		0x004a
 #define WM_CANCELJOURNAL	0x004b
 #define WM_NOTIFY		0x004e
+#define WM_INPUTLANGCHANGEREQUEST       0x0050
+#define WM_INPUTLANGCHANGE              0x0051
 #define WM_TCARD                0x0052
 #define WM_HELP			0x0053
 #define WM_USERCHANGED		0x0054
@@ -1396,7 +1398,7 @@ typedef struct tagMSG
     LPARAM    lParam;
     DWORD     time;
     POINT   pt;
-} MSG, *LPMSG;
+} MSG, *PMSG, *LPMSG;
 
 #define POINTSTOPOINT(pt, pts)                          \
         { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts);   \
@@ -2141,6 +2143,10 @@ typedef struct
 #define IDI_WINLOGOW       MAKEINTRESOURCEW(32517)
 #define IDI_WINLOGO        WINELIB_NAME_AW(IDI_WINLOGO)
 
+#define IDI_WARNING        IDI_EXCLAMATION
+#define IDI_ERROR          IDI_HAND
+#define IDI_INFORMATION    IDI_ASTERISK
+
 #define IDC_BUMMERA      MAKEINTRESOURCEA(100)
 #define IDC_BUMMERW      MAKEINTRESOURCEW(100)
 #define IDC_BUMMER         WINELIB_NAME_AW(IDC_BUMMER)
@@ -3111,6 +3117,9 @@ BOOL      WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
 BOOL        WINAPI EnumDisplayDevicesA(LPVOID,DWORD,LPDISPLAY_DEVICEA,DWORD);
 BOOL        WINAPI EnumDisplayDevicesW(LPVOID,DWORD,LPDISPLAY_DEVICEW,DWORD);
 #define     EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)
+BOOL        WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,LPDEVMODEA);
+BOOL        WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,LPDEVMODEW);
+#define     EnumDisplaySettings WINELIB_NAME_AW(EnumDisplaySettings)
 INT       WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
 INT       WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
 #define     EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)