Updated imported headers to current Wine version git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4894 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/include/amstream.h b/mingw-w64-headers/direct-x/include/amstream.h index 006bb4c..3c22888 100644 --- a/mingw-w64-headers/direct-x/include/amstream.h +++ b/mingw-w64-headers/direct-x/include/amstream.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_AMSTREAM_H -#define __WIDL_AMSTREAM_H +#ifndef __amstream_h__ +#define __amstream_h__ /* Forward declarations */ @@ -1731,4 +1731,4 @@ } #endif -#endif /* __WIDL_AMSTREAM_H */ +#endif /* __amstream_h__ */
diff --git a/mingw-w64-headers/direct-x/include/d3d10.h b/mingw-w64-headers/direct-x/include/d3d10.h index 16bc863..21924ea 100644 --- a/mingw-w64-headers/direct-x/include/d3d10.h +++ b/mingw-w64-headers/direct-x/include/d3d10.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_D3D10_H -#define __WIDL_D3D10_H +#ifndef __d3d10_h__ +#define __d3d10_h__ /* Forward declarations */ @@ -5762,4 +5762,4 @@ } #endif -#endif /* __WIDL_D3D10_H */ +#endif /* __d3d10_h__ */
diff --git a/mingw-w64-headers/direct-x/include/d3d10_1.h b/mingw-w64-headers/direct-x/include/d3d10_1.h index 43d38a3..da75639 100644 --- a/mingw-w64-headers/direct-x/include/d3d10_1.h +++ b/mingw-w64-headers/direct-x/include/d3d10_1.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_D3D10_1_H -#define __WIDL_D3D10_1_H +#ifndef __d3d10_1_h__ +#define __d3d10_1_h__ /* Forward declarations */ @@ -1040,4 +1040,4 @@ } #endif -#endif /* __WIDL_D3D10_1_H */ +#endif /* __d3d10_1_h__ */
diff --git a/mingw-w64-headers/direct-x/include/d3d11.h b/mingw-w64-headers/direct-x/include/d3d11.h index 2e62f62..5cb3150 100644 --- a/mingw-w64-headers/direct-x/include/d3d11.h +++ b/mingw-w64-headers/direct-x/include/d3d11.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_D3D11_H -#define __WIDL_D3D11_H +#ifndef __d3d11_h__ +#define __d3d11_h__ /* Forward declarations */ @@ -48,4 +48,4 @@ } #endif -#endif /* __WIDL_D3D11_H */ +#endif /* __d3d11_h__ */
diff --git a/mingw-w64-headers/direct-x/include/d3dcommon.h b/mingw-w64-headers/direct-x/include/d3dcommon.h index 10b6833..a42d80e 100644 --- a/mingw-w64-headers/direct-x/include/d3dcommon.h +++ b/mingw-w64-headers/direct-x/include/d3dcommon.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_D3DCOMMON_H -#define __WIDL_D3DCOMMON_H +#ifndef __d3dcommon_h__ +#define __d3dcommon_h__ /* Forward declarations */ @@ -731,4 +731,4 @@ } #endif -#endif /* __WIDL_D3DCOMMON_H */ +#endif /* __d3dcommon_h__ */
diff --git a/mingw-w64-headers/direct-x/include/d3dx9tex.h b/mingw-w64-headers/direct-x/include/d3dx9tex.h index 9b68193..7ee6638 100644 --- a/mingw-w64-headers/direct-x/include/d3dx9tex.h +++ b/mingw-w64-headers/direct-x/include/d3dx9tex.h
@@ -53,7 +53,7 @@ #define D3DX_CHANNEL_LUMINANCE 0x00000010 /********************************************** - **************** Typedefs **************** + ****************** Typedefs ****************** **********************************************/ typedef enum _D3DXIMAGE_FILEFORMAT { @@ -64,6 +64,8 @@ D3DXIFF_DDS, D3DXIFF_PPM, D3DXIFF_DIB, + D3DXIFF_HDR, + D3DXIFF_PFM, D3DXIFF_FORCE_DWORD = 0x7fffffff } D3DXIMAGE_FILEFORMAT;
diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h index 1f82fae..4f7c894 100644 --- a/mingw-w64-headers/direct-x/include/dxgi.h +++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_DXGI_H -#define __WIDL_DXGI_H +#ifndef __dxgi_h__ +#define __dxgi_h__ /* Forward declarations */ @@ -2042,4 +2042,4 @@ } #endif -#endif /* __WIDL_DXGI_H */ +#endif /* __dxgi_h__ */
diff --git a/mingw-w64-headers/direct-x/include/qedit.h b/mingw-w64-headers/direct-x/include/qedit.h index 898e913..0836c4e 100644 --- a/mingw-w64-headers/direct-x/include/qedit.h +++ b/mingw-w64-headers/direct-x/include/qedit.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_QEDIT_H -#define __WIDL_QEDIT_H +#ifndef __qedit_h__ +#define __qedit_h__ /* Forward declarations */ @@ -663,4 +663,4 @@ } #endif -#endif /* __WIDL_QEDIT_H */ +#endif /* __qedit_h__ */
diff --git a/mingw-w64-headers/idl/audioclient.idl b/mingw-w64-headers/idl/audioclient.idl index cb1880b..8050ea6 100644 --- a/mingw-w64-headers/idl/audioclient.idl +++ b/mingw-w64-headers/idl/audioclient.idl
@@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audioclient_h__") -cpp_quote("#define __audioclient_h__") - import "wtypes.idl"; import "unknwn.idl"; import "audiosessiontypes.h"; @@ -322,5 +319,3 @@ cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)") cpp_quote("#define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3)") - -cpp_quote("#endif /*__audioclient_h__*/")
diff --git a/mingw-w64-headers/idl/audiopolicy.idl b/mingw-w64-headers/idl/audiopolicy.idl index 53655bc..d1832bb 100644 --- a/mingw-w64-headers/idl/audiopolicy.idl +++ b/mingw-w64-headers/idl/audiopolicy.idl
@@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audiopolicy_h__") -cpp_quote("#define __audiopolicy_h__") - import "oaidl.idl"; import "ocidl.idl"; import "propidl.idl"; @@ -241,5 +238,3 @@ [in] IAudioVolumeDuckNotification *duckNotification ); }; - -cpp_quote("#endif /*__audiopolicy_h__*/")
diff --git a/mingw-w64-headers/include/audioclient.h b/mingw-w64-headers/include/audioclient.h index bb4e6e6..e7ea2d9 100644 --- a/mingw-w64-headers/include/audioclient.h +++ b/mingw-w64-headers/include/audioclient.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_AUDIOCLIENT_H -#define __WIDL_AUDIOCLIENT_H +#ifndef __audioclient_h__ +#define __audioclient_h__ /* Forward declarations */ @@ -72,8 +72,6 @@ extern "C" { #endif -#ifndef __audioclient_h__ -#define __audioclient_h__ #ifndef __IAudioClient_FWD_DEFINED__ #define __IAudioClient_FWD_DEFINED__ typedef interface IAudioClient IAudioClient; @@ -1293,7 +1291,6 @@ #define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1) #define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2) #define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3) -#endif /*__audioclient_h__*/ /* Begin additional prototypes for all interfaces */ @@ -1303,4 +1300,4 @@ } #endif -#endif /* __WIDL_AUDIOCLIENT_H */ +#endif /* __audioclient_h__ */
diff --git a/mingw-w64-headers/include/audiopolicy.h b/mingw-w64-headers/include/audiopolicy.h index 7297a52..5c1d590 100644 --- a/mingw-w64-headers/include/audiopolicy.h +++ b/mingw-w64-headers/include/audiopolicy.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_AUDIOPOLICY_H -#define __WIDL_AUDIOPOLICY_H +#ifndef __audiopolicy_h__ +#define __audiopolicy_h__ /* Forward declarations */ @@ -69,8 +69,6 @@ extern "C" { #endif -#ifndef __audiopolicy_h__ -#define __audiopolicy_h__ #ifndef __IAudioSessionEvents_FWD_DEFINED__ #define __IAudioSessionEvents_FWD_DEFINED__ typedef interface IAudioSessionEvents IAudioSessionEvents; @@ -1173,7 +1171,6 @@ #endif /* __IAudioSessionManager2_INTERFACE_DEFINED__ */ -#endif /*__audiopolicy_h__*/ /* Begin additional prototypes for all interfaces */ @@ -1183,4 +1180,4 @@ } #endif -#endif /* __WIDL_AUDIOPOLICY_H */ +#endif /* __audiopolicy_h__ */
diff --git a/mingw-w64-headers/include/fusion.h b/mingw-w64-headers/include/fusion.h index c666751..24be98c 100644 --- a/mingw-w64-headers/include/fusion.h +++ b/mingw-w64-headers/include/fusion.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_FUSION_H -#define __WIDL_FUSION_H +#ifndef __fusion_h__ +#define __fusion_h__ /* Forward declarations */ @@ -945,4 +945,4 @@ } #endif -#endif /* __WIDL_FUSION_H */ +#endif /* __fusion_h__ */
diff --git a/mingw-w64-headers/include/mmdeviceapi.h b/mingw-w64-headers/include/mmdeviceapi.h index 0971c15..b252ca1 100644 --- a/mingw-w64-headers/include/mmdeviceapi.h +++ b/mingw-w64-headers/include/mmdeviceapi.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_MMDEVICEAPI_H -#define __WIDL_MMDEVICEAPI_H +#ifndef __mmdeviceapi_h__ +#define __mmdeviceapi_h__ /* Forward declarations */ @@ -794,4 +794,4 @@ } #endif -#endif /* __WIDL_MMDEVICEAPI_H */ +#endif /* __mmdeviceapi_h__ */
diff --git a/mingw-w64-headers/include/mscoree.h b/mingw-w64-headers/include/mscoree.h index d3d5b25..f771bee 100644 --- a/mingw-w64-headers/include/mscoree.h +++ b/mingw-w64-headers/include/mscoree.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_MSCOREE_H -#define __WIDL_MSCOREE_H +#ifndef __mscoree_h__ +#define __mscoree_h__ /* Forward declarations */ @@ -1343,4 +1343,4 @@ } #endif -#endif /* __WIDL_MSCOREE_H */ +#endif /* __mscoree_h__ */
diff --git a/mingw-w64-headers/include/objectarray.h b/mingw-w64-headers/include/objectarray.h index 5b0ac04..ca4f5a8 100644 --- a/mingw-w64-headers/include/objectarray.h +++ b/mingw-w64-headers/include/objectarray.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_OBJECTARRAY_H -#define __WIDL_OBJECTARRAY_H +#ifndef __objectarray_h__ +#define __objectarray_h__ /* Forward declarations */ @@ -261,4 +261,4 @@ } #endif -#endif /* __WIDL_OBJECTARRAY_H */ +#endif /* __objectarray_h__ */
diff --git a/mingw-w64-headers/include/optary.h b/mingw-w64-headers/include/optary.h index bee8785..c958881 100644 --- a/mingw-w64-headers/include/optary.h +++ b/mingw-w64-headers/include/optary.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_OPTARY_H -#define __WIDL_OPTARY_H +#ifndef __optary_h__ +#define __optary_h__ /* Forward declarations */ @@ -213,4 +213,4 @@ } #endif -#endif /* __WIDL_OPTARY_H */ +#endif /* __optary_h__ */
diff --git a/mingw-w64-headers/include/propsys.h b/mingw-w64-headers/include/propsys.h index a3a9bf3..7f6d6bc 100644 --- a/mingw-w64-headers/include/propsys.h +++ b/mingw-w64-headers/include/propsys.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_PROPSYS_H -#define __WIDL_PROPSYS_H +#ifndef __propsys_h__ +#define __propsys_h__ /* Forward declarations */ @@ -3826,4 +3826,4 @@ } #endif -#endif /* __WIDL_PROPSYS_H */ +#endif /* __propsys_h__ */
diff --git a/mingw-w64-headers/include/structuredquerycondition.h b/mingw-w64-headers/include/structuredquerycondition.h index 6262e42..311fdac 100644 --- a/mingw-w64-headers/include/structuredquerycondition.h +++ b/mingw-w64-headers/include/structuredquerycondition.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_STRUCTUREDQUERYCONDITION_H -#define __WIDL_STRUCTUREDQUERYCONDITION_H +#ifndef __structuredquerycondition_h__ +#define __structuredquerycondition_h__ /* Forward declarations */ @@ -60,4 +60,4 @@ } #endif -#endif /* __WIDL_STRUCTUREDQUERYCONDITION_H */ +#endif /* __structuredquerycondition_h__ */
diff --git a/mingw-w64-headers/include/wincodec.h b/mingw-w64-headers/include/wincodec.h index 744cc6e..83823e7 100644 --- a/mingw-w64-headers/include/wincodec.h +++ b/mingw-w64-headers/include/wincodec.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_WINCODEC_H -#define __WIDL_WINCODEC_H +#ifndef __wincodec_h__ +#define __wincodec_h__ /* Forward declarations */ @@ -4881,4 +4881,4 @@ } #endif -#endif /* __WIDL_WINCODEC_H */ +#endif /* __wincodec_h__ */
diff --git a/mingw-w64-headers/include/wpcapi.h b/mingw-w64-headers/include/wpcapi.h index 266baa9..e6609b5 100644 --- a/mingw-w64-headers/include/wpcapi.h +++ b/mingw-w64-headers/include/wpcapi.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_WPCAPI_H -#define __WIDL_WPCAPI_H +#ifndef __wpcapi_h__ +#define __wpcapi_h__ /* Forward declarations */ @@ -589,4 +589,4 @@ } #endif -#endif /* __WIDL_WPCAPI_H */ +#endif /* __wpcapi_h__ */
diff --git a/mingw-w64-headers/include/xmllite.h b/mingw-w64-headers/include/xmllite.h index 785bde4..7e48c40 100644 --- a/mingw-w64-headers/include/xmllite.h +++ b/mingw-w64-headers/include/xmllite.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_XMLLITE_H -#define __WIDL_XMLLITE_H +#ifndef __xmllite_h__ +#define __xmllite_h__ /* Forward declarations */ @@ -1109,4 +1109,4 @@ } #endif -#endif /* __WIDL_XMLLITE_H */ +#endif /* __xmllite_h__ */