2009-04-05  Ozkan Sezer <sezeroz@gmail.com>

	* dinput.h: Other bits and pieces from wine git: Add the DIPROP_KEYNAME
	  property for keyboard device (d939367ac8fc1e7c7461008c86557fd870c4fbe4),
	  add DISCL_NOWINKEY define (eb3028acc080922996b04f4e0cb36440680fe876),
	  add some defines for EnumDevicesBySemantics
	  (80c2cabab451b749efb768403d68ccddfede71d9).
	  TODO: we _must_ revisit to double check the version ifdefs again.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@723 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/direct-x/ChangeLog

diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 6b47af7..b685705 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -6,6 +6,12 @@
 	  5b375aec71419a5a5bb57a42293ef348d6dc96a8).
 	* dinput.h: Add missing IID_IDirectInput8 definitions (wine git
 	  59c18ef56d3d33b98e319e8c0cd30c24fc363e4e).
+	* dinput.h: Other bits and pieces from wine git: Add the DIPROP_KEYNAME
+	  property for keyboard device (d939367ac8fc1e7c7461008c86557fd870c4fbe4),
+	  add DISCL_NOWINKEY define (eb3028acc080922996b04f4e0cb36440680fe876),
+	  add some defines for EnumDevicesBySemantics
+	  (80c2cabab451b749efb768403d68ccddfede71d9).
+	  TODO: we _must_ revisit to double check the version ifdefs again.
 
 2009-04-04  Ozkan Sezer <sezeroz@gmail.com>
 

mingw-w64-headers/direct-x/include/dinput.h

diff --git a/mingw-w64-headers/direct-x/include/dinput.h b/mingw-w64-headers/direct-x/include/dinput.h
index 308d5c5..9e24bbc 100644
--- a/mingw-w64-headers/direct-x/include/dinput.h
+++ b/mingw-w64-headers/direct-x/include/dinput.h
@@ -518,6 +518,19 @@
 typedef LPDIENUMDEVICESCALLBACKA LPDIENUMDEVICESCALLBACK;
 #endif
 
+#define DIEDBS_MAPPEDPRI1		0x00000001
+#define DIEDBS_MAPPEDPRI2		0x00000002
+#define DIEDBS_RECENTDEVICE		0x00000010
+#define DIEDBS_NEWDEVICE		0x00000020
+
+#define DIEDBSFL_ATTACHEDONLY		0x00000000
+#define DIEDBSFL_THISUSER		0x00000010
+#define DIEDBSFL_FORCEFEEDBACK		DIEDFL_FORCEFEEDBACK
+#define DIEDBSFL_AVAILABLEDEVICES	0x00001000
+#define DIEDBSFL_MULTIMICEKEYBOARDS	0x00002000
+#define DIEDBSFL_NONGAMINGDEVICES	0x00004000
+#define DIEDBSFL_VALID			0x00007110
+
 #if DIRECTINPUT_VERSION >= 0x0800
 typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBA)(LPCDIDEVICEINSTANCEA,LPDIRECTINPUTDEVICE8A,DWORD,DWORD,LPVOID);
 typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBW)(LPCDIDEVICEINSTANCEW,LPDIRECTINPUTDEVICE8W,DWORD,DWORD,LPVOID);
@@ -823,6 +836,12 @@
 } DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH;
 typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH;
 
+typedef struct DIPROPSTRING {
+        DIPROPHEADER diph;
+        WCHAR        wsz[MAX_PATH];
+} DIPROPSTRING, *LPDIPROPSTRING;
+typedef const DIPROPSTRING *LPCDIPROPSTRING;
+
 /* special property GUIDs */
 #ifdef __cplusplus
 #define MAKEDIPROP(prop)	(*(const GUID *)(prop))
@@ -853,6 +872,7 @@
 
 #define DIPROP_CALIBRATION	MAKEDIPROP(11)
 #define DIPROP_GUIDANDPATH	MAKEDIPROP(12)
+#define DIPROP_KEYNAME          MAKEDIPROP(20)
 
 typedef struct DIDEVCAPS_DX3 {
     DWORD	dwSize;
@@ -901,6 +921,7 @@
 #define DISCL_NONEXCLUSIVE	0x00000002
 #define DISCL_FOREGROUND	0x00000004
 #define DISCL_BACKGROUND	0x00000008
+#define DISCL_NOWINKEY          0x00000010
 
 /* Device FF flags */
 #define DISFFC_RESET            0x00000001