From: <cj...@us...> - 2013-02-27 09:51:01
|
Revision: 5623 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5623&view=rev Author: cjacek Date: 2013-02-27 09:50:45 +0000 (Wed, 27 Feb 2013) Log Message: ----------- Updated imported headers to current Wine version. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/aclocal.m4 trunk/mingw-w64-headers/direct-x/include/amstream.h trunk/mingw-w64-headers/direct-x/include/amvideo.h trunk/mingw-w64-headers/direct-x/include/austream.h trunk/mingw-w64-headers/direct-x/include/d3d10.h trunk/mingw-w64-headers/direct-x/include/d3d10_1.h trunk/mingw-w64-headers/direct-x/include/d3d11.h trunk/mingw-w64-headers/direct-x/include/d3dcommon.h trunk/mingw-w64-headers/direct-x/include/d3dx9math.h trunk/mingw-w64-headers/direct-x/include/ddstream.h trunk/mingw-w64-headers/direct-x/include/dxgi.h trunk/mingw-w64-headers/direct-x/include/mediaobj.h trunk/mingw-w64-headers/direct-x/include/mmstream.h trunk/mingw-w64-headers/direct-x/include/qedit.h trunk/mingw-w64-headers/include/audioclient.h trunk/mingw-w64-headers/include/audiopolicy.h trunk/mingw-w64-headers/include/devicetopology.h trunk/mingw-w64-headers/include/downloadmgr.h trunk/mingw-w64-headers/include/endpointvolume.h trunk/mingw-w64-headers/include/fusion.h trunk/mingw-w64-headers/include/mmdeviceapi.h trunk/mingw-w64-headers/include/mscoree.h trunk/mingw-w64-headers/include/msctf.h trunk/mingw-w64-headers/include/msctf.idl trunk/mingw-w64-headers/include/objectarray.h trunk/mingw-w64-headers/include/optary.h trunk/mingw-w64-headers/include/propsys.h trunk/mingw-w64-headers/include/structuredquerycondition.h trunk/mingw-w64-headers/include/uiautomationclient.h trunk/mingw-w64-headers/include/uiautomationcore.h trunk/mingw-w64-headers/include/urlhist.h trunk/mingw-w64-headers/include/wincodec.h trunk/mingw-w64-headers/include/wpcapi.h trunk/mingw-w64-headers/include/xmllite.h Added Paths: ----------- trunk/mingw-w64-headers/include/ctfutb.h trunk/mingw-w64-headers/include/ctfutb.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/Makefile.am 2013-02-27 09:50:45 UTC (rev 5623) @@ -60,6 +60,7 @@ IDL_SRCS = \ include/audioclient.idl \ include/audiopolicy.idl \ + include/ctfutb.idl \ include/docobj.idl \ include/devicetopology.idl \ include/downloadmgr.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/Makefile.in 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -284,6 +284,7 @@ @HAVE_WIDL_TRUE@IDL_SRCS = \ @HAVE_WIDL_TRUE@ include/audioclient.idl \ @HAVE_WIDL_TRUE@ include/audiopolicy.idl \ +@HAVE_WIDL_TRUE@ include/ctfutb.idl \ @HAVE_WIDL_TRUE@ include/docobj.idl \ @HAVE_WIDL_TRUE@ include/devicetopology.idl \ @HAVE_WIDL_TRUE@ include/downloadmgr.idl \ Modified: trunk/mingw-w64-headers/aclocal.m4 =================================================================== --- trunk/mingw-w64-headers/aclocal.m4 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/aclocal.m4 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.5 -*- Autoconf -*- +# generated automatically by aclocal 1.12.6 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.5], [], +m4_if([$1], [1.12.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.5])dnl +[AM_AUTOMAKE_VERSION([1.12.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) Modified: trunk/mingw-w64-headers/direct-x/include/amstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/amstream.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/amvideo.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/amvideo.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/amvideo.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/amvideo.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/austream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/austream.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/austream.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/austream.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/d3d10.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3d10.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/d3d10.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d10.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/d3d10_1.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3d10_1.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/d3d10_1.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d10_1.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/d3d11.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3d11.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/d3d11.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d11.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/d3dcommon.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3dcommon.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/d3dcommon.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3dcommon.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/d3dx9math.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -38,29 +38,29 @@ { #ifdef __cplusplus D3DXVECTOR2(); - D3DXVECTOR2(CONST FLOAT *pf); + D3DXVECTOR2(const FLOAT *pf); D3DXVECTOR2(FLOAT fx, FLOAT fy); operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; - D3DXVECTOR2& operator += (CONST D3DXVECTOR2&); - D3DXVECTOR2& operator -= (CONST D3DXVECTOR2&); + D3DXVECTOR2& operator += (const D3DXVECTOR2&); + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); D3DXVECTOR2& operator *= (FLOAT); D3DXVECTOR2& operator /= (FLOAT); D3DXVECTOR2 operator + () const; D3DXVECTOR2 operator - () const; - D3DXVECTOR2 operator + (CONST D3DXVECTOR2&) const; - D3DXVECTOR2 operator - (CONST D3DXVECTOR2&) const; + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; D3DXVECTOR2 operator * (FLOAT) const; D3DXVECTOR2 operator / (FLOAT) const; - friend D3DXVECTOR2 operator * (FLOAT, CONST D3DXVECTOR2&); + friend D3DXVECTOR2 operator * (FLOAT, const D3DXVECTOR2&); - WINBOOL operator == (CONST D3DXVECTOR2&) const; - WINBOOL operator != (CONST D3DXVECTOR2&) const; + WINBOOL operator == (const D3DXVECTOR2&) const; + WINBOOL operator != (const D3DXVECTOR2&) const; #endif /* __cplusplus */ FLOAT x, y; } D3DXVECTOR2, *LPD3DXVECTOR2; @@ -69,30 +69,30 @@ typedef struct D3DXVECTOR3 : public D3DVECTOR { D3DXVECTOR3(); - D3DXVECTOR3(CONST FLOAT *pf); - D3DXVECTOR3(CONST D3DVECTOR& v); + D3DXVECTOR3(const FLOAT *pf); + D3DXVECTOR3(const D3DVECTOR& v); D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz); operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; - D3DXVECTOR3& operator += (CONST D3DXVECTOR3&); - D3DXVECTOR3& operator -= (CONST D3DXVECTOR3&); + D3DXVECTOR3& operator += (const D3DXVECTOR3&); + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); D3DXVECTOR3& operator *= (FLOAT); D3DXVECTOR3& operator /= (FLOAT); D3DXVECTOR3 operator + () const; D3DXVECTOR3 operator - () const; - D3DXVECTOR3 operator + (CONST D3DXVECTOR3&) const; - D3DXVECTOR3 operator - (CONST D3DXVECTOR3&) const; + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; D3DXVECTOR3 operator * (FLOAT) const; D3DXVECTOR3 operator / (FLOAT) const; - friend D3DXVECTOR3 operator * (FLOAT, CONST struct D3DXVECTOR3&); + friend D3DXVECTOR3 operator * (FLOAT, const struct D3DXVECTOR3&); - WINBOOL operator == (CONST D3DXVECTOR3&) const; - WINBOOL operator != (CONST D3DXVECTOR3&) const; + WINBOOL operator == (const D3DXVECTOR3&) const; + WINBOOL operator != (const D3DXVECTOR3&) const; } D3DXVECTOR3, *LPD3DXVECTOR3; #else /* !__cplusplus */ typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; @@ -102,29 +102,29 @@ { #ifdef __cplusplus D3DXVECTOR4(); - D3DXVECTOR4(CONST FLOAT *pf); + D3DXVECTOR4(const FLOAT *pf); D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw); operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; - D3DXVECTOR4& operator += (CONST D3DXVECTOR4&); - D3DXVECTOR4& operator -= (CONST D3DXVECTOR4&); + D3DXVECTOR4& operator += (const D3DXVECTOR4&); + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); D3DXVECTOR4& operator *= (FLOAT); D3DXVECTOR4& operator /= (FLOAT); D3DXVECTOR4 operator + () const; D3DXVECTOR4 operator - () const; - D3DXVECTOR4 operator + (CONST D3DXVECTOR4&) const; - D3DXVECTOR4 operator - (CONST D3DXVECTOR4&) const; + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; D3DXVECTOR4 operator * (FLOAT) const; D3DXVECTOR4 operator / (FLOAT) const; - friend D3DXVECTOR4 operator * (FLOAT, CONST D3DXVECTOR4&); + friend D3DXVECTOR4 operator * (FLOAT, const D3DXVECTOR4&); - WINBOOL operator == (CONST D3DXVECTOR4&) const; - WINBOOL operator != (CONST D3DXVECTOR4&) const; + WINBOOL operator == (const D3DXVECTOR4&) const; + WINBOOL operator != (const D3DXVECTOR4&) const; #endif /* __cplusplus */ FLOAT x, y, z, w; } D3DXVECTOR4, *LPD3DXVECTOR4; @@ -133,8 +133,8 @@ typedef struct D3DXMATRIX : public D3DMATRIX { D3DXMATRIX(); - D3DXMATRIX(CONST FLOAT *pf); - D3DXMATRIX(CONST D3DMATRIX& mat); + D3DXMATRIX(const FLOAT *pf); + D3DXMATRIX(const D3DMATRIX& mat); D3DXMATRIX(FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, @@ -144,27 +144,27 @@ FLOAT operator () (UINT row, UINT col) const; operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; - D3DXMATRIX& operator *= (CONST D3DXMATRIX&); - D3DXMATRIX& operator += (CONST D3DXMATRIX&); - D3DXMATRIX& operator -= (CONST D3DXMATRIX&); + D3DXMATRIX& operator *= (const D3DXMATRIX&); + D3DXMATRIX& operator += (const D3DXMATRIX&); + D3DXMATRIX& operator -= (const D3DXMATRIX&); D3DXMATRIX& operator *= (FLOAT); D3DXMATRIX& operator /= (FLOAT); D3DXMATRIX operator + () const; D3DXMATRIX operator - () const; - D3DXMATRIX operator * (CONST D3DXMATRIX&) const; - D3DXMATRIX operator + (CONST D3DXMATRIX&) const; - D3DXMATRIX operator - (CONST D3DXMATRIX&) const; + D3DXMATRIX operator * (const D3DXMATRIX&) const; + D3DXMATRIX operator + (const D3DXMATRIX&) const; + D3DXMATRIX operator - (const D3DXMATRIX&) const; D3DXMATRIX operator * (FLOAT) const; D3DXMATRIX operator / (FLOAT) const; - friend D3DXMATRIX operator * (FLOAT, CONST D3DXMATRIX&); + friend D3DXMATRIX operator * (FLOAT, const D3DXMATRIX&); - WINBOOL operator == (CONST D3DXMATRIX&) const; - WINBOOL operator != (CONST D3DXMATRIX&) const; + WINBOOL operator == (const D3DXMATRIX&) const; + WINBOOL operator != (const D3DXMATRIX&) const; } D3DXMATRIX, *LPD3DXMATRIX; #else /* !__cplusplus */ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; @@ -174,31 +174,31 @@ { #ifdef __cplusplus D3DXQUATERNION(); - D3DXQUATERNION(CONST FLOAT *pf); + D3DXQUATERNION(const FLOAT *pf); D3DXQUATERNION(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw); operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; - D3DXQUATERNION& operator += (CONST D3DXQUATERNION&); - D3DXQUATERNION& operator -= (CONST D3DXQUATERNION&); - D3DXQUATERNION& operator *= (CONST D3DXQUATERNION&); + D3DXQUATERNION& operator += (const D3DXQUATERNION&); + D3DXQUATERNION& operator -= (const D3DXQUATERNION&); + D3DXQUATERNION& operator *= (const D3DXQUATERNION&); D3DXQUATERNION& operator *= (FLOAT); D3DXQUATERNION& operator /= (FLOAT); D3DXQUATERNION operator + () const; D3DXQUATERNION operator - () const; - D3DXQUATERNION operator + (CONST D3DXQUATERNION&) const; - D3DXQUATERNION operator - (CONST D3DXQUATERNION&) const; - D3DXQUATERNION operator * (CONST D3DXQUATERNION&) const; + D3DXQUATERNION operator + (const D3DXQUATERNION&) const; + D3DXQUATERNION operator - (const D3DXQUATERNION&) const; + D3DXQUATERNION operator * (const D3DXQUATERNION&) const; D3DXQUATERNION operator * (FLOAT) const; D3DXQUATERNION operator / (FLOAT) const; - friend D3DXQUATERNION operator * (FLOAT, CONST D3DXQUATERNION&); + friend D3DXQUATERNION operator * (FLOAT, const D3DXQUATERNION&); - WINBOOL operator == (CONST D3DXQUATERNION&) const; - WINBOOL operator != (CONST D3DXQUATERNION&) const; + WINBOOL operator == (const D3DXQUATERNION&) const; + WINBOOL operator != (const D3DXQUATERNION&) const; #endif /* __cplusplus */ FLOAT x, y, z, w; } D3DXQUATERNION, *LPD3DXQUATERNION; @@ -207,17 +207,17 @@ { #ifdef __cplusplus D3DXPLANE(); - D3DXPLANE(CONST FLOAT *pf); + D3DXPLANE(const FLOAT *pf); D3DXPLANE(FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd); operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; D3DXPLANE operator + () const; D3DXPLANE operator - () const; - WINBOOL operator == (CONST D3DXPLANE&) const; - WINBOOL operator != (CONST D3DXPLANE&) const; + WINBOOL operator == (const D3DXPLANE&) const; + WINBOOL operator != (const D3DXPLANE&) const; #endif /* __cplusplus */ FLOAT a, b, c, d; } D3DXPLANE, *LPD3DXPLANE; @@ -227,38 +227,38 @@ #ifdef __cplusplus D3DXCOLOR(); D3DXCOLOR(DWORD col); - D3DXCOLOR(CONST FLOAT *pf); - D3DXCOLOR(CONST D3DCOLORVALUE& col); + D3DXCOLOR(const FLOAT *pf); + D3DXCOLOR(const D3DCOLORVALUE& col); D3DXCOLOR(FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa); operator DWORD () const; operator FLOAT* (); - operator CONST FLOAT* () const; + operator const FLOAT* () const; operator D3DCOLORVALUE* (); - operator CONST D3DCOLORVALUE* () const; + operator const D3DCOLORVALUE* () const; operator D3DCOLORVALUE& (); - operator CONST D3DCOLORVALUE& () const; + operator const D3DCOLORVALUE& () const; - D3DXCOLOR& operator += (CONST D3DXCOLOR&); - D3DXCOLOR& operator -= (CONST D3DXCOLOR&); + D3DXCOLOR& operator += (const D3DXCOLOR&); + D3DXCOLOR& operator -= (const D3DXCOLOR&); D3DXCOLOR& operator *= (FLOAT); D3DXCOLOR& operator /= (FLOAT); D3DXCOLOR operator + () const; D3DXCOLOR operator - () const; - D3DXCOLOR operator + (CONST D3DXCOLOR&) const; - D3DXCOLOR operator - (CONST D3DXCOLOR&) const; + D3DXCOLOR operator + (const D3DXCOLOR&) const; + D3DXCOLOR operator - (const D3DXCOLOR&) const; D3DXCOLOR operator * (FLOAT) const; D3DXCOLOR operator / (FLOAT) const; - friend D3DXCOLOR operator * (FLOAT, CONST D3DXCOLOR&); + friend D3DXCOLOR operator * (FLOAT, const D3DXCOLOR&); - WINBOOL operator == (CONST D3DXCOLOR&) const; - WINBOOL operator != (CONST D3DXCOLOR&) const; + WINBOOL operator == (const D3DXCOLOR&) const; + WINBOOL operator != (const D3DXCOLOR&) const; #endif /* __cplusplus */ FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; @@ -268,12 +268,12 @@ #ifdef __cplusplus D3DXFLOAT16(); D3DXFLOAT16(FLOAT f); - D3DXFLOAT16(CONST D3DXFLOAT16 &f); + D3DXFLOAT16(const D3DXFLOAT16 &f); operator FLOAT (); - WINBOOL operator == (CONST D3DXFLOAT16 &) const; - WINBOOL operator != (CONST D3DXFLOAT16 &) const; + WINBOOL operator == (const D3DXFLOAT16 &) const; + WINBOOL operator != (const D3DXFLOAT16 &) const; #endif /* __cplusplus */ WORD value; } D3DXFLOAT16, *LPD3DXFLOAT16; @@ -282,20 +282,22 @@ extern "C" { #endif -D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); -D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); +D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, const D3DXCOLOR *pc, FLOAT s); +D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, const D3DXCOLOR *pc, FLOAT s); FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex); -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation); -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation); -HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm); -FLOAT WINAPI D3DXMatrixDeterminant(CONST D3DXMATRIX *pm); -D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); -D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup); -D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup); -D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2); -D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2); +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, const D3DXVECTOR3 *rotationcenter, const D3DXQUATERNION *rotation, + const D3DXVECTOR3 *translation); +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, const D3DXVECTOR2 *protationcenter, FLOAT rotation, + const D3DXVECTOR2 *ptranslation); +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, const D3DXMATRIX *pm); +FLOAT WINAPI D3DXMatrixDeterminant(const D3DXMATRIX *pm); +D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, const D3DXMATRIX *pm); +D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup); +D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup); +D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2); +D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2); D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); @@ -306,89 +308,96 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); -D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, CONST D3DXPLANE *pplane); -D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); -D3DXMATRIX* WINAPI D3DXMatrixRotationQuaternion(D3DXMATRIX *pout, CONST D3DXQUATERNION *pq); +D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, const D3DXPLANE *pplane); +D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, const D3DXVECTOR3 *pv, FLOAT angle); +D3DXMATRIX* WINAPI D3DXMatrixRotationQuaternion(D3DXMATRIX *pout, const D3DXQUATERNION *pq); D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); -D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane); -D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); -D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, CONST D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, CONST D3DXVECTOR2 *pscaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation); +D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, const D3DXVECTOR4 *plight, const D3DXPLANE *pPlane); +D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, const D3DXVECTOR3 *pscalingcenter, const D3DXQUATERNION *pscalingrotation, const D3DXVECTOR3 *pscaling, const D3DXVECTOR3 *protationcenter, + const D3DXQUATERNION *protation, const D3DXVECTOR3 *ptranslation); +D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, const D3DXVECTOR2 *pscaling, + const D3DXVECTOR2 *protationcenter, FLOAT rotation, const D3DXVECTOR2 *ptranslation); D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); -D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); +D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm); -D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal); -D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3); -D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); -D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); -D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm); -D3DXPLANE* WINAPI D3DXPlaneTransformArray(D3DXPLANE *pout, UINT outstride, CONST D3DXPLANE *pplane, UINT pstride, CONST D3DXMATRIX *pm, UINT n); +D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, const D3DXVECTOR3 *pvpoint, const D3DXVECTOR3 *pvnormal); +D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3); +D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, const D3DXPLANE *pp, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2); +D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, const D3DXPLANE *pp); +D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, const D3DXPLANE *pplane, const D3DXMATRIX *pm); +D3DXPLANE* WINAPI D3DXPlaneTransformArray(D3DXPLANE *pout, UINT outstride, const D3DXPLANE *pplane, UINT pstride, const D3DXMATRIX *pm, UINT n); -D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, FLOAT f, FLOAT g); -D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); -D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); -D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); -D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2); -D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); -D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); -D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm); +D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3, FLOAT f, FLOAT g); +D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2); +D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); +D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, const D3DXVECTOR3 *pv, FLOAT angle); +D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, const D3DXMATRIX *pm); D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); -D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); -D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t); -void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, CONST D3DXQUATERNION *pq0, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3); -void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); +D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, FLOAT t); +D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3, + const D3DXQUATERNION *pq4, FLOAT t); +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, const D3DXQUATERNION *pq0, + const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3); +void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); -D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); -D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv0, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT s); -D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pt1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pt2, FLOAT s); -D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv); -D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR4* WINAPI D3DXVec2TransformArray(D3DXVECTOR4 *pout, UINT outstride, CONST D3DXVECTOR2 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); -D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2 *pout, UINT outstride, CONST D3DXVECTOR2 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); -D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray(D3DXVECTOR2 *pout, UINT outstride, CONST D3DXVECTOR2 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); +D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv0, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pv3, FLOAT s); +D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pt1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pt2, FLOAT s); +D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv); +D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); +D3DXVECTOR4* WINAPI D3DXVec2TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); +D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); +D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); +D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); +D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray(D3DXVECTOR2 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); -D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); -D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv0, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3, FLOAT s); -D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pt1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pt2, FLOAT s); -D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv); -D3DXVECTOR3* WINAPI D3DXVec3Project(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld); -D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3 *pout, UINT outstride, CONST D3DXVECTOR3 *pv, UINT vstride, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld, UINT n); -D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR4* WINAPI D3DXVec3TransformArray(D3DXVECTOR4 *pout, UINT outstride, CONST D3DXVECTOR3 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); -D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray(D3DXVECTOR3 *pout, UINT outstride, CONST D3DXVECTOR3 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); -D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray(D3DXVECTOR3 *pout, UINT outstride, CONST D3DXVECTOR3 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); -D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld); -D3DXVECTOR3* WINAPI D3DXVec3UnprojectArray(D3DXVECTOR3 *pout, UINT outstride, CONST D3DXVECTOR3 *pv, UINT vstride, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld, UINT n); +D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv0, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3, FLOAT s); +D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pt1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pt2, FLOAT s); +D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv); +D3DXVECTOR3* WINAPI D3DXVec3Project(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DVIEWPORT9 *pviewport, const D3DXMATRIX *pprojection, + const D3DXMATRIX *pview, const D3DXMATRIX *pworld); +D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DVIEWPORT9 *pviewport, + const D3DXMATRIX *pprojection, const D3DXMATRIX *pview, const D3DXMATRIX *pworld, UINT n); +D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); +D3DXVECTOR4* WINAPI D3DXVec3TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); +D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); +D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); +D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); +D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); +D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DVIEWPORT9 *pviewport, const D3DXMATRIX *pprojection, + const D3DXMATRIX *pview, const D3DXMATRIX *pworld); +D3DXVECTOR3* WINAPI D3DXVec3UnprojectArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DVIEWPORT9 *pviewport, + const D3DXMATRIX *pprojection, const D3DXMATRIX *pview, const D3DXMATRIX *pworld, UINT n); +D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); +D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv0, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3, FLOAT s); +D3DXVECTOR4* WINAPI D3DXVec4Cross(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3); +D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pt1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pt2, FLOAT s); +D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv); +D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv, const D3DXMATRIX *pm); +D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR4 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); -D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); -D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv0, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3, FLOAT s); -D3DXVECTOR4* WINAPI D3DXVec4Cross(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pv3); -D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pt1, CONST D3DXVECTOR4 *pv2, CONST D3DXVECTOR4 *pt2, FLOAT s); -D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); -D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm); -D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CONST D3DXVECTOR4 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); +D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, const FLOAT *pin, UINT n); +FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, const D3DXFLOAT16 *pin, UINT n); -D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UINT n); -FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); +FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b); +FLOAT WINAPI D3DXSHDot(UINT order, const FLOAT *a, const FLOAT *b); +FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir); +HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); +FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); +FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); +FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); +FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); +FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale); -FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); -FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b); -FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, CONST D3DXVECTOR3 *dir); -HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, CONST D3DXVECTOR3 *dir, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); -FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); -FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); -FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); -FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CONST FLOAT *in); -FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in); -FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT scale); - #ifdef __cplusplus } #endif @@ -409,11 +418,11 @@ STDMETHOD(Pop)(THIS) PURE; STDMETHOD(Push)(THIS) PURE; STDMETHOD(LoadIdentity)(THIS) PURE; - STDMETHOD(LoadMatrix)(THIS_ CONST D3DXMATRIX* pM ) PURE; - STDMETHOD(MultMatrix)(THIS_ CONST D3DXMATRIX* pM ) PURE; - STDMETHOD(MultMatrixLocal)(THIS_ CONST D3DXMATRIX* pM ) PURE; - STDMETHOD(RotateAxis)(THIS_ CONST D3DXVECTOR3* pV, FLOAT Angle) PURE; - STDMETHOD(RotateAxisLocal)(THIS_ CONST D3DXVECTOR3* pV, FLOAT Angle) PURE; + STDMETHOD(LoadMatrix)(THIS_ const D3DXMATRIX* pM ) PURE; + STDMETHOD(MultMatrix)(THIS_ const D3DXMATRIX* pM ) PURE; + STDMETHOD(MultMatrixLocal)(THIS_ const D3DXMATRIX* pM ) PURE; + STDMETHOD(RotateAxis)(THIS_ const D3DXVECTOR3* pV, FLOAT Angle) PURE; + STDMETHOD(RotateAxisLocal)(THIS_ const D3DXVECTOR3* pV, FLOAT Angle) PURE; STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; STDMETHOD(Scale)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; Modified: trunk/mingw-w64-headers/direct-x/include/ddstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/ddstream.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/dxgi.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/dxgi.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/dxgi.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/dxgi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/mediaobj.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/mediaobj.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/mediaobj.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/mediaobj.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/mmstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/mmstream.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/mmstream.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/mmstream.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/qedit.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/qedit.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/direct-x/include/qedit.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from direct-x/include/qedit.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/audioclient.h =================================================================== --- trunk/mingw-w64-headers/include/audioclient.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/include/audioclient.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from include/audioclient.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/audiopolicy.h =================================================================== --- trunk/mingw-w64-headers/include/audiopolicy.h 2013-02-27 09:49:35 UTC (rev 5622) +++ trunk/mingw-w64-headers/include/audiopolicy.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.24 from include/audiopolicy.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Added: trunk/mingw-w64-headers/include/ctfutb.h =================================================================== --- trunk/mingw-w64-headers/include/ctfutb.h (rev 0) +++ trunk/mingw-w64-headers/include/ctfutb.h 2013-02-27 09:50:45 UTC (rev 5623) @@ -0,0 +1,336 @@ +/*** Autogenerated by WIDL 1.5.24 from include/ctfutb.idl - Do not edit ***/ + +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef COM_NO_WINDOWS_H +#include <windows.h> +#include <ole2.h> +#endif + +#ifndef __ctfutb_h__ +#define __ctfutb_h__ + +/* Forward declarations */ + +#ifndef __ITfLangBarMgr_FWD_DEFINED__ +#define __ITfLangBarMgr_FWD_DEFINED__ +typedef interface ITfLangBarMgr ITfLangBarMgr; +#endif + +/* Headers for imported files */ + +#include <oaidl.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __ITfLangBarEventSink_FWD_DEFINED__ +#define __ITfLangBarEventSink_FWD_DEFINED__ +typedef interface ITfLangBarEventSink ITfLangBarEventSink; +#endif + +#ifndef __ITfLangBarItemMgr_FWD_DEFINED__ +#define __ITfLangBarItemMgr_FWD_DEFINED__ +typedef interface ITfLangBarItemMgr ITfLangBarItemMgr; +#endif + +#ifndef __ITfInputProcessorProfiles_FWD_DEFINED__ +#define __ITfInputProcessorProfiles_FWD_DEFINED__ +typedef interface ITfInputProcessorProfiles ITfInputProcessorProfiles; +#endif + +/***************************************************************************** + * ITfLangBarMgr interface + */ +#ifndef __ITfLangBarMgr_INTERFACE_DEFINED__ +#define __ITfLangBarMgr_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ITfLangBarMgr, 0x87955690, 0xe627, 0x11d2, 0x8d,0xdb, 0x00,0x10,0x5a,0x27,0x99,0xb5); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("87955690-e627-11d2-8ddb-00105a2799b5") +ITfLangBarMgr : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE AdviseEventSink( + ITfLangBarEventSink *pSink, + HWND hwnd, + DWORD dwflags, + DWORD *pdwCookie) = 0; + + virtual HRESULT STDMETHODCALLTYPE UnAdviseEventSink( + DWORD dwCookie) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetThreadMarshalInterface( + DWORD dwThreadId, + DWORD dwType, + REFIID riid, + IUnknown **ppunk) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetThreadLangBarItemMgr( + DWORD dwThreadId, + ITfLangBarItemMgr **pplbie, + DWORD *pdwThreadid) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetInputProcessorProfiles( + DWORD dwThreadId, + ITfInputProcessorProfiles **ppaip, + DWORD *pdwThreadid) = 0; + + virtual HRESULT STDMETHODCALLTYPE RestoreLastFocus( + DWORD *dwThreadId, + WINBOOL fPrev) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetModalInput( + ITfLangBarEventSink *pSink, + DWORD dwThreadId, + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE ShowFloating( + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetShowFloatingStatus( + DWORD *pdwFlags) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ITfLangBarMgr, 0x87955690, 0xe627, 0x11d2, 0x8d,0xdb, 0x00,0x10,0x5a,0x27,0x99,0xb5) +#endif +#else +typedef struct ITfLangBarMgrVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ITfLangBarMgr* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ITfLangBarMgr* This); + + ULONG (STDMETHODCALLTYPE *Release)( + ITfLangBarMgr* This); + + /*** ITfLangBarMgr methods ***/ + HRESULT (STDMETHODCALLTYPE *AdviseEventSink)( + ITfLangBarMgr* This, + ITfLangBarEventSink *pSink, + HWND hwnd, + DWORD dwflags, + DWORD *pdwCookie); + + HRESULT (STDMETHODCALLTYPE *UnAdviseEventSink)( + ITfLangBarMgr* This, + DWORD dwCookie); + + HRESULT (STDMETHODCALLTYPE *GetThreadMarshalInterface)( + ITfLangBarMgr* This, + DWORD dwThreadId, + DWORD dwType, + REFIID riid, + IUnknown **ppunk); + + HRESULT (STDMETHODCALLTYPE *GetThreadLangBarItemMgr)( + ITfLangBarMgr* This, + DWORD dwThreadId, + ITfLangBarItemMgr **pplbie, + DWORD *pdwThreadid); + + HRESULT (STDMETHODCALLTYPE *GetInputProcessorProfiles)( + ITfLangBarMgr* This, + DWORD dwThreadId, + ITfInputProcessorProfiles **ppaip, + DWORD *pdwThreadid); + + HRESULT (STDMETHODCALLTYPE *RestoreLastFocus)( + ITfLangBarMgr* This, + DWORD *dwThreadId, + WINBOOL fPrev); + + HRESULT (STDMETHODCALLTYPE *SetModalInput)( + ITfLangBarMgr* This, + ITfLangBarEventSink *pSink, + DWORD dwThreadId, + DWORD dwFlags); + + HRESULT (STDMETHODCALLTYPE *ShowFloating)( + ITfLangBarMgr* This, + DWORD dwFlags); + + HRESULT (STDMETHODCALLTYPE *GetShowFloatingStatus)( + ITfLangBarMgr* This, + DWORD *pdwFlags); + + END_INTERFACE +} ITfLangBarMgrVtbl; +interface ITfLangBarMgr { + CONST_VTBL ITfLangBarMgrVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ITfLangBarMgr_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ITfLangBarMgr_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ITfLangBarMgr_Release(This) (This)->lpVtbl->Release(This) +/*** ITfLangBarMgr methods ***/ +#define ITfLangBarMgr_AdviseEventSink(This,pSink,hwnd,dwflags,pdwCookie) (This)->lpVtbl->AdviseEventSink(This,pSink,hwnd,dwflags,pdwCookie) +#define ITfLangBarMgr_UnAdviseEventSink(This,dwCookie) (This)->lpVtbl->UnAdviseEventSink(This,dwCookie) +#define ITfLangBarMgr_GetThreadMarshalInterface(This,dwThreadId,dwType,riid,ppunk) (This)->lpVtbl->GetThreadMarshalInterface(This,dwThreadId,dwType,riid,ppunk) +#define ITfLangBarMgr_GetThreadLangBarItemMgr(This,dwThreadId,pplbie,pdwThreadid) (This)->lpVtbl->GetThreadLangBarItemMgr(This,dwThreadId,pplbie,pdwThreadid) +#define ITfLangBarMgr_GetInputProcessorProfiles(This,dwThreadId,ppaip,pdwThreadid) (This)->lpVtbl->GetInputProcessorProfiles(This,dwThreadId,ppaip,pdwThreadid) +#define ITfLangBarMgr_RestoreLastFocus(This,dwThreadId,fPrev) (This)->lpVtbl->RestoreLastFocus(This,dwThreadId,fPrev) +#define ITfLangBarMgr_SetModalInput(This,pSink,dwThreadId,dwFlags) (This)->lpVtbl->SetModalInput(This,pSink,dwThreadId,dwFlags) +#define ITfLangBarMgr_ShowFloating(This,dwFlags) (This)->lpVtbl->ShowFloating(This,dwFlags) +#define ITfLangBarMgr_GetShowFloatingStatus(This,pdwFlags) (This)->lpVtbl->GetShowFloatingStatus(This,pdwFlags) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT ITfLangBarMgr_QueryInterface(ITfLangBarMgr* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG ITfLangBarMgr_AddRef(ITfLangBarMgr* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG ITfLangBarMgr_Release(ITfLangBarMgr* This) { + return This->lpVtbl->Release(This); +} +/*** ITfLangBarMgr methods ***/ +static FORCEINLINE HRESULT ITfLangBarMgr_AdviseEventSink(ITfLangBarMgr* This,ITfLangBarEventSink *pSink,HWND hwnd,DWORD dwflags,DWORD *pdwCookie) { + return This->lpVtbl->AdviseEventSink(This,pSink,hwnd,dwflags,pdwCookie); +} +static FORCEINLINE HRESULT ITfLangBarMgr_UnAdviseEventSink(ITfLangBarMgr* This,DWORD dwCookie) { + return This->lpVtbl->UnAdviseEventSink(This,dwCookie); +} +static FORCEINLINE HRESULT ITfLangBarMgr_GetThreadMarshalInterface(ITfLangBarMgr* This,DWORD dwThreadId,DWORD dwType,REFIID riid,IUnknown **ppunk) { + return This->lpVtbl->GetThreadMarshalInterface(This,dwThreadId,dwType,riid,ppunk); +} +static FORCEINLINE HRESULT ITfLangBarMgr_GetThreadLangBarItemMgr(ITfLangBarMgr* This,DWORD dwThreadId,ITfLangBarItemMgr **pplbie,DWORD *pdwThreadid) { + return This->lpVtbl->GetThreadLangBarItemMgr(This,dwThreadId,pplbie,pdwThreadid); +} +static FORCEINLINE HRESULT ITfLangBarMgr_GetInputProcessorProfiles(ITfLangBarMgr* This,DWORD dwThreadId,ITfInputProcessorProfiles **ppaip,DWORD *pdwThreadid) { + return This->lpVtbl->GetInputProcessorProfiles(This,dwThreadId,ppaip,pdwThreadid); +} +static FORCEINLINE HRESULT ITfLangBarMgr_RestoreLastFocus(ITfLangBarMgr* This,DWORD *dwThreadId,WINBOOL fPrev) { + return This->lpVtbl->RestoreLastFocus(This,dwThreadId,fPrev); +} +static FORCEINLINE HRESULT ITfLangBarMgr_SetModalInput(ITfLangBarMgr* This,ITfLangBarEventSink *pSink,DWORD dwThreadId,DWORD dwFlags) { + return This->lpVtbl->SetModalInput(This,pSink,dwThreadId,dwFlags); +} +static FORCEINLINE HRESULT ITfLangBarMgr_ShowFloating(ITfLangBarMgr* This,DWORD dwFlags) { + return This->lpVtbl->ShowFloating(This,dwFlags); +} +static FORCEINLINE HRESULT ITfLangBarMgr_GetShowFloatingStatus(ITfLangBarMgr* This,DWORD *pdwFlags) { + return This->lpVtbl->GetShowFloatingStatus(This,pdwFlags); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_AdviseEventSink_Proxy( + ITfLangBarMgr* This, + ITfLangBarEventSink *pSink, + HWND hwnd, + DWORD dwflags, + DWORD *pdwCookie); +void __RPC_STUB ITfLangBarMgr_AdviseEventSink_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_UnAdviseEventSink_Proxy( + ITfLangBarMgr* This, + DWORD dwCookie); +void __RPC_STUB ITfLangBarMgr_UnAdviseEventSink_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_GetThreadMarshalInterface_Proxy( + ITfLangBarMgr* This, + DWORD dwThreadId, + DWORD dwType, + REFIID riid, + IUnknown **ppunk); +void __RPC_STUB ITfLangBarMgr_GetThreadMarshalInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_GetThreadLangBarItemMgr_Proxy( + ITfLangBarMgr* This, + DWORD dwThreadId, + ITfLangBarItemMgr **pplbie, + DWORD *pdwThreadid); +void __RPC_STUB ITfLangBarMgr_GetThreadLangBarItemMgr_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_GetInputProcessorProfiles_Proxy( + ITfLangBarMgr* This, + DWORD dwThreadId, + ITfInputProcessorProfiles **ppaip, + DWORD *pdwThreadid); +void __RPC_STUB ITfLangBarMgr_GetInputProcessorProfiles_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_RestoreLastFocus_Proxy( + ITfLangBarMgr* This, + DWORD *dwThreadId, + WINBOOL fPrev); +void __RPC_STUB ITfLangBarMgr_RestoreLastFocus_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_SetModalInput_Proxy( + ITfLangBarMgr* This, + ITfLangBarEventSink *pSink, + DWORD dwThreadId, + DWORD dwFlags); +void __RPC_STUB ITfLangBarMgr_SetModalInput_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_ShowFloating_Proxy( + ITfLangBarMgr* This, + DWORD dwFlags); +void __RPC_STUB ITfLangBarMgr_ShowFloating_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfLangBarMgr_GetShowFloatingStatus_Proxy( + ITfLangBarMgr* This, + DWORD *pdwFlags); +void __RPC_STUB ITfLangBarMgr_GetShowFloatingStatus_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __ITfLangBarMgr_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + +ULONG __RPC_USER HWND_UserSize (ULONG *, ULONG, HWND *); +unsigned char * __RPC_USER HWND_UserMarshal (ULONG *, unsigned char *, HWND *); +unsigned char * __RPC_USER HWND_UserUnmarshal(ULONG *, unsigned char *, HWND *); +void __RPC_USER HWND_UserFree (ULONG *, HWND *); + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __ctfutb_h__ */ Property changes on: trunk/mingw-w64-headers/include/ctfutb.h ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/mingw-w64-headers/include/ctfutb.idl =================================================================== --- trunk/mingw-w64-headers/include/ctfutb.idl (rev 0) +++ trunk/mingw-w64-headers/include/ctfutb.idl 2013-02-27 09:50:45 UTC (rev 5623) @@ -0,0 +1,73 @@ +/* + * Copyright 2010 Justin Chevrier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "oaidl.idl"; +#endif + +interface ITfLangBarEventSink; +interface ITfLangBarItemMgr; +interface ITfInputProcessorProfiles; + +[ + object, + uuid(87955690-e627-11d2-8ddb-00105a2799b5), + pointer_default(unique) +] +int... [truncated message content] |