Updated imported files to current Wine version
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4081 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/include/d3dx9effect.h b/mingw-w64-headers/direct-x/include/d3dx9effect.h
index 7ff0528..4a65d21 100644
--- a/mingw-w64-headers/direct-x/include/d3dx9effect.h
+++ b/mingw-w64-headers/direct-x/include/d3dx9effect.h
@@ -141,9 +141,7 @@
STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE;
STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE;
STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE;
- STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE;
STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE;
- STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE;
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
};
diff --git a/mingw-w64-headers/idl/wincodec.idl b/mingw-w64-headers/idl/wincodec.idl
index 4139f51..6a24f5e 100644
--- a/mingw-w64-headers/idl/wincodec.idl
+++ b/mingw-w64-headers/idl/wincodec.idl
@@ -78,7 +78,7 @@
WICBitmapInterpolationModeNearestNeighbor = 0x00000000,
WICBitmapInterpolationModeLinear = 0x00000001,
WICBitmapInterpolationModeCubic = 0x00000002,
- WICBitmapInterpolationModeFaint = 0x00000003,
+ WICBitmapInterpolationModeFant = 0x00000003,
WICBITMAPINTERPOLATIONMODE_FORCE_DWORD = CODEC_FORCE_DWORD
} WICBitmapInterpolationMode;
diff --git a/mingw-w64-headers/include/wincodec.h b/mingw-w64-headers/include/wincodec.h
index eb2bf12..af90d3c 100644
--- a/mingw-w64-headers/include/wincodec.h
+++ b/mingw-w64-headers/include/wincodec.h
@@ -187,7 +187,7 @@
WICBitmapInterpolationModeNearestNeighbor = 0x0,
WICBitmapInterpolationModeLinear = 0x1,
WICBitmapInterpolationModeCubic = 0x2,
- WICBitmapInterpolationModeFaint = 0x3,
+ WICBitmapInterpolationModeFant = 0x3,
WICBITMAPINTERPOLATIONMODE_FORCE_DWORD = 0x7fffffff
} WICBitmapInterpolationMode;
typedef enum WICBitmapPaletteType {
