diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 295760f..ff5d9b5 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-23  Ozkan Sezer <sezeroz@gmail.com>
+
+	* d3dx9shader.h: Merged d3dx9_36 fix of Christian Costa from wine
+	git-3138ba0d5cfcd37d3b457916240a7e20a08f047c / 2010-02-21: Fix
+	AddRef and Release macros and add IID for ID3DXConstantTable.
+
 2010-02-20  Ozkan Sezer <sezeroz@gmail.com>
 
 	* dvdmedia.h: added from the wine sources.
diff --git a/mingw-w64-headers/direct-x/include/d3dx9shader.h b/mingw-w64-headers/direct-x/include/d3dx9shader.h
index 78abec8..a0df2a8 100644
--- a/mingw-w64-headers/direct-x/include/d3dx9shader.h
+++ b/mingw-w64-headers/direct-x/include/d3dx9shader.h
@@ -112,6 +112,8 @@
     LPCVOID DefaultValue;
 } D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC;
 
+DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39, 0xc6, 0xdd, 0xfb, 0x35, 0x8b);
+
 #undef INTERFACE
 #define INTERFACE ID3DXConstantTable
 
@@ -151,8 +153,8 @@
 #if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define ID3DXConstantTable_QueryInterface(p,a,b)                      (p)->lpVtbl->QueryInterface(p,a,b)
-#define ID3DXConstantTable_AddRef(p)                                  (p)->lpVtbl->AddRef(p,a)
-#define ID3DXConstantTable_Release(p)                                 (p)->lpVtbl->Release(p,a)
+#define ID3DXConstantTable_AddRef(p)                                  (p)->lpVtbl->AddRef(p)
+#define ID3DXConstantTable_Release(p)                                 (p)->lpVtbl->Release(p)
 /*** ID3DXBuffer methods ***/
 #define ID3DXConstantTable_GetBufferPointer(p)                        (p)->lpVtbl->GetBufferPointer(p)
 #define ID3DXConstantTable_GetBufferSize(p)                           (p)->lpVtbl->GetBufferSize(p)
@@ -181,8 +183,8 @@
 #else
 /*** IUnknown methods ***/
 #define ID3DXConstantTable_QueryInterface(p,a,b)                      (p)->QueryInterface(a,b)
-#define ID3DXConstantTable_AddRef(p)                                  (p)->AddRef(a)
-#define ID3DXConstantTable_Release(p)                                 (p)->Release(a)
+#define ID3DXConstantTable_AddRef(p)                                  (p)->AddRef()
+#define ID3DXConstantTable_Release(p)                                 (p)->Release()
 /*** ID3DXBuffer methods ***/
 #define ID3DXConstantTable_GetBufferPointer(p)                        (p)->GetBufferPointer()
 #define ID3DXConstantTable_GetBufferSize(p)                           (p)->GetBufferSize()