* winuser.h: Fix several typos found by Rinrin <rinrin@imbrian.org>:
(TOUCHEVENTMASKF_TIMEFROMSYSTEM): Rename to
TOUCHINPUTMASKF_TIMEFROMSYSTEM.
(TOUCHEVENTMASKF_EXTRAINFO): Rename to TOUCHINPUTMASKF_EXTRAINFO.
(TOUCHEVENTMASKF_CONTACTAREA): Rename to TOUCHINPUTMASKF_CONTACTAREA.
(struct _TOUCHINPUT): Fix member name from wMask to dwMask.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4719 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 1de667b..cb30323 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-06 Ozkan Sezer <sezeroz@gmail.com>
+
+ * winuser.h: Fix several typos found by Rinrin <rinrin@imbrian.org>:
+ (TOUCHEVENTMASKF_TIMEFROMSYSTEM): Rename to
+ TOUCHINPUTMASKF_TIMEFROMSYSTEM.
+ (TOUCHEVENTMASKF_EXTRAINFO): Rename to TOUCHINPUTMASKF_EXTRAINFO.
+ (TOUCHEVENTMASKF_CONTACTAREA): Rename to TOUCHINPUTMASKF_CONTACTAREA.
+ (struct _TOUCHINPUT): Fix member name from wMask to dwMask.
+
2012-01-04 Ozkan Sezer <sezeroz@gmail.com>
* wingdi.h: Uglify the function param names a bit for bug #3469308
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 7f2a348..cd6bff7 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -5349,9 +5349,9 @@
#define TOUCHEVENTF_PEN 0x0040
#define TOUCHEVENTF_PALM 0x0080
-#define TOUCHEVENTMASKF_TIMEFROMSYSTEM 0x0001
-#define TOUCHEVENTMASKF_EXTRAINFO 0x0002
-#define TOUCHEVENTMASKF_CONTACTAREA 0x0004
+#define TOUCHINPUTMASKF_TIMEFROMSYSTEM 0x0001
+#define TOUCHINPUTMASKF_EXTRAINFO 0x0002
+#define TOUCHINPUTMASKF_CONTACTAREA 0x0004
#define MAPVK_VK_TO_VSC 0
#define MAPVK_VSC_TO_VK 1
@@ -5365,7 +5365,7 @@
HANDLE hSource;
DWORD dwID;
DWORD dwFlags;
- DWORD wMask;
+ DWORD dwMask;
DWORD dwTime;
ULONG_PTR dwExtraInfo;
DWORD cxContact;
