* ddraw.h: (DDSCAPS2_VOLUME): New constant from the Wine git repo.
  (DDLOCK_OKTOSWAP): Likewise.
  (DDLOCK_DONOTWAIT): Likewise.
  (DDLOCK_HASVOLUMETEXTUREBOXRECT): Likewise.
  (DDLOCK_NODIRTYUPDATE): Likewise.
* dinput.h (DI_SETTINGSNOTSAVED): New constant from the Wine git repo.

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

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

diff --git a/mingw-w64-headers/direct-x/include/ddraw.h b/mingw-w64-headers/direct-x/include/ddraw.h
index e11d513..0948615 100644
--- a/mingw-w64-headers/direct-x/include/ddraw.h
+++ b/mingw-w64-headers/direct-x/include/ddraw.h
@@ -366,6 +366,7 @@
 #define DDSCAPS2_DONOTPERSIST           0x00040000
 /* indicates surface is part of a stereo flipping chain */
 #define DDSCAPS2_STEREOSURFACELEFT      0x00080000
+#define DDSCAPS2_VOLUME                 0x00200000
 
 typedef struct _DDSCAPS2 {
 	DWORD	dwCaps;	/* capabilities of surface wanted */
@@ -1435,6 +1436,10 @@
 #define DDLOCK_NOSYSLOCK	0x00000800
 #define DDLOCK_NOOVERWRITE      0x00001000
 #define DDLOCK_DISCARDCONTENTS  0x00002000
+#define DDLOCK_OKTOSWAP		0x00002000
+#define DDLOCK_DONOTWAIT	0x00004000
+#define DDLOCK_HASVOLUMETEXTUREBOXRECT  0x00008000
+#define DDLOCK_NODIRTYUPDATE	0x00010000
 
 
 /*****************************************************************************

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 4d606bd..f7f0ee8 100644
--- a/mingw-w64-headers/direct-x/include/dinput.h
+++ b/mingw-w64-headers/direct-x/include/dinput.h
@@ -153,6 +153,7 @@
 #define DI_DOWNLOADSKIPPED              ((HRESULT)0x00000003L)
 #define DI_EFFECTRESTARTED              ((HRESULT)0x00000004L)
 #define DI_TRUNCATED                    ((HRESULT)0x00000008L)
+#define DI_SETTINGSNOTSAVED             ((HRESULT)0x0000000BL)
 #define DI_TRUNCATEDANDRESTARTED        ((HRESULT)0x0000000CL)
 
 #define DIERR_OLDDIRECTINPUTVERSION     \