Menu
▾
▴
[Mingw-w64-svn] SF.net SVN: mingw-w64:[5584] trunk/mingw-w64-headers
|
From: <cj...@us...> - 2013-02-09 12:32:09
|
Revision: 5584
http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5584&view=rev
Author: cjacek
Date: 2013-02-09 12:31:58 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Updated imported headers to current Wine version
Modified Paths:
--------------
trunk/mingw-w64-headers/direct-x/include/d3drm.h
trunk/mingw-w64-headers/direct-x/include/d3drmobj.h
trunk/mingw-w64-headers/include/corerror.h
trunk/mingw-w64-headers/include/wincodec.h
trunk/mingw-w64-headers/include/wincodec.idl
Modified: trunk/mingw-w64-headers/direct-x/include/d3drm.h
===================================================================
--- trunk/mingw-w64-headers/direct-x/include/d3drm.h 2013-02-06 18:26:29 UTC (rev 5583)
+++ trunk/mingw-w64-headers/direct-x/include/d3drm.h 2013-02-09 12:31:58 UTC (rev 5584)
@@ -65,7 +65,7 @@
STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
- STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE *) PURE;
+ STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE;
STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE;
@@ -201,7 +201,7 @@
STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
- STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE2 *) PURE;
+ STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE;
STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE;
@@ -340,7 +340,7 @@
STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE;
- STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE3 *) PURE;
+ STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE;
STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE;
Modified: trunk/mingw-w64-headers/direct-x/include/d3drmobj.h
===================================================================
--- trunk/mingw-w64-headers/direct-x/include/d3drmobj.h 2013-02-06 18:26:29 UTC (rev 5583)
+++ trunk/mingw-w64-headers/direct-x/include/d3drmobj.h 2013-02-09 12:31:58 UTC (rev 5584)
@@ -1692,8 +1692,8 @@
STDMETHOD(GetTraversalOptions)(THIS_ LPDWORD pFlags) PURE;
STDMETHOD(SetSceneFogMethod)(THIS_ DWORD flags) PURE;
STDMETHOD(GetSceneFogMethod)(THIS_ LPDWORD pFlags) PURE;
- STDMETHOD(SetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE;
- STDMETHOD(GetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE;
+ STDMETHOD(SetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE;
+ STDMETHOD(GetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE;
};
#undef INTERFACE
@@ -3328,7 +3328,7 @@
STDMETHOD_(WINBOOL, GetDecalTransparency)(THIS) PURE;
STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE;
/*** IDirect3DRMTexture2 methods ***/
- STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE;
+ STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE;
STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE;
STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE;
};
@@ -3451,7 +3451,7 @@
STDMETHOD_(DWORD, GetDecalScale)(THIS) PURE;
STDMETHOD_(WINBOOL, GetDecalTransparency)(THIS) PURE;
STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE;
- STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE;
+ STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE;
STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE;
STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE;
STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE;
Modified: trunk/mingw-w64-headers/include/corerror.h
===================================================================
--- trunk/mingw-w64-headers/include/corerror.h 2013-02-06 18:26:29 UTC (rev 5583)
+++ trunk/mingw-w64-headers/include/corerror.h 2013-02-09 12:31:58 UTC (rev 5584)
@@ -119,6 +119,7 @@
#define COR_E_HOSTPROTECTION EMAKEHR(0x1640)
#define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641)
+#define FUSION_E_PRIVATE_ASM_DISALLOWED EMAKEHR(0x1044)
#define FUSION_E_INVALID_NAME EMAKEHR(0x1047)
#define CLDB_E_FILE_OLDVER EMAKEHR(0x1107)
Modified: trunk/mingw-w64-headers/include/wincodec.h
===================================================================
--- trunk/mingw-w64-headers/include/wincodec.h 2013-02-06 18:26:29 UTC (rev 5583)
+++ trunk/mingw-w64-headers/include/wincodec.h 2013-02-09 12:31:58 UTC (rev 5584)
@@ -280,6 +280,17 @@
WICPixelFormatNumericRepresentationFloat = 0x5,
WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = 0x7fffffff
} WICPixelFormatNumericRepresentation;
+typedef enum WICTiffCompressionOption {
+ WICTiffCompressionDontCare = 0x0,
+ WICTiffCompressionNone = 0x1,
+ WICTiffCompressionCCITT3 = 0x2,
+ WICTiffCompressionCCITT4 = 0x3,
+ WICTiffCompressionLZW = 0x4,
+ WICTiffCompressionRLE = 0x5,
+ WICTiffCompressionZIP = 0x6,
+ WICTiffCompressionLZWHDifferencing = 0x7,
+ WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = 0x7fffffff
+} WICTiffCompressionOption;
typedef GUID WICPixelFormatGUID;
typedef REFGUID REFWICPixelFormatGUID;
DEFINE_GUID(GUID_WICPixelFormatDontCare, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x00);
@@ -333,6 +344,7 @@
#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80
#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81
#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c
+#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e
#define WINCODEC_ERR_WIN32ERROR 0x88982f94
#ifndef __IWICPalette_FWD_DEFINED__
#define __IWICPalette_FWD_DEFINED__
Modified: trunk/mingw-w64-headers/include/wincodec.idl
===================================================================
--- trunk/mingw-w64-headers/include/wincodec.idl 2013-02-06 18:26:29 UTC (rev 5583)
+++ trunk/mingw-w64-headers/include/wincodec.idl 2013-02-09 12:31:58 UTC (rev 5584)
@@ -156,6 +156,18 @@
WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = CODEC_FORCE_DWORD
} WICPixelFormatNumericRepresentation;
+typedef enum WICTiffCompressionOption {
+ WICTiffCompressionDontCare = 0x00000000,
+ WICTiffCompressionNone = 0x00000001,
+ WICTiffCompressionCCITT3 = 0x00000002,
+ WICTiffCompressionCCITT4 = 0x00000003,
+ WICTiffCompressionLZW = 0x00000004,
+ WICTiffCompressionRLE = 0x00000005,
+ WICTiffCompressionZIP = 0x00000006,
+ WICTiffCompressionLZWHDifferencing = 0x00000007,
+ WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD
+} WICTiffCompressionOption;
+
typedef GUID WICPixelFormatGUID;
typedef REFGUID REFWICPixelFormatGUID;
@@ -219,6 +231,7 @@
cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80")
cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81")
cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")
+cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e")
cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94")
interface IWICPalette;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|