ddraw.h (DDSURFACEDESC2): fix the dwBackBufferCount field to
be a union. MSDN:
http://msdn.microsoft.com/en-us/library/ff550292(VS.85).aspx
cf. Wine git commit 21bfc8c440f5d478bbb91f2f631ff02c37d2d2e0
diff --git a/mingw-w64-headers/direct-x/include/ddraw.h b/mingw-w64-headers/direct-x/include/ddraw.h
index e9bd035..a47008d 100644
--- a/mingw-w64-headers/direct-x/include/ddraw.h
+++ b/mingw-w64-headers/direct-x/include/ddraw.h
@@ -1016,7 +1016,10 @@
 		LONG	lPitch;	      /*10: distance to start of next line (return value only)*/
 		DWORD   dwLinearSize; /*10: formless late-allocated optimized surface size */
 	} DUMMYUNIONNAME1;
-	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
+	__GNU_EXTENSION union {
+	  DWORD dwBackBufferCount;/* 14: number of back buffers requested */
+	  DWORD dwDepth;          /* The bit-depth if this is a volume texture. */
+	} DUMMYUNIONNAME5;
 	__GNU_EXTENSION union {
 		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
 		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
diff --git a/mingw-w64-headers/direct-x/include/dsound.h b/mingw-w64-headers/direct-x/include/dsound.h
index b7fb958..c253834 100644
--- a/mingw-w64-headers/direct-x/include/dsound.h
+++ b/mingw-w64-headers/direct-x/include/dsound.h
@@ -679,6 +679,8 @@
 };
 #undef INTERFACE
 
+DEFINE_GUID(GUID_All_Objects, 0xaa114de5, 0xc262, 0x4169, 0xa1, 0xc8, 0x23, 0xd6, 0x98, 0xcc, 0x73, 0xb5);
+
 #if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IDirectSoundBuffer8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)