2009-04-04 Ozkan Sezer <sezeroz@gmail.com> * d3d9types.h: Fix the D3DFMT_XXX constant declarations. (wine git d4ca34dd9bf98ea71226460092c7095847b97509) * d3d8types.h: Likewise. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@712 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 58650b3..6753e6d 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog

@@ -13,7 +13,9 @@
 	* d3d9.h: Likewise.
 	* d3d9types.h: Fix the value of D3DFVF_POSITION_MASK.
 	(wine git d359a7813fe3d7acd8d3791fe63a4e44bb22ebb2)
-
+	* d3d9types.h: Fix the D3DFMT_XXX constant declarations.
+	(wine git d4ca34dd9bf98ea71226460092c7095847b97509)
+	* d3d8types.h: Likewise.
 
 2009-02-20  Kai Tietz  <kai.tietz@onevision.com>
 

diff --git a/mingw-w64-headers/direct-x/include/d3d8types.h b/mingw-w64-headers/direct-x/include/d3d8types.h
index 915f9b5..9374ec3 100644
--- a/mingw-w64-headers/direct-x/include/d3d8types.h
+++ b/mingw-w64-headers/direct-x/include/d3d8types.h

@@ -636,6 +636,8 @@
     D3DFMT_A8                   =  28,
     D3DFMT_A8R3G3B2             =  29,
     D3DFMT_X4R4G4B4             =  30,
+    D3DFMT_A2B10G10R10          =  31,
+    D3DFMT_G16R16               =  34,
 
     D3DFMT_A8P8                 =  40,
     D3DFMT_P8                   =  41,
@@ -650,6 +652,7 @@
     D3DFMT_Q8W8V8U8             =  63,
     D3DFMT_V16U16               =  64,
     D3DFMT_W11V11U10            =  65,
+    D3DFMT_A2W10V10U10          =  67,
 
     D3DFMT_UYVY                 =  MAKEFOURCC('U', 'Y', 'V', 'Y'),
     D3DFMT_YUY2                 =  MAKEFOURCC('Y', 'U', 'Y', '2'),

diff --git a/mingw-w64-headers/direct-x/include/d3d9types.h b/mingw-w64-headers/direct-x/include/d3d9types.h
index ebd6779..961d959 100644
--- a/mingw-w64-headers/direct-x/include/d3d9types.h
+++ b/mingw-w64-headers/direct-x/include/d3d9types.h

@@ -820,7 +820,6 @@
     D3DFMT_X8L8V8U8             =  62,
     D3DFMT_Q8W8V8U8             =  63,
     D3DFMT_V16U16               =  64,
-    D3DFMT_W11V11U10            =  65,
     D3DFMT_A2W10V10U10          =  67,
 
     D3DFMT_UYVY                 =  MAKEFOURCC('U', 'Y', 'V', 'Y'),
@@ -830,7 +829,7 @@
     D3DFMT_DXT3                 =  MAKEFOURCC('D', 'X', 'T', '3'),
     D3DFMT_DXT4                 =  MAKEFOURCC('D', 'X', 'T', '4'),
     D3DFMT_DXT5                 =  MAKEFOURCC('D', 'X', 'T', '5'),
-    D3DFMT_MULTI2_ARGB          =  MAKEFOURCC('M', 'E', 'T', '1'),
+    D3DFMT_MULTI2_ARGB8         =  MAKEFOURCC('M', 'E', 'T', '1'),
     D3DFMT_G8R8_G8B8            =  MAKEFOURCC('G', 'R', 'G', 'B'),
     D3DFMT_R8G8_B8G8            =  MAKEFOURCC('R', 'G', 'B', 'G'),