From: <nig...@us...> - 2013-02-05 14:08:29
|
Revision: 5579 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5579&view=rev Author: nightstrike Date: 2013-02-05 14:08:15 +0000 (Tue, 05 Feb 2013) Log Message: ----------- 2013-01-30 Christian Franke <fr...@co...> * include/winsvc.h (SERVICE_CONFIG_DELAYED_AUTO_START_INFO): New define for _WIN32_WINNT >= 01x0600. The related struct is already present. (SERVICE_CONFIG_FAILURE_ACTIONS_FLAG): Likewise. (SERVICE_CONFIG_SERVICE_SID_INFO): Likewisee. (SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO): Likewise. (SERVICE_CONFIG_SERVICE_SID_INFONFIG_PRESHUTDOWN_INFO): Likewise. Modified Paths: -------------- trunk/mingw-w64-headers/ChangeLog trunk/mingw-w64-headers/include/winsvc.h Modified: trunk/mingw-w64-headers/ChangeLog =================================================================== --- trunk/mingw-w64-headers/ChangeLog 2013-01-31 15:02:06 UTC (rev 5578) +++ trunk/mingw-w64-headers/ChangeLog 2013-02-05 14:08:15 UTC (rev 5579) @@ -0,0 +1,8 @@ +2013-01-30 Christian Franke <fr...@co...> + + * include/winsvc.h (SERVICE_CONFIG_DELAYED_AUTO_START_INFO): New define + for _WIN32_WINNT >= 0x0600. The related struct is already present. + (SERVICE_CONFIG_FAILURE_ACTIONS_FLAG): Likewise. + (SERVICE_CONFIG_SERVICE_SID_INFO): Likewise. + (SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO): Likewise. + (SERVICE_CONFIG_PRESHUTDOWN_INFO): Likewise. Modified: trunk/mingw-w64-headers/include/winsvc.h =================================================================== --- trunk/mingw-w64-headers/include/winsvc.h 2013-01-31 15:02:06 UTC (rev 5578) +++ trunk/mingw-w64-headers/include/winsvc.h 2013-02-05 14:08:15 UTC (rev 5579) @@ -411,6 +411,12 @@ __MINGW_TYPEDEF_AW(SERVICE_NOTIFY) __MINGW_TYPEDEF_AW(PSERVICE_NOTIFY) +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 + typedef struct _SERVICE_DELAYED_AUTO_START_INFO { WINBOOL fDelayedAutostart; } SERVICE_DELAYED_AUTO_START_INFO, *LPSERVICE_DELAYED_AUTO_START_INFO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <cj...@us...> - 2013-02-14 12:05:50
|
Revision: 5591 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5591&view=rev Author: cjacek Date: 2013-02-14 12:05:41 +0000 (Thu, 14 Feb 2013) Log Message: ----------- Don't for --with-widl to generate headers in source tree. Patch author: Ray Donnelly. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-02-13 13:05:50 UTC (rev 5590) +++ trunk/mingw-w64-headers/Makefile.am 2013-02-14 12:05:41 UTC (rev 5591) @@ -118,7 +118,7 @@ BUILT_SOURCES = $(IDL_SRCS:.idl=.h) .idl.h: crt/_mingw.h - $(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $< + $(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $@ $< endif Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-02-13 13:05:50 UTC (rev 5590) +++ trunk/mingw-w64-headers/Makefile.in 2013-02-14 12:05:41 UTC (rev 5591) @@ -1016,7 +1016,7 @@ find $(distdir) -name ".svn" -type d -delete @HAVE_WIDL_TRUE@.idl.h: crt/_mingw.h -@HAVE_WIDL_TRUE@ $(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $< +@HAVE_WIDL_TRUE@ $(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $@ $< _mingw_directx.h: $(srcdir)/crt/sdks/_mingw_directx.h.in $(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > $@ Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-02-13 13:05:50 UTC (rev 5590) +++ trunk/mingw-w64-headers/configure 2013-02-14 12:05:41 UTC (rev 5591) @@ -2536,6 +2536,11 @@ fi +if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&5 +$as_echo "$as_me: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&2;} +fi + # Checks for libraries. # Checks for header files. Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-02-13 13:05:50 UTC (rev 5590) +++ trunk/mingw-w64-headers/configure.ac 2013-02-14 12:05:41 UTC (rev 5591) @@ -34,6 +34,10 @@ AM_CONDITIONAL([HAVE_WIDL],[AS_VAR_TEST_SET([WIDL])]) +if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then + AC_MSG_WARN([--with-widl used in out of the tree compilation. Existing generated files won't be modified.]) +fi + # Checks for libraries. # Checks for header files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cj...@us...> - 2013-02-22 10:25:50
|
Revision: 5606 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5606&view=rev Author: cjacek Date: 2013-02-22 10:25:38 +0000 (Fri, 22 Feb 2013) Log Message: ----------- mftransform.idl: Moved declarations to an IDL file. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/include/mftransform.h Added Paths: ----------- trunk/mingw-w64-headers/include/mftransform.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-02-22 10:25:20 UTC (rev 5605) +++ trunk/mingw-w64-headers/Makefile.am 2013-02-22 10:25:38 UTC (rev 5606) @@ -71,6 +71,7 @@ include/mfidl.idl \ include/mfobjects.idl \ include/mfreadwrite.idl \ + include/mftransform.idl \ include/mmdeviceapi.idl \ include/mscoree.idl \ include/msctf.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-02-22 10:25:20 UTC (rev 5605) +++ trunk/mingw-w64-headers/Makefile.in 2013-02-22 10:25:38 UTC (rev 5606) @@ -295,6 +295,7 @@ @HAVE_WIDL_TRUE@ include/mfidl.idl \ @HAVE_WIDL_TRUE@ include/mfobjects.idl \ @HAVE_WIDL_TRUE@ include/mfreadwrite.idl \ +@HAVE_WIDL_TRUE@ include/mftransform.idl \ @HAVE_WIDL_TRUE@ include/mmdeviceapi.idl \ @HAVE_WIDL_TRUE@ include/mscoree.idl \ @HAVE_WIDL_TRUE@ include/msctf.idl \ Modified: trunk/mingw-w64-headers/include/mftransform.h =================================================================== --- trunk/mingw-w64-headers/include/mftransform.h 2013-02-22 10:25:20 UTC (rev 5605) +++ trunk/mingw-w64-headers/include/mftransform.h 2013-02-22 10:25:38 UTC (rev 5606) @@ -1,15 +1,30 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_MFTRANSFORM -#define _INC_MFTRANSFORM +/*** Autogenerated by WIDL 1.5.24 from include/mftransform.idl - Do not edit ***/ -#include <mfidl.h> +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif -#if (WINVER >= 0x0600) -/*Not supported.*/ +#include <rpc.h> +#include <rpcndr.h> + +#ifndef COM_NO_WINDOWS_H +#include <windows.h> +#include <ole2.h> +#endif + +#ifndef __mftransform_h__ +#define __mftransform_h__ + +/* Forward declarations */ + +/* Headers for imported files */ + +#include <mfobjects.h> + +#ifdef __cplusplus +extern "C" { +#endif + enum _MFT_DRAIN_TYPE { MFT_DRAIN_PRODUCE_TAILS = 0x00000000, MFT_DRAIN_NO_TAILS = 0x00000001 @@ -186,15 +201,15 @@ #endif /*COBJMACROS*/ #if (WINVER >= 0x0601) -#ifdef __cplusplus -extern "C" { -#endif HRESULT WINAPI MFCreateTransformActivate(IMFActivate **ppActivate); +#endif /*(WINVER >= 0x0601)*/ +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + #ifdef __cplusplus } #endif -#endif /*(WINVER >= 0x0601)*/ -#endif /*(WINVER >= 0x0600)*/ - -#endif /*_INC_MFTRANSFORM*/ +#endif /* __mftransform_h__ */ Added: trunk/mingw-w64-headers/include/mftransform.idl =================================================================== --- trunk/mingw-w64-headers/include/mftransform.idl (rev 0) +++ trunk/mingw-w64-headers/include/mftransform.idl 2013-02-22 10:25:38 UTC (rev 5606) @@ -0,0 +1,186 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +import "mfobjects.idl"; + +cpp_quote(" enum _MFT_DRAIN_TYPE {") +cpp_quote(" MFT_DRAIN_PRODUCE_TAILS = 0x00000000,") +cpp_quote(" MFT_DRAIN_NO_TAILS = 0x00000001 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_INPUT_STATUS_FLAGS {") +cpp_quote(" MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_INPUT_DATA_BUFFER_FLAGS {") +cpp_quote(" MFT_INPUT_DATA_BUFFER_PLACEHOLDER = 0xFFFFFFFF ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_OUTPUT_STREAM_INFO_FLAGS {") +cpp_quote(" MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001,") +cpp_quote(" MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002,") +cpp_quote(" MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004,") +cpp_quote(" MFT_OUTPUT_STREAM_DISCARDABLE = 0x00000008,") +cpp_quote(" MFT_OUTPUT_STREAM_OPTIONAL = 0x00000010,") +cpp_quote(" MFT_OUTPUT_STREAM_PROVIDES_SAMPLES = 0x00000100,") +cpp_quote(" MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES = 0x00000200,") +cpp_quote(" MFT_OUTPUT_STREAM_LAZY_READ = 0x00000400,") +cpp_quote(" MFT_OUTPUT_STREAM_REMOVABLE = 0x00000800 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_OUTPUT_STATUS_FLAGS {") +cpp_quote(" MFT_OUTPUT_STATUS_SAMPLE_READY = 0x00000001 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_OUTPUT_DATA_BUFFER_FLAGS {") +cpp_quote(" MFT_OUTPUT_DATA_BUFFER_INCOMPLETE = 0x01000000,") +cpp_quote(" MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE = 0x00000100,") +cpp_quote(" MFT_OUTPUT_DATA_BUFFER_STREAM_END = 0x00000200,") +cpp_quote(" MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE = 0x00000300 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_INPUT_STREAM_INFO_FLAGS {") +cpp_quote(" MFT_INPUT_STREAM_WHOLE_SAMPLES = 0x00000001,") +cpp_quote(" MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002,") +cpp_quote(" MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004,") +cpp_quote(" MFT_INPUT_STREAM_HOLDS_BUFFERS = 0x00000008,") +cpp_quote(" MFT_INPUT_STREAM_DOES_NOT_ADDREF = 0x00000100,") +cpp_quote(" MFT_INPUT_STREAM_REMOVABLE = 0x00000200,") +cpp_quote(" MFT_INPUT_STREAM_OPTIONAL = 0x00000400,") +cpp_quote(" MFT_INPUT_STREAM_PROCESSES_IN_PLACE = 0x00000800 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" typedef enum _VSS_HARDWARE_OPTIONS {") +cpp_quote(" VSS_BREAKEX_FLAG_MASK_LUNS = 0x00000001,") +cpp_quote(" VSS_BREAKEX_FLAG_MAKE_READ_WRITE = 0x00000002,") +cpp_quote(" VSS_BREAKEX_FLAG_REVERT_IDENTITY_ALL = 0x00000004,") +cpp_quote(" VSS_BREAKEX_FLAG_REVERT_IDENTITY_NONE = 0x00000008,") +cpp_quote(" VSS_ONLUNSTATECHANGE_NOTIFY_READ_WRITE = 0x00000100,") +cpp_quote(" VSS_ONLUNSTATECHANGE_NOTIFY_LUN_PRE_RECOVERY = 0x00000200,") +cpp_quote(" VSS_ONLUNSTATECHANGE_NOTIFY_LUN_POST_RECOVERY = 0x00000400,") +cpp_quote(" VSS_ONLUNSTATECHANGE_DO_MASK_LUNS = 0x00000800 ") +cpp_quote(" } VSS_HARDWARE_OPTIONS, *PVSS_HARDWARE_OPTIONS;") +cpp_quote("") +cpp_quote(" enum _MFT_SET_TYPE_FLAGS {") +cpp_quote(" MFT_SET_TYPE_TEST_ONLY = 0x00000001 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_PROCESS_OUTPUT_STATUS {") +cpp_quote(" MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x00000100 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote(" enum _MFT_PROCESS_OUTPUT_FLAGS {") +cpp_quote(" MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001 ") +cpp_quote(" };") +cpp_quote("") +cpp_quote("typedef enum _MFT_MESSAGE_TYPE {") +cpp_quote(" MFT_MESSAGE_COMMAND_FLUSH = 0x00000000,") +cpp_quote(" MFT_MESSAGE_COMMAND_DRAIN = 0x00000001,") +cpp_quote(" MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002,") +cpp_quote(" MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000,") +cpp_quote(" MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001,") +cpp_quote(" MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002,") +cpp_quote(" MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003,") +cpp_quote(" MFT_MESSAGE_COMMAND_MARKER = 0x20000000 ") +cpp_quote("} MFT_MESSAGE_TYPE;") +cpp_quote("") +cpp_quote("typedef struct _MFT_INPUT_STREAM_INFO {") +cpp_quote(" LONGLONG hnsMaxLatency;") +cpp_quote(" DWORD dwFlags;") +cpp_quote(" DWORD cbSize;") +cpp_quote(" DWORD cbMaxLookahead;") +cpp_quote(" DWORD cbAlignment;") +cpp_quote("} MFT_INPUT_STREAM_INFO;") +cpp_quote("") +cpp_quote("typedef struct _MFT_OUTPUT_STREAM_INFO {") +cpp_quote(" DWORD dwFlags;") +cpp_quote(" DWORD cbSize;") +cpp_quote(" DWORD cbAlignment;") +cpp_quote("} MFT_OUTPUT_STREAM_INFO;") +cpp_quote("") +cpp_quote("typedef struct _MFT_OUTPUT_DATA_BUFFER {") +cpp_quote(" DWORD dwStreamID;") +cpp_quote(" IMFSample *pSample;") +cpp_quote(" DWORD dwStatus;") +cpp_quote(" IMFCollection *pEvents;") +cpp_quote("} MFT_OUTPUT_DATA_BUFFER;") +cpp_quote("") +cpp_quote("#undef INTERFACE") +cpp_quote("#define INTERFACE IMFTransform") +cpp_quote("#ifdef __GNUC__") +cpp_quote("#warning COM interfaces layout in this header has not been verified.") +cpp_quote("#warning COM interfaces with incorrect layout may not work at all.") +cpp_quote("__MINGW_BROKEN_INTERFACE(INTERFACE)") +cpp_quote("#endif") +cpp_quote("DECLARE_INTERFACE_(IMFTransform,IUnknown)") +cpp_quote("{") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote("") +cpp_quote(" /* IUnknown methods */") +cpp_quote(" STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;") +cpp_quote(" STDMETHOD_(ULONG, AddRef)(THIS) PURE;") +cpp_quote(" STDMETHOD_(ULONG, Release)(THIS) PURE;") +cpp_quote("") +cpp_quote(" /* IMFTransform methods */") +cpp_quote(" STDMETHOD_(HRESULT,AddInputStreams)(THIS_ DWORD cStreams,DWORD *adwStreamIDs) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,DeleteInputStream)(THIS_ DWORD dwStreamID) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetAttributes)(THIS_ IMFAttributes **pAttributes) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetInputAvailableType)(THIS_ DWORD dwInputStreamID,DWORD dwTypeIndex,IMFMediaType **ppType) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetInputCurrentType)(THIS_ DWORD dwInputStreamID,IMFMediaType **ppType) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetInputStatus)(THIS_ DWORD dwInputStreamID,DWORD *pdwFlags) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetInputStreamAttributes)(THIS_ DWORD dwInputStreamID,IMFAttributes **ppAttributes) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetInputStreamInfo)(THIS_ DWORD dwInputStreamID,MFT_INPUT_STREAM_INFO *pStreamInfo) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetOutputAvailableType)(THIS_ DWORD dwOutputStreamID,DWORD dwTypeIndex,IMFMediaType **ppType) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetOutputCurrentType)(THIS_ DWORD dwOutputStreamID,IMFMediaType **ppType) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetOutputStatus)(THIS_ DWORD *pdwFlags) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetOutputStreamAttributes)(THIS_ DWORD dwOutputStreamID,IMFAttributes **ppAttributes) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetOutputStreamInfo)(THIS_ DWORD dwOutputStreamID,MFT_OUTPUT_STREAM_INFO *pStreamInfo) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetStreamCount)(THIS_ DWORD *pcInputStreams,DWORD *pcOutputStreams) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetStreamIDs)(THIS_ DWORD dwInputIDArraySize,DWORD *pdwInputIDs,DWORD dwOutputIDArraySize,DWORD *pdwOutputIDs) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetStreamLimits)(THIS_ DWORD *pdwInputMinimum,DWORD *pdwInputMaximum,DWORD *pdwOutputMinimum,DWORD *pdwOutputMaximum) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,ProcessEvent)(THIS_ DWORD dwInputStreamID,IMFMediaEvent *pEvent) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,ProcessInput)(THIS_ DWORD dwInputStreamID,IMFSample *pSample,DWORD dwFlags) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,ProcessMessage)(THIS_ MFT_MESSAGE_TYPE eMessage,ULONG_PTR ulParam) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,ProcessOutput)(THIS_ DWORD dwFlags,DWORD cOutputBufferCount,MFT_OUTPUT_DATA_BUFFER *pOutputSamples,DWORD *pdwStatus) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,SetInputType)(THIS_ DWORD dwInputStreamID,IMFMediaType *pType,DWORD dwFlags) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,SetOutputBounds)(THIS_ LONGLONG hnsLowerBound,LONGLONG hnsUpperBound) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,SetOutputType)(THIS_ DWORD dwOutputStreamID,IMFMediaType *pType,DWORD dwFlags) PURE;") +cpp_quote("") +cpp_quote(" END_INTERFACE") +cpp_quote("};") +cpp_quote("") +cpp_quote("#ifdef COBJMACROS") +cpp_quote("#define IMFTransform_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)") +cpp_quote("#define IMFTransform_AddRef(This) (This)->lpVtbl->AddRef(This)") +cpp_quote("#define IMFTransform_Release(This) (This)->lpVtbl->Release(This)") +cpp_quote("#define IMFTransform_AddInputStreams(This,cStreams,adwStreamIDs) (This)->lpVtbl->AddInputStreams(This,cStreams,adwStreamIDs)") +cpp_quote("#define IMFTransform_DeleteInputStream(This,dwStreamID) (This)->lpVtbl->DeleteInputStream(This,dwStreamID)") +cpp_quote("#define IMFTransform_GetAttributes(This,pAttributes) (This)->lpVtbl->GetAttributes(This,pAttributes)") +cpp_quote("#define IMFTransform_GetInputAvailableType(This,dwInputStreamID,dwTypeIndex,ppType) (This)->lpVtbl->GetInputAvailableType(This,dwInputStreamID,dwTypeIndex,ppType)") +cpp_quote("#define IMFTransform_GetInputCurrentType(This,dwInputStreamID,ppType) (This)->lpVtbl->GetInputCurrentType(This,dwInputStreamID,ppType)") +cpp_quote("#define IMFTransform_GetInputStatus(This,dwInputStreamID,pdwFlags) (This)->lpVtbl->GetInputStatus(This,dwInputStreamID,pdwFlags)") +cpp_quote("#define IMFTransform_GetInputStreamAttributes(This,dwInputStreamID,ppAttributes) (This)->lpVtbl->GetInputStreamAttributes(This,dwInputStreamID,ppAttributes)") +cpp_quote("#define IMFTransform_GetInputStreamInfo(This,dwInputStreamID,pStreamInfo) (This)->lpVtbl->GetInputStreamInfo(This,dwInputStreamID,pStreamInfo)") +cpp_quote("#define IMFTransform_GetOutputAvailableType(This,dwOutputStreamID,dwTypeIndex,ppType) (This)->lpVtbl->GetOutputAvailableType(This,dwOutputStreamID,dwTypeIndex,ppType)") +cpp_quote("#define IMFTransform_GetOutputCurrentType(This,dwOutputStreamID,ppType) (This)->lpVtbl->GetOutputCurrentType(This,dwOutputStreamID,ppType)") +cpp_quote("#define IMFTransform_GetOutputStatus(This,pdwFlags) (This)->lpVtbl->GetOutputStatus(This,pdwFlags)") +cpp_quote("#define IMFTransform_GetOutputStreamAttributes(This,dwOutputStreamID,ppAttributes) (This)->lpVtbl->GetOutputStreamAttributes(This,dwOutputStreamID,ppAttributes)") +cpp_quote("#define IMFTransform_GetOutputStreamInfo(This,dwOutputStreamID,pStreamInfo) (This)->lpVtbl->GetOutputStreamInfo(This,dwOutputStreamID,pStreamInfo)") +cpp_quote("#define IMFTransform_GetStreamCount(This,pcInputStreams,pcOutputStreams) (This)->lpVtbl->GetStreamCount(This,pcInputStreams,pcOutputStreams)") +cpp_quote("#define IMFTransform_GetStreamIDs(This,dwInputIDArraySize,pdwInputIDs,dwOutputIDArraySize,pdwOutputIDs) (This)->lpVtbl->GetStreamIDs(This,dwInputIDArraySize,pdwInputIDs,dwOutputIDArraySize,pdwOutputIDs)") +cpp_quote("#define IMFTransform_GetStreamLimits(This,pdwInputMinimum,pdwInputMaximum,pdwOutputMinimum,pdwOutputMaximum) (This)->lpVtbl->GetStreamLimits(This,pdwInputMinimum,pdwInputMaximum,pdwOutputMinimum,pdwOutputMaximum)") +cpp_quote("#define IMFTransform_ProcessEvent(This,dwInputStreamID,pEvent) (This)->lpVtbl->ProcessEvent(This,dwInputStreamID,pEvent)") +cpp_quote("#define IMFTransform_ProcessInput(This,dwInputStreamID,pSample,dwFlags) (This)->lpVtbl->ProcessInput(This,dwInputStreamID,pSample,dwFlags)") +cpp_quote("#define IMFTransform_ProcessMessage(This,eMessage,ulParam) (This)->lpVtbl->ProcessMessage(This,eMessage,ulParam)") +cpp_quote("#define IMFTransform_ProcessOutput(This,dwFlags,cOutputBufferCount,pOutputSamples,pdwStatus) (This)->lpVtbl->ProcessOutput(This,dwFlags,cOutputBufferCount,pOutputSamples,pdwStatus)") +cpp_quote("#define IMFTransform_SetInputType(This,dwInputStreamID,pType,dwFlags) (This)->lpVtbl->SetInputType(This,dwInputStreamID,pType,dwFlags)") +cpp_quote("#define IMFTransform_SetOutputBounds(This,hnsLowerBound,hnsUpperBound) (This)->lpVtbl->SetOutputBounds(This,hnsLowerBound,hnsUpperBound)") +cpp_quote("#define IMFTransform_SetOutputType(This,dwOutputStreamID,pType,dwFlags) (This)->lpVtbl->SetOutputType(This,dwOutputStreamID,pType,dwFlags)") +cpp_quote("#endif /*COBJMACROS*/") +cpp_quote("") +cpp_quote("#if (WINVER >= 0x0601)") +cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **ppActivate);") +cpp_quote("#endif /*(WINVER >= 0x0601)*/") Property changes on: trunk/mingw-w64-headers/include/mftransform.idl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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] |
From: <cj...@us...> - 2013-03-01 16:51:19
|
Revision: 5626 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5626&view=rev Author: cjacek Date: 2013-03-01 16:51:03 +0000 (Fri, 01 Mar 2013) Log Message: ----------- usp10.h: Updated SCRIPT_CONTROL struct. Patch author: Jan Holesovsky <ke...@su...> Modified Paths: -------------- trunk/mingw-w64-headers/ChangeLog trunk/mingw-w64-headers/include/usp10.h Modified: trunk/mingw-w64-headers/ChangeLog =================================================================== --- trunk/mingw-w64-headers/ChangeLog 2013-03-01 09:42:30 UTC (rev 5625) +++ trunk/mingw-w64-headers/ChangeLog 2013-03-01 16:51:03 UTC (rev 5626) @@ -1,3 +1,7 @@ +2013-03-01 Jan Holesovsky <ke...@su...> + + * include/usp10.h: Updated SCRIPT_CONTROL struct. + 2013-01-30 Christian Franke <fr...@co...> * include/winsvc.h (SERVICE_CONFIG_DELAYED_AUTO_START_INFO): New define Modified: trunk/mingw-w64-headers/include/usp10.h =================================================================== --- trunk/mingw-w64-headers/include/usp10.h 2013-03-01 09:42:30 UTC (rev 5625) +++ trunk/mingw-w64-headers/include/usp10.h 2013-03-01 16:51:03 UTC (rev 5626) @@ -33,7 +33,9 @@ DWORD fNeutralOverride :1; DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; - DWORD fReserved :8; + DWORD fMergeNeutralItems :1; + DWORD fUseStandardBidi :1; + DWORD fReserved :6; } SCRIPT_CONTROL; typedef struct tag_SCRIPT_STATE { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nig...@us...> - 2013-03-13 12:34:27
|
Revision: 5646 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5646&view=rev Author: nightstrike Date: 2013-03-13 12:34:16 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Set the default action for --enable-idl appropriately, and adjust help string to imply the default based on the option name (enable vs disable) Modified Paths: -------------- trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-03-12 22:14:23 UTC (rev 5645) +++ trunk/mingw-w64-headers/configure 2013-03-13 12:34:16 UTC (rev 5646) @@ -1323,7 +1323,7 @@ --disable-crt Do not use the default crt headers --enable-sdk=ARG Add the desired SDK, where ARG can be one of ddk, directx, no or all. Default is all. - --enable-idl Enable installing idl files (default disabled) + --enable-idl Enable installing idl files --enable-secure-api Enable secure API by default Optional Packages: @@ -2680,7 +2680,9 @@ $as_echo_n "checking if installing idl files is enabled... " >&6; } # Check whether --enable-idl was given. if test "${enable_idl+set}" = set; then : - enableval=$enable_idl; enable_idl=yes + enableval=$enable_idl; +else + enable_idl=no fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_idl" >&5 Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-03-12 22:14:23 UTC (rev 5645) +++ trunk/mingw-w64-headers/configure.ac 2013-03-13 12:34:16 UTC (rev 5646) @@ -130,8 +130,9 @@ AC_MSG_CHECKING([if installing idl files is enabled]) AC_ARG_ENABLE([idl], [AS_HELP_STRING([--enable-idl], - [Enable installing idl files (default disabled)])], - [enable_idl=yes]) + [Enable installing idl files])], + [], + [enable_idl=no]) AC_MSG_RESULT([$enable_idl]) AS_VAR_IF([enable_idl],[yes], [IDLHEAD_LIST=$srcdir/include/*.idl], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nig...@us...> - 2013-03-13 12:41:54
|
Revision: 5647 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5647&view=rev Author: nightstrike Date: 2013-03-13 12:41:40 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Fix the semantics of --enable-secure-api so that --disable-secure-api works as expected Modified Paths: -------------- trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-03-13 12:34:16 UTC (rev 5646) +++ trunk/mingw-w64-headers/configure 2013-03-13 12:41:40 UTC (rev 5647) @@ -2698,7 +2698,9 @@ $as_echo_n "checking whether to enable the secure API... " >&6; } # Check whether --enable-secure-api was given. if test "${enable_secure_api+set}" = set; then : - enableval=$enable_secure_api; enable_secure_api=yes + enableval=$enable_secure_api; +else + enable_secure_api=no fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_secure_api" >&5 Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-03-13 12:34:16 UTC (rev 5646) +++ trunk/mingw-w64-headers/configure.ac 2013-03-13 12:41:40 UTC (rev 5647) @@ -143,7 +143,8 @@ AC_ARG_ENABLE([secure-api], [AS_HELP_STRING([--enable-secure-api], [Enable secure API by default])], - [enable_secure_api=yes]) + [], + [enable_secure_api=no]) AC_MSG_RESULT([$enable_secure_api]) AS_VAR_IF([enable_secure_api],[yes], [MINGW_HAS_SECURE_API="#define MINGW_HAS_SECURE_API 1"], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nig...@us...> - 2013-03-13 12:54:42
|
Revision: 5648 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5648&view=rev Author: nightstrike Date: 2013-03-13 12:54:30 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Cleanup error message logic Modified Paths: -------------- trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-03-13 12:41:40 UTC (rev 5647) +++ trunk/mingw-w64-headers/configure 2013-03-13 12:54:30 UTC (rev 5648) @@ -2462,7 +2462,9 @@ # Check whether --with-widl was given. if test "${with_widl+set}" = set; then : - withval=$with_widl; + withval=$with_widl; if test "x$with_widl" = xyes; then : + with_widl="$PATH" +fi else with_widl=no fi @@ -2470,13 +2472,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_widl" >&5 $as_echo "$with_widl" >&6; } -if test "x$with_widl" = xyes; then : - with_widl="$PATH" -fi if test "x$with_widl" = xno; then : else + if test "x$srcdir" = x.; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-widl used in out of the tree compilation. Existing generated files will not be modified." >&5 +$as_echo "$as_me: WARNING: --with-widl used in out of the tree compilation. Existing generated files will not be modified." >&2;} +fi for ac_prog in $host-widl widl do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2536,11 +2541,6 @@ fi -if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&5 -$as_echo "$as_me: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&2;} -fi - # Checks for libraries. # Checks for header files. Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-03-13 12:41:40 UTC (rev 5647) +++ trunk/mingw-w64-headers/configure.ac 2013-03-13 12:54:30 UTC (rev 5648) @@ -23,21 +23,18 @@ AC_ARG_WITH([widl], AS_HELP_STRING([--with-widl=PATH], [use widl to update idl-based headers. Optionally search for a compatible widl in PATH]), - [], + [AS_VAR_IF([with_widl],[yes],[AS_VAR_SET([with_widl],["$PATH"])])], [AS_VAR_SET([with_widl],[no])]) AC_MSG_RESULT([$with_widl]) -AS_VAR_IF([with_widl],[yes],[AS_VAR_SET([with_widl],["$PATH"])]) AS_VAR_IF([with_widl],[no],[],[ + AS_VAR_IF([srcdir],[.],[], + [AC_MSG_WARN([--with-widl used in out of the tree compilation. Existing generated files will not be modified.])]) AC_PATH_PROGS([WIDL], [$host-widl widl], [], [$with_widl]) AS_VAR_IF([WIDL],[],[AC_MSG_ERROR([--with-widl is specified, but widl installation could not be found.])])]) AM_CONDITIONAL([HAVE_WIDL],[AS_VAR_TEST_SET([WIDL])]) -if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then - AC_MSG_WARN([--with-widl used in out of the tree compilation. Existing generated files won't be modified.]) -fi - # Checks for libraries. # Checks for header files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kti...@us...> - 2013-03-13 15:49:44
|
Revision: 5650 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5650&view=rev Author: ktietz70 Date: 2013-03-13 15:49:32 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Add fwptypes and iketypes updates for Windows 8, and add new IDL-files for those headers. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/include/fwptypes.h trunk/mingw-w64-headers/include/iketypes.h Added Paths: ----------- trunk/mingw-w64-headers/include/fwptypes.idl trunk/mingw-w64-headers/include/iketypes.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-03-13 15:15:23 UTC (rev 5649) +++ trunk/mingw-w64-headers/Makefile.am 2013-03-13 15:49:32 UTC (rev 5650) @@ -66,6 +66,8 @@ include/downloadmgr.idl \ include/endpointvolume.idl \ include/fusion.idl \ + include/fwptypes.idl \ + include/iketypes.idl \ include/oaidl.idl \ include/ocidl.idl \ include/comcat.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-03-13 15:15:23 UTC (rev 5649) +++ trunk/mingw-w64-headers/Makefile.in 2013-03-13 15:49:32 UTC (rev 5650) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -290,6 +290,8 @@ @HAVE_WIDL_TRUE@ include/downloadmgr.idl \ @HAVE_WIDL_TRUE@ include/endpointvolume.idl \ @HAVE_WIDL_TRUE@ include/fusion.idl \ +@HAVE_WIDL_TRUE@ include/fwptypes.idl \ +@HAVE_WIDL_TRUE@ include/iketypes.idl \ @HAVE_WIDL_TRUE@ include/oaidl.idl \ @HAVE_WIDL_TRUE@ include/ocidl.idl \ @HAVE_WIDL_TRUE@ include/comcat.idl \ Modified: trunk/mingw-w64-headers/include/fwptypes.h =================================================================== --- trunk/mingw-w64-headers/include/fwptypes.h 2013-03-13 15:15:23 UTC (rev 5649) +++ trunk/mingw-w64-headers/include/fwptypes.h 2013-03-13 15:49:32 UTC (rev 5650) @@ -1,201 +1,351 @@ +/*** Autogenerated by WIDL 1.5.25 from fwptypes.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 __fwptypes_h__ +#define __fwptypes_h__ + +/* Forward declarations */ + +/* Headers for imported files */ + +#include <wtypes.h> + +#ifdef __cplusplus +extern "C" { +#endif + /** - * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _INC_FWTYPES -#define _INC_FWTYPES -#ifdef __cplusplus -extern "C" { +#include <winapifamily.h> + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +#define FWP_BYTE_ARRAY6_SIZE 6 +#define FWP_V6_ADDR_SIZE (16) +#define FWP_ACTRL_MATCH_FILTER (1) + +#define FWP_OPTION_VALUE_ALLOW_MULTICAST_STATE (0) +#define FWP_OPTION_VALUE_DENY_MULTICAST_STATE (1) +#define FWP_OPTION_VALUE_ALLOW_GLOBAL_MULTICAST_STATE (2) + +#define FWP_OPTION_VALUE_DISABLE_LOOSE_SOURCE (0) +#define FWP_OPTION_VALUE_ENABLE_LOOSE_SOURCE (1) + +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define FWP_OPTION_VALUE_DISABLE_LOCAL_ONLY_MAPPING (0) +#define FWP_OPTION_VALUE_ENABLE_LOCAL_ONLY_MAPPING (1) #endif -#if (_WIN32_WINNT >= 0x0600) +#define FWP_ACTION_FLAG_TERMINATING (0x00001000) +#define FWP_ACTION_FLAG_NON_TERMINATING (0x00002000) +#define FWP_ACTION_FLAG_CALLOUT (0x00004000) +#define FWP_ACTION_BLOCK (0x1 | FWP_ACTION_FLAG_TERMINATING) +#define FWP_ACTION_PERMIT (0x2 | FWP_ACTION_FLAG_TERMINATING) +#define FWP_ACTION_CALLOUT_TERMINATING (0x3 | FWP_ACTION_FLAG_CALLOUT | FWP_ACTION_FLAG_TERMINATING) +#define FWP_ACTION_CALLOUT_INSPECTION (0x4 | FWP_ACTION_FLAG_CALLOUT | FWP_ACTION_FLAG_NON_TERMINATING) +#define FWP_ACTION_CALLOUT_UNKNOWN (0x5 | FWP_ACTION_FLAG_CALLOUT) +#define FWP_ACTION_CONTINUE (0x6 | FWP_ACTION_FLAG_NON_TERMINATING) +#define FWP_ACTION_NONE (0x7) +#define FWP_ACTION_NONE_NO_MATCH (0x8) + +#define FWP_CONDITION_FLAG_IS_LOOPBACK (0x00000001) +#define FWP_CONDITION_FLAG_IS_IPSEC_SECURED (0x00000002) +#define FWP_CONDITION_FLAG_IS_REAUTHORIZE (0x00000004) +#define FWP_CONDITION_FLAG_IS_WILDCARD_BIND (0x00000008) +#define FWP_CONDITION_FLAG_IS_RAW_ENDPOINT (0x00000010) +#define FWP_CONDITION_FLAG_IS_FRAGMENT (0x00000020) +#define FWP_CONDITION_FLAG_IS_FRAGMENT_GROUP (0x00000040) +#define FWP_CONDITION_FLAG_IS_IPSEC_NATT_RECLASSIFY (0x00000080) +#define FWP_CONDITION_FLAG_REQUIRES_ALE_CLASSIFY (0x00000100) +#define FWP_CONDITION_FLAG_IS_IMPLICIT_BIND (0x00000200) +#if (NTDDI_VERSION >= NTDDI_WIN6SP1) +#define FWP_CONDITION_FLAG_IS_REASSEMBLED (0x00000400) +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define FWP_CONDITION_FLAG_IS_NAME_APP_SPECIFIED (0x00004000) +#define FWP_CONDITION_FLAG_IS_PROMISCUOUS (0x00008000) +#define FWP_CONDITION_FLAG_IS_AUTH_FW (0x00010000) +#define FWP_CONDITION_FLAG_IS_RECLASSIFY (0x00020000) +#define FWP_CONDITION_FLAG_IS_OUTBOUND_PASS_THRU (0x00040000) +#define FWP_CONDITION_FLAG_IS_INBOUND_PASS_THRU (0x00080000) +#define FWP_CONDITION_FLAG_IS_CONNECTION_REDIRECTED (0x00100000) +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define FWP_CONDITION_FLAG_IS_PROXY_CONNECTION (0x00200000) +#define FWP_CONDITION_FLAG_IS_APPCONTAINER_LOOPBACK (0x00400000) +#define FWP_CONDITION_FLAG_IS_NON_APPCONTAINER_LOOPBACK (0x00800000) +#define FWP_CONDITION_FLAG_IS_RESERVED (0x01000000) +#define FWP_CONDITION_FLAG_IS_HONORING_POLICY_AUTHORIZE (0x02000000) +#endif + +#define FWP_CONDITION_REAUTHORIZE_REASON_POLICY_CHANGE (0x00000001) +#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_ARRIVAL_INTERFACE (0x00000002) +#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_NEXTHOP_INTERFACE (0x00000004) +#define FWP_CONDITION_REAUTHORIZE_REASON_PROFILE_CROSSING (0x00000008) +#define FWP_CONDITION_REAUTHORIZE_REASON_CLASSIFY_COMPLETION (0x00000010) +#define FWP_CONDITION_REAUTHORIZE_REASON_IPSEC_PROPERTIES_CHANGED (0x00000020) +#define FWP_CONDITION_REAUTHORIZE_REASON_MID_STREAM_INSPECTION (0x00000040) +#define FWP_CONDITION_REAUTHORIZE_REASON_SOCKET_PROPERTY_CHANGED (0x00000080) +#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_INBOUND_MCAST_BCAST_PACKET (0x00000100) + +#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_IS_SYSTEM_PORT_RPC (0x00000001) +#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_ALLOW_EDGE_TRAFFIC (0x00000002) +#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_DENY_EDGE_TRAFFIC (0x00000004) + +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define FWP_CONDITION_L2_IS_NATIVE_ETHERNET (0x00000001) +#define FWP_CONDITION_L2_IS_WIFI (0x00000002) +#define FWP_CONDITION_L2_IS_MOBILE_BROADBAND (0x00000004) +#define FWP_CONDITION_L2_IS_WIFI_DIRECT_DATA (0x00000008) +#define FWP_CONDITION_L2_IS_VM2VM (0x00000010) +#define FWP_CONDITION_L2_IS_MALFORMED_PACKET (0x00000020) +#define FWP_CONDITION_L2_IS_IP_FRAGMENT_GROUP (0x00000040) +#define FWP_CONDITION_L2_IF_CONNECTOR_PRESENT (0x00000080) +#endif +#endif +#endif + +#define FWP_FILTER_ENUM_FLAG_BEST_TERMINATING_MATCH (0x00000001) +#define FWP_FILTER_ENUM_FLAG_SORTED (0x00000002) +#define FWP_FILTER_ENUM_FLAG_BOOTTIME_ONLY (0x00000004) +#define FWP_FILTER_ENUM_FLAG_INCLUDE_BOOTTIME (0x00000008) +#define FWP_FILTER_ENUM_FLAG_INCLUDE_DISABLED (0x00000010) + +#define FWP_FILTER_ENUM_VALID_FLAGS (FWP_FILTER_ENUM_FLAG_BEST_TERMINATING_MATCH | FWP_FILTER_ENUM_FLAG_SORTED) +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define FWP_FILTER_ENUM_FLAG_RESERVED1 (0x00000020) +#endif + +#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001) +#define FWP_CALLOUT_FLAG_ALLOW_OFFLOAD (0x00000002) +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define FWP_CALLOUT_FLAG_ENABLE_COMMIT_ADD_NOTIFY (0x00000004) +#define FWP_CALLOUT_FLAG_ALLOW_MID_STREAM_INSPECTION (0x00000008) +#define FWP_CALLOUT_FLAG_ALLOW_RECLASSIFY (0x00000010) +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define FWP_CALLOUT_FLAG_RESERVED1 (0x00000020) +#define FWP_CALLOUT_FLAG_ALLOW_RSC (0x00000040) +#define FWP_CALLOUT_FLAG_ALLOW_L2_BATCH_CLASSIFY (0x00000080) +#endif +#endif +#ifdef __midl +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID; +typedef struct _LUID *PLUID; +#endif + typedef UINT32 FWP_ACTION_TYPE; -typedef enum FWP_CLASSIFY_OPTION_TYPE_ { - FWP_CLASSIFY_OPTION_MULTICAST_STATE = 0, - FWP_CLASSIFY_OPTION_LOOSE_SOURCE_MAPPING, - FWP_CLASSIFY_OPTION_UNICAST_LIFETIME, - FWP_CLASSIFY_OPTION_MCAST_BCAST_LIFETIME, - FWP_CLASSIFY_OPTION_SECURE_SOCKET_SECURITY_FLAGS, - FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_MM_POLICY_KEY, - FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_QM_POLICY_KEY, - FWP_CLASSIFY_OPTION_MAX -} FWP_CLASSIFY_OPTION_TYPE; -typedef enum FWP_DATA_TYPE_ { - FWP_EMPTY = 0, - FWP_UINT8, - FWP_UINT16, - FWP_UINT32, - FWP_UINT64, - FWP_INT8, - FWP_INT16, - FWP_INT32, - FWP_INT64, - FWP_FLOAT, - FWP_DOUBLE, - FWP_BYTE_ARRAY16_TYPE, - FWP_BYTE_BLOB_TYPE, - FWP_SID, - FWP_SECURITY_DESCRIPTOR_TYPE, - FWP_TOKEN_INFORMATION_TYPE , - FWP_TOKEN_ACCESS_INFORMATION_TYPE , - FWP_UNICODE_STRING_TYPE, - FWP_BYTE_ARRAY6_TYPE, - FWP_SINGLE_DATA_TYPE_MAX = 0xFF, - FWP_V4_ADDR_MASK, - FWP_V6_ADDR_MASK, - FWP_RANGE_TYPE, - FWP_DATA_TYPE_MAX -} FWP_DATA_TYPE; - typedef enum FWP_DIRECTION_ { - FWP_DIRECTION_OUTBOUND = 0, - FWP_DIRECTION_INBOUND, - FWP_DIRECTION_MAX + FWP_DIRECTION_OUTBOUND = 0, + FWP_DIRECTION_INBOUND = 1, + FWP_DIRECTION_MAX = 2 } FWP_DIRECTION; -typedef enum FWP_FILTER_ENUM_TYPE_ { - FWP_FILTER_ENUM_FULLY_CONTAINED = 0, - FWP_FILTER_ENUM_OVERLAPPING, - FWP_FILTER_ENUM_TYPE_MAX -} FWP_FILTER_ENUM_TYPE; - typedef enum FWP_IP_VERSION_ { - FWP_IP_VERSION_V4 = 0, - FWP_IP_VERSION_V6, - FWP_IP_VERSION_NONE, - FWP_IP_VERSION_MAX + FWP_IP_VERSION_V4 = 0, + FWP_IP_VERSION_V6 = 1, + FWP_IP_VERSION_NONE = 2, + FWP_IP_VERSION_MAX = 3 } FWP_IP_VERSION; +typedef enum FWP_NE_FAMILY_ { + FWP_AF_INET = FWP_IP_VERSION_V4, + FWP_AF_INET6 = FWP_IP_VERSION_V6, + FWP_AF_ETHER = FWP_IP_VERSION_NONE, + FWP_AF_NONE = 3 +} FWP_AF; + +typedef enum FWP_ETHER_ENCAP_METHOD_ { + FWP_ETHER_ENCAP_METHOD_ETHER_V2 = 0, + FWP_ETHER_ENCAP_METHOD_SNAP = 1, + FWP_ETHER_ENCAP_METHOD_SNAP_W_OUI_ZERO = 3 +} FWP_ETHER_ENCAP_METHOD; + +typedef enum FWP_DATA_TYPE_ { + FWP_EMPTY = 0, + FWP_UINT8 = 1, + FWP_UINT16 = 2, + FWP_UINT32 = 3, + FWP_UINT64 = 4, + FWP_INT8 = 5, + FWP_INT16 = 6, + FWP_INT32 = 7, + FWP_INT64 = 8, + FWP_FLOAT = 9, + FWP_DOUBLE = 10, + FWP_BYTE_ARRAY16_TYPE = 11, + FWP_BYTE_BLOB_TYPE = 12, + FWP_SID = 13, + FWP_SECURITY_DESCRIPTOR_TYPE = 14, + FWP_TOKEN_INFORMATION_TYPE = 15, + FWP_TOKEN_ACCESS_INFORMATION_TYPE = 16, + FWP_UNICODE_STRING_TYPE = 17, + FWP_BYTE_ARRAY6_TYPE = 18, + FWP_SINGLE_DATA_TYPE_MAX = 0xff, + FWP_V4_ADDR_MASK = 0x100, + FWP_V6_ADDR_MASK = 0x101, + FWP_RANGE_TYPE = 0x102, + FWP_DATA_TYPE_MAX = 0x103 +} FWP_DATA_TYPE; + typedef enum FWP_MATCH_TYPE_ { - FWP_MATCH_EQUAL = 0, - FWP_MATCH_GREATER, - FWP_MATCH_LESS, - FWP_MATCH_GREATER_OR_EQUAL, - FWP_MATCH_LESS_OR_EQUAL, - FWP_MATCH_RANGE, - FWP_MATCH_FLAGS_ALL_SET, - FWP_MATCH_FLAGS_ANY_SET, - FWP_MATCH_FLAGS_NONE_SET, - FWP_MATCH_EQUAL_CASE_INSENSITIVE, - FWP_MATCH_NOT_EQUAL, - FWP_MATCH_TYPE_MAX + FWP_MATCH_EQUAL = 0, + FWP_MATCH_GREATER = 1, + FWP_MATCH_LESS = 2, + FWP_MATCH_GREATER_OR_EQUAL = 3, + FWP_MATCH_LESS_OR_EQUAL = 4, + FWP_MATCH_RANGE = 5, + FWP_MATCH_FLAGS_ALL_SET = 6, + FWP_MATCH_FLAGS_ANY_SET = 7, + FWP_MATCH_FLAGS_NONE_SET = 8, + FWP_MATCH_EQUAL_CASE_INSENSITIVE = 9, + FWP_MATCH_NOT_EQUAL = 10, + FWP_MATCH_TYPE_MAX = 11 } FWP_MATCH_TYPE; +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef enum FWP_VSWITCH_NETWORK_TYPE_ { + FWP_VSWITCH_NETWORK_TYPE_UNKNOWN = 0, + FWP_VSWITCH_NETWORK_TYPE_PRIVATE = 1, + FWP_VSWITCH_NETWORK_TYPE_INTERNAL = 2, + FWP_VSWITCH_NETWORK_TYPE_EXTERNAL = 3 +} FWP_VSWITCH_NETWORK_TYPE; +#endif + +typedef enum FWP_CLASSIFY_OPTION_TYPE_ { + FWP_CLASSIFY_OPTION_MULTICAST_STATE = 0, + FWP_CLASSIFY_OPTION_LOOSE_SOURCE_MAPPING = 1, + FWP_CLASSIFY_OPTION_UNICAST_LIFETIME = 2, + FWP_CLASSIFY_OPTION_MCAST_BCAST_LIFETIME = 3, + FWP_CLASSIFY_OPTION_SECURE_SOCKET_SECURITY_FLAGS = 4, + FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_MM_POLICY_KEY = 5, + FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_QM_POLICY_KEY = 6, + FWP_CLASSIFY_OPTION_LOCAL_ONLY_MAPPING = 7, + FWP_CLASSIFY_OPTION_MAX = 8 +} FWP_CLASSIFY_OPTION_TYPE; + +typedef enum FWP_FILTER_ENUM_TYPE_ { + FWP_FILTER_ENUM_FULLY_CONTAINED = 0, + FWP_FILTER_ENUM_OVERLAPPING = 1, + FWP_FILTER_ENUM_TYPE_MAX = 2 +} FWP_FILTER_ENUM_TYPE; + +typedef struct FWP_BYTE_ARRAY6_ { + UINT8 byteArray6[6]; +} FWP_BYTE_ARRAY6; + typedef struct FWP_BYTE_ARRAY16_ { - UINT8 byteArray16[16]; + UINT8 byteArray16[16]; } FWP_BYTE_ARRAY16; typedef struct FWP_BYTE_BLOB_ { - UINT32 size; - UINT8 *data; + UINT32 size; + UINT8 *data; } FWP_BYTE_BLOB; -typedef struct FWP_BYTE_ARRAY6_ { - UINT8 byteArray6[6]; -} FWP_BYTE_ARRAY6; +typedef struct FWP_TOKEN_INFORMATION_ { + ULONG sidCount; + PSID_AND_ATTRIBUTES sids; + ULONG restrictedSidCount; + PSID_AND_ATTRIBUTES restrictedSids; +} FWP_TOKEN_INFORMATION; +typedef struct FWP_VALUE0_ { + FWP_DATA_TYPE type; + __C89_NAMELESS union { + UINT8 uint8; + UINT16 uint16; + UINT32 uint32; + UINT64 *uint64; + INT8 int8; + INT16 int16; + INT32 int32; + INT64 *int64; + float float32; + double *double64; + FWP_BYTE_ARRAY16 *byteArray16; + FWP_BYTE_BLOB *byteBlob; + SID *sid; + FWP_BYTE_BLOB *sd; + FWP_TOKEN_INFORMATION *tokenInformation; + FWP_BYTE_BLOB *tokenAccessInformation; + LPWSTR unicodeString; + FWP_BYTE_ARRAY6 *byteArray6; + } __C89_NAMELESSUNIONNAME; +} FWP_VALUE0; + typedef struct FWP_V4_ADDR_AND_MASK_ { - UINT32 addr; - UINT32 mask; + UINT32 addr; + UINT32 mask; } FWP_V4_ADDR_AND_MASK; -#define FWP_V6_ADDR_SIZE 16 - typedef struct FWP_V6_ADDR_AND_MASK_ { - UINT8 addr[FWP_V6_ADDR_SIZE]; - UINT8 prefixLength; + UINT8 addr[16]; + UINT8 prefixLength; } FWP_V6_ADDR_AND_MASK; -typedef struct _FWP_TOKEN_INFORMATION { - ULONG sidCount; - PSID_AND_ATTRIBUTES sids; - ULONG restrictedSidCount; - PSID_AND_ATTRIBUTES restrictedSids; -} FWP_TOKEN_INFORMATION; - -typedef struct FWP_VALUE0_ { - FWP_DATA_TYPE type; - __C89_NAMELESS union { - LPVOID EMPTY; // case(FWP_EMPTY) - UINT8 uint8; - UINT16 uint16; - UINT32 uint32; - UINT64 *uint64; - INT8 int8; - INT16 int16; - INT32 int32; - INT64 *int64; - float float32; - double *double64; - FWP_BYTE_ARRAY16 *byteArray16; - FWP_BYTE_BLOB *byteBlob; - SID *sid; - FWP_BYTE_BLOB *sd; - FWP_TOKEN_INFORMATION *tokenInformation; - FWP_BYTE_BLOB *tokenAccessInformation; - LPWSTR unicodeString; - FWP_BYTE_ARRAY6 *byteArray6; - }; -} FWP_VALUE0; - typedef struct FWP_RANGE0_ { - FWP_VALUE0 valueLow; - FWP_VALUE0 valueHigh; + FWP_VALUE0 valueLow; + FWP_VALUE0 valueHigh; } FWP_RANGE0; typedef struct FWP_CONDITION_VALUE0_ { - FWP_DATA_TYPE type; - __C89_NAMELESS union { - UINT8 uint8; - UINT16 uint16; - UINT32 uint32; - UINT64 *uint64; - INT8 int8; - INT16 int16; - INT32 int32; - INT64 *int64; - float float32; - double *double64; - FWP_BYTE_ARRAY16 *byteArray16; - FWP_BYTE_BLOB *byteBlob; - SID *sid; - FWP_BYTE_BLOB *sd; - FWP_BYTE_BLOB *tokenInformation; - FWP_BYTE_BLOB *tokenAccessInformation; - LPWSTR unicodeString; - FWP_BYTE_ARRAY6 *byteArray6; - FWP_V4_ADDR_AND_MASK *v4AddrMask; - FWP_V6_ADDR_AND_MASK *v6AddrMask; - FWP_RANGE0 *rangeValue; - }; + FWP_DATA_TYPE type; + __C89_NAMELESS union { + UINT8 uint8; + UINT16 uint16; + UINT32 uint32; + UINT64 *uint64; + INT8 int8; + INT16 int16; + INT32 int32; + INT64 *int64; + float float32; + double *double64; + FWP_BYTE_ARRAY16 *byteArray16; + FWP_BYTE_BLOB *byteBlob; + SID *sid; + FWP_BYTE_BLOB *sd; + FWP_TOKEN_INFORMATION *tokenInformation; + FWP_BYTE_BLOB *tokenAccessInformation; + LPWSTR unicodeString; + FWP_BYTE_ARRAY6 *byteArray6; + FWP_V4_ADDR_AND_MASK *v4AddrMask; + FWP_V6_ADDR_AND_MASK *v6AddrMask; + FWP_RANGE0 *rangeValue; + } __C89_NAMELESSUNIONNAME; } FWP_CONDITION_VALUE0; -#endif /*(_WIN32_WINNT >= 0x0600)*/ +typedef struct FWPM_DISPLAY_DATA0_ { + wchar_t *name; + wchar_t *description; +} FWPM_DISPLAY_DATA0; -#if (_WIN32_WINNT >= 0x0601) +#endif /* WINAPI_PARTITION_DESKTOP. */ +/* Begin additional prototypes for all interfaces */ -typedef enum FWP_NE_FAMILY_ { - FWP_AF_INET = FWP_IP_VERSION_V4, - FWP_AF_INET6 = FWP_IP_VERSION_V6, - FWP_AF_ETHER = FWP_IP_VERSION_NONE, - FWP_AF_NONE -} FWP_AF; -typedef enum FWP_ETHER_ENCAP_METHOD_ { - FWP_ETHER_ENCAP_METHOD_ETHER_V2 = 0, - FWP_ETHER_ENCAP_METHOD_SNAP = 1, - FWP_ETHER_ENCAP_METHOD_SNAP_W_OUI_ZERO = 3 -} FWP_ETHER_ENCAP_METHOD; +/* End additional prototypes */ -#endif /*(_WIN32_WINNT >= 0x0601)*/ - #ifdef __cplusplus } #endif -#endif /*_INC_FWTYPES*/ +#endif /* __fwptypes_h__ */ Added: trunk/mingw-w64-headers/include/fwptypes.idl =================================================================== --- trunk/mingw-w64-headers/include/fwptypes.idl (rev 0) +++ trunk/mingw-w64-headers/include/fwptypes.idl 2013-03-13 15:49:32 UTC (rev 5650) @@ -0,0 +1,385 @@ +cpp_quote("/**") +cpp_quote(" * This file is part of the mingw-w64 runtime package.") +cpp_quote(" * No warranty is given; refer to the file DISCLAIMER within this package.") +cpp_quote(" */") +cpp_quote("") +cpp_quote("#include <winapifamily.h>") +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") +cpp_quote("") + +import "wtypes.idl"; + +#define FWP_BYTE_ARRAY6_SIZE 6 +#define FWP_V6_ADDR_SIZE (16) + +cpp_quote("#define FWP_BYTE_ARRAY6_SIZE 6") +cpp_quote("#define FWP_V6_ADDR_SIZE (16)") +cpp_quote("#define FWP_ACTRL_MATCH_FILTER (1)") + +cpp_quote("") + +cpp_quote("#define FWP_OPTION_VALUE_ALLOW_MULTICAST_STATE (0)") +cpp_quote("#define FWP_OPTION_VALUE_DENY_MULTICAST_STATE (1)") +cpp_quote("#define FWP_OPTION_VALUE_ALLOW_GLOBAL_MULTICAST_STATE (2)") + +cpp_quote("") + +cpp_quote("#define FWP_OPTION_VALUE_DISABLE_LOOSE_SOURCE (0)") +cpp_quote("#define FWP_OPTION_VALUE_ENABLE_LOOSE_SOURCE (1)") + +cpp_quote("") + +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +cpp_quote("#define FWP_OPTION_VALUE_DISABLE_LOCAL_ONLY_MAPPING (0)") +cpp_quote("#define FWP_OPTION_VALUE_ENABLE_LOCAL_ONLY_MAPPING (1)") +cpp_quote("#endif") + +cpp_quote("") + +cpp_quote("#define FWP_ACTION_FLAG_TERMINATING (0x00001000)") +cpp_quote("#define FWP_ACTION_FLAG_NON_TERMINATING (0x00002000)") +cpp_quote("#define FWP_ACTION_FLAG_CALLOUT (0x00004000)") +cpp_quote("") +cpp_quote("#define FWP_ACTION_BLOCK (0x1 | FWP_ACTION_FLAG_TERMINATING)") +cpp_quote("#define FWP_ACTION_PERMIT (0x2 | FWP_ACTION_FLAG_TERMINATING)") +cpp_quote("#define FWP_ACTION_CALLOUT_TERMINATING (0x3 | FWP_ACTION_FLAG_CALLOUT | FWP_ACTION_FLAG_TERMINATING)") +cpp_quote("#define FWP_ACTION_CALLOUT_INSPECTION (0x4 | FWP_ACTION_FLAG_CALLOUT | FWP_ACTION_FLAG_NON_TERMINATING)") +cpp_quote("#define FWP_ACTION_CALLOUT_UNKNOWN (0x5 | FWP_ACTION_FLAG_CALLOUT)") +cpp_quote("#define FWP_ACTION_CONTINUE (0x6 | FWP_ACTION_FLAG_NON_TERMINATING)") +cpp_quote("#define FWP_ACTION_NONE (0x7)") +cpp_quote("#define FWP_ACTION_NONE_NO_MATCH (0x8)") + +cpp_quote("") + +cpp_quote("#define FWP_CONDITION_FLAG_IS_LOOPBACK (0x00000001)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_IPSEC_SECURED (0x00000002)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_REAUTHORIZE (0x00000004)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_WILDCARD_BIND (0x00000008)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_RAW_ENDPOINT (0x00000010)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_FRAGMENT (0x00000020)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_FRAGMENT_GROUP (0x00000040)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_IPSEC_NATT_RECLASSIFY (0x00000080)") +cpp_quote("#define FWP_CONDITION_FLAG_REQUIRES_ALE_CLASSIFY (0x00000100)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_IMPLICIT_BIND (0x00000200)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN6SP1)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_REASSEMBLED (0x00000400)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN7)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_NAME_APP_SPECIFIED (0x00004000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_PROMISCUOUS (0x00008000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_AUTH_FW (0x00010000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_RECLASSIFY (0x00020000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_OUTBOUND_PASS_THRU (0x00040000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_INBOUND_PASS_THRU (0x00080000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_CONNECTION_REDIRECTED (0x00100000)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_PROXY_CONNECTION (0x00200000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_APPCONTAINER_LOOPBACK (0x00400000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_NON_APPCONTAINER_LOOPBACK (0x00800000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_RESERVED (0x01000000)") +cpp_quote("#define FWP_CONDITION_FLAG_IS_HONORING_POLICY_AUTHORIZE (0x02000000)") +cpp_quote("#endif") + +cpp_quote("") + +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_POLICY_CHANGE (0x00000001)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_ARRIVAL_INTERFACE (0x00000002)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_NEXTHOP_INTERFACE (0x00000004)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_PROFILE_CROSSING (0x00000008)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_CLASSIFY_COMPLETION (0x00000010)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_IPSEC_PROPERTIES_CHANGED (0x00000020)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_MID_STREAM_INSPECTION (0x00000040)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_SOCKET_PROPERTY_CHANGED (0x00000080)") +cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_INBOUND_MCAST_BCAST_PACKET (0x00000100)") +cpp_quote("") +cpp_quote("#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_IS_SYSTEM_PORT_RPC (0x00000001)") +cpp_quote("#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_ALLOW_EDGE_TRAFFIC (0x00000002)") +cpp_quote("#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_DENY_EDGE_TRAFFIC (0x00000004)") +cpp_quote("") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +cpp_quote("#define FWP_CONDITION_L2_IS_NATIVE_ETHERNET (0x00000001)") +cpp_quote("#define FWP_CONDITION_L2_IS_WIFI (0x00000002)") +cpp_quote("#define FWP_CONDITION_L2_IS_MOBILE_BROADBAND (0x00000004)") +cpp_quote("#define FWP_CONDITION_L2_IS_WIFI_DIRECT_DATA (0x00000008)") +cpp_quote("#define FWP_CONDITION_L2_IS_VM2VM (0x00000010)") +cpp_quote("#define FWP_CONDITION_L2_IS_MALFORMED_PACKET (0x00000020)") +cpp_quote("#define FWP_CONDITION_L2_IS_IP_FRAGMENT_GROUP (0x00000040)") +cpp_quote("#define FWP_CONDITION_L2_IF_CONNECTOR_PRESENT (0x00000080)") +cpp_quote("#endif") +cpp_quote("#endif") +cpp_quote("#endif") + +cpp_quote("") + +cpp_quote("#define FWP_FILTER_ENUM_FLAG_BEST_TERMINATING_MATCH (0x00000001)") +cpp_quote("#define FWP_FILTER_ENUM_FLAG_SORTED (0x00000002)") +cpp_quote("#define FWP_FILTER_ENUM_FLAG_BOOTTIME_ONLY (0x00000004)") +cpp_quote("#define FWP_FILTER_ENUM_FLAG_INCLUDE_BOOTTIME (0x00000008)") +cpp_quote("#define FWP_FILTER_ENUM_FLAG_INCLUDE_DISABLED (0x00000010)") + +cpp_quote("") + +cpp_quote("#define FWP_FILTER_ENUM_VALID_FLAGS (FWP_FILTER_ENUM_FLAG_BEST_TERMINATING_MATCH | FWP_FILTER_ENUM_FLAG_SORTED)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +cpp_quote("#define FWP_FILTER_ENUM_FLAG_RESERVED1 (0x00000020)") +cpp_quote("#endif") + +cpp_quote("") + +cpp_quote("#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001)") +cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_OFFLOAD (0x00000002)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN7)") +cpp_quote("#define FWP_CALLOUT_FLAG_ENABLE_COMMIT_ADD_NOTIFY (0x00000004)") +cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_MID_STREAM_INSPECTION (0x00000008)") +cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_RECLASSIFY (0x00000010)") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +cpp_quote("#define FWP_CALLOUT_FLAG_RESERVED1 (0x00000020)") +cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_RSC (0x00000040)") +cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_L2_BATCH_CLASSIFY (0x00000080)") +cpp_quote("#endif") +cpp_quote("#endif") + +cpp_quote("#ifdef __midl") +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; +cpp_quote("#endif") + +cpp_quote("") + +typedef UINT32 FWP_ACTION_TYPE; + +cpp_quote("") + +cpp_quote("") +typedef [v1_enum] enum FWP_DIRECTION_ { + FWP_DIRECTION_OUTBOUND, FWP_DIRECTION_INBOUND, FWP_DIRECTION_MAX +} FWP_DIRECTION; + +cpp_quote("") + +typedef [v1_enum] enum FWP_IP_VERSION_ { + FWP_IP_VERSION_V4, FWP_IP_VERSION_V6, FWP_IP_VERSION_NONE, FWP_IP_VERSION_MAX +} FWP_IP_VERSION; + +cpp_quote("") + +typedef [v1_enum] enum FWP_NE_FAMILY_ { + FWP_AF_INET = FWP_IP_VERSION_V4, FWP_AF_INET6 = FWP_IP_VERSION_V6, + FWP_AF_ETHER = FWP_IP_VERSION_NONE, FWP_AF_NONE +} FWP_AF; + +cpp_quote("") + +typedef [v1_enum] enum FWP_ETHER_ENCAP_METHOD_ { + FWP_ETHER_ENCAP_METHOD_ETHER_V2 = 0, FWP_ETHER_ENCAP_METHOD_SNAP = 1, + FWP_ETHER_ENCAP_METHOD_SNAP_W_OUI_ZERO = 3 +} FWP_ETHER_ENCAP_METHOD; + +cpp_quote("") + +typedef [v1_enum] enum FWP_DATA_TYPE_ { + FWP_EMPTY, FWP_UINT8, FWP_UINT16, FWP_UINT32, FWP_UINT64, + FWP_INT8, FWP_INT16, FWP_INT32, FWP_INT64, + FWP_FLOAT, FWP_DOUBLE, + FWP_BYTE_ARRAY16_TYPE, FWP_BYTE_BLOB_TYPE, FWP_SID, + FWP_SECURITY_DESCRIPTOR_TYPE, FWP_TOKEN_INFORMATION_TYPE, + FWP_TOKEN_ACCESS_INFORMATION_TYPE, FWP_UNICODE_STRING_TYPE, + FWP_BYTE_ARRAY6_TYPE, FWP_SINGLE_DATA_TYPE_MAX = 0xff, + FWP_V4_ADDR_MASK, FWP_V6_ADDR_MASK, FWP_RANGE_TYPE, FWP_DATA_TYPE_MAX +} FWP_DATA_TYPE; + +cpp_quote("") + +typedef [v1_enum] enum FWP_MATCH_TYPE_ { + FWP_MATCH_EQUAL, FWP_MATCH_GREATER, + FWP_MATCH_LESS, FWP_MATCH_GREATER_OR_EQUAL, + FWP_MATCH_LESS_OR_EQUAL, FWP_MATCH_RANGE, + FWP_MATCH_FLAGS_ALL_SET, FWP_MATCH_FLAGS_ANY_SET, + FWP_MATCH_FLAGS_NONE_SET, FWP_MATCH_EQUAL_CASE_INSENSITIVE, + FWP_MATCH_NOT_EQUAL, FWP_MATCH_TYPE_MAX +} FWP_MATCH_TYPE; + +cpp_quote("") + +cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)") +typedef [v1_enum] enum FWP_VSWITCH_NETWORK_TYPE_ { + FWP_VSWITCH_NETWORK_TYPE_UNKNOWN, FWP_VSWITCH_NETWORK_TYPE_PRIVATE, + FWP_VSWITCH_NETWORK_TYPE_INTERNAL, FWP_VSWITCH_NETWORK_TYPE_EXTERNAL +} FWP_VSWITCH_NETWORK_TYPE; +cpp_quote("#endif") + +cpp_quote("") + +typedef [v1_enum] enum FWP_CLASSIFY_OPTION_TYPE_ { + FWP_CLASSIFY_OPTION_MULTICAST_STATE, FWP_CLASSIFY_OPTION_LOOSE_SOURCE_MAPPING, + FWP_CLASSIFY_OPTION_UNICAST_LIFETIME, FWP_CLASSIFY_OPTION_MCAST_BCAST_LIFETIME, + FWP_CLASSIFY_OPTION_SECURE_SOCKET_SECURITY_FLAGS, FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_MM_POLICY_KEY, + FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_QM_POLICY_KEY, FWP_CLASSIFY_OPTION_LOCAL_ONLY_MAPPING, + FWP_CLASSIFY_OPTION_MAX +} FWP_CLASSIFY_OPTION_TYPE; + +cpp_quote("") + +typedef [v1_enum] enum FWP_FILTER_ENUM_TYPE_ { + FWP_FILTER_ENUM_FULLY_CONTAINED, FWP_FILTER_ENUM_OVERLAPPING, FWP_FILTER_ENUM_TYPE_MAX +} FWP_FILTER_ENUM_TYPE; + +cpp_quote("") + +typedef struct FWP_BYTE_ARRAY6_ { + UINT8 byteArray6[6]; +} FWP_BYTE_ARRAY6; +cpp_quote("") +typedef struct FWP_BYTE_ARRAY16_ { + UINT8 byteArray16[16]; +} FWP_BYTE_ARRAY16; + +cpp_quote("") + +typedef struct FWP_BYTE_BLOB_ { + UINT32 size; + [size_is(size), unique] UINT8 *data; +} FWP_BYTE_BLOB; + +cpp_quote("") + +typedef struct FWP_TOKEN_INFORMATION_ { + ULONG sidCount; + [size_is(sidCount)] PSID_AND_ATTRIBUTES sids; + ULONG restrictedSidCount; + [size_is(restrictedSidCount)] PSID_AND_ATTRIBUTES restrictedSids; +} FWP_TOKEN_INFORMATION; + +cpp_quote("") + +typedef struct FWP_VALUE0_ { + FWP_DATA_TYPE type; + [switch_type(FWP_DATA_TYPE), switch_is(type)] + union { + [case(FWP_EMPTY)] + ; + [case(FWP_UINT8)] + UINT8 uint8; + [case(FWP_UINT16)] + UINT16 uint16; + [case(FWP_UINT32)] + UINT32 uint32; + [case(FWP_UINT64)] + [unique] UINT64 *uint64; + [case(FWP_INT8)] + INT8 int8; + [case(FWP_INT16)] + INT16 int16; + [case(FWP_INT32)] + INT32 int32; + [case(FWP_INT64)] + [unique] INT64 *int64; + [case(FWP_FLOAT)] + float float32; + [case(FWP_DOUBLE)] + [unique] double *double64; + [case(FWP_BYTE_ARRAY16_TYPE)] + [unique] FWP_BYTE_ARRAY16 *byteArray16; + [case(FWP_BYTE_BLOB_TYPE)] + [unique] FWP_BYTE_BLOB *byteBlob; + [case(FWP_SID)] + [unique] SID *sid; + [case(FWP_SECURITY_DESCRIPTOR_TYPE)] + [unique] FWP_BYTE_BLOB *sd; + [case(FWP_TOKEN_INFORMATION_TYPE)] + [unique] FWP_TOKEN_INFORMATION *tokenInformation; + [case(FWP_TOKEN_ACCESS_INFORMATION_TYPE)] + [unique] FWP_BYTE_BLOB *tokenAccessInformation; + [case(FWP_UNICODE_STRING_TYPE)] + [string] LPWSTR unicodeString; + [case(FWP_BYTE_ARRAY6_TYPE)] + [unique] FWP_BYTE_ARRAY6 *byteArray6; + }; +} FWP_VALUE0; + +cpp_quote("") + +typedef struct FWP_V4_ADDR_AND_MASK_ { + UINT32 addr; + UINT32 mask; +} FWP_V4_ADDR_AND_MASK; + +cpp_quote("") + +typedef struct FWP_V6_ADDR_AND_MASK_ { + UINT8 addr[FWP_V6_ADDR_SIZE]; + UINT8 prefixLength; +} FWP_V6_ADDR_AND_MASK; + +cpp_quote("") + +typedef struct FWP_RANGE0_ { + FWP_VALUE0 valueLow; + FWP_VALUE0 valueHigh; +} FWP_RANGE0; + +cpp_quote("") + +typedef struct FWP_CONDITION_VALUE0_ { + FWP_DATA_TYPE type; + [switch_type(FWP_DATA_TYPE), switch_is(type)] + union { + [case(FWP_EMPTY)] + ; + [case(FWP_UINT8)] + UINT8 uint8; + [case(FWP_UINT16)] + UINT16 uint16; + [case(FWP_UINT32)] + UINT32 uint32; + [case(FWP_UINT64)] + [unique] UINT64 *uint64; + [case(FWP_INT8)] + INT8 int8; + [case(FWP_INT16)] + INT16 int16; + [case(FWP_INT32)] + INT32 int32; + [case(FWP_INT64)] + [unique] INT64 *int64; + [case(FWP_FLOAT)] + float float32; + [case(FWP_DOUBLE)] + [unique] double *double64; + [case(FWP_BYTE_ARRAY16_TYPE)] + [unique] FWP_BYTE_ARRAY16 *byteArray16; + [case(FWP_BYTE_BLOB_TYPE)] + [unique] FWP_BYTE_BLOB *byteBlob; + [case(FWP_SID)] + [unique] SID *sid; + [case(FWP_SECURITY_DESCRIPTOR_TYPE)] + [unique] FWP_BYTE_BLOB *sd; + [case(FWP_TOKEN_INFORMATION_TYPE)] + [unique] FWP_TOKEN_INFORMATION *tokenInformation; + [case(FWP_TOKEN_ACCESS_INFORMATION_TYPE)] + [unique] FWP_BYTE_BLOB *tokenAccessInformation; + [case(FWP_UNICODE_STRING_TYPE)] + [string] LPWSTR unicodeString; + [case(FWP_BYTE_ARRAY6_TYPE)] + [unique] FWP_BYTE_ARRAY6 *byteArray6; + [case(FWP_V4_ADDR_MASK)] + [unique] FWP_V4_ADDR_AND_MASK *v4AddrMask; + [case(FWP_V6_ADDR_MASK)] + [unique] FWP_V6_ADDR_AND_MASK *v6AddrMask; + [case(FWP_RANGE_TYPE)] + [unique] FWP_RANGE0 *rangeValue; + }; +} FWP_CONDITION_VALUE0; + +cpp_quote("") + +typedef struct FWPM_DISPLAY_DATA0_ { + [string, unique] wchar_t *name; + [string, unique] wchar_t *description; +} FWPM_DISPLAY_DATA0; + +cpp_quote("") + +cpp_quote("#endif /* WINAPI_PARTITION_DESKTOP. */") Property changes on: trunk/mingw-w64-headers/include/fwptypes.idl ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Modified: trunk/mingw-w64-headers/include/iketypes.h =================================================================== --- trunk/mingw-w64-headers/include/iketypes.h 2013-03-13 15:15:23 UTC (rev 5649) +++ trunk/mingw-w64-headers/include/iketypes.h 2013-03-13 15:49:32 UTC (rev 5650) @@ -1,530 +1,747 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_IKETYPES -#define _INC_IKETYPES +/*** Autogenerated by WIDL 1.5.25 from iketypes.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 __iketypes_h__ +#define __iketypes_h__ + +/* Forward declarations */ + +/* Headers for imported files */ + #include <fwptypes.h> #ifdef __cplusplus extern "C" { #endif -#if (_WIN32_WINNT >= 0x0600) +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#include <winapifamily.h> +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +#define IKEEXT_ERROR_CODE_COUNT (ERROR_IPSEC_IKE_NEG_STATUS_END - ERROR_IPSEC_IKE_NEG_STATUS_BEGIN) + +/* Please keep in sync with winerror.h defines. */ + +#define IKEEXT_CERT_FLAG_ENABLE_ACCOUNT_MAPPING (0x1) +#define IKEEXT_CERT_FLAG_DISABLE_REQUEST_PAYLOAD (0x2) +#define IKEEXT_CERT_FLAG_USE_NAP_CERTIFICATE (0x4) +#define IKEEXT_CERT_FLAG_INTERMEDIATE_CA (0x8) +#define IKEEXT_CERT_FLAG_IGNORE_INIT_CERT_MAP_FAILURE (0x10) +#define IKEEXT_CERT_FLAG_PREFER_NAP_CERTIFICATE_OUTBOUND (0x20) +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define IKEEXT_CERT_FLAG_SELECT_NAP_CERTIFICATE (0x40) +#define IKEEXT_CERT_FLAG_VERIFY_NAP_CERTIFICATE (0x80) +#define IKEEXT_CERT_FLAG_FOLLOW_RENEWAL_CERTIFICATE (0x100) +#endif + +#define IKEEXT_CERT_AUTH_FLAG_SSL_ONE_WAY (0x1) +#define IKEEXT_CERT_AUTH_FLAG_DISABLE_CRL_CHECK (0x2) +#define IKEEXT_CERT_AUTH_ENABLE_CRL_CHECK_STRONG (0x4) +#define IKEEXT_CERT_AUTH_DISABLE_SSL_CERT_VALIDATION (0x8) +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define IKEEXT_CERT_AUTH_ALLOW_HTTP_CERT_LOOKUP (0x10) +#define IKEEXT_CERT_AUTH_URL_CONTAINS_BUNDLE (0x20) +#endif + +#define IKEEXT_KERB_AUTH_DISABLE_INITIATOR_TOKEN_GENERATION (0x1) +#define IKEEXT_KERB_AUTH_DONT_ACCEPT_EXPLICIT_CREDENTIALS (0x2) +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define IKEEXT_KERB_AUTH_FORCE_PROXY_ON_INITIATOR (0x4) +#endif + +#define IKEEXT_RESERVED_AUTH_DISABLE_INITIATOR_TOKEN_GENERATION (0x1) + +#define IKEEXT_NTLM_V2_AUTH_DONT_ACCEPT_EXPLICIT_CREDENTIALS (0x1) + +#define IKEEXT_POLICY_FLAG_DISABLE_DIAGNOSTICS (0x00000001) +#define IKEEXT_POLICY_FLAG_NO_MACHINE_LUID_VERIFY (0x00000002) +#define IKEEXT_POLICY_FLAG_NO_IMPERSONATION_LUID_VERIFY (0x00000004) +#define IKEEXT_POLICY_FLAG_ENABLE_OPTIONAL_DH (0x00000008) + +#define IKEEXT_CERT_CREDENTIAL_FLAG_NAP_CERT (0x1) + +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define IKEEXT_PSK_FLAG_LOCAL_AUTH_ONLY (0x1) +#define IKEEXT_PSK_FLAG_REMOTE_AUTH_ONLY (0x2) + +#define IKEEXT_EAP_FLAG_LOCAL_AUTH_ONLY (0x1) +#define IKEEXT_EAP_FLAG_REMOTE_AUTH_ONLY (0x2) +#endif + #ifndef __IPSEC_V4_UDP_ENCAPSULATION0_FWD_DECLARED #define __IPSEC_V4_UDP_ENCAPSULATION0_FWD_DECLARED typedef struct IPSEC_V4_UDP_ENCAPSULATION0_ IPSEC_V4_UDP_ENCAPSULATION0; -#endif /* __IPSEC_V4_UDP_ENCAPSULATION0_FWD_DECLARED */ +#endif +typedef UINT64 IKEEXT_COOKIE; + typedef enum IKEEXT_EM_SA_STATE_ { - IKEEXT_EM_SA_STATE_NONE = 0, - IKEEXT_EM_SA_STATE_SENT_ATTS, - IKEEXT_EM_SA_STATE_SSPI_SENT, - IKEEXT_EM_SA_STATE_AUTH_COMPLETE, - IKEEXT_EM_SA_STATE_FINAL, - IKEEXT_EM_SA_STATE_COMPLETE, - IKEEXT_EM_SA_STATE_MAX + IKEEXT_EM_SA_STATE_NONE = 0, + IKEEXT_EM_SA_STATE_SENT_ATTS = 1, + IKEEXT_EM_SA_STATE_SSPI_SENT = 2, + IKEEXT_EM_SA_STATE_AUTH_COMPLETE = 3, + IKEEXT_EM_SA_STATE_FINAL = 4, + IKEEXT_EM_SA_STATE_COMPLETE = 5, + IKEEXT_EM_SA_STATE_MAX = 6 } IKEEXT_EM_SA_STATE; typedef enum IKEEXT_SA_ROLE_ { - IKEEXT_SA_ROLE_INITIATOR = 0, - IKEEXT_SA_ROLE_RESPONDER, - IKEEXT_SA_ROLE_MAX + IKEEXT_SA_ROLE_INITIATOR = 0, + IKEEXT_SA_ROLE_RESPONDER = 1, + IKEEXT_SA_ROLE_MAX = 2 } IKEEXT_SA_ROLE; typedef enum IKEEXT_AUTHENTICATION_METHOD_TYPE_ { - IKEEXT_PRESHARED_KEY = 0, - IKEEXT_CERTIFICATE, - IKEEXT_KERBEROS, - IKEEXT_ANONYMOUS, - IKEEXT_SSL, - IKEEXT_NTLM_V2, - IKEEXT_IPV6_CGA, - IKEEXT_CERTIFICATE_ECDSA_P256, - IKEEXT_CERTIFICATE_ECDSA_P384, - IKEEXT_SSL_ECDSA_P256, - IKEEXT_SSL_ECDSA_P384, - IKEEXT_EAP, - IKEEXT_AUTHENTICATION_METHOD_TYPE_MAX + IKEEXT_PRESHARED_KEY = 0, + IKEEXT_CERTIFICATE = 1, + IKEEXT_KERBEROS = 2, + IKEEXT_ANONYMOUS = 3, + IKEEXT_SSL = 4, + IKEEXT_NTLM_V2 = 5, + IKEEXT_IPV6_CGA = 6, + IKEEXT_CERTIFICATE_ECDSA_P256 = 7, + IKEEXT_CERTIFICATE_ECDSA_P384 = 8, + IKEEXT_SSL_ECDSA_P256 = 9, + IKEEXT_SSL_ECDSA_P384 = 10, + IKEEXT_EAP = 11, + IKEEXT_RESERVED = 12, + IKEEXT_AUTHENTICATION_METHOD_TYPE_MAX = 13 } IKEEXT_AUTHENTICATION_METHOD_TYPE; typedef enum IKEEXT_KEY_MODULE_TYPE_ { - IKEEXT_KEY_MODULE_IKE = 0, - IKEEXT_KEY_MODULE_AUTHIP, - IKEEXT_KEY_MODULE_IKEV2, - IKEEXT_KEY_MODULE_MAX + IKEEXT_KEY_MODULE_IKE = 0, + IKEEXT_KEY_MODULE_AUTHIP = 1, + IKEEXT_KEY_MODULE_IKEV2 = 2, + IKEEXT_KEY_MODULE_MAX = 3 } IKEEXT_KEY_MODULE_TYPE; typedef enum IKEEXT_MM_SA_STATE_ { - IKEEXT_MM_SA_STATE_NONE = 0, - IKEEXT_MM_SA_STATE_SA_SENT, - IKEEXT_MM_SA_STATE_SSPI_SENT, - IKEEXT_MM_SA_STATE_FINAL, - IKEEXT_MM_SA_STATE_FINAL_SENT, - IKEEXT_MM_SA_STATE_COMPLETE, - IKEEXT_MM_SA_STATE_MAX + IKEEXT_MM_SA_STATE_NONE = 0, + IKEEXT_MM_SA_STATE_SA_SENT = 1, + IKEEXT_MM_SA_STATE_SSPI_SENT = 2, + IKEEXT_MM_SA_STATE_FINAL = 3, + IKEEXT_MM_SA_STATE_FINAL_SENT = 4, + IKEEXT_MM_SA_STATE_COMPLETE = 5, + IKEEXT_MM_SA_STATE_MAX = 6 } IKEEXT_MM_SA_STATE; typedef enum IKEEXT_QM_SA_STATE_ { - IKEEXT_QM_SA_STATE_NONE = 0, - IKEEXT_QM_SA_STATE_INITIAL, - IKEEXT_QM_SA_STATE_FINAL, - IKEEXT_QM_SA_STATE_COMPLETE, - IKEEXT_QM_SA_STATE_MAX + IKEEXT_QM_SA_STATE_NONE = 0, + IKEEXT_QM_SA_STATE_INITIAL = 1, + IKEEXT_QM_SA_STATE_FINAL = 2, + IKEEXT_QM_SA_STATE_COMPLETE = 3, + IKEEXT_QM_SA_STATE_MAX = 4 } IKEEXT_QM_SA_STATE; typedef enum IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE_ { - IKEEXT_IMPERSONATION_NONE = 0, - IKEEXT_IMPERSONATION_SOCKET_PRINCIPAL, - IKEEXT_IMPERSONATION_MAX + IKEEXT_IMPERSONATION_NONE = 0, + IKEEXT_IMPERSONATION_SOCKET_PRINCIPAL = 1, + IKEEXT_IMPERSONATION_MAX = 2 } IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE; typedef enum IKEEXT_CERT_CONFIG_TYPE_ { - IKEEXT_CERT_CONFIG_EXPLICIT_TRUST_LIST = 0, - IKEEXT_CERT_CONFIG_ENTERPRISE_STORE, - IKEEXT_CERT_CONFIG_TRUSTED_ROOT_STORE, - IKEEXT_CERT_CONFIG_UNSPECIFIED, - IKEEXT_CERT_CONFIG_TYPE_MAX + IKEEXT_CERT_CONFIG_EXPLICIT_TRUST_LIST = 0, + IKEEXT_CERT_CONFIG_ENTERPRISE_STORE = 1, + IKEEXT_CERT_CONFIG_TRUSTED_ROOT_STORE = 2, + IKEEXT_CERT_CONFIG_UNSPECIFIED = 3, + IKEEXT_CERT_CONFIG_TYPE_MAX = 4 } IKEEXT_CERT_CONFIG_TYPE; typedef enum IKEEXT_CIPHER_TYPE_ { - IKEEXT_CIPHER_DES = 0, - IKEEXT_CIPHER_3DES, - IKEEXT_CIPHER_AES_128, - IKEEXT_CIPHER_AES_192, - IKEEXT_CIPHER_AES_256, - IKEEXT_CIPHER_TYPE_MAX + IKEEXT_CIPHER_DES = 0, + IKEEXT_CIPHER_3DES = 1, + IKEEXT_CIPHER_AES_128 = 2, + IKEEXT_CIPHER_AES_192 = 3, + IKEEXT_CIPHER_AES_256 = 4, + IKEEXT_CIPHER_TYPE_MAX = 5 } IKEEXT_CIPHER_TYPE; typedef enum IKEEXT_INTEGRITY_TYPE_ { - IKEEXT_INTEGRITY_MD5 = 0, - IKEEXT_INTEGRITY_SHA1, - IKEEXT_INTEGRITY_SHA_256, - IKEEXT_INTEGRITY_SHA_384, - IKEEXT_INTEGRITY_TYPE_MAX + IKEEXT_INTEGRITY_MD5 = 0, + IKEEXT_INTEGRITY_SHA1 = 1, + IKEEXT_INTEGRITY_SHA_256 = 2, + IKEEXT_INTEGRITY_SHA_384 = 3, + IKEEXT_INTEGRITY_TYPE_MAX = 4 } IKEEXT_INTEGRITY_TYPE; typedef enum IKEEXT_DH_GROUP_ { - IKEEXT_DH_GROUP_NONE = 0, - IKEEXT_DH_GROUP_1, - IKEEXT_DH_GROUP_2, - IKEEXT_DH_GROUP_2048, - IKEEXT_DH_ECP_256, - IKEEXT_DH_ECP_384, - IKEEXT_DH_GROUP_MAX + IKEEXT_DH_GROUP_NONE = 0, + IKEEXT_DH_GROUP_1 = 1, + IKEEXT_DH_GROUP_2 = 2, + IKEEXT_DH_GROUP_14 = 3, + IKEEXT_DH_GROUP_2048 = IKEEXT_DH_GROUP_14, + IKEEXT_DH_ECP_256 = 4, + IKEEXT_DH_ECP_384 = 5, + IKEEXT_DH_GROUP_24 = 6, + IKEEXT_DH_GROUP_MAX = 7 } IKEEXT_DH_GROUP; -#define IKEEXT_CERT_FLAG_ENABLE_ACCOUNT_MAPPING 0x00000001 -#define IKEEXT_CERT_FLAG_DISABLE_REQUEST_PAYLOAD 0x00000002 -#define IKEEXT_CERT_FLAG_USE_NAP_CERTIFICATE 0x00000004 -#define IKEEXT_CERT_FLAG_INTERMEDIATE_CA 0x00000008 -#define IKEEXT_CERT_FLAG_IGNORE_INIT_CERT_MAP_FAILURE 0x00000010 -#define IKEEXT_CERT_FLAG_PREFER_NAP_CERTIFICATE_OUTBOUND 0x00000020 - typedef struct IKEEXT_CERT_ROOT_CONFIG0_ { - FWP_BYTE_BLOB certData; - UINT32 flags; + FWP_BYTE_BLOB certData; + UINT32 flags; } IKEEXT_CERT_ROOT_CONFIG0; -#define IKEEXT_KERB_AUTH_DISABLE_INITIATOR_TOKEN_GENERATION 0x00000001 -#define IKEEXT_KERB_AUTH_DONT_ACCEPT_EXPLICIT_CREDENTIALS 0x00000002 - -typedef struct IKEEXT_KERBEROS_AUTHENTICATION0_ { - UINT32 flags; +typedef struct IKEEXT_KERBEROS_AUTHENTICATION0__ { + UINT32 flags; } IKEEXT_KERBEROS_AUTHENTICATION0; -#define IKEEXT_NTLM_V2_AUTH_DONT_ACCEPT_EXPLICIT_CREDENTIALS 0x00000001 - -typedef struct IKEEXT_NTLM_V2_AUTHENTICATION0_ { - UINT32 flags; +typedef struct IKEEXT_NTLM_V2_AUTHENTICATION0__ { + UINT32 flags; } IKEEXT_NTLM_V2_AUTHENTICATION0; -typedef struct IKEEXT_IPV6_CGA_AUTHENTICATION0_ { - wchar_t *keyContainerName; - wchar_t *cspName; - UINT32 cspType; - FWP_BYTE_ARRAY16 cgaModifier; - BYTE cgaCollisionCount; -} IKEEXT_IPV6_CGA_AUTHENTICATION0; - typedef struct IKEEXT_PRESHARED_KEY_AUTHENTICATION0__ { - FWP_BYTE_BLOB presharedKey; + FWP_BYTE_BLOB presharedKey; } IKEEXT_PRESHARED_KEY_AUTHENTICATION0; -#define IKEEXT_CERT_AUTH_FLAG_SSL_ONE_WAY 0x00000001 -#define IKEEXT_CERT_AUTH_FLAG_DISABLE_CRL_CHECK 0x00000002 -#define IKEEXT_CERT_AUTH_ENABLE_CRL_CHECK_STRONG 0x00000004 -#define IKEEXT_CERT_AUTH_DISABLE_SSL_CERT_VALIDATION 0x00000008 -#if (_WIN32_WINNT >= 0x0601) -#define IKEEXT_CERT_AUTH_ALLOW_HTTP_CERT_LOOKUP 0x00000010 -#define IKEEXT_CERT_AUTH_URL_CONTAINS_BUNDLE 0x00000020 -#endif /* WIN7 */ +typedef struct IKEEXT_PRESHARED_KEY_AUTHENTICATION1__ { + FWP_BYTE_BLOB presharedKey; + UINT32 flags; +} IKEEXT_PRESHARED_KEY_AUTHENTICATION1; +#endif typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION0_ { - IKEEXT_CERT_CONFIG_TYPE inboundConfigType; - __C89_NAMELESS union { - __C89_NAMELESS struct { - UINT32 inboundRootArraySize; - IKEEXT_CERT_ROOT_CONFIG0 *inboundRootArray; - }; - IKEEXT_CERT_ROOT_CONFIG0 *inboundEnterpriseStoreConfig; - IKEEXT_CERT_ROOT_CONFIG0 *inboundTrustedRootStoreConfig; - }; - IKEEXT_CERT_CONFIG_TYPE outboundConfigType; - __C89_NAMELESS union { - __C89_NAMELESS struct { - UINT32 outboundRootArraySize; - IKEEXT_CERT_ROOT_CONFIG0 *outboundRootArray; - }; - IKEEXT_CERT_ROOT_CONFIG0 *outboundEnterpriseStoreConfig; - IKEEXT_CERT_ROOT_CONFIG0 *outboundTrustedRootStoreConfig; - }; - UINT32 flags; + IKEEXT_CERT_CONFIG_TYPE inboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 inboundRootArraySize; + IKEEXT_CERT_ROOT_CONFIG0 *inboundRootArray; + } __C89_NAMELESSSTRUCTNAME; + IKEEXT_CERT_ROOT_CONFIG0 *inboundEnterpriseStoreConfig; + IKEEXT_CERT_ROOT_CONFIG0 *inboundTrustedRootStoreConfig; + } __C89_NAMELESSUNIONNAME1; + IKEEXT_CERT_CONFIG_TYPE outboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 outboundRootArraySize; + IKEEXT_CERT_ROOT_CONFIG0 *outboundRootArray; + } __C89_NAMELESSSTRUCTNAME; + IKEEXT_CERT_ROOT_CONFIG0 *outboundEnterpriseStoreConfig; + IKEEXT_CERT_ROOT_CONFIG0 *outboundTrustedRootStoreConfig; + } __C89_NAMELESSUNIONNAME2; + UINT32 flags; } IKEEXT_CERTIFICATE_AUTHENTICATION0; +#if NTDDI_VERSION >= NTDDI_WIN7 +typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION1_ { + IKEEXT_CERT_CONFIG_TYPE inboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 inboundRootArraySize; + IKEEXT_CERT_ROOT_CONFIG0 *inboundRootArray; + } __C89_NAMELESSSTRUCTNAME; + IKEEXT_CERT_ROOT_CONFIG0 *inboundEnterpriseStoreConfig; + IKEEXT_CERT_ROOT_CONFIG0 *inboundTrustedRootStoreConfig; + } __C89_NAMELESSUNIONNAME1; + IKEEXT_CERT_CONFIG_TYPE outboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 outboundRootArraySize; + IKEEXT_CERT_ROOT_CONFIG0 *outboundRootArray; + } __C89_NAMELESSSTRUCTNAME; + IKEEXT_CERT_ROOT_CONFIG0 *outboundEnterpriseStoreConfig; + IKEEXT_CERT_ROOT_CONFIG0 *outboundTrustedRootStoreConfig; + } __C89_NAMELESSUNIONNAME2; + UINT32 flags; + FWP_BYTE_BLOB localCertLocationUrl; +} IKEEXT_CERTIFICATE_AUTHENTICATION1; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef enum IKEEXT_CERT_CRITERIA_NAME_TYPE_ { + IKEEXT_CERT_CRITERIA_DNS = 0, + IKEEXT_CERT_CRITERIA_UPN = 1, + IKEEXT_CERT_CRITERIA_RFC822 = 2, + IKEEXT_CERT_CRITERIA_CN = 3, + IKEEXT_CERT_CRITERIA_OU = 4, + IKEEXT_CERT_CRITERIA_O = 5, + IKEEXT_CERT_CRITERIA_DC = 6, + IKEEXT_CERT_CRITERIA_NAME_TYPE_MAX = 7 +} IKEEXT_CERT_CRITERIA_NAME_TYPE; + +typedef struct IKEEXT_CERT_EKUS0_ { + ULONG numEku; + LPSTR *eku; +} IKEEXT_CERT_EKUS0; + +typedef struct IKEEXT_CERT_NAME0_ { + IKEEXT_CERT_CRITERIA_NAME_TYPE nameType; + LPWSTR certName; +} IKEEXT_CERT_NAME0; + +typedef struct IKEEXT_CERTIFICATE_CRITERIA0_ { + FWP_BYTE_BLOB certData; + FWP_BYTE_BLOB certHash; + IKEEXT_CERT_EKUS0 *eku; + IKEEXT_CERT_NAME0 *name; + UINT32 flags; +} IKEEXT_CERTIFICATE_CRITERIA0; + +typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION2_ { + IKEEXT_CERT_CONFIG_TYPE inboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 inboundRootArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *inboundRootCriteria; + } __C89_NAMELESSSTRUCTNAME1; + __C89_NAMELESS struct { + UINT32 inboundEnterpriseStoreArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *inboundEnterpriseStoreCriteria; + } __C89_NAMELESSSTRUCTNAME2; + __C89_NAMELESS struct { + UINT32 inboundRootStoreArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *inboundTrustedRootStoreCriteria; + } __C89_NAMELESSSTRUCTNAME3; + } __C89_NAMELESSUNIONNAME1; + IKEEXT_CERT_CONFIG_TYPE outboundConfigType; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT32 outboundRootArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *outboundRootCriteria; + } __C89_NAMELESSSTRUCTNAME1; + __C89_NAMELESS struct { + UINT32 outboundEnterpriseStoreArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *outboundEnterpriseStoreCriteria; + } __C89_NAMELESSSTRUCTNAME2; + __C89_NAMELESS struct { + UINT32 outboundRootStoreArraySize; + IKEEXT_CERTIFICATE_CRITERIA0 *outboundTrustedRootStoreCriteria; + } __C89_NAMELESSSTRUCTNAME3; + } __C89_NAMELESSUNIONNAME2; + UINT32 flags; + FWP_BYTE_BLOB localCertLocationUrl; +} IKEEXT_CERTIFICATE_AUTHENTICATION2; +#endif + +typedef struct IKEEXT_IPV6_CGA_AUTHENTICATION0_ { + wchar_t *keyContainerName; + wchar_t *cspName; + UINT32 cspType; + FWP_BYTE_ARRAY16 cgaModifier; + BYTE cgaCollisionCount; +} IKEEXT_IPV6_CGA_AUTHENTICATION0; + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct IKEEXT_KERBEROS_AUTHENTICATION1__ { + UINT32 flags; + wchar_t *proxyServer; +} IKEEXT_KERBEROS_AUTHENTICATION1; +#endif + +typedef struct IKEEXT_RESERVED_AUTHENTICATION0__ { + UINT32 flags; +} IKEEXT_RESERVED_AUTHENTICATION0; + +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_EAP_AUTHENTICATION0__ { + UINT32 flags; +} IKEEXT_EAP_AUTHENTICATION0; +#endif + typedef struct IKEEXT_AUTHENTICATION_METHOD0_ { - IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType; - __C89_NAMELESS union { - IKEEXT_PRESHARED_KEY_AUTHENTICATION0 presharedKeyAuthentication; - IKEEXT_CERTIFICATE_AUTHENTICATION0 certificateAuthentication; - IKEEXT_KERBEROS_AUTHENTICATION0 kerberosAuthentication; - IKEEXT_NTLM_V2_AUTHENTICATION0 ntlmV2Authentication; - IKEEXT_CERTIFICATE_AUTHENTICATION0 sslAuthentication; - IKEEXT_IPV6_CGA_AUTHENTICATION0 cgaAuthentication; - }; + IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType; + __C89_NAMELESS union { + IKEEXT_PRESHARED_KEY_AUTHENTICATION0 presharedKeyAuthentication; + IKEEXT_CERTIFICATE_AUTHENTICATION0 certificateAuthentication; + IKEEXT_KERBEROS_AUTHENTICATION0 kerberosAuthentication; + IKEEXT_NTLM_V2_AUTHENTICATION0 ntlmV2Authentication; + IKEEXT_CERTIFICATE_AUTHENTICATION0 sslAuthentication; + IKEEXT_IPV6_CGA_AUTHENTICATION0 cgaAuthentication; + } __C89_NAMELESSUNIONNAME; } IKEEXT_AUTHENTICATION_METHOD0; -typedef struct IKEEXT_INTEGRITY_ALGORITHM0_ { - IKEEXT_INTEGRITY_TYPE algoIdentifier; -} IKEEXT_INTEGRITY_ALGORITHM0; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_AUTHENTICATION_METHOD1_ { + IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType; + __C89_NAMELESS union { + IKEEXT_PRESHARED_KEY_AUTHENTICATION1 presharedKeyAuthentication; + IKEEXT_CERTIFICATE_AUTHENTICATION1 certificateAuthentication; + IKEEXT_KERBEROS_AUTHENTICATION0 kerberosAuthentication; + IKEEXT_NTLM_V2_AUTHENTICATION0 ntlmV2Authentication; + IKEEXT_CERTIFICATE_AUTHENTICATION1 sslAuthentication; + IKEEXT_IPV6_CGA_AUTHENTICATION0 cgaAuthentication; + IKEEXT_EAP_AUTHENTICATION0 eapAuthentication; + } __C89_NAMELESSUNIONNAME; +} IKEEXT_AUTHENTICATION_METHOD1; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct IKEEXT_AUTHENTICATION_METHOD2_ { + IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType; + __C89_NAMELESS union { + IKEEXT_PRESHARED_KEY_AUTHENTICATION1 presharedKeyAuthentication; + IKEEXT_CERTIFICATE_AUTHENTICATION2 certificateAuthentication; + IKEEXT_KERBEROS_AUTHENTICATION1 kerberosAuthentication; + IKEEXT_RESERVED_AUTHENTICATION0 reservedAuthentication; + IKEEXT_NTLM_V2_AUTHENTICATION0 ntlmV2Authentication; + IKEEXT_CERTIFICATE_AUTHENTICATION2 sslAuthentication; + IKEEXT_IPV6_CGA_AUTHENTICATION0 cgaAuthentication; + IKEEXT_EAP_AUTHENTICATION0 eapAuthentication; + } __C89_NAMELESSUNIONNAME; +} IKEEXT_AUTHENTICATION_METHOD2; +#endif + typedef struct IKEEXT_CIPHER_ALGORITHM0_ { - IKEEXT_CIPHER_TYPE algoIdentifier; - UINT32 keyLen; - UINT32 rounds; + IKEEXT_CIPHER_TYPE algoIdentifier; + UINT32 keyLen; + UINT32 rounds; } IKEEXT_CIPHER_ALGORITHM0; +typedef struct IKEEXT_INTEGRITY_ALGORITHM0_ { + IKEEXT_INTEGRITY_TYPE algoIdentifier; +} IKEEXT_INTEGRITY_ALGORITHM0; + typedef struct IKEEXT_PROPOSAL0_ { - IKEEXT_CIPHER_ALGORITHM0 cipherAlgorithm; - IKEEXT_INTEGRITY_ALGORITHM0 integrityAlgorithm; - UINT32 maxLifetimeSeconds; - IKEEXT_DH_GROUP dhGroup; - UINT32 quickModeLimit; + IKEEXT_CIPHER_ALGORITHM0 cipherAlgorithm; + IKEEXT_INTEGRITY_ALGORITHM0 integrityAlgorithm; + UINT32 maxLifetimeSeconds; + IKEEXT_DH_GROUP dhGroup; + UINT32 quickModeLimit; } IKEEXT_PROPOSAL0; -#define IKEEXT_POLICY_FLAG_DISABLE_DIAGNOSTICS 0x00000001 -#define IKEEXT_POLICY_FLAG_NO_MACHINE_LUID_VERIFY 0x00000002 -#define IKEEXT_POLICY_FLAG_NO_IMPERSONATION_LUID_VERIFY 0x00000004 -#define IKEEXT_POLICY_FLAG_ENABLE_OPTIONAL_DH 0x00000008 +typedef struct IKEEXT_POLICY0_ { + UINT32 softExpirationTime; + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD0 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; + UINT32 numIkeProposals; + IKEEXT_PROPOSAL0 *ikeProposals; + UINT32 flags; + UINT32 maxDynamicFilters; +} IKEEXT_POLICY0; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_POLICY1_ { + UINT32 softExpirationTime; + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD1 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; + UINT32 numIkeProposals; + IKEEXT_PROPOSAL0 *ikeProposals; + UINT32 flags; + UINT32 maxDynamicFilters; + UINT32 retransmitDurationSecs; +} IKEEXT_POLICY1; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct IKEEXT_POLICY2_ { + UINT32 softExpirationTime; + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD2 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; + UINT32 numIkeProposals; + IKEEXT_PROPOSAL0 *ikeProposals; + UINT32 flags; + UINT32 maxDynamicFilters; + UINT32 retransmitDurationSecs; +} IKEEXT_POLICY2; +#endif + typedef struct IKEEXT_EM_POLICY0_ { - UINT32 numAuthenticationMethods; - IKEEXT_AUTHENTICATION_METHOD0 *authenticationMethods; - IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD0 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; } IKEEXT_EM_POLICY0; -typedef struct IKEEXT_POLICY0_ { - UINT32 softExpirationTime; - UINT32 numAuthenticationMethods; - IKEEXT_AUTHENTICATION_METHOD0 *authenticationMethods; - IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; - UINT32 numIkeProposals; - IKEEXT_PROPOSAL0 *ikeProposals; - UINT32 flags; - UINT32 maxDynamicFilters; -} IKEEXT_POLICY0; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_EM_POLICY1_ { + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD1 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; +} IKEEXT_EM_POLICY1; +#endif -typedef struct IKEEXT_CERTIFICATE_CREDENTIAL0_ { - FWP_BYTE_BLOB subjectName; - FWP_BYTE_BLOB certHash; - UINT32 flags; -} IKEEXT_CERTIFICATE_CREDENTIAL0; +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct IKEEXT_EM_POLICY2_ { + UINT32 numAuthenticationMethods; + IKEEXT_AUTHENTICATION_METHOD2 *authenticationMethods; + IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE initiatorImpersonationType; +} IKEEXT_EM_POLICY2; +#endif +typedef struct IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS0_ { + UINT32 currentActiveMainModes; + UINT32 totalMainModesStarted; + UINT32 totalSuccessfulMainModes; + UINT32 totalFailedMainModes; + UINT32 totalResponderMainModes; + UINT32 currentNewResponderMainModes; + UINT32 currentActiveQuickModes; + UINT32 totalQuickModesStarted; + UINT32 totalSuccessfulQuickModes; + UINT32 totalFailedQuickModes; + UINT32 totalAcquires; + UINT32 totalReinitAcquires; + UINT32 currentActiveExtendedModes; + UINT32 totalExtendedModesStarted; + UINT32 totalSuccessfulExtendedModes; + UINT32 totalFailedExtendedModes; + UINT32 totalImpersonationExtendedModes; + UINT32 totalImpersonationMainModes; +} IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS0; + +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS1_ { + UINT32 currentActiveMainModes; + UINT32 totalMainModesStarted; + UINT32 totalSuccessfulMainModes; + UINT32 totalFailedMainModes; + UINT32 totalResponderMainModes; + UINT32 currentNewResponderMainModes; + UINT32 currentActiveQuickModes; + UINT32 totalQuickModesStarted; + UINT32 totalSuccessfulQuickModes; + UINT32 totalFailedQuickModes; + UINT32 totalAcquires; + UINT32 totalReinitAcquires; + UINT32 currentActiveExtendedModes; + UINT32 totalExtendedModesStarted; + UINT32 totalSuccessfulExtendedModes; + UINT32 totalFailedExtendedModes; + UINT32 totalImpersonationExtendedModes; + UINT32 totalImpersonationMainModes; +} IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS1; +#endif + +typedef struct IKEEXT_KEYMODULE_STATISTICS0_ { + IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS0 v4Statistics; + IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS0 v6Statistics; + UINT32 errorFrequencyTable[97]; + UINT32 mainModeNegotiationTime; + UINT32 quickModeNegotiationTime; + UINT32 extendedModeNegotiationTime; +} IKEEXT_KEYMODULE_STATISTICS0; + +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_KEYMODULE_STATISTICS1_ { + IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS1 v4Statistics; + IKEEXT_IP_VERSION_SPECIFIC_KEYMODULE_STATISTICS1 v6Statistics; + UINT32 errorFrequencyTable[97]; + UINT32 mainModeNegotiationTime; + UINT32 quickModeNegotiationTime; + UINT32 extendedModeNegotiationTime; +} IKEEXT_KEYMODULE_STATISTICS1; +#endif + typedef struct IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0_ { - UINT32 totalSocketReceiveFailures; - UINT32 totalSocketSendFailures; + UINT32 totalSocketReceiveFailures; + UINT32 totalSocketSendFailures; } IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS1_ { + UINT32 totalSocketReceiveFailures; + UINT32 totalSocketSendFailures; +} IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS1; +#endif + typedef struct IKEEXT_COMMON_STATISTICS0_ { - IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0 v4Statistics; - IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0 v6Statistics; - UINT32 totalPacketsReceived; - UINT32 totalInvalidPacketsReceived; - UINT32 currentQueuedWorkitems; + IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0 v4Statistics; + IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS0 v6Statistics; + UINT32 totalPacketsReceived; + UINT32 totalInvalidPacketsReceived; + UINT32 currentQueuedWorkitems; } IKEEXT_COMMON_STATISTICS0; -typedef UINT64 IKEEXT_COOKIE; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct IKEEXT_COMMON_STATISTICS1_ { + IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS1 v4Statistics; + IKEEXT_IP_VERSION_SPECIFIC_COMMON_STATISTICS1 v6Statistics; + UINT32 totalPacketsReceived; + UINT32 totalInvalidPacketsReceived; + UINT32 currentQueuedWorkitems... [truncated message content] |
From: <cj...@us...> - 2013-03-15 10:53:52
|
Revision: 5659 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5659&view=rev Author: cjacek Date: 2013-03-15 10:53:35 +0000 (Fri, 15 Mar 2013) Log Message: ----------- Updated imported headers to current Wine version. Modified Paths: -------------- 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/dmodshow.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/medparam.h trunk/mingw-w64-headers/direct-x/include/mmstream.h trunk/mingw-w64-headers/direct-x/include/qedit.h trunk/mingw-w64-headers/direct-x/include/qnetwork.h trunk/mingw-w64-headers/direct-x/include/vmr9.h trunk/mingw-w64-headers/include/audioclient.h trunk/mingw-w64-headers/include/audiopolicy.h trunk/mingw-w64-headers/include/comcat.h trunk/mingw-w64-headers/include/ctfutb.h trunk/mingw-w64-headers/include/devicetopology.h trunk/mingw-w64-headers/include/docobj.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/fwptypes.h trunk/mingw-w64-headers/include/iketypes.h trunk/mingw-w64-headers/include/mfidl.h trunk/mingw-w64-headers/include/mfobjects.h trunk/mingw-w64-headers/include/mfreadwrite.h trunk/mingw-w64-headers/include/mftransform.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/msxml.h trunk/mingw-w64-headers/include/oaidl.h trunk/mingw-w64-headers/include/objectarray.h trunk/mingw-w64-headers/include/objidl.h trunk/mingw-w64-headers/include/ocidl.h trunk/mingw-w64-headers/include/oleacc.h trunk/mingw-w64-headers/include/oleidl.h trunk/mingw-w64-headers/include/optary.h trunk/mingw-w64-headers/include/portabledevicetypes.h trunk/mingw-w64-headers/include/propidl.h trunk/mingw-w64-headers/include/propsys.h trunk/mingw-w64-headers/include/sensorsapi.h trunk/mingw-w64-headers/include/shobjidl.h trunk/mingw-w64-headers/include/shtypes.h trunk/mingw-w64-headers/include/strmif.h trunk/mingw-w64-headers/include/structuredquerycondition.h trunk/mingw-w64-headers/include/textstor.h trunk/mingw-w64-headers/include/tpcshrd.h trunk/mingw-w64-headers/include/uiautomationclient.h trunk/mingw-w64-headers/include/uiautomationcore.h trunk/mingw-w64-headers/include/unknwn.h trunk/mingw-w64-headers/include/urlhist.h trunk/mingw-w64-headers/include/urlmon.h trunk/mingw-w64-headers/include/wincodec.h trunk/mingw-w64-headers/include/wmcodecdsp.h trunk/mingw-w64-headers/include/wpcapi.h trunk/mingw-w64-headers/include/wtypes.h trunk/mingw-w64-headers/include/xmllite.h Modified: trunk/mingw-w64-headers/direct-x/include/amstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/amvideo.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/austream.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/d3d10.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/d3d10_1.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/d3d11.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/d3dcommon.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -389,6 +389,7 @@ FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b); FLOAT WINAPI D3DXSHDot(UINT order, const FLOAT *a, const FLOAT *b); +HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); 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); Modified: trunk/mingw-w64-headers/direct-x/include/ddstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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/dmodshow.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/dmodshow.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/dmodshow.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/dmodshow.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from direct-x/include/dmodshow.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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/dxgi.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/mediaobj.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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/medparam.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/medparam.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/medparam.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/medparam.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from direct-x/include/medparam.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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/mmstream.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/qedit.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from direct-x/include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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/direct-x/include/qnetwork.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/qnetwork.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/qnetwork.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/qnetwork.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from direct-x/include/qnetwork.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/direct-x/include/vmr9.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/vmr9.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/direct-x/include/vmr9.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from direct-x/include/vmr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from direct-x/include/vmr9.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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/audioclient.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 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-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/audiopolicy.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/audiopolicy.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/comcat.h =================================================================== --- trunk/mingw-w64-headers/include/comcat.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/comcat.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/comcat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/comcat.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/ctfutb.h =================================================================== --- trunk/mingw-w64-headers/include/ctfutb.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/ctfutb.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/ctfutb.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/ctfutb.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/devicetopology.h =================================================================== --- trunk/mingw-w64-headers/include/devicetopology.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/devicetopology.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/devicetopology.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/devicetopology.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/docobj.h =================================================================== --- trunk/mingw-w64-headers/include/docobj.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/docobj.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/docobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/docobj.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/downloadmgr.h =================================================================== --- trunk/mingw-w64-headers/include/downloadmgr.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/downloadmgr.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/downloadmgr.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/endpointvolume.h =================================================================== --- trunk/mingw-w64-headers/include/endpointvolume.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/endpointvolume.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/endpointvolume.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/endpointvolume.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/fusion.h =================================================================== --- trunk/mingw-w64-headers/include/fusion.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/fusion.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/fusion.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/fusion.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/fwptypes.h =================================================================== --- trunk/mingw-w64-headers/include/fwptypes.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/fwptypes.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from fwptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/fwptypes.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/iketypes.h =================================================================== --- trunk/mingw-w64-headers/include/iketypes.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/iketypes.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from iketypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/iketypes.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mfidl.h =================================================================== --- trunk/mingw-w64-headers/include/mfidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mfidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/mfidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mfidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mfobjects.h =================================================================== --- trunk/mingw-w64-headers/include/mfobjects.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mfobjects.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mfobjects.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mfreadwrite.h =================================================================== --- trunk/mingw-w64-headers/include/mfreadwrite.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mfreadwrite.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/mfreadwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mfreadwrite.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mftransform.h =================================================================== --- trunk/mingw-w64-headers/include/mftransform.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mftransform.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/mftransform.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mftransform.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mmdeviceapi.h =================================================================== --- trunk/mingw-w64-headers/include/mmdeviceapi.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mmdeviceapi.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/mmdeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mmdeviceapi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mscoree.h =================================================================== --- trunk/mingw-w64-headers/include/mscoree.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/mscoree.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/mscoree.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/mscoree.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/msctf.h =================================================================== --- trunk/mingw-w64-headers/include/msctf.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/msctf.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/msctf.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/msctf.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 @@ -182,6 +182,16 @@ typedef interface ITfContextOwnerCompositionServices ITfContextOwnerCompositionServices; #endif +#ifndef __ITfPersistentPropertyLoaderACP_FWD_DEFINED__ +#define __ITfPersistentPropertyLoaderACP_FWD_DEFINED__ +typedef interface ITfPersistentPropertyLoaderACP ITfPersistentPropertyLoaderACP; +#endif + +#ifndef __ITfContextOwnerServices_FWD_DEFINED__ +#define __ITfContextOwnerServices_FWD_DEFINED__ +typedef interface ITfContextOwnerServices ITfContextOwnerServices; +#endif + #ifndef __ITfReadOnlyProperty_FWD_DEFINED__ #define __ITfReadOnlyProperty_FWD_DEFINED__ typedef interface ITfReadOnlyProperty ITfReadOnlyProperty; @@ -384,6 +394,14 @@ #if 0 typedef UINT_PTR HKL; #endif +typedef struct TF_PERSISTENT_PROPERTY_HEADER_ACP { + GUID guidType; + LONG ichStart; + LONG cch; + ULONG cb; + DWORD dwPrivate; + CLSID clsidTIP; +} TF_PERSISTENT_PROPERTY_HEADER_ACP; typedef struct TF_LANGUAGEPROFILE { CLSID clsid; LANGID langid; @@ -7281,6 +7299,313 @@ #endif /* __ITfContextOwnerCompositionServices_INTERFACE_DEFINED__ */ /***************************************************************************** + * ITfPersistentPropertyLoaderACP interface + */ +#ifndef __ITfPersistentPropertyLoaderACP_INTERFACE_DEFINED__ +#define __ITfPersistentPropertyLoaderACP_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ITfPersistentPropertyLoaderACP, 0x4ef89150, 0x0807, 0x11d3, 0x8d,0xf0, 0x00,0x10,0x5a,0x27,0x99,0xb5); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("4ef89150-0807-11d3-8df0-00105a2799b5") +ITfPersistentPropertyLoaderACP : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE LoadProperty( + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream **ppStream) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ITfPersistentPropertyLoaderACP, 0x4ef89150, 0x0807, 0x11d3, 0x8d,0xf0, 0x00,0x10,0x5a,0x27,0x99,0xb5) +#endif +#else +typedef struct ITfPersistentPropertyLoaderACPVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ITfPersistentPropertyLoaderACP* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ITfPersistentPropertyLoaderACP* This); + + ULONG (STDMETHODCALLTYPE *Release)( + ITfPersistentPropertyLoaderACP* This); + + /*** ITfPersistentPropertyLoaderACP methods ***/ + HRESULT (STDMETHODCALLTYPE *LoadProperty)( + ITfPersistentPropertyLoaderACP* This, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream **ppStream); + + END_INTERFACE +} ITfPersistentPropertyLoaderACPVtbl; +interface ITfPersistentPropertyLoaderACP { + CONST_VTBL ITfPersistentPropertyLoaderACPVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ITfPersistentPropertyLoaderACP_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ITfPersistentPropertyLoaderACP_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ITfPersistentPropertyLoaderACP_Release(This) (This)->lpVtbl->Release(This) +/*** ITfPersistentPropertyLoaderACP methods ***/ +#define ITfPersistentPropertyLoaderACP_LoadProperty(This,pHdr,ppStream) (This)->lpVtbl->LoadProperty(This,pHdr,ppStream) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT ITfPersistentPropertyLoaderACP_QueryInterface(ITfPersistentPropertyLoaderACP* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG ITfPersistentPropertyLoaderACP_AddRef(ITfPersistentPropertyLoaderACP* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG ITfPersistentPropertyLoaderACP_Release(ITfPersistentPropertyLoaderACP* This) { + return This->lpVtbl->Release(This); +} +/*** ITfPersistentPropertyLoaderACP methods ***/ +static FORCEINLINE HRESULT ITfPersistentPropertyLoaderACP_LoadProperty(ITfPersistentPropertyLoaderACP* This,const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr,IStream **ppStream) { + return This->lpVtbl->LoadProperty(This,pHdr,ppStream); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE ITfPersistentPropertyLoaderACP_LoadProperty_Proxy( + ITfPersistentPropertyLoaderACP* This, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream **ppStream); +void __RPC_STUB ITfPersistentPropertyLoaderACP_LoadProperty_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __ITfPersistentPropertyLoaderACP_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * ITfContextOwnerServices interface + */ +#ifndef __ITfContextOwnerServices_INTERFACE_DEFINED__ +#define __ITfContextOwnerServices_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ITfContextOwnerServices, 0xb23eb630, 0x3e1c, 0x11d3, 0xa7,0x45, 0x00,0x50,0x04,0x0a,0xb4,0x07); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("b23eb630-3e1c-11d3-a745-0050040ab407") +ITfContextOwnerServices : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE OnLayoutChange( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnStatusChange( + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnAttributeChange( + REFGUID rguidAttribute) = 0; + + virtual HRESULT STDMETHODCALLTYPE Serialize( + ITfProperty *pProp, + ITfRange *pRange, + TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream) = 0; + + virtual HRESULT STDMETHODCALLTYPE Unserialize( + ITfProperty *pProp, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream, + ITfPersistentPropertyLoaderACP *pLoader) = 0; + + virtual HRESULT STDMETHODCALLTYPE ForceLoadProperty( + ITfProperty *pProp) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateRange( + LONG acpStart, + LONG acpEnd, + ITfRangeACP **ppRange) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ITfContextOwnerServices, 0xb23eb630, 0x3e1c, 0x11d3, 0xa7,0x45, 0x00,0x50,0x04,0x0a,0xb4,0x07) +#endif +#else +typedef struct ITfContextOwnerServicesVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ITfContextOwnerServices* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ITfContextOwnerServices* This); + + ULONG (STDMETHODCALLTYPE *Release)( + ITfContextOwnerServices* This); + + /*** ITfContextOwnerServices methods ***/ + HRESULT (STDMETHODCALLTYPE *OnLayoutChange)( + ITfContextOwnerServices* This); + + HRESULT (STDMETHODCALLTYPE *OnStatusChange)( + ITfContextOwnerServices* This, + DWORD dwFlags); + + HRESULT (STDMETHODCALLTYPE *OnAttributeChange)( + ITfContextOwnerServices* This, + REFGUID rguidAttribute); + + HRESULT (STDMETHODCALLTYPE *Serialize)( + ITfContextOwnerServices* This, + ITfProperty *pProp, + ITfRange *pRange, + TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream); + + HRESULT (STDMETHODCALLTYPE *Unserialize)( + ITfContextOwnerServices* This, + ITfProperty *pProp, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream, + ITfPersistentPropertyLoaderACP *pLoader); + + HRESULT (STDMETHODCALLTYPE *ForceLoadProperty)( + ITfContextOwnerServices* This, + ITfProperty *pProp); + + HRESULT (STDMETHODCALLTYPE *CreateRange)( + ITfContextOwnerServices* This, + LONG acpStart, + LONG acpEnd, + ITfRangeACP **ppRange); + + END_INTERFACE +} ITfContextOwnerServicesVtbl; +interface ITfContextOwnerServices { + CONST_VTBL ITfContextOwnerServicesVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ITfContextOwnerServices_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ITfContextOwnerServices_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ITfContextOwnerServices_Release(This) (This)->lpVtbl->Release(This) +/*** ITfContextOwnerServices methods ***/ +#define ITfContextOwnerServices_OnLayoutChange(This) (This)->lpVtbl->OnLayoutChange(This) +#define ITfContextOwnerServices_OnStatusChange(This,dwFlags) (This)->lpVtbl->OnStatusChange(This,dwFlags) +#define ITfContextOwnerServices_OnAttributeChange(This,rguidAttribute) (This)->lpVtbl->OnAttributeChange(This,rguidAttribute) +#define ITfContextOwnerServices_Serialize(This,pProp,pRange,pHdr,pStream) (This)->lpVtbl->Serialize(This,pProp,pRange,pHdr,pStream) +#define ITfContextOwnerServices_Unserialize(This,pProp,pHdr,pStream,pLoader) (This)->lpVtbl->Unserialize(This,pProp,pHdr,pStream,pLoader) +#define ITfContextOwnerServices_ForceLoadProperty(This,pProp) (This)->lpVtbl->ForceLoadProperty(This,pProp) +#define ITfContextOwnerServices_CreateRange(This,acpStart,acpEnd,ppRange) (This)->lpVtbl->CreateRange(This,acpStart,acpEnd,ppRange) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT ITfContextOwnerServices_QueryInterface(ITfContextOwnerServices* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG ITfContextOwnerServices_AddRef(ITfContextOwnerServices* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG ITfContextOwnerServices_Release(ITfContextOwnerServices* This) { + return This->lpVtbl->Release(This); +} +/*** ITfContextOwnerServices methods ***/ +static FORCEINLINE HRESULT ITfContextOwnerServices_OnLayoutChange(ITfContextOwnerServices* This) { + return This->lpVtbl->OnLayoutChange(This); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_OnStatusChange(ITfContextOwnerServices* This,DWORD dwFlags) { + return This->lpVtbl->OnStatusChange(This,dwFlags); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_OnAttributeChange(ITfContextOwnerServices* This,REFGUID rguidAttribute) { + return This->lpVtbl->OnAttributeChange(This,rguidAttribute); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_Serialize(ITfContextOwnerServices* This,ITfProperty *pProp,ITfRange *pRange,TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr,IStream *pStream) { + return This->lpVtbl->Serialize(This,pProp,pRange,pHdr,pStream); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_Unserialize(ITfContextOwnerServices* This,ITfProperty *pProp,const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr,IStream *pStream,ITfPersistentPropertyLoaderACP *pLoader) { + return This->lpVtbl->Unserialize(This,pProp,pHdr,pStream,pLoader); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_ForceLoadProperty(ITfContextOwnerServices* This,ITfProperty *pProp) { + return This->lpVtbl->ForceLoadProperty(This,pProp); +} +static FORCEINLINE HRESULT ITfContextOwnerServices_CreateRange(ITfContextOwnerServices* This,LONG acpStart,LONG acpEnd,ITfRangeACP **ppRange) { + return This->lpVtbl->CreateRange(This,acpStart,acpEnd,ppRange); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_OnLayoutChange_Proxy( + ITfContextOwnerServices* This); +void __RPC_STUB ITfContextOwnerServices_OnLayoutChange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_OnStatusChange_Proxy( + ITfContextOwnerServices* This, + DWORD dwFlags); +void __RPC_STUB ITfContextOwnerServices_OnStatusChange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_OnAttributeChange_Proxy( + ITfContextOwnerServices* This, + REFGUID rguidAttribute); +void __RPC_STUB ITfContextOwnerServices_OnAttributeChange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_Serialize_Proxy( + ITfContextOwnerServices* This, + ITfProperty *pProp, + ITfRange *pRange, + TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream); +void __RPC_STUB ITfContextOwnerServices_Serialize_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_Unserialize_Proxy( + ITfContextOwnerServices* This, + ITfProperty *pProp, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + IStream *pStream, + ITfPersistentPropertyLoaderACP *pLoader); +void __RPC_STUB ITfContextOwnerServices_Unserialize_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_ForceLoadProperty_Proxy( + ITfContextOwnerServices* This, + ITfProperty *pProp); +void __RPC_STUB ITfContextOwnerServices_ForceLoadProperty_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfContextOwnerServices_CreateRange_Proxy( + ITfContextOwnerServices* This, + LONG acpStart, + LONG acpEnd, + ITfRangeACP **ppRange); +void __RPC_STUB ITfContextOwnerServices_CreateRange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __ITfContextOwnerServices_INTERFACE_DEFINED__ */ + +/***************************************************************************** * ITfReadOnlyProperty interface */ #ifndef __ITfReadOnlyProperty_INTERFACE_DEFINED__ Modified: trunk/mingw-w64-headers/include/msctf.idl =================================================================== --- trunk/mingw-w64-headers/include/msctf.idl 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/msctf.idl 2013-03-15 10:53:35 UTC (rev 5659) @@ -106,6 +106,16 @@ typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; cpp_quote("#endif") +typedef [uuid(e26d9e1d-691e-4f29-90d7-338dcf1f8cef)] struct TF_PERSISTENT_PROPERTY_HEADER_ACP +{ + GUID guidType; + LONG ichStart; + LONG cch; + ULONG cb; + DWORD dwPrivate; + CLSID clsidTIP; +} TF_PERSISTENT_PROPERTY_HEADER_ACP; + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -1301,6 +1311,51 @@ [ object, + uuid(4ef89150-0807-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfPersistentPropertyLoaderACP : IUnknown +{ + HRESULT LoadProperty( + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [out] IStream **ppStream); +} + +[ + object, + uuid(b23eb630-3e1c-11d3-a745-0050040ab407), + pointer_default(unique) +] +interface ITfContextOwnerServices : IUnknown +{ + HRESULT OnLayoutChange(); + + HRESULT OnStatusChange([in] DWORD dwFlags); + + HRESULT OnAttributeChange([in] REFGUID rguidAttribute); + + HRESULT Serialize( + [in] ITfProperty *pProp, + [in] ITfRange *pRange, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream); + + HRESULT Unserialize( + [in] ITfProperty *pProp, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream, + [in] ITfPersistentPropertyLoaderACP *pLoader); + + HRESULT ForceLoadProperty([in] ITfProperty *pProp); + + HRESULT CreateRange( + [in] LONG acpStart, + [in] LONG acpEnd, + [out] ITfRangeACP **ppRange); +} + +[ + object, uuid(17d49a3d-f8b8-4b2f-b254-52319dd64c53), pointer_default(unique) ] Modified: trunk/mingw-w64-headers/include/msxml.h =================================================================== --- trunk/mingw-w64-headers/include/msxml.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/msxml.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/msxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/msxml.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/oaidl.h =================================================================== --- trunk/mingw-w64-headers/include/oaidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/oaidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/oaidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/oaidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/objectarray.h =================================================================== --- trunk/mingw-w64-headers/include/objectarray.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/objectarray.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/objectarray.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/objectarray.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/objidl.h =================================================================== --- trunk/mingw-w64-headers/include/objidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/objidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/objidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/objidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/ocidl.h =================================================================== --- trunk/mingw-w64-headers/include/ocidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/ocidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/ocidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/ocidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/oleacc.h =================================================================== --- trunk/mingw-w64-headers/include/oleacc.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/oleacc.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/oleacc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/oleacc.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/oleidl.h =================================================================== --- trunk/mingw-w64-headers/include/oleidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/oleidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/oleidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/oleidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/optary.h =================================================================== --- trunk/mingw-w64-headers/include/optary.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/optary.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/optary.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/optary.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/portabledevicetypes.h =================================================================== --- trunk/mingw-w64-headers/include/portabledevicetypes.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/portabledevicetypes.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/portabledevicetypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/portabledevicetypes.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/propidl.h =================================================================== --- trunk/mingw-w64-headers/include/propidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/propidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/propidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/propidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/propsys.h =================================================================== --- trunk/mingw-w64-headers/include/propsys.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/propsys.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/propsys.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/propsys.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/sensorsapi.h =================================================================== --- trunk/mingw-w64-headers/include/sensorsapi.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/sensorsapi.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/sensorsapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/sensorsapi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/shobjidl.h =================================================================== --- trunk/mingw-w64-headers/include/shobjidl.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/shobjidl.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/shobjidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/shobjidl.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/shtypes.h =================================================================== --- trunk/mingw-w64-headers/include/shtypes.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/shtypes.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/shtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/shtypes.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/strmif.h =================================================================== --- trunk/mingw-w64-headers/include/strmif.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/strmif.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/strmif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/strmif.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/structuredquerycondition.h =================================================================== --- trunk/mingw-w64-headers/include/structuredquerycondition.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/structuredquerycondition.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/structuredquerycondition.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/structuredquerycondition.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/textstor.h =================================================================== --- trunk/mingw-w64-headers/include/textstor.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/textstor.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/textstor.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/textstor.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/tpcshrd.h =================================================================== --- trunk/mingw-w64-headers/include/tpcshrd.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/tpcshrd.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/tpcshrd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/tpcshrd.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/uiautomationclient.h =================================================================== --- trunk/mingw-w64-headers/include/uiautomationclient.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/uiautomationclient.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/uiautomationclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/uiautomationclient.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/uiautomationcore.h =================================================================== --- trunk/mingw-w64-headers/include/uiautomationcore.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/uiautomationcore.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/uiautomationcore.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/uiautomationcore.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/unknwn.h =================================================================== --- trunk/mingw-w64-headers/include/unknwn.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/unknwn.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/unknwn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/unknwn.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/urlhist.h =================================================================== --- trunk/mingw-w64-headers/include/urlhist.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/urlhist.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/urlhist.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/urlhist.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/urlmon.h =================================================================== --- trunk/mingw-w64-headers/include/urlmon.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/urlmon.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/urlmon.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wincodec.h =================================================================== --- trunk/mingw-w64-headers/include/wincodec.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/wincodec.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/wincodec.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/wincodec.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wmcodecdsp.h =================================================================== --- trunk/mingw-w64-headers/include/wmcodecdsp.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/wmcodecdsp.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/wmcodecdsp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/wmcodecdsp.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wpcapi.h =================================================================== --- trunk/mingw-w64-headers/include/wpcapi.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/wpcapi.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/wpcapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/wpcapi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wtypes.h =================================================================== --- trunk/mingw-w64-headers/include/wtypes.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/wtypes.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.22 from include/wtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/wtypes.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/xmllite.h =================================================================== --- trunk/mingw-w64-headers/include/xmllite.h 2013-03-14 17:29:49 UTC (rev 5658) +++ trunk/mingw-w64-headers/include/xmllite.h 2013-03-15 10:53:35 UTC (rev 5659) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.24 from include/xmllite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.5.25 from include/xmllite.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cor...@us...> - 2013-04-05 11:17:42
|
Revision: 5725 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5725&view=rev Author: corinnav999 Date: 2013-04-05 11:17:31 +0000 (Fri, 05 Apr 2013) Log Message: ----------- * configure.ac (BASEHEAD_LIST): Add crt/intrin.h. * configure: Regenerate. Modified Paths: -------------- trunk/mingw-w64-headers/ChangeLog trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/ChangeLog =================================================================== --- trunk/mingw-w64-headers/ChangeLog 2013-04-05 11:16:06 UTC (rev 5724) +++ trunk/mingw-w64-headers/ChangeLog 2013-04-05 11:17:31 UTC (rev 5725) @@ -1,3 +1,8 @@ +2013-04-05 Corinna Vinschen <vin...@re...> + + * configure.ac (BASEHEAD_LIST): Add crt/intrin.h. + * configure: Regenerate. + 2013-03-01 Jan Holesovsky <ke...@su...> * include/usp10.h: Updated SCRIPT_CONTROL struct. Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-04-05 11:16:06 UTC (rev 5724) +++ trunk/mingw-w64-headers/configure 2013-04-05 11:17:31 UTC (rev 5725) @@ -2545,7 +2545,7 @@ # Checks for header files. -BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/vadefs.h "$srcdir/include/*.h +BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/intrin.h crt/vadefs.h "$srcdir/include/*.h SECHEAD_LIST="$srcdir/crt/sec_api/stralign_s.h" for i in dlg h16 hxx rh ver; do BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/include/*.$i Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-04-05 11:16:06 UTC (rev 5724) +++ trunk/mingw-w64-headers/configure.ac 2013-04-05 11:17:31 UTC (rev 5725) @@ -39,7 +39,7 @@ # Checks for header files. -BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/vadefs.h "$srcdir/include/*.h +BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/intrin.h crt/vadefs.h "$srcdir/include/*.h SECHEAD_LIST="$srcdir/crt/sec_api/stralign_s.h" for i in dlg h16 hxx rh ver; do BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/include/*.$i This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cj...@us...> - 2013-04-11 11:29:44
|
Revision: 5770 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5770&view=rev Author: cjacek Date: 2013-04-11 11:29:36 +0000 (Thu, 11 Apr 2013) Log Message: ----------- Updated imported headers to current Wine version. Modified Paths: -------------- trunk/mingw-w64-headers/direct-x/include/d3dx9math.h trunk/mingw-w64-headers/include/winhttp.h Modified: trunk/mingw-w64-headers/direct-x/include/d3dx9math.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-04-10 18:22:31 UTC (rev 5769) +++ trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-04-11 11:29:36 UTC (rev 5770) @@ -392,6 +392,8 @@ HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); 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); +HRESULT WINAPI D3DXSHEvalHemisphereLight(UINT order, const D3DXVECTOR3 *dir, D3DXCOLOR top, D3DXCOLOR bottom, FLOAT *rout, FLOAT *gout, FLOAT *bout); +HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, 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); Modified: trunk/mingw-w64-headers/include/winhttp.h =================================================================== --- trunk/mingw-w64-headers/include/winhttp.h 2013-04-10 18:22:31 UTC (rev 5769) +++ trunk/mingw-w64-headers/include/winhttp.h 2013-04-11 11:29:36 UTC (rev 5770) @@ -19,6 +19,12 @@ #ifndef __WINE_WINHTTP_H #define __WINE_WINHTTP_H +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack4.h> +#endif + #define WINHTTPAPI #define BOOLAPI WINHTTPAPI WINBOOL WINAPI @@ -527,6 +533,14 @@ DWORD dwMinorVersion; } HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; +#ifdef _WS2DEF_ +typedef struct +{ + DWORD cbSize; + SOCKADDR_STORAGE LocalAddress; + SOCKADDR_STORAGE RemoteAddress; +} WINHTTP_CONNECTION_INFO; +#endif #ifdef __cplusplus extern "C" { @@ -565,4 +579,6 @@ } #endif +#include <poppack.h> + #endif /* __WINE_WINHTTP_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cj...@us...> - 2013-05-02 12:08:40
|
Revision: 5835 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5835&view=rev Author: cjacek Date: 2013-05-02 12:08:28 +0000 (Thu, 02 May 2013) Log Message: ----------- inputscope.idl: Use IDL file to generate inputscope.h. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/include/inputscope.h Added Paths: ----------- trunk/mingw-w64-headers/include/inputscope.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-05-02 11:43:47 UTC (rev 5834) +++ trunk/mingw-w64-headers/Makefile.am 2013-05-02 12:08:28 UTC (rev 5835) @@ -68,6 +68,7 @@ include/fusion.idl \ include/fwptypes.idl \ include/iketypes.idl \ + include/inputscope.idl \ include/oaidl.idl \ include/ocidl.idl \ include/comcat.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-05-02 11:43:47 UTC (rev 5834) +++ trunk/mingw-w64-headers/Makefile.in 2013-05-02 12:08:28 UTC (rev 5835) @@ -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. @@ -292,6 +292,7 @@ @HAVE_WIDL_TRUE@ include/fusion.idl \ @HAVE_WIDL_TRUE@ include/fwptypes.idl \ @HAVE_WIDL_TRUE@ include/iketypes.idl \ +@HAVE_WIDL_TRUE@ include/inputscope.idl \ @HAVE_WIDL_TRUE@ include/oaidl.idl \ @HAVE_WIDL_TRUE@ include/ocidl.idl \ @HAVE_WIDL_TRUE@ include/comcat.idl \ Modified: trunk/mingw-w64-headers/include/inputscope.h =================================================================== --- trunk/mingw-w64-headers/include/inputscope.h 2013-05-02 11:43:47 UTC (rev 5834) +++ trunk/mingw-w64-headers/include/inputscope.h 2013-05-02 12:08:28 UTC (rev 5835) @@ -1,142 +1,280 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ +/*** Autogenerated by WIDL 1.5.25 from include/inputscope.idl - Do not edit ***/ + #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif -#include "rpc.h" -#include "rpcndr.h" +#include <rpc.h> +#include <rpcndr.h> -#ifndef __RPCNDR_H_VERSION__ -#error This stub requires an updated version of <rpcndr.h> -#endif - #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include <windows.h> +#include <ole2.h> #endif #ifndef __inputscope_h__ #define __inputscope_h__ +/* Forward declarations */ + #ifndef __ITfInputScope_FWD_DEFINED__ #define __ITfInputScope_FWD_DEFINED__ -typedef struct ITfInputScope ITfInputScope; +typedef interface ITfInputScope ITfInputScope; #endif -#include "oaidl.h" -#include "ocidl.h" +/* Headers for imported files */ +#include <oaidl.h> +#include <ocidl.h> + #ifdef __cplusplus extern "C" { #endif -#ifndef __MIDL_user_allocate_free_DEFINED__ -#define __MIDL_user_allocate_free_DEFINED__ - void *__RPC_API MIDL_user_allocate(size_t); - void __RPC_API MIDL_user_free(void *); -#endif +typedef enum __WIDL_inputscope_generated_name_00000000 { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; +HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope); +HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS); +HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML); +DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d); +/***************************************************************************** + * ITfInputScope interface + */ +#ifndef __ITfInputScope_INTERFACE_DEFINED__ +#define __ITfInputScope_INTERFACE_DEFINED__ -#ifndef INPUTSCOPE_DEFINED -#define INPUTSCOPE_DEFINED +DEFINE_GUID(IID_ITfInputScope, 0xfde1eaee, 0x6924, 0x4cdf, 0x91,0xe7, 0xda,0x38,0xcf,0xf5,0x55,0x9d); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("fde1eaee-6924-4cdf-91e7-da38cff5559d") +ITfInputScope : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetInputScopes( + InputScope **pprgInputScopes, + UINT *pcCount) = 0; -#include <windows.h> + virtual HRESULT STDMETHODCALLTYPE GetPhrase( + BSTR **ppbstrPhrases, + UINT *pcCount) = 0; -#ifdef __cplusplus - extern "C" { + virtual HRESULT STDMETHODCALLTYPE GetRegularExpression( + BSTR *pbstrRegExp) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSRGS( + BSTR *pbstrSRGS) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetXML( + BSTR *pbstrXML) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ITfInputScope, 0xfde1eaee, 0x6924, 0x4cdf, 0x91,0xe7, 0xda,0x38,0xcf,0xf5,0x55,0x9d) #endif +#else +typedef struct ITfInputScopeVtbl { + BEGIN_INTERFACE - typedef enum __MIDL___MIDL_itf_inputscope_0000_0001 { - IS_DEFAULT = 0,IS_URL = 1,IS_FILE_FULLFILEPATH = 2,IS_FILE_FILENAME = 3,IS_EMAIL_USERNAME = 4,IS_EMAIL_SMTPEMAILADDRESS = 5, - IS_LOGINNAME = 6,IS_PERSONALNAME_FULLNAME = 7,IS_PERSONALNAME_PREFIX = 8,IS_PERSONALNAME_GIVENNAME = 9,IS_PERSONALNAME_MIDDLENAME = 10, - IS_PERSONALNAME_SURNAME = 11,IS_PERSONALNAME_SUFFIX = 12,IS_ADDRESS_FULLPOSTALADDRESS = 13,IS_ADDRESS_POSTALCODE = 14,IS_ADDRESS_STREET = 15, - IS_ADDRESS_STATEORPROVINCE = 16,IS_ADDRESS_CITY = 17,IS_ADDRESS_COUNTRYNAME = 18,IS_ADDRESS_COUNTRYSHORTNAME = 19, - IS_CURRENCY_AMOUNTANDSYMBOL = 20,IS_CURRENCY_AMOUNT = 21,IS_DATE_FULLDATE = 22,IS_DATE_MONTH = 23,IS_DATE_DAY = 24, - IS_DATE_YEAR = 25,IS_DATE_MONTHNAME = 26,IS_DATE_DAYNAME = 27,IS_DIGITS = 28,IS_NUMBER = 29,IS_ONECHAR = 30,IS_PASSWORD = 31, - IS_TELEPHONE_FULLTELEPHONENUMBER = 32,IS_TELEPHONE_COUNTRYCODE = 33,IS_TELEPHONE_AREACODE = 34,IS_TELEPHONE_LOCALNUMBER = 35, - IS_TIME_FULLTIME = 36,IS_TIME_HOUR = 37,IS_TIME_MINORSEC = 38,IS_NUMBER_FULLWIDTH = 39,IS_ALPHANUMERIC_HALFWIDTH = 40, - IS_ALPHANUMERIC_FULLWIDTH = 41,IS_CURRENCY_CHINESE = 42,IS_BOPOMOFO = 43,IS_HIRAGANA = 44,IS_KATAKANA_HALFWIDTH = 45, - IS_KATAKANA_FULLWIDTH = 46,IS_HANJA = 47,IS_PHRASELIST = -1,IS_REGULAREXPRESSION = -2,IS_SRGS = -3,IS_XML = -4 - } InputScope; + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ITfInputScope* This, + REFIID riid, + void **ppvObject); - HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope); - HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS); - HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML); + ULONG (STDMETHODCALLTYPE *AddRef)( + ITfInputScope* This); - DEFINE_GUID(IID_ITfInputScope,0xfde1eaee,0x6924,0x4cdf,0x91,0xe7,0xda,0x38,0xcf,0xf5,0x55,0x9d); - DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d); + ULONG (STDMETHODCALLTYPE *Release)( + ITfInputScope* This); -#ifdef __cplusplus - } -#endif + /*** ITfInputScope methods ***/ + HRESULT (STDMETHODCALLTYPE *GetInputScopes)( + ITfInputScope* This, + InputScope **pprgInputScopes, + UINT *pcCount); - extern RPC_IF_HANDLE __MIDL_itf_inputscope_0000_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_inputscope_0000_v0_0_s_ifspec; + HRESULT (STDMETHODCALLTYPE *GetPhrase)( + ITfInputScope* This, + BSTR **ppbstrPhrases, + UINT *pcCount); -#ifndef __ITfInputScope_INTERFACE_DEFINED__ -#define __ITfInputScope_INTERFACE_DEFINED__ - EXTERN_C const IID IID_ITfInputScope; -#if defined(__cplusplus) && !defined(CINTERFACE) - struct ITfInputScope : public IUnknown { - public: - virtual HRESULT WINAPI GetInputScopes(InputScope **pprgInputScopes,UINT *pcCount) = 0; - virtual HRESULT WINAPI GetPhrase(BSTR **ppbstrPhrases,UINT *pcCount) = 0; - virtual HRESULT WINAPI GetRegularExpression(BSTR *pbstrRegExp) = 0; - virtual HRESULT WINAPI GetSRGS(BSTR *pbstrSRGS) = 0; - virtual HRESULT WINAPI GetXML(BSTR *pbstrXML) = 0; - }; -#else - typedef struct ITfInputScopeVtbl { - BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(ITfInputScope *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(ITfInputScope *This); - ULONG (WINAPI *Release)(ITfInputScope *This); - HRESULT (WINAPI *GetInputScopes)(ITfInputScope *This,InputScope **pprgInputScopes,UINT *pcCount); - HRESULT (WINAPI *GetPhrase)(ITfInputScope *This,BSTR **ppbstrPhrases,UINT *pcCount); - HRESULT (WINAPI *GetRegularExpression)(ITfInputScope *This,BSTR *pbstrRegExp); - HRESULT (WINAPI *GetSRGS)(ITfInputScope *This,BSTR *pbstrSRGS); - HRESULT (WINAPI *GetXML)(ITfInputScope *This,BSTR *pbstrXML); + HRESULT (STDMETHODCALLTYPE *GetRegularExpression)( + ITfInputScope* This, + BSTR *pbstrRegExp); + + HRESULT (STDMETHODCALLTYPE *GetSRGS)( + ITfInputScope* This, + BSTR *pbstrSRGS); + + HRESULT (STDMETHODCALLTYPE *GetXML)( + ITfInputScope* This, + BSTR *pbstrXML); + END_INTERFACE - } ITfInputScopeVtbl; - struct ITfInputScope { - CONST_VTBL struct ITfInputScopeVtbl *lpVtbl; - }; +} ITfInputScopeVtbl; +interface ITfInputScope { + CONST_VTBL ITfInputScopeVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define ITfInputScope_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define ITfInputScope_AddRef(This) (This)->lpVtbl->AddRef(This) #define ITfInputScope_Release(This) (This)->lpVtbl->Release(This) +/*** ITfInputScope methods ***/ #define ITfInputScope_GetInputScopes(This,pprgInputScopes,pcCount) (This)->lpVtbl->GetInputScopes(This,pprgInputScopes,pcCount) #define ITfInputScope_GetPhrase(This,ppbstrPhrases,pcCount) (This)->lpVtbl->GetPhrase(This,ppbstrPhrases,pcCount) #define ITfInputScope_GetRegularExpression(This,pbstrRegExp) (This)->lpVtbl->GetRegularExpression(This,pbstrRegExp) #define ITfInputScope_GetSRGS(This,pbstrSRGS) (This)->lpVtbl->GetSRGS(This,pbstrSRGS) #define ITfInputScope_GetXML(This,pbstrXML) (This)->lpVtbl->GetXML(This,pbstrXML) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT ITfInputScope_QueryInterface(ITfInputScope* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG ITfInputScope_AddRef(ITfInputScope* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG ITfInputScope_Release(ITfInputScope* This) { + return This->lpVtbl->Release(This); +} +/*** ITfInputScope methods ***/ +static FORCEINLINE HRESULT ITfInputScope_GetInputScopes(ITfInputScope* This,InputScope **pprgInputScopes,UINT *pcCount) { + return This->lpVtbl->GetInputScopes(This,pprgInputScopes,pcCount); +} +static FORCEINLINE HRESULT ITfInputScope_GetPhrase(ITfInputScope* This,BSTR **ppbstrPhrases,UINT *pcCount) { + return This->lpVtbl->GetPhrase(This,ppbstrPhrases,pcCount); +} +static FORCEINLINE HRESULT ITfInputScope_GetRegularExpression(ITfInputScope* This,BSTR *pbstrRegExp) { + return This->lpVtbl->GetRegularExpression(This,pbstrRegExp); +} +static FORCEINLINE HRESULT ITfInputScope_GetSRGS(ITfInputScope* This,BSTR *pbstrSRGS) { + return This->lpVtbl->GetSRGS(This,pbstrSRGS); +} +static FORCEINLINE HRESULT ITfInputScope_GetXML(ITfInputScope* This,BSTR *pbstrXML) { + return This->lpVtbl->GetXML(This,pbstrXML); +} #endif #endif - HRESULT WINAPI ITfInputScope_GetInputScopes_Proxy(ITfInputScope *This,InputScope **pprgInputScopes,UINT *pcCount); - void __RPC_STUB ITfInputScope_GetInputScopes_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI ITfInputScope_GetPhrase_Proxy(ITfInputScope *This,BSTR **ppbstrPhrases,UINT *pcCount); - void __RPC_STUB ITfInputScope_GetPhrase_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI ITfInputScope_GetRegularExpression_Proxy(ITfInputScope *This,BSTR *pbstrRegExp); - void __RPC_STUB ITfInputScope_GetRegularExpression_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI ITfInputScope_GetSRGS_Proxy(ITfInputScope *This,BSTR *pbstrSRGS); - void __RPC_STUB ITfInputScope_GetSRGS_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI ITfInputScope_GetXML_Proxy(ITfInputScope *This,BSTR *pbstrXML); - void __RPC_STUB ITfInputScope_GetXML_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); + #endif -#endif - extern RPC_IF_HANDLE __MIDL_itf_inputscope_0262_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_inputscope_0262_v0_0_s_ifspec; +HRESULT STDMETHODCALLTYPE ITfInputScope_GetInputScopes_Proxy( + ITfInputScope* This, + InputScope **pprgInputScopes, + UINT *pcCount); +void __RPC_STUB ITfInputScope_GetInputScopes_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfInputScope_GetPhrase_Proxy( + ITfInputScope* This, + BSTR **ppbstrPhrases, + UINT *pcCount); +void __RPC_STUB ITfInputScope_GetPhrase_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfInputScope_GetRegularExpression_Proxy( + ITfInputScope* This, + BSTR *pbstrRegExp); +void __RPC_STUB ITfInputScope_GetRegularExpression_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfInputScope_GetSRGS_Proxy( + ITfInputScope* This, + BSTR *pbstrSRGS); +void __RPC_STUB ITfInputScope_GetSRGS_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE ITfInputScope_GetXML_Proxy( + ITfInputScope* This, + BSTR *pbstrXML); +void __RPC_STUB ITfInputScope_GetXML_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); - ULONG __RPC_API BSTR_UserSize(ULONG *,ULONG,BSTR *); - unsigned char *__RPC_API BSTR_UserMarshal(ULONG *,unsigned char *,BSTR *); - unsigned char *__RPC_API BSTR_UserUnmarshal(ULONG *,unsigned char *,BSTR *); - void __RPC_API BSTR_UserFree(ULONG *,BSTR *); +#endif /* __ITfInputScope_INTERFACE_DEFINED__ */ +/* Begin additional prototypes for all interfaces */ + +ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *); +unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *); +unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *); +void __RPC_USER BSTR_UserFree (ULONG *, BSTR *); + +/* End additional prototypes */ + #ifdef __cplusplus } #endif -#endif + +#endif /* __inputscope_h__ */ Added: trunk/mingw-w64-headers/include/inputscope.idl =================================================================== --- trunk/mingw-w64-headers/include/inputscope.idl (rev 0) +++ trunk/mingw-w64-headers/include/inputscope.idl 2013-05-02 12:08:28 UTC (rev 5835) @@ -0,0 +1,93 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; + +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);") +cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);") + +cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);") + +[ + object, + uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d), + pointer_default(unique) +] +interface ITfInputScope : IUnknown +{ + HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount); + HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount); + HRESULT GetRegularExpression([out] BSTR *pbstrRegExp); + HRESULT GetSRGS([out] BSTR *pbstrSRGS); + HRESULT GetXML([out] BSTR *pbstrXML); +} Property changes on: trunk/mingw-w64-headers/include/inputscope.idl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cj...@us...> - 2013-05-06 09:13:06
|
Revision: 5837 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5837&view=rev Author: cjacek Date: 2013-05-06 09:12:54 +0000 (Mon, 06 May 2013) Log Message: ----------- dxva2api.idl: Moved dxva2api.h declarations to an IDL file. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in trunk/mingw-w64-headers/include/dxva2api.h Added Paths: ----------- trunk/mingw-w64-headers/include/dxva2api.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-05-03 10:10:18 UTC (rev 5836) +++ trunk/mingw-w64-headers/Makefile.am 2013-05-06 09:12:54 UTC (rev 5837) @@ -64,6 +64,7 @@ include/docobj.idl \ include/devicetopology.idl \ include/downloadmgr.idl \ + include/dxva2api.idl \ include/endpointvolume.idl \ include/fusion.idl \ include/fwptypes.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-05-03 10:10:18 UTC (rev 5836) +++ trunk/mingw-w64-headers/Makefile.in 2013-05-06 09:12:54 UTC (rev 5837) @@ -288,6 +288,7 @@ @HAVE_WIDL_TRUE@ include/docobj.idl \ @HAVE_WIDL_TRUE@ include/devicetopology.idl \ @HAVE_WIDL_TRUE@ include/downloadmgr.idl \ +@HAVE_WIDL_TRUE@ include/dxva2api.idl \ @HAVE_WIDL_TRUE@ include/endpointvolume.idl \ @HAVE_WIDL_TRUE@ include/fusion.idl \ @HAVE_WIDL_TRUE@ include/fwptypes.idl \ Modified: trunk/mingw-w64-headers/include/dxva2api.h =================================================================== --- trunk/mingw-w64-headers/include/dxva2api.h 2013-05-03 10:10:18 UTC (rev 5836) +++ trunk/mingw-w64-headers/include/dxva2api.h 2013-05-06 09:12:54 UTC (rev 5837) @@ -1,23 +1,45 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_DXVA2API -#define _INC_DXVA2API -#if (_WIN32_WINNT >= 0x0600) -#include <objbase.h> -#include <d3d9.h> -#include <guiddef.h> +/*** Autogenerated by WIDL 1.5.25 from include/dxva2api.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 __dxva2api_h__ +#define __dxva2api_h__ + +/* Forward declarations */ + +#ifndef __IDirect3DDeviceManager9_FWD_DEFINED__ +#define __IDirect3DDeviceManager9_FWD_DEFINED__ +typedef interface IDirect3DDeviceManager9 IDirect3DDeviceManager9; +#endif + +/* Headers for imported files */ + +#include <unknwn.h> + #ifdef __cplusplus extern "C" { #endif +#if 0 +typedef DWORD IDirect3DDevice9; +typedef DWORD IDirect3DSurface9; +typedef DWORD D3DFORMAT; +typedef DWORD D3DPOOL; +#endif #ifndef __REFERENCE_TIME_DEFINED #define __REFERENCE_TIME_DEFINED typedef LONGLONG REFERENCE_TIME; #endif /*__REFERENCE_TIME_DEFINED*/ - #define DXVA2_ProcAmp_None 0x0000 #define DXVA2_ProcAmp_Brightness 0x0001 #define DXVA2_ProcAmp_Contrast 0x0002 @@ -51,8 +73,6 @@ DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5); DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5); - -typedef struct IDirect3DDeviceManager9 IDirect3DDeviceManager9; typedef struct IDirectXVideoDecoderService IDirectXVideoDecoderService; typedef enum _DXVA2_SampleFormat { @@ -410,13 +430,222 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *pResetToken,IDirect3DDeviceManager9 **ppDXVAManager); HRESULT WINAPI DXVA2CreateVideoService(IDirect3DDevice9 *pDD,REFIID riid,void **ppService); +/***************************************************************************** + * IDirect3DDeviceManager9 interface + */ +#ifndef __IDirect3DDeviceManager9_INTERFACE_DEFINED__ +#define __IDirect3DDeviceManager9_INTERFACE_DEFINED__ -#ifdef __cplusplus +DEFINE_GUID(IID_IDirect3DDeviceManager9, 0xa0cade0f, 0x06d5, 0x4cf4, 0xa1,0xc7, 0xf3,0xcd,0xd7,0x25,0xaa,0x75); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("a0cade0f-06d5-4cf4-a1c7-f3cdd725aa75") +IDirect3DDeviceManager9 : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE ResetDevice( + IDirect3DDevice9 *pDevice, + UINT resetToken) = 0; + + virtual HRESULT STDMETHODCALLTYPE OpenDeviceHandle( + HANDLE *phDevice) = 0; + + virtual HRESULT STDMETHODCALLTYPE CloseDeviceHandle( + HANDLE hDevice) = 0; + + virtual HRESULT STDMETHODCALLTYPE TestDevice( + HANDLE hDevice) = 0; + + virtual HRESULT STDMETHODCALLTYPE LockDevice( + HANDLE hDevice, + IDirect3DDevice9 **ppDevice, + WINBOOL fBlock) = 0; + + virtual HRESULT STDMETHODCALLTYPE UnlockDevice( + HANDLE hDevice, + WINBOOL fSaveState) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetVideoService( + HANDLE hDevice, + REFIID riid, + void **ppService) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DDeviceManager9, 0xa0cade0f, 0x06d5, 0x4cf4, 0xa1,0xc7, 0xf3,0xcd,0xd7,0x25,0xaa,0x75) +#endif +#else +typedef struct IDirect3DDeviceManager9Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IDirect3DDeviceManager9* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IDirect3DDeviceManager9* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IDirect3DDeviceManager9* This); + + /*** IDirect3DDeviceManager9 methods ***/ + HRESULT (STDMETHODCALLTYPE *ResetDevice)( + IDirect3DDeviceManager9* This, + IDirect3DDevice9 *pDevice, + UINT resetToken); + + HRESULT (STDMETHODCALLTYPE *OpenDeviceHandle)( + IDirect3DDeviceManager9* This, + HANDLE *phDevice); + + HRESULT (STDMETHODCALLTYPE *CloseDeviceHandle)( + IDirect3DDeviceManager9* This, + HANDLE hDevice); + + HRESULT (STDMETHODCALLTYPE *TestDevice)( + IDirect3DDeviceManager9* This, + HANDLE hDevice); + + HRESULT (STDMETHODCALLTYPE *LockDevice)( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + IDirect3DDevice9 **ppDevice, + WINBOOL fBlock); + + HRESULT (STDMETHODCALLTYPE *UnlockDevice)( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + WINBOOL fSaveState); + + HRESULT (STDMETHODCALLTYPE *GetVideoService)( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + REFIID riid, + void **ppService); + + END_INTERFACE +} IDirect3DDeviceManager9Vtbl; +interface IDirect3DDeviceManager9 { + CONST_VTBL IDirect3DDeviceManager9Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IDirect3DDeviceManager9_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IDirect3DDeviceManager9_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IDirect3DDeviceManager9_Release(This) (This)->lpVtbl->Release(This) +/*** IDirect3DDeviceManager9 methods ***/ +#define IDirect3DDeviceManager9_ResetDevice(This,pDevice,resetToken) (This)->lpVtbl->ResetDevice(This,pDevice,resetToken) +#define IDirect3DDeviceManager9_OpenDeviceHandle(This,phDevice) (This)->lpVtbl->OpenDeviceHandle(This,phDevice) +#define IDirect3DDeviceManager9_CloseDeviceHandle(This,hDevice) (This)->lpVtbl->CloseDeviceHandle(This,hDevice) +#define IDirect3DDeviceManager9_TestDevice(This,hDevice) (This)->lpVtbl->TestDevice(This,hDevice) +#define IDirect3DDeviceManager9_LockDevice(This,hDevice,ppDevice,fBlock) (This)->lpVtbl->LockDevice(This,hDevice,ppDevice,fBlock) +#define IDirect3DDeviceManager9_UnlockDevice(This,hDevice,fSaveState) (This)->lpVtbl->UnlockDevice(This,hDevice,fSaveState) +#define IDirect3DDeviceManager9_GetVideoService(This,hDevice,riid,ppService) (This)->lpVtbl->GetVideoService(This,hDevice,riid,ppService) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IDirect3DDeviceManager9_QueryInterface(IDirect3DDeviceManager9* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); } +static FORCEINLINE ULONG IDirect3DDeviceManager9_AddRef(IDirect3DDeviceManager9* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IDirect3DDeviceManager9_Release(IDirect3DDeviceManager9* This) { + return This->lpVtbl->Release(This); +} +/*** IDirect3DDeviceManager9 methods ***/ +static FORCEINLINE HRESULT IDirect3DDeviceManager9_ResetDevice(IDirect3DDeviceManager9* This,IDirect3DDevice9 *pDevice,UINT resetToken) { + return This->lpVtbl->ResetDevice(This,pDevice,resetToken); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_OpenDeviceHandle(IDirect3DDeviceManager9* This,HANDLE *phDevice) { + return This->lpVtbl->OpenDeviceHandle(This,phDevice); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_CloseDeviceHandle(IDirect3DDeviceManager9* This,HANDLE hDevice) { + return This->lpVtbl->CloseDeviceHandle(This,hDevice); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_TestDevice(IDirect3DDeviceManager9* This,HANDLE hDevice) { + return This->lpVtbl->TestDevice(This,hDevice); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_LockDevice(IDirect3DDeviceManager9* This,HANDLE hDevice,IDirect3DDevice9 **ppDevice,WINBOOL fBlock) { + return This->lpVtbl->LockDevice(This,hDevice,ppDevice,fBlock); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_UnlockDevice(IDirect3DDeviceManager9* This,HANDLE hDevice,WINBOOL fSaveState) { + return This->lpVtbl->UnlockDevice(This,hDevice,fSaveState); +} +static FORCEINLINE HRESULT IDirect3DDeviceManager9_GetVideoService(IDirect3DDeviceManager9* This,HANDLE hDevice,REFIID riid,void **ppService) { + return This->lpVtbl->GetVideoService(This,hDevice,riid,ppService); +} #endif +#endif -/* COM Interfaces */ +#endif +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_ResetDevice_Proxy( + IDirect3DDeviceManager9* This, + IDirect3DDevice9 *pDevice, + UINT resetToken); +void __RPC_STUB IDirect3DDeviceManager9_ResetDevice_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_OpenDeviceHandle_Proxy( + IDirect3DDeviceManager9* This, + HANDLE *phDevice); +void __RPC_STUB IDirect3DDeviceManager9_OpenDeviceHandle_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_CloseDeviceHandle_Proxy( + IDirect3DDeviceManager9* This, + HANDLE hDevice); +void __RPC_STUB IDirect3DDeviceManager9_CloseDeviceHandle_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_TestDevice_Proxy( + IDirect3DDeviceManager9* This, + HANDLE hDevice); +void __RPC_STUB IDirect3DDeviceManager9_TestDevice_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_LockDevice_Proxy( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + IDirect3DDevice9 **ppDevice, + WINBOOL fBlock); +void __RPC_STUB IDirect3DDeviceManager9_LockDevice_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_UnlockDevice_Proxy( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + WINBOOL fSaveState); +void __RPC_STUB IDirect3DDeviceManager9_UnlockDevice_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_GetVideoService_Proxy( + IDirect3DDeviceManager9* This, + HANDLE hDevice, + REFIID riid, + void **ppService); +void __RPC_STUB IDirect3DDeviceManager9_GetVideoService_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IDirect3DDeviceManager9_INTERFACE_DEFINED__ */ + #undef INTERFACE #define INTERFACE IDirectXVideoDecoder DECLARE_INTERFACE_(IDirectXVideoDecoder,IUnknown) @@ -507,41 +736,13 @@ #define IDirectXVideoDecoderService_GetDecoderConfigurations(This,Guid,pVideoDesc,pReserved,pCount,ppConfigs) (This)->lpVtbl->GetDecoderConfigurations(This,Guid,pVideoDesc,pReserved,pCount,ppConfigs) #define IDirectXVideoDecoderService_CreateVideoDecoder(This,Guid,pVideoDesc,pConfig,ppDecoderRenderTargets,NumSurfaces,ppDecode) (This)->lpVtbl->CreateVideoDecoder(This,Guid,pVideoDesc,pConfig,ppDecoderRenderTargets,NumSurfaces,ppDecode) #endif /*COBJMACROS*/ +/* Begin additional prototypes for all interfaces */ -#undef INTERFACE -#define INTERFACE IDirect3DDeviceManager9 -DECLARE_INTERFACE_(IDirect3DDeviceManager9,IUnknown) -{ - BEGIN_INTERFACE - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; +/* End additional prototypes */ - /* IDirect3DDeviceManager9 methods */ - STDMETHOD_(HRESULT,ResetDevice)(THIS_ IDirect3DDevice9 *pDevice,UINT resetToken) PURE; - STDMETHOD_(HRESULT,OpenDeviceHandle)(THIS_ HANDLE *phDevice) PURE; - STDMETHOD_(HRESULT,CloseDeviceHandle)(THIS_ HANDLE hDevice) PURE; - STDMETHOD_(HRESULT,TestDevice)(THIS_ HANDLE hDevice) PURE; - STDMETHOD_(HRESULT,LockDevice)(THIS_ HANDLE hDevice,IDirect3DDevice9 **ppDevice,WINBOOL fBlock) PURE; - STDMETHOD_(HRESULT,UnlockDevice)(THIS_ HANDLE hDevice,BOOL fSaveState) PURE; - STDMETHOD_(HRESULT,GetVideoService)(THIS_ HANDLE hDevice,REFIID riid,void **ppService) PURE; +#ifdef __cplusplus +} +#endif - END_INTERFACE -}; -#ifdef COBJMACROS -#define IDirect3DDeviceManager9_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -#define IDirect3DDeviceManager9_AddRef(This) (This)->lpVtbl->AddRef(This) -#define IDirect3DDeviceManager9_Release(This) (This)->lpVtbl->Release(This) -#define IDirect3DDeviceManager9_ResetDevice(This,pDevice,resetToken) (This)->lpVtbl->ResetDevice(This,pDevice,resetToken) -#define IDirect3DDeviceManager9_OpenDeviceHandle(This,phDevice) (This)->lpVtbl->OpenDeviceHandle(This,phDevice) -#define IDirect3DDeviceManager9_CloseDeviceHandle(This,hDevice) (This)->lpVtbl->CloseDeviceHandle(This,hDevice) -#define IDirect3DDeviceManager9_TestDevice(This,hDevice) (This)->lpVtbl->TestDevice(This,hDevice) -#define IDirect3DDeviceManager9_LockDevice(This,hDevice,ppDevice,fBlock) (This)->lpVtbl->LockDevice(This,hDevice,ppDevice,fBlock) -#define IDirect3DDeviceManager9_UnlockDevice(This,hDevice,fSaveState) (This)->lpVtbl->UnlockDevice(This,hDevice,fSaveState) -#define IDirect3DDeviceManager9_GetVideoService(This,hDevice,riid,ppService) (This)->lpVtbl->GetVideoService(This,hDevice,riid,ppService) -#endif /*COBJMACROS*/ - -#endif /*(_WIN32_WINNT >= 0x0600)*/ -#endif /*_INC_DXVA2API*/ +#endif /* __dxva2api_h__ */ Added: trunk/mingw-w64-headers/include/dxva2api.idl =================================================================== --- trunk/mingw-w64-headers/include/dxva2api.idl (rev 0) +++ trunk/mingw-w64-headers/include/dxva2api.idl 2013-05-06 09:12:54 UTC (rev 5837) @@ -0,0 +1,518 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +import "unknwn.idl"; + +/* Fake widl types */ +cpp_quote("#if 0") +typedef DWORD IDirect3DDevice9; +typedef DWORD IDirect3DSurface9; +typedef DWORD D3DFORMAT; +typedef DWORD D3DPOOL; +cpp_quote("#endif") + +cpp_quote("#ifndef __REFERENCE_TIME_DEFINED") +cpp_quote("#define __REFERENCE_TIME_DEFINED") +cpp_quote("typedef LONGLONG REFERENCE_TIME;") +cpp_quote("#endif /*__REFERENCE_TIME_DEFINED*/") + +cpp_quote("#define DXVA2_ProcAmp_None 0x0000") +cpp_quote("#define DXVA2_ProcAmp_Brightness 0x0001") +cpp_quote("#define DXVA2_ProcAmp_Contrast 0x0002") +cpp_quote("#define DXVA2_ProcAmp_Hue 0x0004") +cpp_quote("#define DXVA2_ProcAmp_Saturation 0x0008") +cpp_quote("") +cpp_quote("#define DXVA2_E_NOT_INITIALIZED MAKE_HRESULT(1, 4, 4096)") +cpp_quote("#define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)") +cpp_quote("#define DXVA2_E_VIDEO_DEVICE_LOCKED MAKE_HRESULT(1, 4, 4098)") +cpp_quote("#define DXVA2_E_NOT_AVAILABLE MAKE_HRESULT(1, 4, 4099)") +cpp_quote("") +cpp_quote("DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551, 0xd5e7, 0x11d9, 0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);") +cpp_quote("DEFINE_GUID(IID_IDirectXVideoAccelerationService, 0xfc51a550, 0xd5e7, 0x11d9, 0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);") +cpp_quote("") +cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0,0x4563, 0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);") +cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);") +cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("") +cpp_quote("typedef struct IDirectXVideoDecoderService IDirectXVideoDecoderService;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_SampleFormat {") +cpp_quote(" DXVA2_SampleFormatMask = 0x00FF,") +cpp_quote(" DXVA2_SampleUnknown = 0,") +cpp_quote(" DXVA2_SampleProgressiveFrame = 2,") +cpp_quote(" DXVA2_SampleFieldInterleavedEvenFirst = 3,") +cpp_quote(" DXVA2_SampleFieldInterleavedOddFirst = 4,") +cpp_quote(" DXVA2_SampleFieldSingleEven = 5,") +cpp_quote(" DXVA2_SampleFieldSingleOdd = 6,") +cpp_quote(" DXVA2_SampleSubStream = 7 ") +cpp_quote("} DXVA2_SampleFormat;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_VideoChromaSubSampling {") +cpp_quote(" DXVA2_VideoChromaSubsamplingMask = 0x0F,") +cpp_quote(" DXVA2_VideoChromaSubsampling_Unknown = 0,") +cpp_quote(" DXVA2_VideoChromaSubsampling_ProgressiveChroma = 0x8,") +cpp_quote(" DXVA2_VideoChromaSubsampling_Horizontally_Cosited = 0x4,") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_Cosited = 0x2,") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1,") +cpp_quote(" DXVA2_VideoChromaSubsampling_MPEG2 = ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Horizontally_Cosited |") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes,") +cpp_quote(" DXVA2_VideoChromaSubsampling_MPEG1 = ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes,") +cpp_quote(" DXVA2_VideoChromaSubsampling_DV_PAL = ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Horizontally_Cosited | ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_Cosited,") +cpp_quote(" DXVA2_VideoChromaSubsampling_Cosited = ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Horizontally_Cosited | ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_Cosited | ") +cpp_quote(" DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes ") +cpp_quote("} DXVA2_VideoChromaSubSampling;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_NominalRange {") +cpp_quote(" DXVA2_NominalRangeMask = 0x07,") +cpp_quote(" DXVA2_NominalRange_Unknown = 0,") +cpp_quote(" DXVA2_NominalRange_Normal = 1,") +cpp_quote(" DXVA2_NominalRange_Wide = 2,") +cpp_quote(" DXVA2_NominalRange_0_255 = 1,") +cpp_quote(" DXVA2_NominalRange_16_235 = 2,") +cpp_quote(" DXVA2_NominalRange_48_208 = 3 ") +cpp_quote("} DXVA2_NominalRange;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_VideoLighting {") +cpp_quote(" DXVA2_VideoLightingMask = 0x0F,") +cpp_quote(" DXVA2_VideoLighting_Unknown = 0,") +cpp_quote(" DXVA2_VideoLighting_bright = 1,") +cpp_quote(" DXVA2_VideoLighting_office = 2,") +cpp_quote(" DXVA2_VideoLighting_dim = 3,") +cpp_quote(" DXVA2_VideoLighting_dark = 4 ") +cpp_quote("} DXVA2_VideoLighting;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_VideoPrimaries {") +cpp_quote(" DXVA2_VideoPrimariesMask = 0x001f,") +cpp_quote(" DXVA2_VideoPrimaries_Unknown = 0,") +cpp_quote(" DXVA2_VideoPrimaries_reserved = 1,") +cpp_quote(" DXVA2_VideoPrimaries_BT709 = 2,") +cpp_quote(" DXVA2_VideoPrimaries_BT470_2_SysM = 3,") +cpp_quote(" DXVA2_VideoPrimaries_BT470_2_SysBG = 4,") +cpp_quote(" DXVA2_VideoPrimaries_SMPTE170M = 5,") +cpp_quote(" DXVA2_VideoPrimaries_SMPTE240M = 6,") +cpp_quote(" DXVA2_VideoPrimaries_EBU3213 = 7,") +cpp_quote(" DXVA2_VideoPrimaries_SMPTE_C = 8 ") +cpp_quote("} DXVA2_VideoPrimaries;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_VideoTransferFunction {") +cpp_quote(" DXVA2_VideoTransFuncMask = 0x001f,") +cpp_quote(" DXVA2_VideoTransFunc_Unknown = 0,") +cpp_quote(" DXVA2_VideoTransFunc_10 = 1,") +cpp_quote(" DXVA2_VideoTransFunc_18 = 2,") +cpp_quote(" DXVA2_VideoTransFunc_20 = 3,") +cpp_quote(" DXVA2_VideoTransFunc_22 = 4,") +cpp_quote(" DXVA2_VideoTransFunc_709 = 5,") +cpp_quote(" DXVA2_VideoTransFunc_240M = 6,") +cpp_quote(" DXVA2_VideoTransFunc_sRGB = 7,") +cpp_quote(" DXVA2_VideoTransFunc_28 = 8 ") +cpp_quote("} DXVA2_VideoTransferFunction;") +cpp_quote("") +cpp_quote("typedef enum {") +cpp_quote(" DXVA2_SurfaceType_DecoderRenderTarget = 0,") +cpp_quote(" DXVA2_SurfaceType_ProcessorRenderTarget = 1,") +cpp_quote(" DXVA2_SurfaceType_D3DRenderTargetTexture = 2 ") +cpp_quote("} DXVA2_SurfaceType;") +cpp_quote("") +cpp_quote("typedef enum _DXVA2_VideoTransferMatrix {") +cpp_quote(" DXVA2_VideoTransferMatrixMask = 0x07,") +cpp_quote(" DXVA2_VideoTransferMatrix_Unknown = 0,") +cpp_quote(" DXVA2_VideoTransferMatrix_BT709 = 1,") +cpp_quote(" DXVA2_VideoTransferMatrix_BT601 = 2,") +cpp_quote(" DXVA2_VideoTransferMatrix_SMPTE240M = 3 ") +cpp_quote("} DXVA2_VideoTransferMatrix;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_AYUVSample16 {") +cpp_quote(" USHORT Cr;") +cpp_quote(" USHORT Cb;") +cpp_quote(" USHORT Y;") +cpp_quote(" USHORT Alpha;") +cpp_quote("} DXVA2_AYUVSample16;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_AYUVSample8 {") +cpp_quote(" UCHAR Cr;") +cpp_quote(" UCHAR Cb;") +cpp_quote(" UCHAR Y;") +cpp_quote(" UCHAR Alpha;") +cpp_quote("} DXVA2_AYUVSample8;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_ConfigPictureDecode {") +cpp_quote(" GUID guidConfigBitstreamEncryption;") +cpp_quote(" GUID guidConfigMBcontrolEncryption;") +cpp_quote(" GUID guidConfigResidDiffEncryption;") +cpp_quote(" UINT ConfigBitstreamRaw;") +cpp_quote(" UINT ConfigMBcontrolRasterOrder;") +cpp_quote(" UINT ConfigResidDiffHost;") +cpp_quote(" UINT ConfigSpatialResid8;") +cpp_quote(" UINT ConfigResid8Subtraction;") +cpp_quote(" UINT ConfigSpatialHost8or9Clipping;") +cpp_quote(" UINT ConfigSpatialResidInterleaved;") +cpp_quote(" UINT ConfigIntraResidUnsigned;") +cpp_quote(" UINT ConfigResidDiffAccelerator;") +cpp_quote(" UINT ConfigHostInverseScan;") +cpp_quote(" UINT ConfigSpecificIDCT;") +cpp_quote(" UINT Config4GroupedCoefs;") +cpp_quote(" USHORT ConfigMinRenderTargetBuffCount;") +cpp_quote(" USHORT ConfigDecoderSpecific;") +cpp_quote("} DXVA2_ConfigPictureDecode;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_DecodeBufferDesc {") +cpp_quote(" DWORD CompressedBufferType;") +cpp_quote(" UINT BufferIndex;") +cpp_quote(" UINT DataOffset;") +cpp_quote(" UINT DataSize;") +cpp_quote(" UINT FirstMBaddress;") +cpp_quote(" UINT NumMBsInBuffer;") +cpp_quote(" UINT Width;") +cpp_quote(" UINT Height;") +cpp_quote(" UINT Stride;") +cpp_quote(" UINT ReservedBits;") +cpp_quote(" PVOID pvPVPState;") +cpp_quote("} DXVA2_DecodeBufferDesc;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_DecodeExtensionData {") +cpp_quote(" UINT Function;") +cpp_quote(" PVOID pPrivateInputData;") +cpp_quote(" UINT PrivateInputDataSize;") +cpp_quote(" PVOID pPrivateOutputData;") +cpp_quote(" UINT PrivateOutputDataSize;") +cpp_quote("} DXVA2_DecodeExtensionData;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_DecodeExecuteParams {") +cpp_quote(" UINT NumCompBuffers;") +cpp_quote(" DXVA2_DecodeBufferDesc *pCompressedBuffers;") +cpp_quote(" DXVA2_DecodeExtensionData *pExtensionData;") +cpp_quote("} DXVA2_DecodeExecuteParams;") +cpp_quote("") +cpp_quote("typedef struct {") +cpp_quote(" __C89_NAMELESS union {") +cpp_quote(" __C89_NAMELESS struct {") +cpp_quote(" UINT SampleFormat :8;") +cpp_quote(" UINT VideoChromaSubsampling :4;") +cpp_quote(" UINT NominalRange :3;") +cpp_quote(" UINT VideoTransferMatrix :3;") +cpp_quote(" UINT VideoLighting :4;") +cpp_quote(" UINT VideoPrimaries :5;") +cpp_quote(" UINT VideoTransferFunction :5;") +cpp_quote(" } DUMMYSTRUCTNAME;") +cpp_quote(" UINT value;") +cpp_quote(" } DUMMYUNIONNAME;") +cpp_quote("} DXVA2_ExtendedFormat;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_Fixed32 {") +cpp_quote(" __C89_NAMELESS union {") +cpp_quote(" __C89_NAMELESS struct {") +cpp_quote(" USHORT Fraction;") +cpp_quote(" SHORT Value;") +cpp_quote(" } DUMMYSTRUCTNAME;") +cpp_quote(" LONG ll;") +cpp_quote(" } DUMMYUNIONNAME;") +cpp_quote("} DXVA2_Fixed32;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_FilterValues {") +cpp_quote(" DXVA2_Fixed32 Level;") +cpp_quote(" DXVA2_Fixed32 Threshold;") +cpp_quote(" DXVA2_Fixed32 Radius;") +cpp_quote("} DXVA2_FilterValues;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_Frequency {") +cpp_quote(" UINT Numerator;") +cpp_quote(" UINT Denominator;") +cpp_quote("} DXVA2_Frequency;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_ProcAmpValues {") +cpp_quote(" DXVA2_Fixed32 Brightness;") +cpp_quote(" DXVA2_Fixed32 Contrast;") +cpp_quote(" DXVA2_Fixed32 Hue;") +cpp_quote(" DXVA2_Fixed32 Saturation;") +cpp_quote("} DXVA2_ProcAmpValues;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_ValueRange {") +cpp_quote(" DXVA2_Fixed32 MinValue;") +cpp_quote(" DXVA2_Fixed32 MaxValue;") +cpp_quote(" DXVA2_Fixed32 DefaultValue;") +cpp_quote(" DXVA2_Fixed32 StepSize;") +cpp_quote("} DXVA2_ValueRange;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_VideoDesc {") +cpp_quote(" UINT SampleWidth;") +cpp_quote(" UINT SampleHeight;") +cpp_quote(" DXVA2_ExtendedFormat SampleFormat;") +cpp_quote(" D3DFORMAT Format;") +cpp_quote(" DXVA2_Frequency InputSampleFreq;") +cpp_quote(" DXVA2_Frequency OutputFrameFreq;") +cpp_quote(" UINT UABProtectionLevel;") +cpp_quote(" UINT Reserved;") +cpp_quote("} DXVA2_VideoDesc;") +cpp_quote("") +cpp_quote("/* DeviceCaps") +cpp_quote("DXVA2_VPDev_EmulatedDXVA1") +cpp_quote("DXVA2_VPDev_HardwareDevice") +cpp_quote("DXVA2_VPDev_SoftwareDevice") +cpp_quote("*/") +cpp_quote("/* DeinterlaceTechnology") +cpp_quote("DXVA2_DeinterlaceTech_Unknown") +cpp_quote("DXVA2_DeinterlaceTech_BOBLineReplicate") +cpp_quote("DXVA2_DeinterlaceTech_BOBVerticalStretch") +cpp_quote("DXVA2_DeinterlaceTech_BOBVerticalStretch4Tap") +cpp_quote("DXVA2_DeinterlaceTech_MedianFiltering") +cpp_quote("DXVA2_DeinterlaceTech_EdgeFiltering") +cpp_quote("DXVA2_DeinterlaceTech_FieldAdaptive") +cpp_quote("DXVA2_DeinterlaceTech_PixelAdaptive") +cpp_quote("DXVA2_DeinterlaceTech_MotionVectorSteered") +cpp_quote("DXVA2_DeinterlaceTech_InverseTelecine") +cpp_quote("*/") +cpp_quote("") +cpp_quote("/* VideoProcessorOperations") +cpp_quote("DXVA2_VideoProcess_YUV2RGB") +cpp_quote("DXVA2_VideoProcess_StretchX") +cpp_quote("DXVA2_VideoProcess_StretchY") +cpp_quote("DXVA2_VideoProcess_AlphaBlend") +cpp_quote("DXVA2_VideoProcess_SubRects") +cpp_quote("DXVA2_VideoProcess_SubStreams") +cpp_quote("DXVA2_VideoProcess_SubStreamsExtended") +cpp_quote("DXVA2_VideoProcess_YUV2RGBExtended") +cpp_quote("DXVA2_VideoProcess_AlphaBlendExtended") +cpp_quote("DXVA2_VideoProcess_Constriction") +cpp_quote("DXVA2_VideoProcess_NoiseFilter") +cpp_quote("DXVA2_VideoProcess_DetailFilter") +cpp_quote("DXVA2_VideoProcess_PlanarAlpha") +cpp_quote("DXVA2_VideoProcess_LinearScaling") +cpp_quote("DXVA2_VideoProcess_GammaCompensated") +cpp_quote("DXVA2_VideoProcess_MaintainsOriginalFieldData") +cpp_quote("*/") +cpp_quote("") +cpp_quote("/*NoiseFilterTechnology") +cpp_quote("DXVA2_NoiseFilterTech_Unsupported") +cpp_quote("DXVA2_NoiseFilterTech_Unknown") +cpp_quote("DXVA2_NoiseFilterTech_Median") +cpp_quote("DXVA2_NoiseFilterTech_Temporal") +cpp_quote("DXVA2_NoiseFilterTech_BlockNoise") +cpp_quote("DXVA2_NoiseFilterTech_MosquitoNoise") +cpp_quote("*/") +cpp_quote("") +cpp_quote("/* DetailFilterTechnology") +cpp_quote("DXVA2_DetailFilterTech_Unsupported") +cpp_quote("DXVA2_DetailFilterTech_Unknown") +cpp_quote("DXVA2_DetailFilterTech_Edge") +cpp_quote("DXVA2_DetailFilterTech_Sharpening") +cpp_quote("*/") +cpp_quote("typedef struct _DXVA2_VideoProcessBltParams {") +cpp_quote(" REFERENCE_TIME TargetFrame;") +cpp_quote(" RECT TargetRect;") +cpp_quote(" SIZE ConstrictionSize;") +cpp_quote(" UINT StreamingFlags;") +cpp_quote(" DXVA2_AYUVSample16 BackgroundColor;") +cpp_quote(" DXVA2_ExtendedFormat DestFormat;") +cpp_quote(" DXVA2_ProcAmpValues ProcAmpValues;") +cpp_quote(" DXVA2_Fixed32 Alpha;") +cpp_quote(" DXVA2_FilterValues NoiseFilterLuma;") +cpp_quote(" DXVA2_FilterValues NoiseFilterChroma;") +cpp_quote(" DXVA2_FilterValues DetailFilterLuma;") +cpp_quote(" DXVA2_FilterValues DetailFilterChroma;") +cpp_quote(" DWORD DestData;") +cpp_quote("} DXVA2_VideoProcessBltParams;") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_VideoProcessorCaps {") +cpp_quote(" UINT DeviceCaps;") +cpp_quote(" D3DPOOL InputPool;") +cpp_quote(" UINT NumForwardRefSamples;") +cpp_quote(" UINT NumBackwardRefSamples;") +cpp_quote(" UINT Reserved;") +cpp_quote(" UINT DeinterlaceTechnology;") +cpp_quote(" UINT ProcAmpControlCaps;") +cpp_quote(" UINT VideoProcessorOperations;") +cpp_quote(" UINT NoiseFilterTechnology;") +cpp_quote(" UINT DetailFilterTechnology;") +cpp_quote("} DXVA2_VideoProcessorCaps;") +cpp_quote("") +cpp_quote("/* SampleData") +cpp_quote("DXVA2_SampleData_RFF") +cpp_quote("DXVA2_SampleData_TFF") +cpp_quote("DXVA2_SampleData_RFF_TFF_Present") +cpp_quote("*/") +cpp_quote("") +cpp_quote("typedef struct _DXVA2_VideoSample {") +cpp_quote(" REFERENCE_TIME Start;") +cpp_quote(" REFERENCE_TIME End;") +cpp_quote(" DXVA2_ExtendedFormat SampleFormat;") +cpp_quote(" IDirect3DSurface9* SrcSurface;") +cpp_quote(" RECT SrcRect;") +cpp_quote(" RECT DstRect;") +cpp_quote(" DXVA2_AYUVSample8 Pal[16];") +cpp_quote(" DXVA2_Fixed32 PlanarAlpha;") +cpp_quote(" DWORD SampleData;") +cpp_quote("} DXVA2_VideoSample;") +cpp_quote("") +cpp_quote("/* Constants */") +cpp_quote("") +cpp_quote("#define DXVA2_VideoDecoderRenderTarget 0") +cpp_quote("#define DXVA2_VideoProcessorRenderTarget 1") +cpp_quote("#define DXVA2_VideoSoftwareRenderTarget 2") +cpp_quote("") +cpp_quote("/* CompressedBufferType */") +cpp_quote("#define DXVA2_PictureParametersBufferType 0") +cpp_quote("#define DXVA2_MacroBlockControlBufferType 1") +cpp_quote("#define DXVA2_ResidualDifferenceBufferType 2") +cpp_quote("#define DXVA2_DeblockingControlBufferType 3") +cpp_quote("#define DXVA2_InverseQuantizationMatrixBufferType 4") +cpp_quote("#define DXVA2_SliceControlBufferType 5") +cpp_quote("#define DXVA2_BitStreamDateBufferType 6") +cpp_quote("#define DXVA2_MotionVectorBuffer 7") +cpp_quote("#define DXVA2_FilmGrainBuffer 8") +cpp_quote("") +cpp_quote("__forceinline const DXVA2_Fixed32 DXVA2_Fixed32OpaqueAlpha (void) {") +cpp_quote(" DXVA2_Fixed32 f32;") +cpp_quote(" f32.ll = 0 + (1 << 16);") +cpp_quote(" return f32;") +cpp_quote("}") +cpp_quote("") +cpp_quote("__forceinline const DXVA2_Fixed32 DXVA2_Fixed32TransparentAlpha (void) {") +cpp_quote(" DXVA2_Fixed32 f32;") +cpp_quote(" f32.ll = 0;") +cpp_quote(" return f32;") +cpp_quote("}") +cpp_quote("") +cpp_quote("__forceinline float DXVA2FixedToFloat (const DXVA2_Fixed32 f32) {") +cpp_quote(" return (float)f32.Value + (float)f32.Fraction / (1 << 16);") +cpp_quote("}") +cpp_quote("") +cpp_quote("__forceinline DXVA2_Fixed32 DXVA2FloatToFixed (const float f) {") +cpp_quote(" DXVA2_Fixed32 f32;") +cpp_quote(" f32.Value = ((ULONG) (f * (1 << 16))) >> 16;") +cpp_quote(" f32.Fraction = ((ULONG) (f * (1 << 16))) & 0xFFFF;") +cpp_quote(" return f32;") +cpp_quote("}") +cpp_quote("") +cpp_quote("HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *pResetToken,IDirect3DDeviceManager9 **ppDXVAManager);") +cpp_quote("HRESULT WINAPI DXVA2CreateVideoService(IDirect3DDevice9 *pDD,REFIID riid,void **ppService);") + +[ + object, + uuid(a0cade0f-06d5-4cf4-a1c7-f3cdd725aa75), + local +] +interface IDirect3DDeviceManager9 : IUnknown +{ + HRESULT ResetDevice([in] IDirect3DDevice9 *pDevice, [in] UINT resetToken); + HRESULT OpenDeviceHandle([out] HANDLE *phDevice); + HRESULT CloseDeviceHandle([in] HANDLE hDevice); + HRESULT TestDevice([in] HANDLE hDevice); + HRESULT LockDevice([in] HANDLE hDevice, [out] IDirect3DDevice9 **ppDevice, [in] BOOL fBlock); + HRESULT UnlockDevice([in] HANDLE hDevice, [in] BOOL fSaveState); + HRESULT GetVideoService([in] HANDLE hDevice, [in] REFIID riid, [out] void **ppService); +} + +cpp_quote("#undef INTERFACE") +cpp_quote("#define INTERFACE IDirectXVideoDecoder") +cpp_quote("DECLARE_INTERFACE_(IDirectXVideoDecoder,IUnknown)") +cpp_quote("{") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote("") +cpp_quote(" /* IUnknown methods */") +cpp_quote(" STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;") +cpp_quote(" STDMETHOD_(ULONG, AddRef)(THIS) PURE;") +cpp_quote(" STDMETHOD_(ULONG, Release)(THIS) PURE;") +cpp_quote("") +cpp_quote(" /* IDirectXVideoDecoder methods */") +cpp_quote(" STDMETHOD_(HRESULT,GetVideoDecoderService)(THIS_ IDirectXVideoDecoderService **ppAccelServices) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetCreationParameters)(THIS_ GUID *pDeviceGuid,DXVA2_VideoDesc *pVideoDesc,DXVA2_ConfigPictureDecode *pConfig,IDirect3DSurface9 ***pppDecoderRenderTargets,UINT *pNumSurfaces) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetBuffer)(THIS_ UINT BufferType,void **ppBuffer,UINT *pBufferSize) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,ReleaseBuffer)(THIS_ UINT BufferType) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,BeginFrame)(THIS_ IDirect3DSurface9 *pRenderTarget,void *pvPVPData) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,EndFrame)(THIS_ HANDLE *pHandleComplete) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,Execute)(THIS_ const DXVA2_DecodeExecuteParams *pExecuteParams) PURE;") +cpp_quote("") +cpp_quote(" END_INTERFACE") +cpp_quote("};") +cpp_quote("#ifdef COBJMACROS") +cpp_quote("#define IDirectXVideoDecoder_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)") +cpp_quote("#define IDirectXVideoDecoder_AddRef(This) (This)->lpVtbl->AddRef(This)") +cpp_quote("#define IDirectXVideoDecoder_Release(This) (This)->lpVtbl->Release(This)") +cpp_quote("#define IDirectXVideoDecoder_GetVideoDecoderService(This,ppAccelServices) (This)->lpVtbl->GetVideoDecoderService(This,ppAccelServices)") +cpp_quote("#define IDirectXVideoDecoder_GetCreationParameters(This,pDeviceGuid,pVideoDesc,pConfig,pppDecoderRenderTargets,pNumSurfaces) (This)->lpVtbl->GetCreationParameters(This,pDeviceGuid,pVideoDesc,pConfig,pppDecoderRenderTargets,pNumSurfaces)") +cpp_quote("#define IDirectXVideoDecoder_GetBuffer(This,BufferType,ppBuffer,pBufferSize) (This)->lpVtbl->GetBuffer(This,BufferType,ppBuffer,pBufferSize)") +cpp_quote("#define IDirectXVideoDecoder_ReleaseBuffer(This,BufferType) (This)->lpVtbl->ReleaseBuffer(This,BufferType)") +cpp_quote("#define IDirectXVideoDecoder_BeginFrame(This,pRenderTarget,pvPVPData) (This)->lpVtbl->BeginFrame(This,pRenderTarget,pvPVPData)") +cpp_quote("#define IDirectXVideoDecoder_EndFrame(This,pHandleComplete) (This)->lpVtbl->EndFrame(This,pHandleComplete)") +cpp_quote("#define IDirectXVideoDecoder_Execute(This,pExecuteParams) (This)->lpVtbl->Execute(This,pExecuteParams)") +cpp_quote("#endif /*COBJMACROS*/") +cpp_quote("") +cpp_quote("#undef INTERFACE") +cpp_quote("#define INTERFACE IDirectXVideoAccelerationService") +cpp_quote("DECLARE_INTERFACE_(IDirectXVideoAccelerationService,IUnknown)") +cpp_quote("{") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote("") +cpp_quote(" /* IUnknown methods */") +cpp_quote(" STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;") +cpp_quote(" STDMETHOD_(ULONG, AddRef)(THIS) PURE;") +cpp_quote(" STDMETHOD_(ULONG, Release)(THIS) PURE;") +cpp_quote("") +cpp_quote(" /* IDirectXVideoAccelerationService methods */") +cpp_quote(" STDMETHOD_(HRESULT,CreateSurface)(THIS_ UINT Width,UINT Height,UINT BackBuffers,D3DFORMAT Format,D3DPOOL Pool,DWORD Usage,DWORD DxvaType,IDirect3DSurface9 **ppSurface,HANDLE *pSharedHandle) PURE;") +cpp_quote("") +cpp_quote(" END_INTERFACE") +cpp_quote("};") +cpp_quote("#ifdef COBJMACROS") +cpp_quote("#define IDirectXVideoAccelerationService_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)") +cpp_quote("#define IDirectXVideoAccelerationService_AddRef(This) (This)->lpVtbl->AddRef(This)") +cpp_quote("#define IDirectXVideoAccelerationService_Release(This) (This)->lpVtbl->Release(This)") +cpp_quote("#define IDirectXVideoAccelerationService_CreateSurface(This,Width,Height,BackBuffers,Format,Pool,Usage,DxvaType,ppSurface,pSharedHandle) (This)->lpVtbl->CreateSurface(This,Width,Height,BackBuffers,Format,Pool,Usage,DxvaType,ppSurface,pSharedHandle)") +cpp_quote("#endif /*COBJMACROS*/") +cpp_quote("") +cpp_quote("#undef INTERFACE") +cpp_quote("#define INTERFACE IDirectXVideoDecoderService") +cpp_quote("DECLARE_INTERFACE_(IDirectXVideoDecoderService,IDirectXVideoAccelerationService)") +cpp_quote("{") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote("") +cpp_quote(" /* IUnknown methods */") +cpp_quote(" STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;") +cpp_quote(" STDMETHOD_(ULONG, AddRef)(THIS) PURE;") +cpp_quote(" STDMETHOD_(ULONG, Release)(THIS) PURE;") +cpp_quote("") +cpp_quote(" /* IDirectXVideoAccelerationService methods */") +cpp_quote(" STDMETHOD_(HRESULT,CreateSurface)(THIS_ UINT Width,UINT Height,UINT BackBuffers,D3DFORMAT Format,D3DPOOL Pool,DWORD Usage,DWORD DxvaType,IDirect3DSurface9 **ppSurface,HANDLE *pSharedHandle) PURE;") +cpp_quote(" ") +cpp_quote(" /* IDirectXVideoDecoderService methods */") +cpp_quote(" STDMETHOD_(HRESULT,GetDecoderDeviceGuids)(THIS_ UINT *Count,GUID **pGuids) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetDecoderRenderTargets)(THIS_ REFGUID Guid,UINT *pCount,D3DFORMAT **pFormats) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,GetDecoderConfigurations)(THIS_ REFGUID Guid,const DXVA2_VideoDesc *pVideoDesc,IUnknown *pReserved,UINT *pCount,DXVA2_ConfigPictureDecode **ppConfigs) PURE;") +cpp_quote(" STDMETHOD_(HRESULT,CreateVideoDecoder)(THIS_ REFGUID Guid,const DXVA2_VideoDesc *pVideoDesc,DXVA2_ConfigPictureDecode *pConfig,IDirect3DSurface9 **ppDecoderRenderTargets,UINT NumSurfaces,IDirectXVideoDecoder **ppDecode) PURE;") +cpp_quote("") +cpp_quote(" END_INTERFACE") +cpp_quote("};") +cpp_quote("#ifdef COBJMACROS") +cpp_quote("#define IDirectXVideoDecoderService_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)") +cpp_quote("#define IDirectXVideoDecoderService_AddRef(This) (This)->lpVtbl->AddRef(This)") +cpp_quote("#define IDirectXVideoDecoderService_Release(This) (This)->lpVtbl->Release(This)") +cpp_quote("#define IDirectXVideoDecoderService_CreateSurface(This,Width,Height,BackBuffers,Format,Pool,Usage,DxvaType,ppSurface,pSharedHandle) (This)->lpVtbl->CreateSurface(This,Width,Height,BackBuffers,Format,Pool,Usage,DxvaType,ppSurface,pSharedHandle)") +cpp_quote("#define IDirectXVideoDecoderService_GetDecoderDeviceGuids(This,Count,pGuids) (This)->lpVtbl->GetDecoderDeviceGuids(This,Count,pGuids)") +cpp_quote("#define IDirectXVideoDecoderService_GetDecoderRenderTargets(This,Guid,pCount,pFormats) (This)->lpVtbl->GetDecoderRenderTargets(This,Guid,pCount,pFormats)") +cpp_quote("#define IDirectXVideoDecoderService_GetDecoderConfigurations(This,Guid,pVideoDesc,pReserved,pCount,ppConfigs) (This)->lpVtbl->GetDecoderConfigurations(This,Guid,pVideoDesc,pReserved,pCount,ppConfigs)") +cpp_quote("#define IDirectXVideoDecoderService_CreateVideoDecoder(This,Guid,pVideoDesc,pConfig,ppDecoderRenderTargets,NumSurfaces,ppDecode) (This)->lpVtbl->CreateVideoDecoder(This,Guid,pVideoDesc,pConfig,ppDecoderRenderTargets,NumSurfaces,ppDecode)") +cpp_quote("#endif /*COBJMACROS*/") Property changes on: trunk/mingw-w64-headers/include/dxva2api.idl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wa...@us...> - 2013-06-06 16:29:36
|
Revision: 5882 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5882&view=rev Author: wavael Date: 2013-06-06 16:29:25 +0000 (Thu, 06 Jun 2013) Log Message: ----------- Add IInspectable and IActivationFactory IDLs Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/Makefile.in Added Paths: ----------- trunk/mingw-w64-headers/include/activation.h trunk/mingw-w64-headers/include/activation.idl trunk/mingw-w64-headers/include/inspectable.h trunk/mingw-w64-headers/include/inspectable.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-06-06 14:39:26 UTC (rev 5881) +++ trunk/mingw-w64-headers/Makefile.am 2013-06-06 16:29:25 UTC (rev 5882) @@ -58,6 +58,7 @@ if HAVE_WIDL IDL_SRCS = \ + include/activation.idl \ include/audioclient.idl \ include/audiopolicy.idl \ include/ctfutb.idl \ @@ -71,6 +72,7 @@ include/hstring.idl \ include/iketypes.idl \ include/inputscope.idl \ + include/inspectable.idl \ include/oaidl.idl \ include/ocidl.idl \ include/comcat.idl \ Modified: trunk/mingw-w64-headers/Makefile.in =================================================================== --- trunk/mingw-w64-headers/Makefile.in 2013-06-06 14:39:26 UTC (rev 5881) +++ trunk/mingw-w64-headers/Makefile.in 2013-06-06 16:29:25 UTC (rev 5882) @@ -282,6 +282,7 @@ ddk/include/ddk/*.h @HAVE_WIDL_TRUE@IDL_SRCS = \ +@HAVE_WIDL_TRUE@ include/activation.idl \ @HAVE_WIDL_TRUE@ include/audioclient.idl \ @HAVE_WIDL_TRUE@ include/audiopolicy.idl \ @HAVE_WIDL_TRUE@ include/ctfutb.idl \ @@ -295,6 +296,7 @@ @HAVE_WIDL_TRUE@ include/hstring.idl \ @HAVE_WIDL_TRUE@ include/iketypes.idl \ @HAVE_WIDL_TRUE@ include/inputscope.idl \ +@HAVE_WIDL_TRUE@ include/inspectable.idl \ @HAVE_WIDL_TRUE@ include/oaidl.idl \ @HAVE_WIDL_TRUE@ include/ocidl.idl \ @HAVE_WIDL_TRUE@ include/comcat.idl \ Added: trunk/mingw-w64-headers/include/activation.h =================================================================== --- trunk/mingw-w64-headers/include/activation.h (rev 0) +++ trunk/mingw-w64-headers/include/activation.h 2013-06-06 16:29:25 UTC (rev 5882) @@ -0,0 +1,154 @@ +/*** Autogenerated by WIDL 1.5.19 from include/activation.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 __activation_h__ +#define __activation_h__ + +/* Forward declarations */ + +#ifndef __IActivationFactory_FWD_DEFINED__ +#define __IActivationFactory_FWD_DEFINED__ +typedef interface IActivationFactory IActivationFactory; +#endif + +/* Headers for imported files */ + +#include <inspectable.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * IActivationFactory interface + */ +#ifndef __IActivationFactory_INTERFACE_DEFINED__ +#define __IActivationFactory_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IActivationFactory, 0x00000035, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("00000035-0000-0000-c000-000000000046") +IActivationFactory : public IInspectable +{ + virtual HRESULT STDMETHODCALLTYPE ActivateInstance( + IInspectable **instance) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActivationFactory, 0x00000035, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) +#endif +#else +typedef struct IActivationFactoryVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActivationFactory* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActivationFactory* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActivationFactory* This); + + /*** IInspectable methods ***/ + HRESULT (STDMETHODCALLTYPE *GetIids)( + IActivationFactory* This, + ULONG *iidCount, + IID **iids); + + HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( + IActivationFactory* This, + HSTRING *className); + + HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( + IActivationFactory* This, + TrustLevel *trustLevel); + + /*** IActivationFactory methods ***/ + HRESULT (STDMETHODCALLTYPE *ActivateInstance)( + IActivationFactory* This, + IInspectable **instance); + + END_INTERFACE +} IActivationFactoryVtbl; +interface IActivationFactory { + CONST_VTBL IActivationFactoryVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IActivationFactory_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IActivationFactory_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IActivationFactory_Release(This) (This)->lpVtbl->Release(This) +/*** IInspectable methods ***/ +#define IActivationFactory_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) +#define IActivationFactory_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) +#define IActivationFactory_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) +/*** IActivationFactory methods ***/ +#define IActivationFactory_ActivateInstance(This,instance) (This)->lpVtbl->ActivateInstance(This,instance) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActivationFactory_QueryInterface(IActivationFactory* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActivationFactory_AddRef(IActivationFactory* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IActivationFactory_Release(IActivationFactory* This) { + return This->lpVtbl->Release(This); +} +/*** IInspectable methods ***/ +static FORCEINLINE HRESULT IActivationFactory_GetIids(IActivationFactory* This,ULONG *iidCount,IID **iids) { + return This->lpVtbl->GetIids(This,iidCount,iids); +} +static FORCEINLINE HRESULT IActivationFactory_GetRuntimeClassName(IActivationFactory* This,HSTRING *className) { + return This->lpVtbl->GetRuntimeClassName(This,className); +} +static FORCEINLINE HRESULT IActivationFactory_GetTrustLevel(IActivationFactory* This,TrustLevel *trustLevel) { + return This->lpVtbl->GetTrustLevel(This,trustLevel); +} +/*** IActivationFactory methods ***/ +static FORCEINLINE HRESULT IActivationFactory_ActivateInstance(IActivationFactory* This,IInspectable **instance) { + return This->lpVtbl->ActivateInstance(This,instance); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IActivationFactory_ActivateInstance_Proxy( + IActivationFactory* This, + IInspectable **instance); +void __RPC_STUB IActivationFactory_ActivateInstance_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IActivationFactory_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __activation_h__ */ Property changes on: trunk/mingw-w64-headers/include/activation.h ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/mingw-w64-headers/include/activation.idl =================================================================== --- trunk/mingw-w64-headers/include/activation.idl (rev 0) +++ trunk/mingw-w64-headers/include/activation.idl 2013-06-06 16:29:25 UTC (rev 5882) @@ -0,0 +1,18 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +import "inspectable.idl"; + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance( + [out] IInspectable **instance); +} Property changes on: trunk/mingw-w64-headers/include/activation.idl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/mingw-w64-headers/include/inspectable.h =================================================================== --- trunk/mingw-w64-headers/include/inspectable.h (rev 0) +++ trunk/mingw-w64-headers/include/inspectable.h 2013-06-06 16:29:25 UTC (rev 5882) @@ -0,0 +1,178 @@ +/*** Autogenerated by WIDL 1.5.19 from include/inspectable.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 __inspectable_h__ +#define __inspectable_h__ + +/* Forward declarations */ + +#ifndef __IInspectable_FWD_DEFINED__ +#define __IInspectable_FWD_DEFINED__ +typedef interface IInspectable IInspectable; +#endif + +/* Headers for imported files */ + +#include <wtypes.h> +#include <hstring.h> +#include <unknwn.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum TrustLevel { + BaseTrust = 0, + PartialTrust = 1, + FullTrust = 2 +} TrustLevel; +/***************************************************************************** + * IInspectable interface + */ +#ifndef __IInspectable_INTERFACE_DEFINED__ +#define __IInspectable_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IInspectable, 0xaf86e2e0, 0xb12d, 0x4c6a, 0x9c,0x5a, 0xd7,0xaa,0x65,0x10,0x1e,0x90); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("af86e2e0-b12d-4c6a-9c5a-d7aa65101e90") +IInspectable : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetIids( + ULONG *iidCount, + IID **iids) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetRuntimeClassName( + HSTRING *className) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetTrustLevel( + TrustLevel *trustLevel) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IInspectable, 0xaf86e2e0, 0xb12d, 0x4c6a, 0x9c,0x5a, 0xd7,0xaa,0x65,0x10,0x1e,0x90) +#endif +#else +typedef struct IInspectableVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IInspectable* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IInspectable* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IInspectable* This); + + /*** IInspectable methods ***/ + HRESULT (STDMETHODCALLTYPE *GetIids)( + IInspectable* This, + ULONG *iidCount, + IID **iids); + + HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( + IInspectable* This, + HSTRING *className); + + HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( + IInspectable* This, + TrustLevel *trustLevel); + + END_INTERFACE +} IInspectableVtbl; +interface IInspectable { + CONST_VTBL IInspectableVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IInspectable_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IInspectable_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IInspectable_Release(This) (This)->lpVtbl->Release(This) +/*** IInspectable methods ***/ +#define IInspectable_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) +#define IInspectable_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) +#define IInspectable_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IInspectable_QueryInterface(IInspectable* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IInspectable_AddRef(IInspectable* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IInspectable_Release(IInspectable* This) { + return This->lpVtbl->Release(This); +} +/*** IInspectable methods ***/ +static FORCEINLINE HRESULT IInspectable_GetIids(IInspectable* This,ULONG *iidCount,IID **iids) { + return This->lpVtbl->GetIids(This,iidCount,iids); +} +static FORCEINLINE HRESULT IInspectable_GetRuntimeClassName(IInspectable* This,HSTRING *className) { + return This->lpVtbl->GetRuntimeClassName(This,className); +} +static FORCEINLINE HRESULT IInspectable_GetTrustLevel(IInspectable* This,TrustLevel *trustLevel) { + return This->lpVtbl->GetTrustLevel(This,trustLevel); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IInspectable_GetIids_Proxy( + IInspectable* This, + ULONG *iidCount, + IID **iids); +void __RPC_STUB IInspectable_GetIids_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IInspectable_GetRuntimeClassName_Proxy( + IInspectable* This, + HSTRING *className); +void __RPC_STUB IInspectable_GetRuntimeClassName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IInspectable_GetTrustLevel_Proxy( + IInspectable* This, + TrustLevel *trustLevel); +void __RPC_STUB IInspectable_GetTrustLevel_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IInspectable_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + +ULONG __RPC_USER HSTRING_UserSize (ULONG *, ULONG, HSTRING *); +unsigned char * __RPC_USER HSTRING_UserMarshal (ULONG *, unsigned char *, HSTRING *); +unsigned char * __RPC_USER HSTRING_UserUnmarshal(ULONG *, unsigned char *, HSTRING *); +void __RPC_USER HSTRING_UserFree (ULONG *, HSTRING *); + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __inspectable_h__ */ Property changes on: trunk/mingw-w64-headers/include/inspectable.h ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/mingw-w64-headers/include/inspectable.idl =================================================================== --- trunk/mingw-w64-headers/include/inspectable.idl (rev 0) +++ trunk/mingw-w64-headers/include/inspectable.idl 2013-06-06 16:29:25 UTC (rev 5882) @@ -0,0 +1,33 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +import "wtypes.idl"; +import "hstring.idl"; +import "unknwn.idl"; + +typedef enum TrustLevel { + BaseTrust = 0, + PartialTrust = 1, + FullTrust = 2 +} TrustLevel; + +[ + object, + uuid(af86e2e0-b12d-4c6a-9c5a-d7aa65101e90), + pointer_default(unique) +] +interface IInspectable : IUnknown +{ + HRESULT GetIids( + [out] ULONG *iidCount, + [out, size_is(*iidCount)] IID **iids); + + HRESULT GetRuntimeClassName( + [out] HSTRING *className); + + HRESULT GetTrustLevel( + [out] TrustLevel *trustLevel); +} Property changes on: trunk/mingw-w64-headers/include/inspectable.idl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <se...@us...> - 2013-07-04 11:36:03
|
Revision: 5932 http://sourceforge.net/p/mingw-w64/code/5932 Author: sezero Date: 2013-07-04 11:35:51 +0000 (Thu, 04 Jul 2013) Log Message: ----------- several ddk-related header fixes/updates from r/os svn: * bugcodes.h: updated from r/os bugcodes.mc rev. 58242 * hidpi.h: applied r/os rev. 59217 change to fix two function signatures * wdm.h: fix BYTES_TO_PAGES macro (r/os svn r58738) * ndis.h: fix harmless typo in NdisWaitEvent() (r/os svn r58384) * portcls.h: add missing IMP_IMiniportWaveRT & IMP_IMiniportWaveRTStream definitions (r/os svn r58638) Revision Links: -------------- http://sourceforge.net/p/mingw-w64/code/58738 http://sourceforge.net/p/mingw-w64/code/58384 http://sourceforge.net/p/mingw-w64/code/58638 Modified Paths: -------------- trunk/mingw-w64-headers/ddk/include/ddk/ndis.h trunk/mingw-w64-headers/ddk/include/ddk/portcls.h trunk/mingw-w64-headers/ddk/include/ddk/wdm.h trunk/mingw-w64-headers/include/bugcodes.h trunk/mingw-w64-headers/include/hidpi.h Modified: trunk/mingw-w64-headers/ddk/include/ddk/ndis.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/ndis.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/ndis.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -5654,7 +5654,7 @@ NTAPI NdisWaitEvent( IN PNDIS_EVENT Event, - IN UINT Timeout); + IN UINT MsToWait); /* NDIS intermediate miniport structures */ Modified: trunk/mingw-w64-headers/ddk/include/ddk/portcls.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/portcls.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/portcls.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -1841,7 +1841,43 @@ typedef IMiniportWaveRTStream *PMINIPORTWAVERTSTREAM; +#define IMP_IMiniportWaveRTStream\ + STDMETHODIMP_(NTSTATUS) SetFormat\ + ( IN PKSDATAFORMAT DataFormat\ + );\ + STDMETHODIMP_(NTSTATUS) SetState\ + ( IN KSSTATE State\ + );\ + STDMETHODIMP_(NTSTATUS) GetPosition\ + ( OUT PKSAUDIO_POSITION Position\ + );\ + STDMETHODIMP_(NTSTATUS) AllocateAudioBuffer\ + (\ + IN ULONG RequestedSize,\ + OUT PMDL *AudioBufferMdl,\ + OUT ULONG *ActualSize,\ + OUT ULONG *OffsetFromFirstPage,\ + OUT MEMORY_CACHING_TYPE *CacheType\ + );\ + STDMETHODIMP_(VOID) FreeAudioBuffer\ + (\ + IN PMDL AudioBufferMdl,\ + IN ULONG BufferSize\ + );\ + STDMETHODIMP_(VOID) GetHWLatency\ + (\ + OUT KSRTAUDIO_HWLATENCY *hwLatency\ + );\ + STDMETHODIMP_(NTSTATUS) GetPositionRegister\ + (\ + OUT KSRTAUDIO_HWREGISTER *Register\ + );\ + STDMETHODIMP_(NTSTATUS) GetClockRegister\ + (\ + OUT KSRTAUDIO_HWREGISTER *Register\ + ) + /* =============================================================== IMiniportWaveRTStreamNotification Interface */ @@ -1923,6 +1959,24 @@ typedef IMiniportWaveRT *PMINIPORTWAVERT; +#define IMP_IMiniportWaveRT\ + IMP_IMiniport;\ + STDMETHODIMP_(NTSTATUS) Init\ + ( IN PUNKNOWN UnknownAdapter,\ + IN PRESOURCELIST ResourceList,\ + IN PPORTWAVERT Port\ + );\ + STDMETHODIMP_(NTSTATUS) NewStream\ + ( OUT PMINIPORTWAVERTSTREAM * Stream,\ + IN PPORTWAVERTSTREAM PortStream,\ + IN ULONG Pin,\ + IN BOOLEAN Capture,\ + IN PKSDATAFORMAT DataFormat\ + );\ + STDMETHODIMP_(NTSTATUS) GetDeviceDescription\ + ( OUT PDEVICE_DESCRIPTION DeviceDescription\ + ) + #endif /* =============================================================== Modified: trunk/mingw-w64-headers/ddk/include/ddk/wdm.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -10539,9 +10539,11 @@ /* ULONG * BYTES_TO_PAGES( * IN ULONG Size) + * + * Note: This needs to be like this to avoid overflows! */ #define BYTES_TO_PAGES(Size) \ - (((Size) + PAGE_SIZE - 1) >> PAGE_SHIFT) + (((Size) >> PAGE_SHIFT) + (((Size) & (PAGE_SIZE - 1)) != 0)) /* PVOID * PAGE_ALIGN( Modified: trunk/mingw-w64-headers/include/bugcodes.h =================================================================== --- trunk/mingw-w64-headers/include/bugcodes.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/include/bugcodes.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -1,7 +1,7 @@ /* This file is generated with wmc version 1.4-rc5. Do not edit! */ /* Source : bugcodes.mc */ /* Cmdline: wmc bugcodes.mc */ -/* Date : Mon Feb 27 10:01:33 2012 */ +/* Date : Thu Jul 4 12:10:51 2013 */ #ifndef __WMCGENERATED_4f4b46e6_H #define __WMCGENERATED_4f4b46e6_H @@ -406,6 +406,14 @@ /* Approximate msg: PINBALL_FILE_SYSTEM */ #define PINBALL_FILE_SYSTEM ((ULONG)0x00000059) +/* MessageId : 0x0000005a */ +/* Approximate msg: CRITICAL_SERVICE_FAILED */ +#define CRITICAL_SERVICE_FAILED ((ULONG)0x0000005a) + +/* MessageId : 0x0000005b */ +/* Approximate msg: SET_ENV_VAR_FAILED */ +#define SET_ENV_VAR_FAILED ((ULONG)0x0000005b) + /* MessageId : 0x0000005c */ /* Approximate msg: HAL_INITIALIZATION_FAILED */ #define HAL_INITIALIZATION_FAILED ((ULONG)0x0000005c) @@ -702,6 +710,10 @@ /* Approximate msg: POWER_FAILURE_SIMULATE */ #define POWER_FAILURE_SIMULATE ((ULONG)0x000000e5) +/* MessageId : 0x000000e8 */ +/* Approximate msg: Invalid cancel of a open file. It already has handle. */ +#define INVALID_CANCEL_OF_FILE_OPEN ((ULONG)0x000000e8) + /* MessageId : 0x000000e9 */ /* Approximate msg: An executive worker thread is being terminated without having gone through the worker thread rundown code. */ #define ACTIVE_EX_WORKER_THREAD_TERMINATION ((ULONG)0x000000e9) Modified: trunk/mingw-w64-headers/include/hidpi.h =================================================================== --- trunk/mingw-w64-headers/include/hidpi.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/include/hidpi.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -275,7 +275,7 @@ * HidP_GetButtonCaps( * IN HIDP_REPORT_TYPE ReportType, * OUT PHIDP_BUTTON_CAPS ButtonCaps, - * IN OUT PULONG ButtonCapsLength, + * IN OUT PUSHORT ButtonCapsLength, * IN PHIDP_PREPARSED_DATA PreparsedData); */ #define HidP_GetButtonCaps(_Type_, _Caps_, _Len_, _Data_) \ @@ -374,7 +374,7 @@ USHORT LinkCollection, USAGE Usage, PHIDP_BUTTON_CAPS ButtonCaps, - PULONG ButtonCapsLength, + PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); HIDAPI @@ -386,7 +386,7 @@ USHORT LinkCollection, USAGE Usage, PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, + PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); HIDAPI @@ -448,7 +448,7 @@ * HidP_GetValueCaps( * IN HIDP_REPORT_TYPE ReportType, * OUT PHIDP_VALUE_CAPS ValueCaps, - * IN OUT PULONG ValueCapsLength, + * IN OUT PUSHORT ValueCapsLength, * IN PHIDP_PREPARSED_DATA PreparsedData); */ #define HidP_GetValueCaps(_Type_, _Caps_, _Len_, _Data_) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <se...@us...> - 2013-07-07 09:12:50
|
Revision: 5936 http://sourceforge.net/p/mingw-w64/code/5936 Author: sezero Date: 2013-07-07 09:12:42 +0000 (Sun, 07 Jul 2013) Log Message: ----------- * ntdef.h: add missing MAX_NATURAL_ALIGNMENT, MEMORY_ALLOCATION_ALIGNMENT, SYSTEM_CACHE_ALIGNMENT_SIZE, DECLSPEC_CACHEALIGN, DECLSPEC_SELECTANY, RTL_FIELD_TYPE, RTL_BITS_OF and RTL_BITS_OF_FIELD macros from r/os svn. * wdm.h: define LOOKASIDE_ALIGN as DECLSPEC_CACHEALIGN (r/os svn: r59431.) Revision Links: -------------- http://sourceforge.net/p/mingw-w64/code/59431 Modified Paths: -------------- trunk/mingw-w64-headers/ddk/include/ddk/wdm.h trunk/mingw-w64-headers/include/ntdef.h Modified: trunk/mingw-w64-headers/ddk/include/ddk/wdm.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-05 09:14:56 UTC (rev 5935) +++ trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-07 09:12:42 UTC (rev 5936) @@ -1749,7 +1749,7 @@ #if !defined(_WIN64) && (defined(_NTDDK_) || defined(_NTIFS_) || defined(_NDIS_)) #define LOOKASIDE_ALIGN #else -#define LOOKASIDE_ALIGN /* FIXME: DECLSPEC_CACHEALIGN */ +#define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN #endif typedef struct _LOOKASIDE_LIST_EX *PLOOKASIDE_LIST_EX; Modified: trunk/mingw-w64-headers/include/ntdef.h =================================================================== --- trunk/mingw-w64-headers/include/ntdef.h 2013-07-05 09:14:56 UTC (rev 5935) +++ trunk/mingw-w64-headers/include/ntdef.h 2013-07-07 09:12:42 UTC (rev 5936) @@ -131,6 +131,14 @@ #define UNALIGNED64 #endif +#if defined(_WIN64) || defined(_M_ALPHA) +#define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) +#define MEMORY_ALLOCATION_ALIGNMENT 16 +#else +#define MAX_NATURAL_ALIGNMENT sizeof(ULONG) +#define MEMORY_ALLOCATION_ALIGNMENT 8 +#endif + #if defined(_M_MRX000) && !(defined(MIDL_PASS) || defined(RC_INVOKED)) && defined(ENABLE_RESTRICTED) #define RESTRICTED_POINTER __restrict #else @@ -247,6 +255,26 @@ #endif #endif /* DECLSPEC_ALIGN */ +#ifndef SYSTEM_CACHE_ALIGNMENT_SIZE +#if defined(_AMD64_) || defined(_X86_) +#define SYSTEM_CACHE_ALIGNMENT_SIZE 64 +#else +#define SYSTEM_CACHE_ALIGNMENT_SIZE 128 +#endif +#endif + +#ifndef DECLSPEC_CACHEALIGN +#define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(SYSTEM_CACHE_ALIGNMENT_SIZE) +#endif + +#ifndef DECLSPEC_SELECTANY +#if (_MSC_VER >= 1100) || defined(__GNUC__) +#define DECLSPEC_SELECTANY __declspec(selectany) +#else +#define DECLSPEC_SELECTANY +#endif +#endif + /* Use to silence unused variable warnings when it is intentional */ #define UNREFERENCED_PARAMETER(P) {(P) = (P);} #define UNREFERENCED_LOCAL_VARIABLE(L) {(L) = (L);} @@ -629,6 +657,10 @@ #endif /* !___GROUP_AFFINITY_DEFINED */ /* Helper Macros */ +#define RTL_FIELD_TYPE(type, field) (((type*)0)->field) +#define RTL_BITS_OF(sizeOfArg) (sizeof(sizeOfArg) * 8) +#define RTL_BITS_OF_FIELD(type, field) (RTL_BITS_OF(RTL_FIELD_TYPE(type, field))) + #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wa...@us...> - 2013-07-09 15:02:05
|
Revision: 5939 http://sourceforge.net/p/mingw-w64/code/5939 Author: wavael Date: 2013-07-09 15:01:57 +0000 (Tue, 09 Jul 2013) Log Message: ----------- include/wincon.h: Replace BOOL by WINBOOL in struct _CONSOLE_SCREEN_BUFFER_INFOEX. Fixes BOOL conflict with GNUStep Patch by Roland Schwingel <rol...@on...> Modified Paths: -------------- trunk/mingw-w64-headers/ChangeLog trunk/mingw-w64-headers/include/wincon.h Modified: trunk/mingw-w64-headers/ChangeLog =================================================================== --- trunk/mingw-w64-headers/ChangeLog 2013-07-07 09:13:35 UTC (rev 5938) +++ trunk/mingw-w64-headers/ChangeLog 2013-07-09 15:01:57 UTC (rev 5939) @@ -1,3 +1,8 @@ +2013-07-09 Roland Schwingel <rol...@on...> + + * include/wincon.h: Replace BOOL by WINBOOL in + struct _CONSOLE_SCREEN_BUFFER_INFOEX. + 2013-04-05 Corinna Vinschen <vin...@re...> * configure.ac (BASEHEAD_LIST): Add crt/intrin.h. Modified: trunk/mingw-w64-headers/include/wincon.h =================================================================== --- trunk/mingw-w64-headers/include/wincon.h 2013-07-07 09:13:35 UTC (rev 5938) +++ trunk/mingw-w64-headers/include/wincon.h 2013-07-09 15:01:57 UTC (rev 5939) @@ -321,7 +321,7 @@ SMALL_RECT srWindow; COORD dwMaximumWindowSize; WORD wPopupAttributes; - BOOL bFullscreenSupported; + WINBOOL bFullscreenSupported; COLORREF ColorTable[16]; } CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cj...@us...> - 2013-07-23 13:39:55
|
Revision: 5978 http://sourceforge.net/p/mingw-w64/code/5978 Author: cjacek Date: 2013-07-23 13:39:47 +0000 (Tue, 23 Jul 2013) Log Message: ----------- Updated imported headers to current Wine version. Modified Paths: -------------- 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/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/ctfutb.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 Modified: trunk/mingw-w64-headers/direct-x/include/amstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/amstream.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/amvideo.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/austream.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/d3d10.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/d3d10_1.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/d3d11.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/d3dcommon.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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/ddstream.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/ddstream.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/dxgi.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/mediaobj.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/mmstream.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/direct-x/include/qedit.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from direct-x/include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/audioclient.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 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-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/audiopolicy.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/audiopolicy.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/ctfutb.h =================================================================== --- trunk/mingw-w64-headers/include/ctfutb.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/ctfutb.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/ctfutb.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/ctfutb.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/devicetopology.h =================================================================== --- trunk/mingw-w64-headers/include/devicetopology.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/devicetopology.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/devicetopology.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/devicetopology.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/downloadmgr.h =================================================================== --- trunk/mingw-w64-headers/include/downloadmgr.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/downloadmgr.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/downloadmgr.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/endpointvolume.h =================================================================== --- trunk/mingw-w64-headers/include/endpointvolume.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/endpointvolume.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/endpointvolume.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/endpointvolume.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/fusion.h =================================================================== --- trunk/mingw-w64-headers/include/fusion.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/fusion.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/fusion.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/fusion.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mmdeviceapi.h =================================================================== --- trunk/mingw-w64-headers/include/mmdeviceapi.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/mmdeviceapi.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/mmdeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/mmdeviceapi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/mscoree.h =================================================================== --- trunk/mingw-w64-headers/include/mscoree.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/mscoree.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/mscoree.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/mscoree.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/msctf.h =================================================================== --- trunk/mingw-w64-headers/include/msctf.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/msctf.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/msctf.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/msctf.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 @@ -253,10 +253,14 @@ #define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504) #define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506) #define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201) +HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope); +HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS); HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim); HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim); HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr); HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm); +HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim); +HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void); EXTERN_C const GUID GUID_PROP_TEXTOWNER; DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5); EXTERN_C const GUID GUID_PROP_LANGID; Modified: trunk/mingw-w64-headers/include/msctf.idl =================================================================== --- trunk/mingw-w64-headers/include/msctf.idl 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/msctf.idl 2013-07-23 13:39:47 UTC (rev 5978) @@ -29,10 +29,14 @@ cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") cpp_quote("HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm);") +cpp_quote("HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim);") +cpp_quote("HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);") Modified: trunk/mingw-w64-headers/include/objectarray.h =================================================================== --- trunk/mingw-w64-headers/include/objectarray.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/objectarray.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/objectarray.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/objectarray.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/optary.h =================================================================== --- trunk/mingw-w64-headers/include/optary.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/optary.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/optary.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/optary.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/propsys.h =================================================================== --- trunk/mingw-w64-headers/include/propsys.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/propsys.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/propsys.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/propsys.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/structuredquerycondition.h =================================================================== --- trunk/mingw-w64-headers/include/structuredquerycondition.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/structuredquerycondition.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/structuredquerycondition.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/structuredquerycondition.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/uiautomationclient.h =================================================================== --- trunk/mingw-w64-headers/include/uiautomationclient.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/uiautomationclient.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/uiautomationclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/uiautomationclient.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/uiautomationcore.h =================================================================== --- trunk/mingw-w64-headers/include/uiautomationcore.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/uiautomationcore.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/uiautomationcore.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/uiautomationcore.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/urlhist.h =================================================================== --- trunk/mingw-w64-headers/include/urlhist.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/urlhist.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/urlhist.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/urlhist.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wincodec.h =================================================================== --- trunk/mingw-w64-headers/include/wincodec.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/wincodec.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/wincodec.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/wincodec.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/wpcapi.h =================================================================== --- trunk/mingw-w64-headers/include/wpcapi.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/wpcapi.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/wpcapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/wpcapi.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 Modified: trunk/mingw-w64-headers/include/xmllite.h =================================================================== --- trunk/mingw-w64-headers/include/xmllite.h 2013-07-23 13:39:29 UTC (rev 5977) +++ trunk/mingw-w64-headers/include/xmllite.h 2013-07-23 13:39:47 UTC (rev 5978) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.5.25 from include/xmllite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.6 from include/xmllite.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kti...@us...> - 2013-08-07 10:05:50
|
Revision: 6029 http://sourceforge.net/p/mingw-w64/code/6029 Author: ktietz70 Date: 2013-08-07 10:05:38 +0000 (Wed, 07 Aug 2013) Log Message: ----------- Add winapi-family and some missing Vista+ stuff to aclui.h header. IDL interface activaut.idl for Active-Script. Add new idl to Makefile.am file. Makefile.in needs to be regenerated with the correct automake FU Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/include/aclui.h Added Paths: ----------- trunk/mingw-w64-headers/include/activaut.h trunk/mingw-w64-headers/include/activaut.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 09:13:55 UTC (rev 6028) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 10:05:38 UTC (rev 6029) @@ -59,6 +59,7 @@ IDL_SRCS = \ include/activation.idl \ + include/activaut.idl \ include/audioclient.idl \ include/audiopolicy.idl \ include/ctfutb.idl \ Modified: trunk/mingw-w64-headers/include/aclui.h =================================================================== --- trunk/mingw-w64-headers/include/aclui.h 2013-08-07 09:13:55 UTC (rev 6028) +++ trunk/mingw-w64-headers/include/aclui.h 2013-08-07 10:05:38 UTC (rev 6029) @@ -1,14 +1,18 @@ /** - * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ #ifndef _ACLUI_H_ #define _ACLUI_H_ +#include <winapifamily.h> + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + #include <objbase.h> #include <commctrl.h> #include <accctrl.h> +#include <authz.h> #ifndef _ACLUI_ #define ACLUIAPI DECLSPEC_IMPORT WINAPI @@ -51,7 +55,21 @@ #define SI_RESET_SACL __MSABI_LONG(0x00080000) #define SI_RESET_OWNER __MSABI_LONG(0x00100000) #define SI_NO_ADDITIONAL_PERMISSION __MSABI_LONG(0x00200000) +#if NTDDI_VERSION >= 0x06000000 +#define SI_VIEW_ONLY __MSABI_LONG(0x00400000) +#define SI_PERMS_ELEVATION_REQUIRED __MSABI_LONG(0x01000000) +#define SI_AUDITS_ELEVATION_REQUIRED __MSABI_LONG(0x02000000) +#define SI_OWNER_ELEVATION_REQUIRED __MSABI_LONG(0x04000000) +#endif +#if NTDDI_VERSION >= 0x06020000 +#define SI_SCOPE_ELEVATION_REQUIRED __MSABI_LONG(0x08000000) +#endif #define SI_MAY_WRITE __MSABI_LONG(0x10000000) +#if NTDDI_VERSION >= 0x06020000 +#define SI_ENABLE_EDIT_ATTRIBUTE_CONDITION __MSABI_LONG(0x20000000) +#define SI_ENABLE_CENTRAL_POLICY __MSABI_LONG(0x40000000) +#define SI_DISABLE_DENY_ACE __MSABI_LONG(0x80000000) +#endif #define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) @@ -60,7 +78,7 @@ ACCESS_MASK mask; LPCWSTR pszName; DWORD dwFlags; - } SI_ACCESS,*PSI_ACCESS; + } SI_ACCESS, *PSI_ACCESS; #define SI_ACCESS_SPECIFIC __MSABI_LONG(0x00010000) #define SI_ACCESS_GENERAL __MSABI_LONG(0x00020000) @@ -71,83 +89,194 @@ const GUID *pguid; ULONG dwFlags; LPCWSTR pszName; - } SI_INHERIT_TYPE,*PSI_INHERIT_TYPE; + } SI_INHERIT_TYPE, *PSI_INHERIT_TYPE; typedef enum _SI_PAGE_TYPE { - SI_PAGE_PERM=0,SI_PAGE_ADVPERM,SI_PAGE_AUDIT,SI_PAGE_OWNER,SI_PAGE_EFFECTIVE, + SI_PAGE_PERM=0, + SI_PAGE_ADVPERM, + SI_PAGE_AUDIT, + SI_PAGE_OWNER, + SI_PAGE_EFFECTIVE +#if NTDDI_VERSION >= 0x06000000 + , SI_PAGE_TAKEOWNERSHIP +#endif +#if NTDDI_VERSION >= 0x06020000 + , SI_PAGE_SHARE +#endif } SI_PAGE_TYPE; -#define PSPCB_SI_INITDIALOG (WM_USER+1) + typedef enum _SI_PAGE_ACTIVATED { + SI_SHOW_DEFAULT=0, + SI_SHOW_PERM_ACTIVATED, + SI_SHOW_AUDIT_ACTIVATED, + SI_SHOW_OWNER_ACTIVATED, + SI_SHOW_EFFECTIVE_ACTIVATED, + SI_SHOW_SHARE_ACTIVATED, + SI_SHOW_CENTRAL_POLICY_ACTIVATED, + } SI_PAGE_ACTIVATED; + +#define GET_PAGE_TYPE(X) (UINT) ((X) &0x0000ffff) +#define GET_ACTIVATION_TYPE(Y) (UINT) (((Y) >> 16) &0x0000ffff) +#define COMBINE_PAGE_ACTIVATION(X, Y) (UINT) (((Y) << 16) | X) + +#define DOBJ_RES_CONT __MSABI_LONG(0x00000001) +#define DOBJ_RES_ROOT __MSABI_LONG(0x00000002) +#define DOBJ_VOL_NTACLS __MSABI_LONG(0x00000004) +#define DOBJ_COND_NTACLS __MSABI_LONG(0x00000008) +#define DOBJ_RIBBON_LAUNCH __MSABI_LONG(0x00000010) + +#define PSPCB_SI_INITDIALOG (WM_USER + 1) + #undef INTERFACE #define INTERFACE ISecurityInformation - DECLARE_INTERFACE_(ISecurityInformation,IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(GetObjectInformation) (THIS_ PSI_OBJECT_INFO pObjectInfo) PURE; - STDMETHOD(GetSecurity) (THIS_ SECURITY_INFORMATION RequestedInformation,PSECURITY_DESCRIPTOR *ppSecurityDescriptor,WINBOOL fDefault) PURE; - STDMETHOD(SetSecurity) (THIS_ SECURITY_INFORMATION SecurityInformation,PSECURITY_DESCRIPTOR pSecurityDescriptor) PURE; - STDMETHOD(GetAccessRights) (THIS_ const GUID *pguidObjectType,DWORD dwFlags,PSI_ACCESS *ppAccess,ULONG *pcAccesses,ULONG *piDefaultAccess) PURE; - STDMETHOD(MapGeneric) (THIS_ const GUID *pguidObjectType,UCHAR *pAceFlags,ACCESS_MASK *pMask) PURE; - STDMETHOD(GetInheritTypes) (THIS_ PSI_INHERIT_TYPE *ppInheritTypes,ULONG *pcInheritTypes) PURE; - STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd,UINT uMsg,SI_PAGE_TYPE uPage) PURE; + + DECLARE_INTERFACE_IID_ (ISecurityInformation, IUnknown, "965FC360-16FF-11d0-91CB-00AA00BBB723") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (GetObjectInformation) (THIS_ PSI_OBJECT_INFO pObjectInfo) PURE; + STDMETHOD (GetSecurity) (THIS_ SECURITY_INFORMATION RequestedInformation, PSECURITY_DESCRIPTOR *ppSecurityDescriptor, WINBOOL fDefault) PURE; + STDMETHOD (SetSecurity) (THIS_ SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor) PURE; + STDMETHOD (GetAccessRights) (THIS_ const GUID *pguidObjectType, DWORD dwFlags, PSI_ACCESS *ppAccess, ULONG *pcAccesses, ULONG *piDefaultAccess) PURE; + STDMETHOD (MapGeneric) (THIS_ const GUID *pguidObjectType, UCHAR *pAceFlags, ACCESS_MASK *pMask) PURE; + STDMETHOD (GetInheritTypes) (THIS_ PSI_INHERIT_TYPE *ppInheritTypes, ULONG *pcInheritTypes) PURE; + STDMETHOD (PropertySheetPageCallback) (THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYPE uPage) PURE; }; + typedef ISecurityInformation *LPSECURITYINFO; - #undef INTERFACE #define INTERFACE ISecurityInformation2 - DECLARE_INTERFACE_(ISecurityInformation2,IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD_(WINBOOL,IsDaclCanonical) (THIS_ PACL pDacl) PURE; - STDMETHOD(LookupSids) (THIS_ ULONG cSids,PSID *rgpSids,LPDATAOBJECT *ppdo) PURE; + + DECLARE_INTERFACE_IID_ (ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD_ (WINBOOL, IsDaclCanonical) (THIS_ PACL pDacl) PURE; + STDMETHOD (LookupSids) (THIS_ ULONG cSids, PSID *rgpSids, LPDATAOBJECT *ppdo) PURE; }; + typedef ISecurityInformation2 *LPSECURITYINFO2; -#define CFSTR_ACLUI_SID_INFO_LIST TEXT("CFSTR_ACLUI_SID_INFO_LIST") +#define CFSTR_ACLUI_SID_INFO_LIST TEXT ("CFSTR_ACLUI_SID_INFO_LIST") typedef struct _SID_INFO { PSID pSid; PWSTR pwzCommonName; PWSTR pwzClass; PWSTR pwzUPN; - } SID_INFO,*PSID_INFO; + } SID_INFO, *PSID_INFO; typedef struct _SID_INFO_LIST { ULONG cItems; SID_INFO aSidInfo[ANYSIZE_ARRAY]; - } SID_INFO_LIST,*PSID_INFO_LIST; + } SID_INFO_LIST, *PSID_INFO_LIST; #undef INTERFACE #define INTERFACE IEffectivePermission - DECLARE_INTERFACE_(IEffectivePermission,IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(GetEffectivePermission) (THIS_ const GUID *pguidObjectType,PSID pUserSid,LPCWSTR pszServerName,PSECURITY_DESCRIPTOR pSD,POBJECT_TYPE_LIST *ppObjectTypeList,ULONG *pcObjectTypeListLength,PACCESS_MASK *ppGrantedAccessList,ULONG *pcGrantedAccessListLength) PURE; + + DECLARE_INTERFACE_IID_ (IEffectivePermission, IUnknown, "3853DC76-9F35-407c-88A1-D19344365FBC") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (GetEffectivePermission) (THIS_ const GUID *pguidObjectType, PSID pUserSid, LPCWSTR pszServerName, PSECURITY_DESCRIPTOR pSD, POBJECT_TYPE_LIST *ppObjectTypeList, ULONG *pcObjectTypeListLength, PACCESS_MASK *ppGrantedAccessList, ULONG *pcGrantedAccessListLength) PURE; }; + typedef IEffectivePermission *LPEFFECTIVEPERMISSION; #undef INTERFACE #define INTERFACE ISecurityObjectTypeInfo - DECLARE_INTERFACE_(ISecurityObjectTypeInfo,IUnknown) { - STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(GetInheritSource)(SECURITY_INFORMATION si,PACL pACL,PINHERITED_FROM *ppInheritArray) PURE; + + DECLARE_INTERFACE_IID_ (ISecurityObjectTypeInfo, IUnknown, "FC3066EB-79EF-444b-9111-D18A75EBF2FA") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (GetInheritSource) (SECURITY_INFORMATION si, PACL pACL, PINHERITED_FROM *ppInheritArray) PURE; }; + typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; - EXTERN_GUID(IID_ISecurityInformation,0x965fc360,0x16ff,0x11d0,0x91,0xcb,0x0,0xaa,0x0,0xbb,0xb7,0x23); - EXTERN_GUID(IID_ISecurityInformation2,0xc3ccfdb4,0x6f88,0x11d2,0xa3,0xce,0x0,0xc0,0x4f,0xb1,0x78,0x2a); - EXTERN_GUID(IID_IEffectivePermission,0x3853dc76,0x9f35,0x407c,0x88,0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); - EXTERN_GUID(IID_ISecurityObjectTypeInfo,0xfc3066eb,0x79ef,0x444b,0x91,0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa); +#if NTDDI_VERSION >= 0x06000000 +#undef INTERFACE +#define INTERFACE ISecurityInformation3 + DECLARE_INTERFACE_IID_ (ISecurityInformation3, IUnknown, "E2CDC9CC-31BD-4f8f-8C8B-B641AF516A1A") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (GetFullResourceName) (THIS_ LPWSTR *ppszResourceName) PURE; + STDMETHOD (OpenElevatedEditor) (THIS_ HWND hWnd, SI_PAGE_TYPE uPage) PURE; + }; - HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(LPSECURITYINFO psi); - WINBOOL ACLUIAPI EditSecurity(HWND hwndOwner,LPSECURITYINFO psi); + typedef ISecurityInformation3 *LPSECURITYINFO3; +#endif +#if NTDDI_VERSION >= 0x06020000 + typedef struct _SECURITY_OBJECT { + PWSTR pwszName; + PVOID pData; + DWORD cbData; + PVOID pData2; + DWORD cbData2; + DWORD Id; + BOOLEAN fWellKnown; + } SECURITY_OBJECT, *PSECURITY_OBJECT; + +#define SECURITY_OBJECT_ID_OBJECT_SD 1 +#define SECURITY_OBJECT_ID_SHARE 2 +#define SECURITY_OBJECT_ID_CENTRAL_POLICY 3 +#define SECURITY_OBJECT_ID_CENTRAL_ACCESS_RULE 4 + + typedef struct _EFFPERM_RESULT_LIST { + BOOLEAN fEvaluated; + ULONG cObjectTypeListLength; + OBJECT_TYPE_LIST *pObjectTypeList; + ACCESS_MASK *pGrantedAccessList; + } EFFPERM_RESULT_LIST, *PEFFPERM_RESULT_LIST; + +#undef INTERFACE +#define INTERFACE ISecurityInformation4 + + DECLARE_INTERFACE_IID_ (ISecurityInformation4, IUnknown, "EA961070-CD14-4621-ACE4-F63C03E583E4") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (GetSecondarySecurity) (THIS_ PSECURITY_OBJECT *pSecurityObjects, PULONG pSecurityObjectCount) PURE; + }; + + typedef ISecurityInformation4 *LPSECURITYINFO4; + +#undef INTERFACE +#define INTERFACE IEffectivePermission + + DECLARE_INTERFACE_IID_ (IEffectivePermission2, IUnknown, "941FABCA-DD47-4FCA-90BB-B0E10255F20D") { + STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE; + STDMETHOD_ (ULONG, AddRef) (THIS) PURE; + STDMETHOD_ (ULONG, Release) (THIS) PURE; + STDMETHOD (ComputeEffectivePermissionWithSecondarySecurity) (THIS_ PSID pSid, PSID pDeviceSid, PCWSTR pszServerName, PSECURITY_OBJECT pSecurityObjects, DWORD dwSecurityObjectCount, PTOKEN_GROUPS pUserGroups, PAUTHZ_SID_OPERATION pAuthzUserGroupsOperations, PTOKEN_GROUPS pDeviceGroups, PAUTHZ_SID_OPERATION pAuthzDeviceGroupsOperations, PAUTHZ_SECURITY_ATTRIBUTES_INFORMATION pAuthzUserClaims, PAUTHZ_SECURITY_ATTRIBUTE_OPERATION pAuthzUserClaimsOperations, PAUTHZ_SECURITY_ATTRIBUTES_INFORMATION pAuthzDeviceClaims, PAUTHZ_SECURITY_ATTRIBUTE_OPERATION pAuthzDeviceClaimsOperations, PEFFPERM_RESULT_LIST pEffpermResultLists); + }; + + typedef IEffectivePermission2 *LPEFFECTIVEPERMISSION2; +#endif + + EXTERN_GUID (IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23); + EXTERN_GUID (IID_ISecurityInformation2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0xa3, 0xce, 0x0, 0xc0, 0x4f, 0xb1, 0x78, 0x2a); + EXTERN_GUID (IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x88, 0xa1, 0xd1, 0x93, 0x44, 0x36, 0x5f, 0xbc); + EXTERN_GUID (IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x91, 0x11, 0xd1, 0x8a, 0x75, 0xeb, 0xf2, 0xfa); +#if NTDDI_VERSION >= 0x06000000 + EXTERN_GUID (IID_ISecurityInformation3, 0xe2cdc9cc, 0x31bd, 0x4f8f, 0x8c, 0x8b, 0xb6, 0x41, 0xaf, 0x51, 0x6a, 0x1a); +#endif +#if NTDDI_VERSION >= 0x06020000 + EXTERN_GUID (IID_ISecurityInformation4, 0xea961070, 0xcd14, 0x4621, 0xac, 0xe4, 0xf6, 0x3c, 0x3, 0xe5, 0x83, 0xe4); + EXTERN_GUID (IID_IEffectivePermission2, 0x941fabca, 0xdd47, 0x4fca, 0x90, 0xbb, 0xb0, 0xe1, 0x2, 0x55, 0xf2, 0xd); +#endif + + HPROPSHEETPAGE ACLUIAPI CreateSecurityPage (LPSECURITYINFO psi); + WINBOOL ACLUIAPI EditSecurity (HWND hwndOwner, LPSECURITYINFO psi); +#if NTDDI_VERSION >= 0x06000000 + HRESULT ACLUIAPI EditSecurityAdvanced (HWND hwndOwner, LPSECURITYINFO psi, SI_PAGE_TYPE uSIPage); +#endif + #ifdef __cplusplus } #endif #endif +#endif Added: trunk/mingw-w64-headers/include/activaut.h =================================================================== --- trunk/mingw-w64-headers/include/activaut.h (rev 0) +++ trunk/mingw-w64-headers/include/activaut.h 2013-08-07 10:05:38 UTC (rev 6029) @@ -0,0 +1,1733 @@ +/*** Autogenerated by WIDL 1.5.29 from activaut.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 __activaut_h__ +#define __activaut_h__ + +/* Forward declarations */ + +#ifndef __IScriptNode_FWD_DEFINED__ +#define __IScriptNode_FWD_DEFINED__ +typedef interface IScriptNode IScriptNode; +#endif + +#ifndef __IScriptEntry_FWD_DEFINED__ +#define __IScriptEntry_FWD_DEFINED__ +typedef interface IScriptEntry IScriptEntry; +#endif + +#ifndef __IScriptScriptlet_FWD_DEFINED__ +#define __IScriptScriptlet_FWD_DEFINED__ +typedef interface IScriptScriptlet IScriptScriptlet; +#endif + +#ifndef __IActiveScriptAuthor_FWD_DEFINED__ +#define __IActiveScriptAuthor_FWD_DEFINED__ +typedef interface IActiveScriptAuthor IActiveScriptAuthor; +#endif + +#ifndef __IActiveScriptAuthorProcedure_FWD_DEFINED__ +#define __IActiveScriptAuthorProcedure_FWD_DEFINED__ +typedef interface IActiveScriptAuthorProcedure IActiveScriptAuthorProcedure; +#endif + +/* Headers for imported files */ + +#include <ocidl.h> +#include <oleidl.h> +#include <oaidl.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <winapifamily.h> + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +#ifndef __ActivAut_h +#define __ActivAut_h + + +#ifndef _NO_AUTHOR_GUIDS +DEFINE_GUID(CATID_ActiveScriptAuthor, 0xaee2a92, 0xbcbb, 0x11d0, 0x8c, 0x72, 0x0, 0xc0, 0x4f, 0xc2, 0xb0, 0x85); +DEFINE_GUID(IID_IActiveScriptAuthor, 0x9c109da0, 0x7006, 0x11d1, 0xb3, 0x6c, 0x00, 0xa0, 0xc9, 0x11, 0xe8, 0xb2); +DEFINE_GUID(IID_IScriptNode, 0xaee2a94, 0xbcbb, 0x11d0, 0x8c, 0x72, 0x0, 0xc0, 0x4f, 0xc2, 0xb0, 0x85); +DEFINE_GUID(IID_IScriptEntry, 0xaee2a95, 0xbcbb, 0x11d0, 0x8c, 0x72, 0x0, 0xc0, 0x4f, 0xc2, 0xb0, 0x85); +DEFINE_GUID(IID_IScriptScriptlet, 0xaee2a96, 0xbcbb, 0x11d0, 0x8c, 0x72, 0x0, 0xc0, 0x4f, 0xc2, 0xb0, 0x85); +DEFINE_GUID(IID_IActiveScriptAuthorProcedure, 0x7e2d4b70, 0xbd9a, 0x11d0, 0x93, 0x36, 0x0, 0xa0, 0xc9, 0xd, 0xca, 0xa9); +#endif + +const DWORD fasaPreferInternalHandler = 1; +const DWORD fasaSupportInternalHandler = 2; +const DWORD fasaCaseSensitive = 4; + +const DWORD SCRIPT_CMPL_NOLIST = 0; +const DWORD SCRIPT_CMPL_MEMBERLIST = 1; +const DWORD SCRIPT_CMPL_ENUMLIST = 2; +const DWORD SCRIPT_CMPL_PARAMTIP = 4; +const DWORD SCRIPT_CMPL_GLOBALLIST = 8; + +const DWORD SCRIPT_CMPL_ENUM_TRIGGER = 1; +const DWORD SCRIPT_CMPL_MEMBER_TRIGGER = 2; +const DWORD SCRIPT_CMPL_PARAM_TRIGGER = 3; +const DWORD SCRIPT_CMPL_COMMIT = 4; + +const DWORD GETATTRTYPE_NORMAL = 0; +const DWORD GETATTRTYPE_DEPSCAN = 1; + +const DWORD GETATTRFLAG_THIS = 0x100; +const DWORD GETATTRFLAG_HUMANTEXT = 0x8000; + +const DWORD SOURCETEXT_ATTR_IDENTIFIER = 0x100; +const DWORD SOURCETEXT_ATTR_MEMBERLOOKUP = 0x200; +const DWORD SOURCETEXT_ATTR_THIS = 0x400; +const DWORD SOURCETEXT_ATTR_HUMANTEXT = 0x8000; + +#ifndef __IActiveScriptAuthor_FWD_DEFINED__ +#define __IActiveScriptAuthor_FWD_DEFINED__ +typedef interface IActiveScriptAuthor IActiveScriptAuthor; +#endif + +#ifndef __IScriptNode_FWD_DEFINED__ +#define __IScriptNode_FWD_DEFINED__ +typedef interface IScriptNode IScriptNode; +#endif + +#ifndef __IScriptEntry_FWD_DEFINED__ +#define __IScriptEntry_FWD_DEFINED__ +typedef interface IScriptEntry IScriptEntry; +#endif + +#ifndef __IScriptScriptlet_FWD_DEFINED__ +#define __IScriptScriptlet_FWD_DEFINED__ +typedef interface IScriptScriptlet IScriptScriptlet; +#endif + +typedef WORD SOURCE_TEXT_ATTR; +/***************************************************************************** + * IScriptNode interface + */ +#ifndef __IScriptNode_INTERFACE_DEFINED__ +#define __IScriptNode_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IScriptNode, 0x0aee2a94, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("0aee2a94-bcbb-11d0-8c72-00c04fc2b085") +IScriptNode : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE Alive( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Delete( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetParent( + IScriptNode **ppsnParent) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetIndexInParent( + ULONG *pisn) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetCookie( + DWORD *pdwCookie) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNumberOfChildren( + ULONG *pcsn) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetChild( + ULONG isn, + IScriptNode **ppsn) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetLanguage( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateChildEntry( + ULONG isn, + DWORD dwCookie, + LPCOLESTR pszDelimiter, + IScriptEntry **ppse) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateChildHandler( + LPCOLESTR pszDefaultName, + LPCOLESTR *prgpszNames, + ULONG cpszNames, + LPCOLESTR pszEvent, + LPCOLESTR pszDelimiter, + ITypeInfo *ptiSignature, + ULONG iMethodSignature, + ULONG isn, + DWORD dwCookie, + IScriptEntry **ppse) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IScriptNode, 0x0aee2a94, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85) +#endif +#else +typedef struct IScriptNodeVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IScriptNode* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IScriptNode* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IScriptNode* This); + + /*** IScriptNode methods ***/ + HRESULT (STDMETHODCALLTYPE *Alive)( + IScriptNode* This); + + HRESULT (STDMETHODCALLTYPE *Delete)( + IScriptNode* This); + + HRESULT (STDMETHODCALLTYPE *GetParent)( + IScriptNode* This, + IScriptNode **ppsnParent); + + HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( + IScriptNode* This, + ULONG *pisn); + + HRESULT (STDMETHODCALLTYPE *GetCookie)( + IScriptNode* This, + DWORD *pdwCookie); + + HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( + IScriptNode* This, + ULONG *pcsn); + + HRESULT (STDMETHODCALLTYPE *GetChild)( + IScriptNode* This, + ULONG isn, + IScriptNode **ppsn); + + HRESULT (STDMETHODCALLTYPE *GetLanguage)( + IScriptNode* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( + IScriptNode* This, + ULONG isn, + DWORD dwCookie, + LPCOLESTR pszDelimiter, + IScriptEntry **ppse); + + HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( + IScriptNode* This, + LPCOLESTR pszDefaultName, + LPCOLESTR *prgpszNames, + ULONG cpszNames, + LPCOLESTR pszEvent, + LPCOLESTR pszDelimiter, + ITypeInfo *ptiSignature, + ULONG iMethodSignature, + ULONG isn, + DWORD dwCookie, + IScriptEntry **ppse); + + END_INTERFACE +} IScriptNodeVtbl; +interface IScriptNode { + CONST_VTBL IScriptNodeVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IScriptNode_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IScriptNode_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IScriptNode_Release(This) (This)->lpVtbl->Release(This) +/*** IScriptNode methods ***/ +#define IScriptNode_Alive(This) (This)->lpVtbl->Alive(This) +#define IScriptNode_Delete(This) (This)->lpVtbl->Delete(This) +#define IScriptNode_GetParent(This,ppsnParent) (This)->lpVtbl->GetParent(This,ppsnParent) +#define IScriptNode_GetIndexInParent(This,pisn) (This)->lpVtbl->GetIndexInParent(This,pisn) +#define IScriptNode_GetCookie(This,pdwCookie) (This)->lpVtbl->GetCookie(This,pdwCookie) +#define IScriptNode_GetNumberOfChildren(This,pcsn) (This)->lpVtbl->GetNumberOfChildren(This,pcsn) +#define IScriptNode_GetChild(This,isn,ppsn) (This)->lpVtbl->GetChild(This,isn,ppsn) +#define IScriptNode_GetLanguage(This,pbstr) (This)->lpVtbl->GetLanguage(This,pbstr) +#define IScriptNode_CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) (This)->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) +#define IScriptNode_CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) (This)->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IScriptNode_QueryInterface(IScriptNode* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IScriptNode_AddRef(IScriptNode* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IScriptNode_Release(IScriptNode* This) { + return This->lpVtbl->Release(This); +} +/*** IScriptNode methods ***/ +static FORCEINLINE HRESULT IScriptNode_Alive(IScriptNode* This) { + return This->lpVtbl->Alive(This); +} +static FORCEINLINE HRESULT IScriptNode_Delete(IScriptNode* This) { + return This->lpVtbl->Delete(This); +} +static FORCEINLINE HRESULT IScriptNode_GetParent(IScriptNode* This,IScriptNode **ppsnParent) { + return This->lpVtbl->GetParent(This,ppsnParent); +} +static FORCEINLINE HRESULT IScriptNode_GetIndexInParent(IScriptNode* This,ULONG *pisn) { + return This->lpVtbl->GetIndexInParent(This,pisn); +} +static FORCEINLINE HRESULT IScriptNode_GetCookie(IScriptNode* This,DWORD *pdwCookie) { + return This->lpVtbl->GetCookie(This,pdwCookie); +} +static FORCEINLINE HRESULT IScriptNode_GetNumberOfChildren(IScriptNode* This,ULONG *pcsn) { + return This->lpVtbl->GetNumberOfChildren(This,pcsn); +} +static FORCEINLINE HRESULT IScriptNode_GetChild(IScriptNode* This,ULONG isn,IScriptNode **ppsn) { + return This->lpVtbl->GetChild(This,isn,ppsn); +} +static FORCEINLINE HRESULT IScriptNode_GetLanguage(IScriptNode* This,BSTR *pbstr) { + return This->lpVtbl->GetLanguage(This,pbstr); +} +static FORCEINLINE HRESULT IScriptNode_CreateChildEntry(IScriptNode* This,ULONG isn,DWORD dwCookie,LPCOLESTR pszDelimiter,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse); +} +static FORCEINLINE HRESULT IScriptNode_CreateChildHandler(IScriptNode* This,LPCOLESTR pszDefaultName,LPCOLESTR *prgpszNames,ULONG cpszNames,LPCOLESTR pszEvent,LPCOLESTR pszDelimiter,ITypeInfo *ptiSignature,ULONG iMethodSignature,ULONG isn,DWORD dwCookie,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IScriptNode_Alive_Proxy( + IScriptNode* This); +void __RPC_STUB IScriptNode_Alive_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_Delete_Proxy( + IScriptNode* This); +void __RPC_STUB IScriptNode_Delete_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetParent_Proxy( + IScriptNode* This, + IScriptNode **ppsnParent); +void __RPC_STUB IScriptNode_GetParent_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetIndexInParent_Proxy( + IScriptNode* This, + ULONG *pisn); +void __RPC_STUB IScriptNode_GetIndexInParent_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetCookie_Proxy( + IScriptNode* This, + DWORD *pdwCookie); +void __RPC_STUB IScriptNode_GetCookie_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetNumberOfChildren_Proxy( + IScriptNode* This, + ULONG *pcsn); +void __RPC_STUB IScriptNode_GetNumberOfChildren_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetChild_Proxy( + IScriptNode* This, + ULONG isn, + IScriptNode **ppsn); +void __RPC_STUB IScriptNode_GetChild_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_GetLanguage_Proxy( + IScriptNode* This, + BSTR *pbstr); +void __RPC_STUB IScriptNode_GetLanguage_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildEntry_Proxy( + IScriptNode* This, + ULONG isn, + DWORD dwCookie, + LPCOLESTR pszDelimiter, + IScriptEntry **ppse); +void __RPC_STUB IScriptNode_CreateChildEntry_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildHandler_Proxy( + IScriptNode* This, + LPCOLESTR pszDefaultName, + LPCOLESTR *prgpszNames, + ULONG cpszNames, + LPCOLESTR pszEvent, + LPCOLESTR pszDelimiter, + ITypeInfo *ptiSignature, + ULONG iMethodSignature, + ULONG isn, + DWORD dwCookie, + IScriptEntry **ppse); +void __RPC_STUB IScriptNode_CreateChildHandler_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IScriptNode_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IScriptEntry interface + */ +#ifndef __IScriptEntry_INTERFACE_DEFINED__ +#define __IScriptEntry_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IScriptEntry, 0x0aee2a95, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("0aee2a95-bcbb-11d0-8c72-00c04fc2b085") +IScriptEntry : public IScriptNode +{ + virtual HRESULT STDMETHODCALLTYPE GetText( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetText( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetBody( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetBody( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetName( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetName( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetItemName( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetItemName( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSignature( + ITypeInfo **ppti, + ULONG *piMethod) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSignature( + ITypeInfo *pti, + ULONG iMethod) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetRange( + ULONG *pichMin, + ULONG *pcch) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IScriptEntry, 0x0aee2a95, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85) +#endif +#else +typedef struct IScriptEntryVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IScriptEntry* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IScriptEntry* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IScriptEntry* This); + + /*** IScriptNode methods ***/ + HRESULT (STDMETHODCALLTYPE *Alive)( + IScriptEntry* This); + + HRESULT (STDMETHODCALLTYPE *Delete)( + IScriptEntry* This); + + HRESULT (STDMETHODCALLTYPE *GetParent)( + IScriptEntry* This, + IScriptNode **ppsnParent); + + HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( + IScriptEntry* This, + ULONG *pisn); + + HRESULT (STDMETHODCALLTYPE *GetCookie)( + IScriptEntry* This, + DWORD *pdwCookie); + + HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( + IScriptEntry* This, + ULONG *pcsn); + + HRESULT (STDMETHODCALLTYPE *GetChild)( + IScriptEntry* This, + ULONG isn, + IScriptNode **ppsn); + + HRESULT (STDMETHODCALLTYPE *GetLanguage)( + IScriptEntry* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( + IScriptEntry* This, + ULONG isn, + DWORD dwCookie, + LPCOLESTR pszDelimiter, + IScriptEntry **ppse); + + HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( + IScriptEntry* This, + LPCOLESTR pszDefaultName, + LPCOLESTR *prgpszNames, + ULONG cpszNames, + LPCOLESTR pszEvent, + LPCOLESTR pszDelimiter, + ITypeInfo *ptiSignature, + ULONG iMethodSignature, + ULONG isn, + DWORD dwCookie, + IScriptEntry **ppse); + + /*** IScriptEntry methods ***/ + HRESULT (STDMETHODCALLTYPE *GetText)( + IScriptEntry* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetText)( + IScriptEntry* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetBody)( + IScriptEntry* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetBody)( + IScriptEntry* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetName)( + IScriptEntry* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetName)( + IScriptEntry* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetItemName)( + IScriptEntry* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetItemName)( + IScriptEntry* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetSignature)( + IScriptEntry* This, + ITypeInfo **ppti, + ULONG *piMethod); + + HRESULT (STDMETHODCALLTYPE *SetSignature)( + IScriptEntry* This, + ITypeInfo *pti, + ULONG iMethod); + + HRESULT (STDMETHODCALLTYPE *GetRange)( + IScriptEntry* This, + ULONG *pichMin, + ULONG *pcch); + + END_INTERFACE +} IScriptEntryVtbl; +interface IScriptEntry { + CONST_VTBL IScriptEntryVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IScriptEntry_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IScriptEntry_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IScriptEntry_Release(This) (This)->lpVtbl->Release(This) +/*** IScriptNode methods ***/ +#define IScriptEntry_Alive(This) (This)->lpVtbl->Alive(This) +#define IScriptEntry_Delete(This) (This)->lpVtbl->Delete(This) +#define IScriptEntry_GetParent(This,ppsnParent) (This)->lpVtbl->GetParent(This,ppsnParent) +#define IScriptEntry_GetIndexInParent(This,pisn) (This)->lpVtbl->GetIndexInParent(This,pisn) +#define IScriptEntry_GetCookie(This,pdwCookie) (This)->lpVtbl->GetCookie(This,pdwCookie) +#define IScriptEntry_GetNumberOfChildren(This,pcsn) (This)->lpVtbl->GetNumberOfChildren(This,pcsn) +#define IScriptEntry_GetChild(This,isn,ppsn) (This)->lpVtbl->GetChild(This,isn,ppsn) +#define IScriptEntry_GetLanguage(This,pbstr) (This)->lpVtbl->GetLanguage(This,pbstr) +#define IScriptEntry_CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) (This)->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) +#define IScriptEntry_CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) (This)->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) +/*** IScriptEntry methods ***/ +#define IScriptEntry_GetText(This,pbstr) (This)->lpVtbl->GetText(This,pbstr) +#define IScriptEntry_SetText(This,psz) (This)->lpVtbl->SetText(This,psz) +#define IScriptEntry_GetBody(This,pbstr) (This)->lpVtbl->GetBody(This,pbstr) +#define IScriptEntry_SetBody(This,psz) (This)->lpVtbl->SetBody(This,psz) +#define IScriptEntry_GetName(This,pbstr) (This)->lpVtbl->GetName(This,pbstr) +#define IScriptEntry_SetName(This,psz) (This)->lpVtbl->SetName(This,psz) +#define IScriptEntry_GetItemName(This,pbstr) (This)->lpVtbl->GetItemName(This,pbstr) +#define IScriptEntry_SetItemName(This,psz) (This)->lpVtbl->SetItemName(This,psz) +#define IScriptEntry_GetSignature(This,ppti,piMethod) (This)->lpVtbl->GetSignature(This,ppti,piMethod) +#define IScriptEntry_SetSignature(This,pti,iMethod) (This)->lpVtbl->SetSignature(This,pti,iMethod) +#define IScriptEntry_GetRange(This,pichMin,pcch) (This)->lpVtbl->GetRange(This,pichMin,pcch) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IScriptEntry_QueryInterface(IScriptEntry* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IScriptEntry_AddRef(IScriptEntry* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IScriptEntry_Release(IScriptEntry* This) { + return This->lpVtbl->Release(This); +} +/*** IScriptNode methods ***/ +static FORCEINLINE HRESULT IScriptEntry_Alive(IScriptEntry* This) { + return This->lpVtbl->Alive(This); +} +static FORCEINLINE HRESULT IScriptEntry_Delete(IScriptEntry* This) { + return This->lpVtbl->Delete(This); +} +static FORCEINLINE HRESULT IScriptEntry_GetParent(IScriptEntry* This,IScriptNode **ppsnParent) { + return This->lpVtbl->GetParent(This,ppsnParent); +} +static FORCEINLINE HRESULT IScriptEntry_GetIndexInParent(IScriptEntry* This,ULONG *pisn) { + return This->lpVtbl->GetIndexInParent(This,pisn); +} +static FORCEINLINE HRESULT IScriptEntry_GetCookie(IScriptEntry* This,DWORD *pdwCookie) { + return This->lpVtbl->GetCookie(This,pdwCookie); +} +static FORCEINLINE HRESULT IScriptEntry_GetNumberOfChildren(IScriptEntry* This,ULONG *pcsn) { + return This->lpVtbl->GetNumberOfChildren(This,pcsn); +} +static FORCEINLINE HRESULT IScriptEntry_GetChild(IScriptEntry* This,ULONG isn,IScriptNode **ppsn) { + return This->lpVtbl->GetChild(This,isn,ppsn); +} +static FORCEINLINE HRESULT IScriptEntry_GetLanguage(IScriptEntry* This,BSTR *pbstr) { + return This->lpVtbl->GetLanguage(This,pbstr); +} +static FORCEINLINE HRESULT IScriptEntry_CreateChildEntry(IScriptEntry* This,ULONG isn,DWORD dwCookie,LPCOLESTR pszDelimiter,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse); +} +static FORCEINLINE HRESULT IScriptEntry_CreateChildHandler(IScriptEntry* This,LPCOLESTR pszDefaultName,LPCOLESTR *prgpszNames,ULONG cpszNames,LPCOLESTR pszEvent,LPCOLESTR pszDelimiter,ITypeInfo *ptiSignature,ULONG iMethodSignature,ULONG isn,DWORD dwCookie,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse); +} +/*** IScriptEntry methods ***/ +static FORCEINLINE HRESULT IScriptEntry_GetText(IScriptEntry* This,BSTR *pbstr) { + return This->lpVtbl->GetText(This,pbstr); +} +static FORCEINLINE HRESULT IScriptEntry_SetText(IScriptEntry* This,LPCOLESTR psz) { + return This->lpVtbl->SetText(This,psz); +} +static FORCEINLINE HRESULT IScriptEntry_GetBody(IScriptEntry* This,BSTR *pbstr) { + return This->lpVtbl->GetBody(This,pbstr); +} +static FORCEINLINE HRESULT IScriptEntry_SetBody(IScriptEntry* This,LPCOLESTR psz) { + return This->lpVtbl->SetBody(This,psz); +} +static FORCEINLINE HRESULT IScriptEntry_GetName(IScriptEntry* This,BSTR *pbstr) { + return This->lpVtbl->GetName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptEntry_SetName(IScriptEntry* This,LPCOLESTR psz) { + return This->lpVtbl->SetName(This,psz); +} +static FORCEINLINE HRESULT IScriptEntry_GetItemName(IScriptEntry* This,BSTR *pbstr) { + return This->lpVtbl->GetItemName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptEntry_SetItemName(IScriptEntry* This,LPCOLESTR psz) { + return This->lpVtbl->SetItemName(This,psz); +} +static FORCEINLINE HRESULT IScriptEntry_GetSignature(IScriptEntry* This,ITypeInfo **ppti,ULONG *piMethod) { + return This->lpVtbl->GetSignature(This,ppti,piMethod); +} +static FORCEINLINE HRESULT IScriptEntry_SetSignature(IScriptEntry* This,ITypeInfo *pti,ULONG iMethod) { + return This->lpVtbl->SetSignature(This,pti,iMethod); +} +static FORCEINLINE HRESULT IScriptEntry_GetRange(IScriptEntry* This,ULONG *pichMin,ULONG *pcch) { + return This->lpVtbl->GetRange(This,pichMin,pcch); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IScriptEntry_GetText_Proxy( + IScriptEntry* This, + BSTR *pbstr); +void __RPC_STUB IScriptEntry_GetText_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_SetText_Proxy( + IScriptEntry* This, + LPCOLESTR psz); +void __RPC_STUB IScriptEntry_SetText_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_GetBody_Proxy( + IScriptEntry* This, + BSTR *pbstr); +void __RPC_STUB IScriptEntry_GetBody_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_SetBody_Proxy( + IScriptEntry* This, + LPCOLESTR psz); +void __RPC_STUB IScriptEntry_SetBody_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_GetName_Proxy( + IScriptEntry* This, + BSTR *pbstr); +void __RPC_STUB IScriptEntry_GetName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_SetName_Proxy( + IScriptEntry* This, + LPCOLESTR psz); +void __RPC_STUB IScriptEntry_SetName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_GetItemName_Proxy( + IScriptEntry* This, + BSTR *pbstr); +void __RPC_STUB IScriptEntry_GetItemName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_SetItemName_Proxy( + IScriptEntry* This, + LPCOLESTR psz); +void __RPC_STUB IScriptEntry_SetItemName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_GetSignature_Proxy( + IScriptEntry* This, + ITypeInfo **ppti, + ULONG *piMethod); +void __RPC_STUB IScriptEntry_GetSignature_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_SetSignature_Proxy( + IScriptEntry* This, + ITypeInfo *pti, + ULONG iMethod); +void __RPC_STUB IScriptEntry_SetSignature_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptEntry_GetRange_Proxy( + IScriptEntry* This, + ULONG *pichMin, + ULONG *pcch); +void __RPC_STUB IScriptEntry_GetRange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IScriptEntry_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IScriptScriptlet interface + */ +#ifndef __IScriptScriptlet_INTERFACE_DEFINED__ +#define __IScriptScriptlet_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IScriptScriptlet, 0x0aee2a96, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("0aee2a96-bcbb-11d0-8c72-00c04fc2b085") +IScriptScriptlet : public IScriptEntry +{ + virtual HRESULT STDMETHODCALLTYPE GetSubItemName( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSubItemName( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetEventName( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetEventName( + LPCOLESTR psz) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSimpleEventName( + BSTR *pbstr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSimpleEventName( + LPCOLESTR psz) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IScriptScriptlet, 0x0aee2a96, 0xbcbb, 0x11d0, 0x8c,0x72, 0x00,0xc0,0x4f,0xc2,0xb0,0x85) +#endif +#else +typedef struct IScriptScriptletVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IScriptScriptlet* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IScriptScriptlet* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IScriptScriptlet* This); + + /*** IScriptNode methods ***/ + HRESULT (STDMETHODCALLTYPE *Alive)( + IScriptScriptlet* This); + + HRESULT (STDMETHODCALLTYPE *Delete)( + IScriptScriptlet* This); + + HRESULT (STDMETHODCALLTYPE *GetParent)( + IScriptScriptlet* This, + IScriptNode **ppsnParent); + + HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( + IScriptScriptlet* This, + ULONG *pisn); + + HRESULT (STDMETHODCALLTYPE *GetCookie)( + IScriptScriptlet* This, + DWORD *pdwCookie); + + HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( + IScriptScriptlet* This, + ULONG *pcsn); + + HRESULT (STDMETHODCALLTYPE *GetChild)( + IScriptScriptlet* This, + ULONG isn, + IScriptNode **ppsn); + + HRESULT (STDMETHODCALLTYPE *GetLanguage)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( + IScriptScriptlet* This, + ULONG isn, + DWORD dwCookie, + LPCOLESTR pszDelimiter, + IScriptEntry **ppse); + + HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( + IScriptScriptlet* This, + LPCOLESTR pszDefaultName, + LPCOLESTR *prgpszNames, + ULONG cpszNames, + LPCOLESTR pszEvent, + LPCOLESTR pszDelimiter, + ITypeInfo *ptiSignature, + ULONG iMethodSignature, + ULONG isn, + DWORD dwCookie, + IScriptEntry **ppse); + + /*** IScriptEntry methods ***/ + HRESULT (STDMETHODCALLTYPE *GetText)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetText)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetBody)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetBody)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetName)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetName)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetItemName)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetItemName)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetSignature)( + IScriptScriptlet* This, + ITypeInfo **ppti, + ULONG *piMethod); + + HRESULT (STDMETHODCALLTYPE *SetSignature)( + IScriptScriptlet* This, + ITypeInfo *pti, + ULONG iMethod); + + HRESULT (STDMETHODCALLTYPE *GetRange)( + IScriptScriptlet* This, + ULONG *pichMin, + ULONG *pcch); + + /*** IScriptScriptlet methods ***/ + HRESULT (STDMETHODCALLTYPE *GetSubItemName)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetSubItemName)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetEventName)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetEventName)( + IScriptScriptlet* This, + LPCOLESTR psz); + + HRESULT (STDMETHODCALLTYPE *GetSimpleEventName)( + IScriptScriptlet* This, + BSTR *pbstr); + + HRESULT (STDMETHODCALLTYPE *SetSimpleEventName)( + IScriptScriptlet* This, + LPCOLESTR psz); + + END_INTERFACE +} IScriptScriptletVtbl; +interface IScriptScriptlet { + CONST_VTBL IScriptScriptletVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IScriptScriptlet_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IScriptScriptlet_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IScriptScriptlet_Release(This) (This)->lpVtbl->Release(This) +/*** IScriptNode methods ***/ +#define IScriptScriptlet_Alive(This) (This)->lpVtbl->Alive(This) +#define IScriptScriptlet_Delete(This) (This)->lpVtbl->Delete(This) +#define IScriptScriptlet_GetParent(This,ppsnParent) (This)->lpVtbl->GetParent(This,ppsnParent) +#define IScriptScriptlet_GetIndexInParent(This,pisn) (This)->lpVtbl->GetIndexInParent(This,pisn) +#define IScriptScriptlet_GetCookie(This,pdwCookie) (This)->lpVtbl->GetCookie(This,pdwCookie) +#define IScriptScriptlet_GetNumberOfChildren(This,pcsn) (This)->lpVtbl->GetNumberOfChildren(This,pcsn) +#define IScriptScriptlet_GetChild(This,isn,ppsn) (This)->lpVtbl->GetChild(This,isn,ppsn) +#define IScriptScriptlet_GetLanguage(This,pbstr) (This)->lpVtbl->GetLanguage(This,pbstr) +#define IScriptScriptlet_CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) (This)->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse) +#define IScriptScriptlet_CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) (This)->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse) +/*** IScriptEntry methods ***/ +#define IScriptScriptlet_GetText(This,pbstr) (This)->lpVtbl->GetText(This,pbstr) +#define IScriptScriptlet_SetText(This,psz) (This)->lpVtbl->SetText(This,psz) +#define IScriptScriptlet_GetBody(This,pbstr) (This)->lpVtbl->GetBody(This,pbstr) +#define IScriptScriptlet_SetBody(This,psz) (This)->lpVtbl->SetBody(This,psz) +#define IScriptScriptlet_GetName(This,pbstr) (This)->lpVtbl->GetName(This,pbstr) +#define IScriptScriptlet_SetName(This,psz) (This)->lpVtbl->SetName(This,psz) +#define IScriptScriptlet_GetItemName(This,pbstr) (This)->lpVtbl->GetItemName(This,pbstr) +#define IScriptScriptlet_SetItemName(This,psz) (This)->lpVtbl->SetItemName(This,psz) +#define IScriptScriptlet_GetSignature(This,ppti,piMethod) (This)->lpVtbl->GetSignature(This,ppti,piMethod) +#define IScriptScriptlet_SetSignature(This,pti,iMethod) (This)->lpVtbl->SetSignature(This,pti,iMethod) +#define IScriptScriptlet_GetRange(This,pichMin,pcch) (This)->lpVtbl->GetRange(This,pichMin,pcch) +/*** IScriptScriptlet methods ***/ +#define IScriptScriptlet_GetSubItemName(This,pbstr) (This)->lpVtbl->GetSubItemName(This,pbstr) +#define IScriptScriptlet_SetSubItemName(This,psz) (This)->lpVtbl->SetSubItemName(This,psz) +#define IScriptScriptlet_GetEventName(This,pbstr) (This)->lpVtbl->GetEventName(This,pbstr) +#define IScriptScriptlet_SetEventName(This,psz) (This)->lpVtbl->SetEventName(This,psz) +#define IScriptScriptlet_GetSimpleEventName(This,pbstr) (This)->lpVtbl->GetSimpleEventName(This,pbstr) +#define IScriptScriptlet_SetSimpleEventName(This,psz) (This)->lpVtbl->SetSimpleEventName(This,psz) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IScriptScriptlet_QueryInterface(IScriptScriptlet* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IScriptScriptlet_AddRef(IScriptScriptlet* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IScriptScriptlet_Release(IScriptScriptlet* This) { + return This->lpVtbl->Release(This); +} +/*** IScriptNode methods ***/ +static FORCEINLINE HRESULT IScriptScriptlet_Alive(IScriptScriptlet* This) { + return This->lpVtbl->Alive(This); +} +static FORCEINLINE HRESULT IScriptScriptlet_Delete(IScriptScriptlet* This) { + return This->lpVtbl->Delete(This); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetParent(IScriptScriptlet* This,IScriptNode **ppsnParent) { + return This->lpVtbl->GetParent(This,ppsnParent); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetIndexInParent(IScriptScriptlet* This,ULONG *pisn) { + return This->lpVtbl->GetIndexInParent(This,pisn); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetCookie(IScriptScriptlet* This,DWORD *pdwCookie) { + return This->lpVtbl->GetCookie(This,pdwCookie); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetNumberOfChildren(IScriptScriptlet* This,ULONG *pcsn) { + return This->lpVtbl->GetNumberOfChildren(This,pcsn); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetChild(IScriptScriptlet* This,ULONG isn,IScriptNode **ppsn) { + return This->lpVtbl->GetChild(This,isn,ppsn); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetLanguage(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetLanguage(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_CreateChildEntry(IScriptScriptlet* This,ULONG isn,DWORD dwCookie,LPCOLESTR pszDelimiter,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildEntry(This,isn,dwCookie,pszDelimiter,ppse); +} +static FORCEINLINE HRESULT IScriptScriptlet_CreateChildHandler(IScriptScriptlet* This,LPCOLESTR pszDefaultName,LPCOLESTR *prgpszNames,ULONG cpszNames,LPCOLESTR pszEvent,LPCOLESTR pszDelimiter,ITypeInfo *ptiSignature,ULONG iMethodSignature,ULONG isn,DWORD dwCookie,IScriptEntry **ppse) { + return This->lpVtbl->CreateChildHandler(This,pszDefaultName,prgpszNames,cpszNames,pszEvent,pszDelimiter,ptiSignature,iMethodSignature,isn,dwCookie,ppse); +} +/*** IScriptEntry methods ***/ +static FORCEINLINE HRESULT IScriptScriptlet_GetText(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetText(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetText(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetText(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetBody(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetBody(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetBody(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetBody(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetName(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetName(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetName(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetItemName(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetItemName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetItemName(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetItemName(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetSignature(IScriptScriptlet* This,ITypeInfo **ppti,ULONG *piMethod) { + return This->lpVtbl->GetSignature(This,ppti,piMethod); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetSignature(IScriptScriptlet* This,ITypeInfo *pti,ULONG iMethod) { + return This->lpVtbl->SetSignature(This,pti,iMethod); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetRange(IScriptScriptlet* This,ULONG *pichMin,ULONG *pcch) { + return This->lpVtbl->GetRange(This,pichMin,pcch); +} +/*** IScriptScriptlet methods ***/ +static FORCEINLINE HRESULT IScriptScriptlet_GetSubItemName(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetSubItemName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetSubItemName(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetSubItemName(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetEventName(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetEventName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetEventName(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetEventName(This,psz); +} +static FORCEINLINE HRESULT IScriptScriptlet_GetSimpleEventName(IScriptScriptlet* This,BSTR *pbstr) { + return This->lpVtbl->GetSimpleEventName(This,pbstr); +} +static FORCEINLINE HRESULT IScriptScriptlet_SetSimpleEventName(IScriptScriptlet* This,LPCOLESTR psz) { + return This->lpVtbl->SetSimpleEventName(This,psz); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSubItemName_Proxy( + IScriptScriptlet* This, + BSTR *pbstr); +void __RPC_STUB IScriptScriptlet_GetSubItemName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSubItemName_Proxy( + IScriptScriptlet* This, + LPCOLESTR psz); +void __RPC_STUB IScriptScriptlet_SetSubItemName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetEventName_Proxy( + IScriptScriptlet* This, + BSTR *pbstr); +void __RPC_STUB IScriptScriptlet_GetEventName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetEventName_Proxy( + IScriptScriptlet* This, + LPCOLESTR psz); +void __RPC_STUB IScriptScriptlet_SetEventName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSimpleEventName_Proxy( + IScriptScriptlet* This, + BSTR *pbstr); +void __RPC_STUB IScriptScriptlet_GetSimpleEventName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSimpleEventName_Proxy( + IScriptScriptlet* This, + LPCOLESTR psz); +void __RPC_STUB IScriptScriptlet_SetSimpleEventName_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IScriptScriptlet_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IActiveScriptAuthor interface + */ +#ifndef __IActiveScriptAuthor_INTERFACE_DEFINED__ +#define __IActiveScriptAuthor_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IActiveScriptAuthor, 0x9c109da0, 0x7006, 0x11d1, 0xb3,0x6c, 0x00,0xa0,0xc9,0x11,0xe8,0xb2); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("9c109da0-7006-11d1-b36c-00a0c911e8b2") +IActiveScriptAuthor : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE AddNamedItem( + LPCOLESTR pszName, + DWORD dwFlags, + IDispatch *pdisp) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddScriptlet( + LPCOLESTR pszDefaultName, + LPCOLESTR pszCode, + LPCOLESTR pszItemName, + LPCOLESTR pszSubItemName, + LPCOLESTR pszEventName, + LPCOLESTR pszDelimiter, + DWORD dwCookie, + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE ParseScriptText( + LPCOLESTR pszCode, + LPCOLESTR pszItemName, + LPCOLESTR pszDelimiter, + DWORD dwCookie, + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetScriptTextAttributes( + LPCOLESTR pszCode, + ULONG cch, + LPCOLESTR pszDelimiter, + DWORD dwFlags, + SOURCE_TEXT_ATTR *pattr) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetScriptletTextAttributes( + LPCOLESTR pszCode, + ULONG cch, + LPCOLESTR pszDelimiter, + DWORD dwFlags, + SOURCE_TEXT_ATTR *pattr) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetRoot( + IScriptNode **ppsp) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetLanguageFlags( + DWORD *pgrfasa) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetEventHandler( + IDispatch *pdisp, + LPCOLESTR pszItem, + LPCOLESTR pszSubItem, + LPCOLESTR pszEvent, + IScriptEntry **ppse) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveNamedItem( + LPCOLESTR pszName) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddTypeLib( + REFGUID rguidTypeLib, + DWORD dwMajor, + DWORD dwMinor, + DWORD dwFlags) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveTypeLib( + REFGUID rguidTypeLib, + DWORD dwMajor, + DWORD dwMinor) = 0; + + virtual HRESULT STDM... [truncated message content] |
From: <kti...@us...> - 2013-08-07 10:51:27
|
Revision: 6032 http://sourceforge.net/p/mingw-w64/code/6032 Author: ktietz70 Date: 2013-08-07 10:51:15 +0000 (Wed, 07 Aug 2013) Log Message: ----------- Add IDL for existing activscp.h header, and extend it by some missing Vista+ interfaces and defines. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/include/activscp.h Added Paths: ----------- trunk/mingw-w64-headers/include/activscp.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 10:38:56 UTC (rev 6031) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 10:51:15 UTC (rev 6032) @@ -60,6 +60,7 @@ IDL_SRCS = \ include/activation.idl \ include/activaut.idl \ + include/activscp.idl \ include/audioclient.idl \ include/audiopolicy.idl \ include/ctfutb.idl \ Modified: trunk/mingw-w64-headers/include/activscp.h =================================================================== --- trunk/mingw-w64-headers/include/activscp.h 2013-08-07 10:38:56 UTC (rev 6031) +++ trunk/mingw-w64-headers/include/activscp.h 2013-08-07 10:51:15 UTC (rev 6032) @@ -1,193 +1,209 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ +/*** Autogenerated by WIDL 1.5.29 from activscp.idl - Do not edit ***/ + #ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 440 +#define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif -#include "rpc.h" -#include "rpcndr.h" +#include <rpc.h> +#include <rpcndr.h> -#ifndef __RPCNDR_H_VERSION__ -#error this stub requires an updated version of <rpcndr.h> -#endif - #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include <windows.h> +#include <ole2.h> #endif #ifndef __activscp_h__ #define __activscp_h__ +/* Forward declarations */ + #ifndef __IActiveScriptSite_FWD_DEFINED__ #define __IActiveScriptSite_FWD_DEFINED__ -typedef struct IActiveScriptSite IActiveScriptSite; +typedef interface IActiveScriptSite IActiveScriptSite; #endif #ifndef __IActiveScriptError_FWD_DEFINED__ #define __IActiveScriptError_FWD_DEFINED__ -typedef struct IActiveScriptError IActiveScriptError; +typedef interface IActiveScriptError IActiveScriptError; #endif #ifndef __IActiveScriptError64_FWD_DEFINED__ #define __IActiveScriptError64_FWD_DEFINED__ -typedef struct IActiveScriptError64 IActiveScriptError64; +typedef interface IActiveScriptError64 IActiveScriptError64; #endif #ifndef __IActiveScriptSiteWindow_FWD_DEFINED__ #define __IActiveScriptSiteWindow_FWD_DEFINED__ -typedef struct IActiveScriptSiteWindow IActiveScriptSiteWindow; +typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow; #endif +#ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__ +#define __IActiveScriptSiteUIControl_FWD_DEFINED__ +typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl; +#endif + #ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ #define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ -typedef struct IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; +typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; #endif #ifndef __IActiveScript_FWD_DEFINED__ #define __IActiveScript_FWD_DEFINED__ -typedef struct IActiveScript IActiveScript; +typedef interface IActiveScript IActiveScript; #endif #ifndef __IActiveScriptParse32_FWD_DEFINED__ #define __IActiveScriptParse32_FWD_DEFINED__ -typedef struct IActiveScriptParse32 IActiveScriptParse32; +typedef interface IActiveScriptParse32 IActiveScriptParse32; #endif #ifndef __IActiveScriptParse64_FWD_DEFINED__ #define __IActiveScriptParse64_FWD_DEFINED__ -typedef struct IActiveScriptParse64 IActiveScriptParse64; +typedef interface IActiveScriptParse64 IActiveScriptParse64; #endif #ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld32_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32; +typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32; #endif #ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld64_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64; +typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64; #endif #ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__ #define __IActiveScriptParseProcedure32_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedure32 IActiveScriptParseProcedure32; +typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32; #endif #ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__ #define __IActiveScriptParseProcedure64_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedure64 IActiveScriptParseProcedure64; +typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64; #endif #ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_32_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32; +typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32; #endif #ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_64_FWD_DEFINED__ -typedef struct IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64; +typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64; #endif #ifndef __IActiveScriptEncode_FWD_DEFINED__ #define __IActiveScriptEncode_FWD_DEFINED__ -typedef struct IActiveScriptEncode IActiveScriptEncode; +typedef interface IActiveScriptEncode IActiveScriptEncode; #endif #ifndef __IActiveScriptHostEncode_FWD_DEFINED__ #define __IActiveScriptHostEncode_FWD_DEFINED__ -typedef struct IActiveScriptHostEncode IActiveScriptHostEncode; +typedef interface IActiveScriptHostEncode IActiveScriptHostEncode; #endif #ifndef __IBindEventHandler_FWD_DEFINED__ #define __IBindEventHandler_FWD_DEFINED__ -typedef struct IBindEventHandler IBindEventHandler; +typedef interface IBindEventHandler IBindEventHandler; #endif #ifndef __IActiveScriptStats_FWD_DEFINED__ #define __IActiveScriptStats_FWD_DEFINED__ -typedef struct IActiveScriptStats IActiveScriptStats; +typedef interface IActiveScriptStats IActiveScriptStats; #endif #ifndef __IActiveScriptProperty_FWD_DEFINED__ #define __IActiveScriptProperty_FWD_DEFINED__ -typedef struct IActiveScriptProperty IActiveScriptProperty; +typedef interface IActiveScriptProperty IActiveScriptProperty; #endif #ifndef __ITridentEventSink_FWD_DEFINED__ #define __ITridentEventSink_FWD_DEFINED__ -typedef struct ITridentEventSink ITridentEventSink; +typedef interface ITridentEventSink ITridentEventSink; #endif #ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__ #define __IActiveScriptGarbageCollector_FWD_DEFINED__ -typedef struct IActiveScriptGarbageCollector IActiveScriptGarbageCollector; +typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector; #endif #ifndef __IActiveScriptSIPInfo_FWD_DEFINED__ #define __IActiveScriptSIPInfo_FWD_DEFINED__ -typedef struct IActiveScriptSIPInfo IActiveScriptSIPInfo; +typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo; #endif #ifndef __IActiveScriptSiteTraceInfo_FWD_DEFINED__ #define __IActiveScriptSiteTraceInfo_FWD_DEFINED__ -typedef struct IActiveScriptSiteTraceInfo IActiveScriptSiteTraceInfo; +typedef interface IActiveScriptSiteTraceInfo IActiveScriptSiteTraceInfo; #endif #ifndef __IActiveScriptTraceInfo_FWD_DEFINED__ #define __IActiveScriptTraceInfo_FWD_DEFINED__ -typedef struct IActiveScriptTraceInfo IActiveScriptTraceInfo; +typedef interface IActiveScriptTraceInfo IActiveScriptTraceInfo; #endif -#include "ocidl.h" +#ifndef __IActiveScriptStringCompare_FWD_DEFINED__ +#define __IActiveScriptStringCompare_FWD_DEFINED__ +typedef interface IActiveScriptStringCompare IActiveScriptStringCompare; +#endif +/* Headers for imported files */ + +#include <ocidl.h> +#include <oleidl.h> +#include <oaidl.h> + #ifdef __cplusplus -extern "C"{ +extern "C" { #endif -#ifndef __MIDL_user_allocate_free_DEFINED__ -#define __MIDL_user_allocate_free_DEFINED__ - void *__RPC_API MIDL_user_allocate(size_t); - void __RPC_API MIDL_user_free(void *); -#endif +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ #ifndef __ActivScp_h #define __ActivScp_h +#include <winapifamily.h> + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + + #ifndef _NO_SCRIPT_GUIDS - DEFINE_GUID(CATID_ActiveScript,0xf0b7a1a1,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(CATID_ActiveScriptParse,0xf0b7a1a2,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(CATID_ActiveScriptEncode,0xf0b7a1a3,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptParse32,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptParse64,0xc7ef7658,0xe1ee,0x480e,0x97,0xea,0xd5,0x2c,0xb4,0xd7,0x6d,0x17); - DEFINE_GUID(IID_IActiveScriptEncode,0xbb1a2ae3,0xa4f9,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptHostEncode,0xbee9b76e,0xcfe3,0x11d1,0xb7,0x47,0x00,0xc0,0x4f,0xc2,0xb0,0x85); - DEFINE_GUID(IID_IActiveScriptParseProcedureOld32,0x1cff0050,0x6fdd,0x11d0,0x93,0x28,0x00,0xa0,0xc9,0x0d,0xca,0xa9); - DEFINE_GUID(IID_IActiveScriptParseProcedureOld64,0x21f57128,0x08c9,0x4638,0xba,0x12,0x22,0xd1,0x5d,0x88,0xdc,0x5c); - DEFINE_GUID(IID_IActiveScriptParseProcedure32,0xaa5b6a80,0xb834,0x11d0,0x93,0x2f,0x00,0xa0,0xc9,0x0d,0xca,0xa9); - DEFINE_GUID(IID_IActiveScriptParseProcedure64,0xc64713b6,0xe029,0x4cc5,0x92,0x00,0x43,0x8b,0x72,0x89,0x0b,0x6a); - DEFINE_GUID(IID_IActiveScriptParseProcedure2_32,0x71ee5b20,0xfb04,0x11d1,0xb3,0xa8,0x00,0xa0,0xc9,0x11,0xe8,0xb2); - DEFINE_GUID(IID_IActiveScriptParseProcedure2_64,0xfe7c4271,0x210c,0x448d,0x9f,0x54,0x76,0xda,0xb7,0x04,0x7b,0x28); - DEFINE_GUID(IID_IActiveScriptSite,0xdb01a1e3,0xa42b,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptSiteTraceInfo,0x4b7272ae,0x1955,0x4bfe,0x98,0xb0,0x78,0x6,0x21,0x88,0x85,0x69); - DEFINE_GUID(IID_IActiveScriptSiteWindow,0xd10f6761,0x83e9,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptSiteInterruptPoll,0x539698a0,0xcdca,0x11cf,0xa5,0xeb,0x00,0xaa,0x00,0x47,0xa0,0x63); - DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64); - DEFINE_GUID(IID_IActiveScriptError64,0xb21fb2a1,0x5b8f,0x4963,0x8c,0x21,0x21,0x45,0x0f,0x84,0xed,0x7f); - DEFINE_GUID(IID_IBindEventHandler,0x63cdbcb0,0xc1b1,0x11d0,0x93,0x36,0x00,0xa0,0xc9,0x0d,0xca,0xa9); - DEFINE_GUID(IID_IActiveScriptStats,0xb8da6310,0xe19b,0x11d0,0x93,0x3c,0x00,0xa0,0xc9,0x0d,0xca,0xa9); - DEFINE_GUID(IID_IActiveScriptProperty,0x4954E0D0,0xFBC7,0x11D1,0x84,0x10,0x00,0x60,0x08,0xC3,0xFB,0xFC); - DEFINE_GUID(IID_ITridentEventSink,0x1dc9ca50,0x6ef,0x11d2,0x84,0x15,0x00,0x60,0x08,0xc3,0xfb,0xfc); - DEFINE_GUID(IID_IActiveScriptGarbageCollector,0x6aa2c4a0,0x2b53,0x11d4,0xa2,0xa0,0x00,0x10,0x4b,0xd3,0x50,0x90); - DEFINE_GUID(IID_IActiveScriptSIPInfo,0x764651d0,0x38de,0x11d4,0xa2,0xa3,0x00,0x10,0x4b,0xd3,0x50,0x90); - DEFINE_GUID(IID_IActiveScriptTraceInfo,0xC35456E7,0xBEBF,0x4a1b,0x86,0xA9,0x24,0xD5,0x6B,0xE8,0xB3,0x69); - DEFINE_GUID(OID_VBSSIP,0x1629f04e,0x2799,0x4db5,0x8f,0xe5,0xac,0xe1,0x0f,0x17,0xeb,0xab); - DEFINE_GUID(OID_JSSIP,0x6c9e010,0x38ce,0x11d4,0xa2,0xa3,0x00,0x10,0x4b,0xd3,0x50,0x90); - DEFINE_GUID(OID_WSFSIP,0x1a610570,0x38ce,0x11d4,0xa2,0xa3,0x00,0x10,0x4b,0xd3,0x50,0x90); + +DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(CATID_ActiveScriptParse, 0xf0b7a1a2, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(CATID_ActiveScriptEncode, 0xf0b7a1a3, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScript, 0xbb1a2ae1, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptParse32, 0xbb1a2ae2, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptParse64, 0xc7ef7658, 0xe1ee, 0x480e, 0x97, 0xea, 0xd5, 0x2c, 0xb4, 0xd7, 0x6d, 0x17); +DEFINE_GUID(IID_IActiveScriptEncode, 0xbb1a2ae3, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptHostEncode, 0xbee9b76e, 0xcfe3, 0x11d1, 0xb7, 0x47, 0x00, 0xc0, 0x4f, 0xc2, 0xb0, 0x85); +DEFINE_GUID(IID_IActiveScriptParseProcedureOld32, 0x1cff0050, 0x6fdd, 0x11d0, 0x93, 0x28, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9); +DEFINE_GUID(IID_IActiveScriptParseProcedureOld64, 0x21f57128, 0x08c9, 0x4638, 0xba, 0x12, 0x22, 0xd1, 0x5d, 0x88, 0xdc, 0x5c); +DEFINE_GUID(IID_IActiveScriptParseProcedure32, 0xaa5b6a80, 0xb834, 0x11d0, 0x93, 0x2f, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9); +DEFINE_GUID(IID_IActiveScriptParseProcedure64, 0xc64713b6, 0xe029, 0x4cc5, 0x92, 0x00, 0x43, 0x8b, 0x72, 0x89, 0x0b, 0x6a); +DEFINE_GUID(IID_IActiveScriptParseProcedure2_32, 0x71ee5b20, 0xfb04, 0x11d1, 0xb3, 0xa8, 0x00, 0xa0, 0xc9, 0x11, 0xe8, 0xb2); +DEFINE_GUID(IID_IActiveScriptParseProcedure2_64, 0xfe7c4271, 0x210c, 0x448d, 0x9f, 0x54, 0x76, 0xda, 0xb7, 0x04, 0x7b, 0x28); +DEFINE_GUID(IID_IActiveScriptSite, 0xdb01a1e3, 0xa42b, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptSiteTraceInfo, 0x4b7272ae, 0x1955, 0x4bfe, 0x98, 0xb0, 0x78, 0x6, 0x21, 0x88, 0x85, 0x69); +DEFINE_GUID(IID_IActiveScriptSiteWindow, 0xd10f6761, 0x83e9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptSiteInterruptPoll, 0x539698a0, 0xcdca, 0x11cf, 0xa5, 0xeb, 0x00, 0xaa, 0x00, 0x47, 0xa0, 0x63); +DEFINE_GUID(IID_IActiveScriptSiteUIControl, 0xaedae97e, 0xd7ee, 0x4796, 0xb9, 0x60, 0x7f, 0x9, 0x2a, 0xe8, 0x44, 0xab); +DEFINE_GUID(IID_IActiveScriptError, 0xeae1ba61, 0xa4ed, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64); +DEFINE_GUID(IID_IActiveScriptError64, 0xb21fb2a1, 0x5b8f, 0x4963, 0x8c, 0x21, 0x21, 0x45, 0x0f, 0x84, 0xed, 0x7f); +DEFINE_GUID(IID_IBindEventHandler, 0x63cdbcb0, 0xc1b1, 0x11d0, 0x93, 0x36, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9); +DEFINE_GUID(IID_IActiveScriptStats, 0xb8da6310, 0xe19b, 0x11d0, 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9); +DEFINE_GUID(IID_IActiveScriptProperty, 0x4954E0D0, 0xFBC7, 0x11D1, 0x84, 0x10, 0x00, 0x60, 0x08, 0xC3, 0xFB, 0xFC); +DEFINE_GUID(IID_ITridentEventSink, 0x1dc9ca50, 0x6ef, 0x11d2, 0x84, 0x15, 0x00, 0x60, 0x08, 0xc3, 0xfb, 0xfc); +DEFINE_GUID(IID_IActiveScriptGarbageCollector, 0x6aa2c4a0, 0x2b53, 0x11d4, 0xa2, 0xa0, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90); +DEFINE_GUID(IID_IActiveScriptSIPInfo, 0x764651d0, 0x38de, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90); +DEFINE_GUID(IID_IActiveScriptTraceInfo, 0xC35456E7, 0xBEBF, 0x4a1b, 0x86, 0xA9, 0x24, 0xD5, 0x6B, 0xE8, 0xB3, 0x69); +DEFINE_GUID(OID_VBSSIP, 0x1629f04e, 0x2799, 0x4db5, 0x8f, 0xe5, 0xac, 0xe1, 0x0f, 0x17, 0xeb, 0xab); +DEFINE_GUID(OID_JSSIP, 0x6c9e010, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90); +DEFINE_GUID(OID_WSFSIP, 0x1a610570, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90); +DEFINE_GUID(IID_IActiveScriptStringCompare, 0x58562769, 0xED52, 0x42f7, 0x84, 0x03, 0x49, 0x63, 0x51, 0x4E, 0x1F, 0x11); #endif #define SCRIPTITEM_ISVISIBLE 0x00000002 @@ -201,6 +217,7 @@ #define SCRIPTTYPELIB_ISCONTROL 0x00000010 #define SCRIPTTYPELIB_ISPERSISTENT 0x00000040 + #define SCRIPTTYPELIB_ALL_FLAGS (SCRIPTTYPELIB_ISCONTROL | SCRIPTTYPELIB_ISPERSISTENT) #define SCRIPTTEXT_DELAYEXECUTION 0x00000001 @@ -208,116 +225,349 @@ #define SCRIPTTEXT_ISEXPRESSION 0x00000020 #define SCRIPTTEXT_ISPERSISTENT 0x00000040 #define SCRIPTTEXT_HOSTMANAGESSOURCE 0x00000080 -#define SCRIPTTEXT_ALL_FLAGS (SCRIPTTEXT_DELAYEXECUTION | SCRIPTTEXT_ISVISIBLE | SCRIPTTEXT_ISEXPRESSION | SCRIPTTEXT_ISPERSISTENT | SCRIPTTEXT_HOSTMANAGESSOURCE) +#define SCRIPTTEXT_ISXDOMAIN 0x00000100 +#define SCRIPTTEXT_ALL_FLAGS (SCRIPTTEXT_DELAYEXECUTION | SCRIPTTEXT_ISVISIBLE | SCRIPTTEXT_ISEXPRESSION | SCRIPTTEXT_ISPERSISTENT | SCRIPTTEXT_HOSTMANAGESSOURCE | SCRIPTTEXT_ISXDOMAIN) + #define SCRIPTPROC_ISEXPRESSION 0x00000020 #define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080 #define SCRIPTPROC_IMPLICIT_THIS 0x00000100 #define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200 -#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | SCRIPTPROC_ISEXPRESSION | SCRIPTPROC_IMPLICIT_THIS | SCRIPTPROC_IMPLICIT_PARENTS) +#define SCRIPTPROC_ISXDOMAIN 0x00000400 +#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | SCRIPTPROC_ISEXPRESSION | SCRIPTPROC_IMPLICIT_THIS | SCRIPTPROC_IMPLICIT_PARENTS | SCRIPTPROC_ISXDOMAIN) + #define SCRIPTINFO_IUNKNOWN 0x00000001 #define SCRIPTINFO_ITYPEINFO 0x00000002 + #define SCRIPTINFO_ALL_FLAGS (SCRIPTINFO_IUNKNOWN | SCRIPTINFO_ITYPEINFO) #define SCRIPTINTERRUPT_DEBUG 0x00000001 #define SCRIPTINTERRUPT_RAISEEXCEPTION 0x00000002 + #define SCRIPTINTERRUPT_ALL_FLAGS (SCRIPTINTERRUPT_DEBUG | SCRIPTINTERRUPT_RAISEEXCEPTION) -#define SCRIPTSTAT_STATEMENT_COUNT 1 -#define SCRIPTSTAT_INSTRUCTION_COUNT 2 -#define SCRIPTSTAT_INTSTRUCTION_TIME 3 -#define SCRIPTSTAT_TOTAL_TIME 4 +#define SCRIPTSTAT_STATEMENT_COUNT 0x1 +#define SCRIPTSTAT_INSTRUCTION_COUNT 0x2 +#define SCRIPTSTAT_INTSTRUCTION_TIME 0x3 +#define SCRIPTSTAT_TOTAL_TIME 0x4 -#define SCRIPT_ENCODE_SECTION 0x00000001 +#define SCRIPT_ENCODE_SECTION 0x1 -#define SCRIPT_ENCODE_DEFAULT_LANGUAGE 0x00000001 -#define SCRIPT_ENCODE_NO_ASP_LANGUAGE 0x00000002 +#define SCRIPT_ENCODE_DEFAULT_LANGUAGE 0x1 +#define SCRIPT_ENCODE_NO_ASP_LANGUAGE 0x2 -#define SCRIPTPROP_NAME 0x00000000 -#define SCRIPTPROP_MAJORVERSION 0x00000001 -#define SCRIPTPROP_MINORVERSION 0x00000002 -#define SCRIPTPROP_BUILDNUMBER 0x00000003 +#define SCRIPTPROP_NAME 0x0 +#define SCRIPTPROP_MAJORVERSION 0x1 +#define SCRIPTPROP_MINORVERSION 0x2 +#define SCRIPTPROP_BUILDNUMBER 0x3 -#define SCRIPTPROP_DELAYEDEVENTSINKING 0x00001000 -#define SCRIPTPROP_CATCHEXCEPTION 0x00001001 -#define SCRIPTPROP_CONVERSIONLCID 0x00001002 -#define SCRIPTPROP_HOSTSTACKREQUIRED 0x00001003 +#define SCRIPTPROP_DELAYEDEVENTSINKING 0x1000 +#define SCRIPTPROP_CATCHEXCEPTION 0x1001 +#define SCRIPTPROP_CONVERSIONLCID 0x1002 +#define SCRIPTPROP_HOSTSTACKREQUIRED 0x1003 -#define SCRIPTPROP_DEBUGGER 0x00001100 -#define SCRIPTPROP_JITDEBUG 0x00001101 +#define SCRIPTPROP_DEBUGGER 0x1100 +#define SCRIPTPROP_JITDEBUG 0x1101 +#define SCRIPTPROP_GCCONTROLSOFTCLOSE 0x2000 + +#define SCRIPTPROP_INTEGERMODE 0x3000 +#define SCRIPTPROP_STRINGCOMPAREINSTANCE 0x3001 + +#define SCRIPTPROP_INVOKEVERSIONING 0x4000 + #define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000 #define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001 +#define SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION 0x70000002 +#define SCRIPTPROP_HOSTKEEPALIVE 0x70000004 - typedef enum tagSCRIPTSTATE { - SCRIPTSTATE_UNINITIALIZED = 0,SCRIPTSTATE_INITIALIZED = 5,SCRIPTSTATE_STARTED = 1,SCRIPTSTATE_CONNECTED = 2, - SCRIPTSTATE_DISCONNECTED = 3,SCRIPTSTATE_CLOSED = 4 - } SCRIPTSTATE; +#define SCRIPT_E_RECORDED __MSABI_LONG(0x86664004) +#define SCRIPT_E_REPORTED __MSABI_LONG(0x80020101) +#define SCRIPT_E_PROPAGATE __MSABI_LONG(0x80020102) - typedef enum tagSCRIPTTRACEINFO { - SCRIPTTRACEINFO_SCRIPTSTART = 0,SCRIPTTRACEINFO_SCRIPTEND = 1,SCRIPTTRACEINFO_COMCALLSTART = 2, - SCRIPTTRACEINFO_COMCALLEND = 3,SCRIPTTRACEINFO_CREATEOBJSTART = 4,SCRIPTTRACEINFO_CREATEOBJEND = 5, - SCRIPTTRACEINFO_GETOBJSTART = 6,SCRIPTTRACEINFO_GETOBJEND = 7 - } SCRIPTTRACEINFO; +typedef enum tagSCRIPTLANGUAGEVERSION { + SCRIPTLANGUAGEVERSION_DEFAULT = 0, + SCRIPTLANGUAGEVERSION_5_7 = 1, + SCRIPTLANGUAGEVERSION_5_8 = 2, + SCRIPTLANGUAGEVERSION_MAX = 255 +} SCRIPTLANGUAGEVERSION; - typedef enum tagSCRIPTTHREADSTATE { - SCRIPTTHREADSTATE_NOTINSCRIPT = 0,SCRIPTTHREADSTATE_RUNNING = 1 - } SCRIPTTHREADSTATE; +typedef enum tagSCRIPTSTATE { + SCRIPTSTATE_UNINITIALIZED = 0, + SCRIPTSTATE_INITIALIZED = 5, + SCRIPTSTATE_STARTED = 1, + SCRIPTSTATE_CONNECTED = 2, + SCRIPTSTATE_DISCONNECTED = 3, + SCRIPTSTATE_CLOSED = 4 +} SCRIPTSTATE; - typedef enum tagSCRIPTGCTYPE { - SCRIPTGCTYPE_NORMAL = 0,SCRIPTGCTYPE_EXHAUSTIVE = 1 - } SCRIPTGCTYPE; +typedef enum tagSCRIPTTRACEINFO { + SCRIPTTRACEINFO_SCRIPTSTART = 0, + SCRIPTTRACEINFO_SCRIPTEND = 1, + SCRIPTTRACEINFO_COMCALLSTART = 2, + SCRIPTTRACEINFO_COMCALLEND = 3, + SCRIPTTRACEINFO_CREATEOBJSTART = 4, + SCRIPTTRACEINFO_CREATEOBJEND = 5, + SCRIPTTRACEINFO_GETOBJSTART = 6, + SCRIPTTRACEINFO_GETOBJEND = 7 +} SCRIPTTRACEINFO; - typedef DWORD SCRIPTTHREADID; +typedef enum tagSCRIPTTHREADSTATE { + SCRIPTTHREADSTATE_NOTINSCRIPT = 0, + SCRIPTTHREADSTATE_RUNNING = 1 +} SCRIPTTHREADSTATE; +typedef enum tagSCRIPTGCTYPE { + SCRIPTGCTYPE_NORMAL = 0, + SCRIPTGCTYPE_EXHAUSTIVE = 1 +} SCRIPTGCTYPE; + +typedef enum tagSCRIPTUICITEM { + SCRIPTUICITEM_INPUTBOX = 1, + SCRIPTUICITEM_MSGBOX = 2 +} SCRIPTUICITEM; + +typedef enum tagSCRIPTUICHANDLING { + SCRIPTUICHANDLING_ALLOW = 0, + SCRIPTUICHANDLING_NOUIERROR = 1, + SCRIPTUICHANDLING_NOUIDEFAULT = 2 +} SCRIPTUICHANDLING; + +typedef DWORD SCRIPTTHREADID; + #define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1) -#define SCRIPTTHREADID_BASE ((SCRIPTTHREADID)-2) -#define SCRIPTTHREADID_ALL ((SCRIPTTHREADID)-3) +#define SCRIPTTHREADID_BASE ((SCRIPTTHREADID)-2) +#define SCRIPTTHREADID_ALL ((SCRIPTTHREADID)-3) - extern RPC_IF_HANDLE __MIDL_itf_activscp_0000_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_activscp_0000_v0_0_s_ifspec; +#ifndef __IActiveScriptSite_FWD_DEFINED__ +#define __IActiveScriptSite_FWD_DEFINED__ +typedef interface IActiveScriptSite IActiveScriptSite; +#endif +#ifndef __IActiveScriptError_FWD_DEFINED__ +#define __IActiveScriptError_FWD_DEFINED__ +typedef interface IActiveScriptError IActiveScriptError; +#endif + +#ifndef __IActiveScriptError64_FWD_DEFINED__ +#define __IActiveScriptError64_FWD_DEFINED__ +typedef interface IActiveScriptError64 IActiveScriptError64; +#endif + +#ifndef __IActiveScriptSiteWindow_FWD_DEFINED__ +#define __IActiveScriptSiteWindow_FWD_DEFINED__ +typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow; +#endif + +#ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__ +#define __IActiveScriptSiteUIControl_FWD_DEFINED__ +typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl; +#endif + +#ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ +#define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ +typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; +#endif + +#ifndef __IActiveScript_FWD_DEFINED__ +#define __IActiveScript_FWD_DEFINED__ +typedef interface IActiveScript IActiveScript; +#endif + +#ifndef __IActiveScriptParse32_FWD_DEFINED__ +#define __IActiveScriptParse32_FWD_DEFINED__ +typedef interface IActiveScriptParse32 IActiveScriptParse32; +#endif + +#ifndef __IActiveScriptParse64_FWD_DEFINED__ +#define __IActiveScriptParse64_FWD_DEFINED__ +typedef interface IActiveScriptParse64 IActiveScriptParse64; +#endif + +#ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__ +#define __IActiveScriptParseProcedureOld32_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32; +#endif + +#ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__ +#define __IActiveScriptParseProcedureOld64_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64; +#endif + +#ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__ +#define __IActiveScriptParseProcedure32_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32; +#endif + +#ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__ +#define __IActiveScriptParseProcedure64_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64; +#endif + +#ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__ +#define __IActiveScriptParseProcedure2_32_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32; +#endif + +#ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__ +#define __IActiveScriptParseProcedure2_64_FWD_DEFINED__ +typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64; +#endif + +#ifndef __IActiveScriptEncode_FWD_DEFINED__ +#define __IActiveScriptEncode_FWD_DEFINED__ +typedef interface IActiveScriptEncode IActiveScriptEncode; +#endif + +#ifndef __IActiveScriptHostEncode_FWD_DEFINED__ +#define __IActiveScriptHostEncode_FWD_DEFINED__ +typedef interface IActiveScriptHostEncode IActiveScriptHostEncode; +#endif + +#ifndef __IBindEventHandler_FWD_DEFINED__ +#define __IBindEventHandler_FWD_DEFINED__ +typedef interface IBindEventHandler IBindEventHandler; +#endif + +#ifndef __IActiveScriptStats_FWD_DEFINED__ +#define __IActiveScriptStats_FWD_DEFINED__ +typedef interface IActiveScriptStats IActiveScriptStats; +#endif + +#ifndef __IActiveScriptProperty_FWD_DEFINED__ +#define __IActiveScriptProperty_FWD_DEFINED__ +typedef interface IActiveScriptProperty IActiveScriptProperty; +#endif + +#ifndef __ITridentEventSink_FWD_DEFINED__ +#define __ITridentEventSink_FWD_DEFINED__ +typedef interface ITridentEventSink ITridentEventSink; +#endif + +#ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__ +#define __IActiveScriptGarbageCollector_FWD_DEFINED__ +typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector; +#endif + +#ifndef __IActiveScriptSIPInfo_FWD_DEFINED__ +#define __IActiveScriptSIPInfo_FWD_DEFINED__ +typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo; +#endif + +#ifndef __IActiveScriptStringCompare_FWD_DEFINED__ +#define __IActiveScriptStringCompare_FWD_DEFINED__ +typedef interface IActiveScriptStringCompare IActiveScriptStringCompare; +#endif + + +/***************************************************************************** + * IActiveScriptSite interface + */ #ifndef __IActiveScriptSite_INTERFACE_DEFINED__ #define __IActiveScriptSite_INTERFACE_DEFINED__ - EXTERN_C const IID IID_IActiveScriptSite; +DEFINE_GUID(IID_IActiveScriptSite, 0xdb01a1e3, 0xa42b, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("db01a1e3-a42b-11cf-8f20-00805f2cd064") +IActiveScriptSite : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetLCID( + LCID *plcid) = 0; -#if defined(__cplusplus) && !defined(CINTERFACE) - struct IActiveScriptSite : public IUnknown { - public: - virtual HRESULT WINAPI GetLCID(LCID *plcid) = 0; - virtual HRESULT WINAPI GetItemInfo(LPCOLESTR pstrName,DWORD dwReturnMask,IUnknown **ppiunkItem,ITypeInfo **ppti) = 0; - virtual HRESULT WINAPI GetDocVersionString(BSTR *pbstrVersion) = 0; - virtual HRESULT WINAPI OnScriptTerminate(const VARIANT *pvarResult,const EXCEPINFO *pexcepinfo) = 0; - virtual HRESULT WINAPI OnStateChange(SCRIPTSTATE ssScriptState) = 0; - virtual HRESULT WINAPI OnScriptError(IActiveScriptError *pscripterror) = 0; - virtual HRESULT WINAPI OnEnterScript(void) = 0; - virtual HRESULT WINAPI OnLeaveScript(void) = 0; - }; + virtual HRESULT STDMETHODCALLTYPE GetItemInfo( + LPCOLESTR pstrName, + DWORD dwReturnMask, + IUnknown **ppiunkItem, + ITypeInfo **ppti) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDocVersionString( + BSTR *pbstrVersion) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnScriptTerminate( + const VARIANT *pvarResult, + const EXCEPINFO *pexcepinfo) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnStateChange( + SCRIPTSTATE ssScriptState) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnScriptError( + IActiveScriptError *pscripterror) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnEnterScript( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnLeaveScript( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActiveScriptSite, 0xdb01a1e3, 0xa42b, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64) +#endif #else - typedef struct IActiveScriptSiteVtbl { +typedef struct IActiveScriptSiteVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IActiveScriptSite *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IActiveScriptSite *This); - ULONG (WINAPI *Release)(IActiveScriptSite *This); - HRESULT (WINAPI *GetLCID)(IActiveScriptSite *This,LCID *plcid); - HRESULT (WINAPI *GetItemInfo)(IActiveScriptSite *This,LPCOLESTR pstrName,DWORD dwReturnMask,IUnknown **ppiunkItem,ITypeInfo **ppti); - HRESULT (WINAPI *GetDocVersionString)(IActiveScriptSite *This,BSTR *pbstrVersion); - HRESULT (WINAPI *OnScriptTerminate)(IActiveScriptSite *This,const VARIANT *pvarResult,const EXCEPINFO *pexcepinfo); - HRESULT (WINAPI *OnStateChange)(IActiveScriptSite *This,SCRIPTSTATE ssScriptState); - HRESULT (WINAPI *OnScriptError)(IActiveScriptSite *This,IActiveScriptError *pscripterror); - HRESULT (WINAPI *OnEnterScript)(IActiveScriptSite *This); - HRESULT (WINAPI *OnLeaveScript)(IActiveScriptSite *This); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActiveScriptSite* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActiveScriptSite* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActiveScriptSite* This); + + /*** IActiveScriptSite methods ***/ + HRESULT (STDMETHODCALLTYPE *GetLCID)( + IActiveScriptSite* This, + LCID *plcid); + + HRESULT (STDMETHODCALLTYPE *GetItemInfo)( + IActiveScriptSite* This, + LPCOLESTR pstrName, + DWORD dwReturnMask, + IUnknown **ppiunkItem, + ITypeInfo **ppti); + + HRESULT (STDMETHODCALLTYPE *GetDocVersionString)( + IActiveScriptSite* This, + BSTR *pbstrVersion); + + HRESULT (STDMETHODCALLTYPE *OnScriptTerminate)( + IActiveScriptSite* This, + const VARIANT *pvarResult, + const EXCEPINFO *pexcepinfo); + + HRESULT (STDMETHODCALLTYPE *OnStateChange)( + IActiveScriptSite* This, + SCRIPTSTATE ssScriptState); + + HRESULT (STDMETHODCALLTYPE *OnScriptError)( + IActiveScriptSite* This, + IActiveScriptError *pscripterror); + + HRESULT (STDMETHODCALLTYPE *OnEnterScript)( + IActiveScriptSite* This); + + HRESULT (STDMETHODCALLTYPE *OnLeaveScript)( + IActiveScriptSite* This); + END_INTERFACE - } IActiveScriptSiteVtbl; - struct IActiveScriptSite { - CONST_VTBL struct IActiveScriptSiteVtbl *lpVtbl; - }; +} IActiveScriptSiteVtbl; +interface IActiveScriptSite { + CONST_VTBL IActiveScriptSiteVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IActiveScriptSite_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IActiveScriptSite_AddRef(This) (This)->lpVtbl->AddRef(This) #define IActiveScriptSite_Release(This) (This)->lpVtbl->Release(This) +/*** IActiveScriptSite methods ***/ #define IActiveScriptSite_GetLCID(This,plcid) (This)->lpVtbl->GetLCID(This,plcid) #define IActiveScriptSite_GetItemInfo(This,pstrName,dwReturnMask,ppiunkItem,ppti) (This)->lpVtbl->GetItemInfo(This,pstrName,dwReturnMask,ppiunkItem,ppti) #define IActiveScriptSite_GetDocVersionString(This,pbstrVersion) (This)->lpVtbl->GetDocVersionString(This,pbstrVersion) @@ -326,224 +576,801 @@ #define IActiveScriptSite_OnScriptError(This,pscripterror) (This)->lpVtbl->OnScriptError(This,pscripterror) #define IActiveScriptSite_OnEnterScript(This) (This)->lpVtbl->OnEnterScript(This) #define IActiveScriptSite_OnLeaveScript(This) (This)->lpVtbl->OnLeaveScript(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActiveScriptSite_QueryInterface(IActiveScriptSite* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActiveScriptSite_AddRef(IActiveScriptSite* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IActiveScriptSite_Release(IActiveScriptSite* This) { + return This->lpVtbl->Release(This); +} +/*** IActiveScriptSite methods ***/ +static FORCEINLINE HRESULT IActiveScriptSite_GetLCID(IActiveScriptSite* This,LCID *plcid) { + return This->lpVtbl->GetLCID(This,plcid); +} +static FORCEINLINE HRESULT IActiveScriptSite_GetItemInfo(IActiveScriptSite* This,LPCOLESTR pstrName,DWORD dwReturnMask,IUnknown **ppiunkItem,ITypeInfo **ppti) { + return This->lpVtbl->GetItemInfo(This,pstrName,dwReturnMask,ppiunkItem,ppti); +} +static FORCEINLINE HRESULT IActiveScriptSite_GetDocVersionString(IActiveScriptSite* This,BSTR *pbstrVersion) { + return This->lpVtbl->GetDocVersionString(This,pbstrVersion); +} +static FORCEINLINE HRESULT IActiveScriptSite_OnScriptTerminate(IActiveScriptSite* This,const VARIANT *pvarResult,const EXCEPINFO *pexcepinfo) { + return This->lpVtbl->OnScriptTerminate(This,pvarResult,pexcepinfo); +} +static FORCEINLINE HRESULT IActiveScriptSite_OnStateChange(IActiveScriptSite* This,SCRIPTSTATE ssScriptState) { + return This->lpVtbl->OnStateChange(This,ssScriptState); +} +static FORCEINLINE HRESULT IActiveScriptSite_OnScriptError(IActiveScriptSite* This,IActiveScriptError *pscripterror) { + return This->lpVtbl->OnScriptError(This,pscripterror); +} +static FORCEINLINE HRESULT IActiveScriptSite_OnEnterScript(IActiveScriptSite* This) { + return This->lpVtbl->OnEnterScript(This); +} +static FORCEINLINE HRESULT IActiveScriptSite_OnLeaveScript(IActiveScriptSite* This) { + return This->lpVtbl->OnLeaveScript(This); +} #endif #endif - HRESULT WINAPI IActiveScriptSite_GetLCID_Proxy(IActiveScriptSite *This,LCID *plcid); - void __RPC_STUB IActiveScriptSite_GetLCID_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_GetItemInfo_Proxy(IActiveScriptSite *This,LPCOLESTR pstrName,DWORD dwReturnMask,IUnknown **ppiunkItem,ITypeInfo **ppti); - void __RPC_STUB IActiveScriptSite_GetItemInfo_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_GetDocVersionString_Proxy(IActiveScriptSite *This,BSTR *pbstrVersion); - void __RPC_STUB IActiveScriptSite_GetDocVersionString_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_OnScriptTerminate_Proxy(IActiveScriptSite *This,const VARIANT *pvarResult,const EXCEPINFO *pexcepinfo); - void __RPC_STUB IActiveScriptSite_OnScriptTerminate_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_OnStateChange_Proxy(IActiveScriptSite *This,SCRIPTSTATE ssScriptState); - void __RPC_STUB IActiveScriptSite_OnStateChange_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_OnScriptError_Proxy(IActiveScriptSite *This,IActiveScriptError *pscripterror); - void __RPC_STUB IActiveScriptSite_OnScriptError_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_OnEnterScript_Proxy(IActiveScriptSite *This); - void __RPC_STUB IActiveScriptSite_OnEnterScript_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSite_OnLeaveScript_Proxy(IActiveScriptSite *This); - void __RPC_STUB IActiveScriptSite_OnLeaveScript_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); #endif +HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetLCID_Proxy( + IActiveScriptSite* This, + LCID *plcid); +void __RPC_STUB IActiveScriptSite_GetLCID_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetItemInfo_Proxy( + IActiveScriptSite* This, + LPCOLESTR pstrName, + DWORD dwReturnMask, + IUnknown **ppiunkItem, + ITypeInfo **ppti); +void __RPC_STUB IActiveScriptSite_GetItemInfo_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetDocVersionString_Proxy( + IActiveScriptSite* This, + BSTR *pbstrVersion); +void __RPC_STUB IActiveScriptSite_GetDocVersionString_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptTerminate_Proxy( + IActiveScriptSite* This, + const VARIANT *pvarResult, + const EXCEPINFO *pexcepinfo); +void __RPC_STUB IActiveScriptSite_OnScriptTerminate_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnStateChange_Proxy( + IActiveScriptSite* This, + SCRIPTSTATE ssScriptState); +void __RPC_STUB IActiveScriptSite_OnStateChange_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptError_Proxy( + IActiveScriptSite* This, + IActiveScriptError *pscripterror); +void __RPC_STUB IActiveScriptSite_OnScriptError_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnEnterScript_Proxy( + IActiveScriptSite* This); +void __RPC_STUB IActiveScriptSite_OnEnterScript_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnLeaveScript_Proxy( + IActiveScriptSite* This); +void __RPC_STUB IActiveScriptSite_OnLeaveScript_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IActiveScriptSite_INTERFACE_DEFINED__ */ + + +/***************************************************************************** + * IActiveScriptError interface + */ #ifndef __IActiveScriptError_INTERFACE_DEFINED__ #define __IActiveScriptError_INTERFACE_DEFINED__ - EXTERN_C const IID IID_IActiveScriptError; + +DEFINE_GUID(IID_IActiveScriptError, 0xeae1ba61, 0xa4ed, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); #if defined(__cplusplus) && !defined(CINTERFACE) - struct IActiveScriptError : public IUnknown { - public: - virtual HRESULT WINAPI GetExceptionInfo(EXCEPINFO *pexcepinfo) = 0; - virtual HRESULT WINAPI GetSourcePosition(DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition) = 0; - virtual HRESULT WINAPI GetSourceLineText(BSTR *pbstrSourceLine) = 0; - }; +MIDL_INTERFACE("eae1ba61-a4ed-11cf-8f20-00805f2cd064") +IActiveScriptError : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetExceptionInfo( + EXCEPINFO *pexcepinfo) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourcePosition( + DWORD *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceLineText( + BSTR *pbstrSourceLine) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActiveScriptError, 0xeae1ba61, 0xa4ed, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64) +#endif #else - typedef struct IActiveScriptErrorVtbl { +typedef struct IActiveScriptErrorVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IActiveScriptError *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IActiveScriptError *This); - ULONG (WINAPI *Release)(IActiveScriptError *This); - HRESULT (WINAPI *GetExceptionInfo)(IActiveScriptError *This,EXCEPINFO *pexcepinfo); - HRESULT (WINAPI *GetSourcePosition)(IActiveScriptError *This,DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition); - HRESULT (WINAPI *GetSourceLineText)(IActiveScriptError *This,BSTR *pbstrSourceLine); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActiveScriptError* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActiveScriptError* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActiveScriptError* This); + + /*** IActiveScriptError methods ***/ + HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( + IActiveScriptError* This, + EXCEPINFO *pexcepinfo); + + HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( + IActiveScriptError* This, + DWORD *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition); + + HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( + IActiveScriptError* This, + BSTR *pbstrSourceLine); + END_INTERFACE - } IActiveScriptErrorVtbl; - struct IActiveScriptError { - CONST_VTBL struct IActiveScriptErrorVtbl *lpVtbl; - }; +} IActiveScriptErrorVtbl; +interface IActiveScriptError { + CONST_VTBL IActiveScriptErrorVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IActiveScriptError_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IActiveScriptError_AddRef(This) (This)->lpVtbl->AddRef(This) #define IActiveScriptError_Release(This) (This)->lpVtbl->Release(This) +/*** IActiveScriptError methods ***/ #define IActiveScriptError_GetExceptionInfo(This,pexcepinfo) (This)->lpVtbl->GetExceptionInfo(This,pexcepinfo) #define IActiveScriptError_GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition) (This)->lpVtbl->GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition) #define IActiveScriptError_GetSourceLineText(This,pbstrSourceLine) (This)->lpVtbl->GetSourceLineText(This,pbstrSourceLine) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActiveScriptError_QueryInterface(IActiveScriptError* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActiveScriptError_AddRef(IActiveScriptError* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IActiveScriptError_Release(IActiveScriptError* This) { + return This->lpVtbl->Release(This); +} +/*** IActiveScriptError methods ***/ +static FORCEINLINE HRESULT IActiveScriptError_GetExceptionInfo(IActiveScriptError* This,EXCEPINFO *pexcepinfo) { + return This->lpVtbl->GetExceptionInfo(This,pexcepinfo); +} +static FORCEINLINE HRESULT IActiveScriptError_GetSourcePosition(IActiveScriptError* This,DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition) { + return This->lpVtbl->GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition); +} +static FORCEINLINE HRESULT IActiveScriptError_GetSourceLineText(IActiveScriptError* This,BSTR *pbstrSourceLine) { + return This->lpVtbl->GetSourceLineText(This,pbstrSourceLine); +} #endif #endif - HRESULT WINAPI IActiveScriptError_RemoteGetExceptionInfo_Proxy(IActiveScriptError *This,EXCEPINFO *pexcepinfo); - void __RPC_STUB IActiveScriptError_RemoteGetExceptionInfo_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptError_GetSourcePosition_Proxy(IActiveScriptError *This,DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition); - void __RPC_STUB IActiveScriptError_GetSourcePosition_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptError_GetSourceLineText_Proxy(IActiveScriptError *This,BSTR *pbstrSourceLine); - void __RPC_STUB IActiveScriptError_GetSourceLineText_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); #endif +HRESULT STDMETHODCALLTYPE IActiveScriptError_RemoteGetExceptionInfo_Proxy( + IActiveScriptError* This, + EXCEPINFO *pexcepinfo); +void __RPC_STUB IActiveScriptError_RemoteGetExceptionInfo_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourcePosition_Proxy( + IActiveScriptError* This, + DWORD *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition); +void __RPC_STUB IActiveScriptError_GetSourcePosition_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourceLineText_Proxy( + IActiveScriptError* This, + BSTR *pbstrSourceLine); +void __RPC_STUB IActiveScriptError_GetSourceLineText_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IActiveScriptError_GetExceptionInfo_Proxy( + IActiveScriptError* This, + EXCEPINFO *pexcepinfo); +HRESULT __RPC_STUB IActiveScriptError_GetExceptionInfo_Stub( + IActiveScriptError* This, + EXCEPINFO *pexcepinfo); + +#endif /* __IActiveScriptError_INTERFACE_DEFINED__ */ + + +/***************************************************************************** + * IActiveScriptError64 interface + */ #ifndef __IActiveScriptError64_INTERFACE_DEFINED__ #define __IActiveScriptError64_INTERFACE_DEFINED__ - EXTERN_C const IID IID_IActiveScriptError64; + +DEFINE_GUID(IID_IActiveScriptError64, 0xb21fb2a1, 0x5b8f, 0x4963, 0x8c,0x21, 0x21,0x45,0x0f,0x84,0xed,0x7f); #if defined(__cplusplus) && !defined(CINTERFACE) - struct IActiveScriptError64 : public IActiveScriptError { - public: - virtual HRESULT WINAPI GetSourcePosition64(DWORDLONG *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition) = 0; - }; +MIDL_INTERFACE("b21fb2a1-5b8f-4963-8c21-21450f84ed7f") +IActiveScriptError64 : public IActiveScriptError +{ + virtual HRESULT STDMETHODCALLTYPE GetSourcePosition64( + DWORDLONG *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActiveScriptError64, 0xb21fb2a1, 0x5b8f, 0x4963, 0x8c,0x21, 0x21,0x45,0x0f,0x84,0xed,0x7f) +#endif #else - typedef struct IActiveScriptError64Vtbl { +typedef struct IActiveScriptError64Vtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IActiveScriptError64 *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IActiveScriptError64 *This); - ULONG (WINAPI *Release)(IActiveScriptError64 *This); - HRESULT (WINAPI *GetExceptionInfo)(IActiveScriptError64 *This,EXCEPINFO *pexcepinfo); - HRESULT (WINAPI *GetSourcePosition)(IActiveScriptError64 *This,DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition); - HRESULT (WINAPI *GetSourceLineText)(IActiveScriptError64 *This,BSTR *pbstrSourceLine); - HRESULT (WINAPI *GetSourcePosition64)(IActiveScriptError64 *This,DWORDLONG *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActiveScriptError64* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActiveScriptError64* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActiveScriptError64* This); + + /*** IActiveScriptError methods ***/ + HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( + IActiveScriptError64* This, + EXCEPINFO *pexcepinfo); + + HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( + IActiveScriptError64* This, + DWORD *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition); + + HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( + IActiveScriptError64* This, + BSTR *pbstrSourceLine); + + /*** IActiveScriptError64 methods ***/ + HRESULT (STDMETHODCALLTYPE *GetSourcePosition64)( + IActiveScriptError64* This, + DWORDLONG *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition); + END_INTERFACE - } IActiveScriptError64Vtbl; - struct IActiveScriptError64 { - CONST_VTBL struct IActiveScriptError64Vtbl *lpVtbl; - }; +} IActiveScriptError64Vtbl; +interface IActiveScriptError64 { + CONST_VTBL IActiveScriptError64Vtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IActiveScriptError64_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IActiveScriptError64_AddRef(This) (This)->lpVtbl->AddRef(This) #define IActiveScriptError64_Release(This) (This)->lpVtbl->Release(This) +/*** IActiveScriptError methods ***/ #define IActiveScriptError64_GetExceptionInfo(This,pexcepinfo) (This)->lpVtbl->GetExceptionInfo(This,pexcepinfo) #define IActiveScriptError64_GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition) (This)->lpVtbl->GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition) #define IActiveScriptError64_GetSourceLineText(This,pbstrSourceLine) (This)->lpVtbl->GetSourceLineText(This,pbstrSourceLine) +/*** IActiveScriptError64 methods ***/ #define IActiveScriptError64_GetSourcePosition64(This,pdwSourceContext,pulLineNumber,plCharacterPosition) (This)->lpVtbl->GetSourcePosition64(This,pdwSourceContext,pulLineNumber,plCharacterPosition) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActiveScriptError64_QueryInterface(IActiveScriptError64* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActiveScriptError64_AddRef(IActiveScriptError64* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IActiveScriptError64_Release(IActiveScriptError64* This) { + return This->lpVtbl->Release(This); +} +/*** IActiveScriptError methods ***/ +static FORCEINLINE HRESULT IActiveScriptError64_GetExceptionInfo(IActiveScriptError64* This,EXCEPINFO *pexcepinfo) { + return This->lpVtbl->GetExceptionInfo(This,pexcepinfo); +} +static FORCEINLINE HRESULT IActiveScriptError64_GetSourcePosition(IActiveScriptError64* This,DWORD *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition) { + return This->lpVtbl->GetSourcePosition(This,pdwSourceContext,pulLineNumber,plCharacterPosition); +} +static FORCEINLINE HRESULT IActiveScriptError64_GetSourceLineText(IActiveScriptError64* This,BSTR *pbstrSourceLine) { + return This->lpVtbl->GetSourceLineText(This,pbstrSourceLine); +} +/*** IActiveScriptError64 methods ***/ +static FORCEINLINE HRESULT IActiveScriptError64_GetSourcePosition64(IActiveScriptError64* This,DWORDLONG *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition) { + return This->lpVtbl->GetSourcePosition64(This,pdwSourceContext,pulLineNumber,plCharacterPosition); +} #endif #endif - HRESULT WINAPI IActiveScriptError64_GetSourcePosition64_Proxy(IActiveScriptError64 *This,DWORDLONG *pdwSourceContext,ULONG *pulLineNumber,LONG *plCharacterPosition); - void __RPC_STUB IActiveScriptError64_GetSourcePosition64_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); #endif +HRESULT STDMETHODCALLTYPE IActiveScriptError64_GetSourcePosition64_Proxy( + IActiveScriptError64* This, + DWORDLONG *pdwSourceContext, + ULONG *pulLineNumber, + LONG *plCharacterPosition); +void __RPC_STUB IActiveScriptError64_GetSourcePosition64_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IActiveScriptError64_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IActiveScriptSiteWindow interface + */ #ifndef __IActiveScriptSiteWindow_INTERFACE_DEFINED__ #define __IActiveScriptSiteWindow_INTERFACE_DEFINED__ - EXTERN_C const IID IID_IActiveScriptSiteWindow; + +DEFINE_GUID(IID_IActiveScriptSiteWindow, 0xd10f6761, 0x83e9, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); #if defined(__cplusplus) && !defined(CINTERFACE) - struct IActiveScriptSiteWindow : public IUnknown { - public: - virtual HRESULT WINAPI GetWindow(HWND *phwnd) = 0; - virtual HRESULT WINAPI EnableModeless(WINBOOL fEnable) = 0; - }; +MIDL_INTERFACE("d10f6761-83e9-11cf-8f20-00805f2cd064") +IActiveScriptSiteWindow : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetWindow( + HWND *phwnd) = 0; + + virtual HRESULT STDMETHODCALLTYPE EnableModeless( + WINBOOL fEnable) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActiveScriptSiteWindow, 0xd10f6761, 0x83e9, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64) +#endif #else - typedef struct IActiveScriptSiteWindowVtbl { +typedef struct IActiveScriptSiteWindowVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IActiveScriptSiteWindow *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IActiveScriptSiteWindow *This); - ULONG (WINAPI *Release)(IActiveScriptSiteWindow *This); - HRESULT (WINAPI *GetWindow)(IActiveScriptSiteWindow *This,HWND *phwnd); - HRESULT (WINAPI *EnableModeless)(IActiveScriptSiteWindow *This,WINBOOL fEnable); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActiveScriptSiteWindow* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActiveScriptSiteWindow* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActiveScriptSiteWindow* This); + + /*** IActiveScriptSiteWindow methods ***/ + HRESULT (STDMETHODCALLTYPE *GetWindow)( + IActiveScriptSiteWindow* This, + HWND *phwnd); + + HRESULT (STDMETHODCALLTYPE *EnableModeless)( + IActiveScriptSiteWindow* This, + WINBOOL fEnable); + END_INTERFACE - } IActiveScriptSiteWindowVtbl; - struct IActiveScriptSiteWindow { - CONST_VTBL struct IActiveScriptSiteWindowVtbl *lpVtbl; - }; +} IActiveScriptSiteWindowVtbl; +interface IActiveScriptSiteWindow { + CONST_VTBL IActiveScriptSiteWindowVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IActiveScriptSiteWindow_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IActiveScriptSiteWindow_AddRef(This) (This)->lpVtbl->AddRef(This) #define IActiveScriptSiteWindow_Release(This) (This)->lpVtbl->Release(This) +/*** IActiveScriptSiteWindow methods ***/ #define IActiveScriptSiteWindow_GetWindow(This,phwnd) (This)->lpVtbl->GetWindow(This,phwnd) #define IActiveScriptSiteWindow_EnableModeless(This,fEnable) (This)->lpVtbl->EnableModeless(This,fEnable) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IActiveScriptSiteWindow_Release(IActiveScriptSiteWindow* This) { + return This->lpVtbl->Release(This); +} +/*** IActiveScriptSiteWindow methods ***/ +static FORCEINLINE HRESULT IActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow* This,HWND *phwnd) { + return This->lpVtbl->GetWindow(This,phwnd); +} +static FORCEINLINE HRESULT IActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow* This,WINBOOL fEnable) { + return This->lpVtbl->EnableModeless(This,fEnable); +} #endif #endif - HRESULT WINAPI IActiveScriptSiteWindow_GetWindow_Proxy(IActiveScriptSiteWindow *This,HWND *phwnd); - void __RPC_STUB IActiveScriptSiteWindow_GetWindow_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI IActiveScriptSiteWindow_EnableModeless_Proxy(IActiveScriptSiteWindow *This,WINBOOL fEnable); - void __RPC_STUB IActiveScriptSiteWindow_EnableModeless_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); #endif +HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_GetWindow_Proxy( + IActiveScriptSiteWindow* This, + HWND *phwnd); +void __RPC_STUB IActiveScriptSiteWindow_GetWindow_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_EnableModeless_Proxy( + IActiveScriptSiteWindow* This, + WINBOOL fEnable); +void __RPC_STUB IActiveScriptSiteWindow_EnableModeless_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IActiveScriptSiteWindow_INTERFACE_DEFINED__ */ + + +/***************************************************************************** + * IActiveScriptSiteUIControl interface + */ +#ifndef __IActiveScriptSiteUIControl_INTERFACE_DEFINED__ +#define __IActiveScriptSiteUIControl_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IActiveScriptSiteUIControl, 0xaedae97e, 0xd7ee, 0x4796, 0xb9,0x60, 0x7f,0x09,0x2a,0xe8,0x44,0xab); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("aedae97e-d7ee-4796-b960-7f092ae844ab") +IActiveScriptSiteUIControl : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetUIBehavior( + SCRIPTUICITEM UicItem, + SCRIPTUICHANDLING *pUicHandling) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IActiveScriptSiteUIControl, 0xaedae97e, 0xd7ee, 0x4796, 0xb9,0x60, 0x7f,0x09,0x2a,0xe8,0x44,0xab) +#endif +#else +typedef struct IActiveScriptSiteUIControlVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IActiveScriptSiteUIControl* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IActiveScriptSiteUIControl* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IActiveScriptSiteUIControl* This); + + /*** IActiveScriptSiteUIControl methods ***/ + HRESULT (STDMETHODCALLTYPE *GetUIBehavior)( + IActiveScriptSiteUIControl* This, + SCRIPTUICITEM UicItem, + SCRIPTUICHANDLING *pUicHandling); + + END_INTERFACE +} IActiveScriptSiteUIControlVtbl; +interface IActiveScriptSiteUIControl { + CONST_VTBL IActiveScriptSiteUIControlVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IActiveScriptSiteUIControl_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IActiveScriptSiteUIControl_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IActiveScriptSiteUIControl_Release(This) (This)->lpVtbl->Release(This) +/*** IActiveScriptSiteUIControl methods ***/ +#define IActiveScriptSiteUIControl_GetUIBehavior(This,UicItem,pUicHandling) (This)->lpVtbl->GetUIBehavior(This,UicItem,pUicHandling) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IActiveScriptSiteUIControl_QueryInterface(IActiveScriptSiteUIControl* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IActiveScriptSiteUIControl_AddRef(IActiveScriptSiteUIControl* This) { + return This->lpVtbl->AddRef(This); +} ... [truncated message content] |
From: <kti...@us...> - 2013-08-07 12:41:10
|
Revision: 6035 http://sourceforge.net/p/mingw-w64/code/6035 Author: ktietz70 Date: 2013-08-07 12:41:03 +0000 (Wed, 07 Aug 2013) Log Message: ----------- add servprov.idl file for existing servprov.h header, and improve. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/include/servprov.h Added Paths: ----------- trunk/mingw-w64-headers/include/servprov.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 11:42:45 UTC (rev 6034) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 12:41:03 UTC (rev 6035) @@ -60,6 +60,7 @@ IDL_SRCS = \ include/activation.idl \ include/activaut.idl \ + include/activprof.idl \ include/activscp.idl \ include/audioclient.idl \ include/audiopolicy.idl \ @@ -94,6 +95,7 @@ include/propidl.idl \ include/propsys.idl \ include/sensorsapi.idl \ + include/servprov.idl \ include/shobjidl.idl \ include/shtypes.idl \ include/strmif.idl \ Modified: trunk/mingw-w64-headers/include/servprov.h =================================================================== --- trunk/mingw-w64-headers/include/servprov.h 2013-08-07 11:42:45 UTC (rev 6034) +++ trunk/mingw-w64-headers/include/servprov.h 2013-08-07 12:41:03 UTC (rev 6035) @@ -1,103 +1,180 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ +/*** Autogenerated by WIDL 1.5.29 from servprov.idl - Do not edit ***/ + #ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 440 +#define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif -#include <_mingw.h> -#include "rpc.h" -#include "rpcndr.h" +#include <rpc.h> +#include <rpcndr.h> -#ifndef __RPCNDR_H_VERSION__ -#error This stub requires an updated version of <rpcndr.h> -#endif - #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include <windows.h> +#include <ole2.h> #endif #ifndef __servprov_h__ #define __servprov_h__ +/* Forward declarations */ + #ifndef __IServiceProvider_FWD_DEFINED__ #define __IServiceProvider_FWD_DEFINED__ -typedef struct IServiceProvider IServiceProvider; +typedef interface IServiceProvider IServiceProvider; #endif -#include "objidl.h" +/* Headers for imported files */ +#include <objidl.h> + #ifdef __cplusplus extern "C" { #endif -#ifndef __MIDL_user_allocate_free_DEFINED__ -#define __MIDL_user_allocate_free_DEFINED__ - void *__RPC_API MIDL_user_allocate(size_t); - void __RPC_API MIDL_user_free(void *); +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <winapifamily.h> + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + + +#ifndef __IServiceProvider_FWD_DEFINED__ +#define __IServiceProvider_FWD_DEFINED__ +typedef interface IServiceProvider IServiceProvider; #endif - extern RPC_IF_HANDLE __MIDL_itf_servprov_0000_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_servprov_0000_v0_0_s_ifspec; +/***************************************************************************** + * IServiceProvider interface + */ #ifndef __IServiceProvider_INTERFACE_DEFINED__ #define __IServiceProvider_INTERFACE_DEFINED__ - typedef IServiceProvider *LPSERVICEPROVIDER; +typedef IServiceProvider *LPSERVICEPROVIDER; #if defined(__cplusplus) && !defined(CINTERFACE) - EXTERN_C const IID IID_IServiceProvider; - extern "C++" { - struct IServiceProvider : public IUnknown { - public: - virtual HRESULT WINAPI QueryService(REFGUID guidService,REFIID riid,void **ppvObject) = 0; -#ifndef __STRICT_ANSI__ - template <class Q> HRESULT WINAPI QueryService(REFGUID guidService,Q **pp) { return QueryService(guidService,__uuidof(*pp),(void **)pp); } -#endif - }; - } - HRESULT WINAPI IServiceProvider_RemoteQueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); - void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); -#else - EXTERN_C const IID IID_IServiceProvider; -#if defined(__cplusplus) && !defined(CINTERFACE) - struct IServiceProvider : public IUnknown { +EXTERN_C const IID IID_IServiceProvider; +extern "C++" { + MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa") + IServiceProvider : public IUnknown { public: - virtual HRESULT WINAPI QueryService(REFGUID guidService,REFIID riid,void **ppvObject) = 0; + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) = 0; + + template <class Q> +HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q **pp) { + return QueryService(guidService, __uuidof(Q), (void **)pp); + } }; +} + +HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy(IServiceProvider __RPC_FAR *This, REFGUID guidService, REFIID riid, IUnknown __RPC_FAR *__RPC_FAR *ppvObject); +void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); #else - typedef struct IServiceProviderVtbl { +DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa") +IServiceProvider : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE QueryService( + REFGUID guidService, + REFIID riid, + void **ppvObject) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa) +#endif +#else +typedef struct IServiceProviderVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IServiceProvider *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IServiceProvider *This); - ULONG (WINAPI *Release)(IServiceProvider *This); - HRESULT (WINAPI *QueryService)(IServiceProvider *This,REFGUID guidService,REFIID riid,void **ppvObject); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IServiceProvider* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IServiceProvider* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IServiceProvider* This); + + /*** IServiceProvider methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryService)( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + void **ppvObject); + END_INTERFACE - } IServiceProviderVtbl; - struct IServiceProvider { - CONST_VTBL struct IServiceProviderVtbl *lpVtbl; - }; +} IServiceProviderVtbl; +interface IServiceProvider { + CONST_VTBL IServiceProviderVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IServiceProvider_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IServiceProvider_AddRef(This) (This)->lpVtbl->AddRef(This) #define IServiceProvider_Release(This) (This)->lpVtbl->Release(This) +/*** IServiceProvider methods ***/ #define IServiceProvider_QueryService(This,guidService,riid,ppvObject) (This)->lpVtbl->QueryService(This,guidService,riid,ppvObject) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IServiceProvider_QueryInterface(IServiceProvider* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IServiceProvider_AddRef(IServiceProvider* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IServiceProvider_Release(IServiceProvider* This) { + return This->lpVtbl->Release(This); +} +/*** IServiceProvider methods ***/ +static FORCEINLINE HRESULT IServiceProvider_QueryService(IServiceProvider* This,REFGUID guidService,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryService(This,guidService,riid,ppvObject); +} #endif #endif - HRESULT WINAPI IServiceProvider_RemoteQueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); - void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); + #endif + +HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + IUnknown **ppvObject); +void __RPC_STUB IServiceProvider_RemoteQueryService_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IServiceProvider_QueryService_Proxy( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + void **ppvObject); +HRESULT __RPC_STUB IServiceProvider_QueryService_Stub( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + IUnknown **ppvObject); + +#endif /* __IServiceProvider_INTERFACE_DEFINED__ */ + #endif - extern RPC_IF_HANDLE __MIDL_itf_servprov_0093_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_servprov_0093_v0_0_s_ifspec; +#endif +/* Begin additional prototypes for all interfaces */ - HRESULT WINAPI IServiceProvider_QueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,void **ppvObject); - HRESULT WINAPI IServiceProvider_QueryService_Stub(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); +/* End additional prototypes */ + #ifdef __cplusplus } #endif -#endif + +#endif /* __servprov_h__ */ Added: trunk/mingw-w64-headers/include/servprov.idl =================================================================== --- trunk/mingw-w64-headers/include/servprov.idl (rev 0) +++ trunk/mingw-w64-headers/include/servprov.idl 2013-08-07 12:41:03 UTC (rev 6035) @@ -0,0 +1,43 @@ +cpp_quote("/**") +cpp_quote(" * This file is part of the mingw-w64 runtime package.") +cpp_quote(" * No warranty is given; refer to the file DISCLAIMER within this package.") +cpp_quote(" */") +cpp_quote("") +cpp_quote("#include <winapifamily.h>") +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") +cpp_quote("") + +import "objidl.idl"; + +cpp_quote("") +interface IServiceProvider; + +cpp_quote("") +[object, uuid (6d5140c1-7436-11ce-8034-00aa006009fa), pointer_default (unique)] +interface IServiceProvider : IUnknown { + typedef [unique] IServiceProvider *LPSERVICEPROVIDER; + cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") + cpp_quote("EXTERN_C const IID IID_IServiceProvider;") + cpp_quote("extern \"C++\" {") + cpp_quote(" MIDL_INTERFACE(\"6d5140c1-7436-11ce-8034-00aa006009fa\")") + cpp_quote(" IServiceProvider : public IUnknown {") + cpp_quote(" public:") + cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) = 0;") + cpp_quote("") + cpp_quote(" template <class Q>") + cpp_quote("HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q **pp) {") + cpp_quote(" return QueryService(guidService, __uuidof(Q), (void **)pp);") + cpp_quote(" }") + cpp_quote(" };") + cpp_quote("}") + cpp_quote("") + cpp_quote("HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy(IServiceProvider __RPC_FAR *This, REFGUID guidService, REFIID riid, IUnknown __RPC_FAR *__RPC_FAR *ppvObject);") + cpp_quote("void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);") + cpp_quote("#else") + [local] HRESULT QueryService ([in] REFGUID guidService,[in] REFIID riid,[out] void **ppvObject); + [call_as (QueryService)] HRESULT RemoteQueryService ([in] REFGUID guidService,[in] REFIID riid,[out, iid_is (riid)] IUnknown **ppvObject); +} +cpp_quote("#endif") +cpp_quote("") +cpp_quote("#endif") Property changes on: trunk/mingw-w64-headers/include/servprov.idl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kti...@us...> - 2013-08-07 19:52:19
|
Revision: 6040 http://sourceforge.net/p/mingw-w64/code/6040 Author: ktietz70 Date: 2013-08-07 19:52:12 +0000 (Wed, 07 Aug 2013) Log Message: ----------- Add wtypebase.idl as factored-out part of wtypes.idl Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am Added Paths: ----------- trunk/mingw-w64-headers/include/wtypesbase.h trunk/mingw-w64-headers/include/wtypesbase.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 18:25:21 UTC (rev 6039) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 19:52:12 UTC (rev 6040) @@ -107,6 +107,7 @@ include/unknwn.idl \ include/urlmon.idl \ include/wincodec.idl \ + include/wtypesbase.idl \ include/wmcodecdsp.idl \ include/wpcapi.idl \ include/wtypes.idl \ Added: trunk/mingw-w64-headers/include/wtypesbase.h =================================================================== --- trunk/mingw-w64-headers/include/wtypesbase.h (rev 0) +++ trunk/mingw-w64-headers/include/wtypesbase.h 2013-08-07 19:52:12 UTC (rev 6040) @@ -0,0 +1,423 @@ +/*** Autogenerated by WIDL 1.5.29 from wtypesbase.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 __wtypesbase_h__ +#define __wtypesbase_h__ + +/* Forward declarations */ + +/* Headers for imported files */ + +#include <basetsd.h> +#include <guiddef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + + +/***************************************************************************** + * IWinTypesBase interface (v0.1) + */ +#ifndef __IWinTypesBase_INTERFACE_DEFINED__ +#define __IWinTypesBase_INTERFACE_DEFINED__ + +extern RPC_IF_HANDLE IWinTypesBase_v0_1_c_ifspec; +extern RPC_IF_HANDLE IWinTypesBase_v0_1_s_ifspec; + +#if 0 +typedef byte BYTE; +typedef unsigned short WORD; +typedef unsigned int UINT; +typedef int INT; +typedef LONG BOOL; +typedef LONG LONG; +typedef ULONG DWORD; +typedef void *HANDLE; +typedef WORD *LPWORD; +typedef DWORD *LPDWORD; +typedef char CHAR; +typedef CHAR *LPSTR; +typedef const CHAR *LPCSTR; +typedef wchar_t WCHAR; +typedef WCHAR TCHAR; +typedef WCHAR *LPWSTR; +typedef TCHAR *LPTSTR; +typedef const WCHAR *LPCWSTR; +typedef const TCHAR *LPCTSTR; +typedef HANDLE *LPHANDLE; +#endif + +#if !defined(OLE2ANSI) +typedef WCHAR OLECHAR; +typedef OLECHAR *LPOLESTR; +typedef const OLECHAR *LPCOLESTR; + +#define OLESTR(str) L##str +#else +typedef char OLECHAR; +typedef LPSTR LPOLESTR; +typedef LPCSTR LPCOLESTR; + +#define OLESTR(str) str +#endif + +#ifndef _WINDEF_ +#ifndef _MINWINDEF_ +typedef void *PVOID; +typedef void *LPVOID; +typedef float FLOAT; +#endif +#endif + +typedef unsigned char UCHAR; +typedef short SHORT; +typedef unsigned short USHORT; +typedef DWORD ULONG; +typedef double DOUBLE; +#ifndef _DWORDLONG_ +typedef UINT64 DWORDLONG; +typedef DWORDLONG *PDWORDLONG; +#endif + +#ifndef _ULONGLONG_ +typedef INT64 LONGLONG; +typedef UINT64 ULONGLONG; +typedef LONGLONG *PLONGLONG; +typedef ULONGLONG *PULONGLONG; +#endif +#if 0 +typedef struct _LARGE_INTEGER { + LONGLONG QuadPart; +} LARGE_INTEGER; +typedef LARGE_INTEGER *PLARGE_INTEGER; +typedef struct _ULARGE_INTEGER { + ULONGLONG QuadPart; +} ULARGE_INTEGER; +#endif + +#ifndef _WINBASE_ +#ifndef _FILETIME_ +#define _FILETIME_ + +typedef struct _FILETIME { + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME; +typedef struct _FILETIME *PFILETIME; +typedef struct _FILETIME *LPFILETIME; +#endif + +#ifndef _SYSTEMTIME_ +#define _SYSTEMTIME_ + +typedef struct _SYSTEMTIME { + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; +} SYSTEMTIME; +typedef struct _SYSTEMTIME *PSYSTEMTIME; +typedef struct _SYSTEMTIME *LPSYSTEMTIME; +#endif + +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ + +typedef struct _SECURITY_ATTRIBUTES { + DWORD nLength; + LPVOID lpSecurityDescriptor; + BOOL bInheritHandle; +} SECURITY_ATTRIBUTES; +typedef struct _SECURITY_ATTRIBUTES *PSECURITY_ATTRIBUTES; +typedef struct _SECURITY_ATTRIBUTES *LPSECURITY_ATTRIBUTES; +#endif + +#ifndef SECURITY_DESCRIPTOR_REVISION +typedef USHORT SECURITY_DESCRIPTOR_CONTROL; +typedef USHORT *PSECURITY_DESCRIPTOR_CONTROL; +typedef PVOID PSID; + +typedef struct _ACL { + UCHAR AclRevision; + UCHAR Sbz1; + USHORT AclSize; + USHORT AceCount; + USHORT Sbz2; +} ACL; + +typedef ACL *PACL; + +typedef struct _SECURITY_DESCRIPTOR { + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + PSID Owner; + PSID Group; + PACL Sacl; + PACL Dacl; +} SECURITY_DESCRIPTOR; +typedef struct _SECURITY_DESCRIPTOR *PISECURITY_DESCRIPTOR; +#endif +#endif + +typedef struct _COAUTHIDENTITY { + USHORT *User; + ULONG UserLength; + USHORT *Domain; + ULONG DomainLength; + USHORT *Password; + ULONG PasswordLength; + ULONG Flags; +} COAUTHIDENTITY; + +typedef struct _COAUTHINFO { + DWORD dwAuthnSvc; + DWORD dwAuthzSvc; + LPWSTR pwszServerPrincName; + DWORD dwAuthnLevel; + DWORD dwImpersonationLevel; + COAUTHIDENTITY *pAuthIdentityData; + DWORD dwCapabilities; +} COAUTHINFO; + +typedef LONG SCODE; +typedef SCODE *PSCODE; + +#ifndef _HRESULT_DEFINED +#define _HRESULT_DEFINED +#ifdef __WIDL__ +typedef LONG HRESULT; +#else +typedef __LONG32 HRESULT; +#endif +#endif + +#ifndef __OBJECTID_DEFINED +#define __OBJECTID_DEFINED +#define _OBJECTID_DEFINED + +typedef struct _OBJECTID { + GUID Lineage; + ULONG Uniquifier; +} OBJECTID; +#endif + +#if 0 +typedef GUID *REFGUID; +typedef IID *REFIID; +typedef CLSID *REFCLSID; +#endif + +typedef enum tagMEMCTX { + MEMCTX_TASK = 1, + MEMCTX_SHARED = 2, + MEMCTX_MACSYSTEM = 3, + MEMCTX_UNKNOWN = -1, + MEMCTX_SAME = -2 +} MEMCTX; +#ifndef _ROTREGFLAGS_DEFINED +#define _ROTREGFLAGS_DEFINED + +#define ROTREGFLAGS_ALLOWANYCLIENT 0x1 +#endif + +#ifndef _APPIDREGFLAGS_DEFINED +#define _APPIDREGFLAGS_DEFINED + +#define APPIDREGFLAGS_ACTIVATE_IUSERVER_INDESKTOP 0x1 +#define APPIDREGFLAGS_SECURE_SERVER_PROCESS_SD_AND_BIND 0x2 +#define APPIDREGFLAGS_ISSUE_ACTIVATION_RPC_AT_IDENTIFY 0x4 +#define APPIDREGFLAGS_IUSERVER_UNMODIFIED_LOGON_TOKEN 0x8 +#define APPIDREGFLAGS_IUSERVER_SELF_SID_IN_LAUNCH_PERMISSION 0x10 +#define APPIDREGFLAGS_IUSERVER_ACTIVATE_IN_CLIENT_SESSION_ONLY 0x20 +#define APPIDREGFLAGS_RESERVED1 0x40 +#endif + +#ifndef _DCOMSCM_REMOTECALL_FLAGS_DEFINED +#define _DCOMSCM_REMOTECALL_FLAGS_DEFINED + +#define DCOMSCM_ACTIVATION_USE_ALL_AUTHNSERVICES 0x1 +#define DCOMSCM_ACTIVATION_DISALLOW_UNSECURE_CALL 0x2 +#define DCOMSCM_RESOLVE_USE_ALL_AUTHNSERVICES 0x4 +#define DCOMSCM_RESOLVE_DISALLOW_UNSECURE_CALL 0x8 +#define DCOMSCM_PING_USE_MID_AUTHNSERVICE 0x10 +#define DCOMSCM_PING_DISALLOW_UNSECURE_CALL 0x20 +#endif + +typedef enum tagCLSCTX { + CLSCTX_INPROC_SERVER = 0x1, + CLSCTX_INPROC_HANDLER = 0x2, + CLSCTX_LOCAL_SERVER = 0x4, + CLSCTX_INPROC_SERVER16 = 0x8, + CLSCTX_REMOTE_SERVER = 0x10, + CLSCTX_INPROC_HANDLER16 = 0x20, + CLSCTX_RESERVED1 = 0x40, + CLSCTX_RESERVED2 = 0x80, + CLSCTX_RESERVED3 = 0x100, + CLSCTX_RESERVED4 = 0x200, + CLSCTX_NO_CODE_DOWNLOAD = 0x400, + CLSCTX_RESERVED5 = 0x800, + CLSCTX_NO_CUSTOM_MARSHAL = 0x1000, + CLSCTX_ENABLE_CODE_DOWNLOAD = 0x2000, + CLSCTX_NO_FAILURE_LOG = 0x4000, + CLSCTX_DISABLE_AAA = 0x8000, + CLSCTX_ENABLE_AAA = 0x10000, + CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000, + CLSCTX_ACTIVATE_32_BIT_SERVER = 0x40000, + CLSCTX_ACTIVATE_64_BIT_SERVER = 0x80000, + CLSCTX_ENABLE_CLOAKING = 0x100000, + CLSCTX_APPCONTAINER = 0x400000, + CLSCTX_ACTIVATE_AAA_AS_IU = 0x800000, + CLSCTX_PS_DLL = (int)0x80000000 +} CLSCTX; + +#define CLSCTX_VALID_MASK (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_INPROC_SERVER16 | CLSCTX_REMOTE_SERVER | CLSCTX_NO_CODE_DOWNLOAD | CLSCTX_NO_CUSTOM_MARSHAL | CLSCTX_ENABLE_CODE_DOWNLOAD | CLSCTX_NO_FAILURE_LOG | CLSCTX_DISABLE_AAA | CLSCTX_ENABLE_AAA | CLSCTX_FROM_DEFAULT_CONTEXT | CLSCTX_ACTIVATE_32_BIT_SERVER | CLSCTX_ACTIVATE_64_BIT_SERVER | CLSCTX_ENABLE_CLOAKING | CLSCTX_APPCONTAINER | CLSCTX_ACTIVATE_AAA_AS_IU | CLSCTX_PS_DLL) + +typedef enum tagMSHLFLAGS { + MSHLFLAGS_NORMAL = 0, + MSHLFLAGS_TABLESTRONG = 1, + MSHLFLAGS_TABLEWEAK = 2, + MSHLFLAGS_NOPING = 4, + MSHLFLAGS_RESERVED1 = 8, + MSHLFLAGS_RESERVED2 = 16, + MSHLFLAGS_RESERVED3 = 32, + MSHLFLAGS_RESERVED4 = 64 +} MSHLFLAGS; + +typedef enum tagMSHCTX { + MSHCTX_LOCAL = 0, + MSHCTX_NOSHAREDMEM = 1, + MSHCTX_DIFFERENTMACHINE = 2, + MSHCTX_INPROC = 3, + MSHCTX_CROSSCTX = 4 +} MSHCTX; + +typedef struct _BYTE_BLOB { + ULONG clSize; + byte abData[1]; +} BYTE_BLOB; + +typedef BYTE_BLOB *UP_BYTE_BLOB; + +typedef struct _WORD_BLOB { + ULONG clSize; + unsigned short asData[1]; +} WORD_BLOB; + +typedef WORD_BLOB *UP_WORD_BLOB; + +typedef struct _DWORD_BLOB { + ULONG clSize; + ULONG alData[1]; +} DWORD_BLOB; + +typedef DWORD_BLOB *UP_DWORD_BLOB; + +typedef struct _FLAGGED_BYTE_BLOB { + ULONG fFlags; + ULONG clSize; + byte abData[1]; +} FLAGGED_BYTE_BLOB; + +typedef FLAGGED_BYTE_BLOB *UP_FLAGGED_BYTE_BLOB; + +typedef struct _FLAGGED_WORD_BLOB { + ULONG fFlags; + ULONG clSize; + unsigned short asData[1]; +} FLAGGED_WORD_BLOB; + +typedef FLAGGED_WORD_BLOB *UP_FLAGGED_WORD_BLOB; + +typedef struct _BYTE_SIZEDARR { + ULONG clSize; + byte *pData; +} BYTE_SIZEDARR; + +typedef struct _SHORT_SIZEDARR { + ULONG clSize; + unsigned short *pData; +} WORD_SIZEDARR; + +typedef struct _LONG_SIZEDARR { + ULONG clSize; + ULONG *pData; +} DWORD_SIZEDARR; + +typedef struct _HYPER_SIZEDARR { + ULONG clSize; + hyper *pData; +} HYPER_SIZEDARR; + +#endif /* __IWinTypesBase_INTERFACE_DEFINED__ */ + + +typedef boolean BOOLEAN; +#ifndef _tagBLOB_DEFINED +#define _tagBLOB_DEFINED +#define _BLOB_DEFINED +#define _LPBLOB_DEFINED + +typedef struct tagBLOB { + ULONG cbSize; + BYTE *pBlobData; +} BLOB; +typedef struct tagBLOB *LPBLOB; +#endif + +#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED +#define SID_IDENTIFIER_AUTHORITY_DEFINED +typedef struct _SID_IDENTIFIER_AUTHORITY { + UCHAR Value[6]; +} SID_IDENTIFIER_AUTHORITY; +typedef struct _SID_IDENTIFIER_AUTHORITY *PSID_IDENTIFIER_AUTHORITY; +#endif + +#ifndef SID_DEFINED +#define SID_DEFINED + +typedef struct _SID { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + ULONG SubAuthority[1]; +} SID; +typedef struct _SID *PISID; + +typedef struct _SID_AND_ATTRIBUTES { + SID *Sid; + DWORD Attributes; +} SID_AND_ATTRIBUTES; +typedef struct _SID_AND_ATTRIBUTES *PSID_AND_ATTRIBUTES; +#endif +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __wtypesbase_h__ */ Property changes on: trunk/mingw-w64-headers/include/wtypesbase.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/mingw-w64-headers/include/wtypesbase.idl =================================================================== --- trunk/mingw-w64-headers/include/wtypesbase.idl (rev 0) +++ trunk/mingw-w64-headers/include/wtypesbase.idl 2013-08-07 19:52:12 UTC (rev 6040) @@ -0,0 +1,424 @@ +cpp_quote("/**") +cpp_quote(" * This file is part of the mingw-w64 runtime package.") +cpp_quote(" * No warranty is given; refer to the file DISCLAIMER within this package.") +cpp_quote(" */") +cpp_quote("") + +/* Make sure the type BOOL isn't defined. */ +#ifdef BOOL +#undef BOOL +#define REDEF_BOOL +#endif + +import "basetsd.h"; +import "guiddef.h"; + +cpp_quote("") +[uuid (B1BEA154-1c2f-4da9-9abf-6e2d24eea1be), version (0.1), pointer_default (unique)] +interface IWinTypesBase { +cpp_quote("") + cpp_quote("#if 0") + typedef byte BYTE; + typedef unsigned short WORD; + typedef unsigned int UINT; + typedef int INT; + typedef long BOOL; + /*typedef long WINBOOL;*/ + typedef long LONG; + typedef unsigned long DWORD; + typedef void *HANDLE; + typedef WORD *LPWORD; + typedef DWORD *LPDWORD; + typedef char CHAR; + typedef [string] CHAR *LPSTR; + typedef [string] const CHAR *LPCSTR; + typedef wchar_t WCHAR; + typedef WCHAR TCHAR; + typedef [string] WCHAR *LPWSTR; + typedef [string] TCHAR *LPTSTR; + typedef [string] const WCHAR *LPCWSTR; + typedef [string] const TCHAR *LPCTSTR; + typedef HANDLE *LPHANDLE; + cpp_quote("#endif") + +cpp_quote("") +cpp_quote("#if !defined(OLE2ANSI)") + typedef WCHAR OLECHAR; + typedef [string] OLECHAR *LPOLESTR; + typedef [string] const OLECHAR *LPCOLESTR; +cpp_quote("") + cpp_quote("#define OLESTR(str) L##str") +cpp_quote("#else") + cpp_quote("typedef char OLECHAR;") + cpp_quote("typedef LPSTR LPOLESTR;") + cpp_quote("typedef LPCSTR LPCOLESTR;") +cpp_quote("") + cpp_quote("#define OLESTR(str) str") +cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _WINDEF_") + cpp_quote("#ifndef _MINWINDEF_") + typedef void *PVOID, *LPVOID; + typedef float FLOAT; + cpp_quote("#endif") + cpp_quote("#endif") + +cpp_quote("") + typedef unsigned char UCHAR; + typedef short SHORT; + typedef unsigned short USHORT; + typedef DWORD ULONG; + typedef double DOUBLE; + cpp_quote("#ifndef _DWORDLONG_") + typedef unsigned __int64 DWORDLONG; + typedef DWORDLONG *PDWORDLONG; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _ULONGLONG_") + typedef __int64 LONGLONG; + typedef unsigned __int64 ULONGLONG; + typedef LONGLONG *PLONGLONG; + typedef ULONGLONG *PULONGLONG; + cpp_quote("#endif") + + cpp_quote("#if 0") + typedef struct _LARGE_INTEGER { + LONGLONG QuadPart; + } LARGE_INTEGER; + typedef LARGE_INTEGER *PLARGE_INTEGER; + typedef struct _ULARGE_INTEGER { + ULONGLONG QuadPart; + } ULARGE_INTEGER; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _WINBASE_") + cpp_quote("#ifndef _FILETIME_") + cpp_quote("#define _FILETIME_") +cpp_quote("") + typedef struct _FILETIME { + DWORD dwLowDateTime; + DWORD dwHighDateTime; + } FILETIME,*PFILETIME,*LPFILETIME; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _SYSTEMTIME_") + cpp_quote("#define _SYSTEMTIME_") +cpp_quote("") + typedef struct _SYSTEMTIME { + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; + } SYSTEMTIME,*PSYSTEMTIME,*LPSYSTEMTIME; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _SECURITY_ATTRIBUTES_") + cpp_quote("#define _SECURITY_ATTRIBUTES_") +cpp_quote("") + typedef struct _SECURITY_ATTRIBUTES { + DWORD nLength; + LPVOID lpSecurityDescriptor; + BOOL bInheritHandle; + } SECURITY_ATTRIBUTES,*PSECURITY_ATTRIBUTES,*LPSECURITY_ATTRIBUTES; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef SECURITY_DESCRIPTOR_REVISION") + typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; + typedef PVOID PSID; +cpp_quote("") + typedef struct _ACL { + UCHAR AclRevision; + UCHAR Sbz1; + USHORT AclSize; + USHORT AceCount; + USHORT Sbz2; + } ACL; +cpp_quote("") + typedef ACL *PACL; +cpp_quote("") + typedef struct _SECURITY_DESCRIPTOR { + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + PSID Owner; + PSID Group; + PACL Sacl; + PACL Dacl; + } SECURITY_DESCRIPTOR,*PISECURITY_DESCRIPTOR; + cpp_quote("#endif") + cpp_quote("#endif") + +cpp_quote("") + typedef struct _COAUTHIDENTITY { + [size_is (UserLength+1)] USHORT *User; + [range (0, 256)]ULONG UserLength; + [size_is (DomainLength+1)] USHORT *Domain; + [range (0, 256)]ULONG DomainLength; + [size_is (PasswordLength+1)] USHORT *Password; + [range (0, 256)]ULONG PasswordLength; + ULONG Flags; + } COAUTHIDENTITY; + +cpp_quote("") + typedef struct _COAUTHINFO { + DWORD dwAuthnSvc; + DWORD dwAuthzSvc; + LPWSTR pwszServerPrincName; + DWORD dwAuthnLevel; + DWORD dwImpersonationLevel; + COAUTHIDENTITY *pAuthIdentityData; + DWORD dwCapabilities; + } COAUTHINFO; + +cpp_quote("") + typedef LONG SCODE; + typedef SCODE *PSCODE; +cpp_quote("") + cpp_quote("#ifndef _HRESULT_DEFINED") + cpp_quote("#define _HRESULT_DEFINED") +#if defined (_STRICT_HRESULT) + typedef struct _HRESULT_STRUCT { + DWORD Data1; + } HRESULT_STRUCT,*PHRESULT_STRUCT; + typedef PHRESULT_STRUCT HRESULT; +#else + cpp_quote("#ifdef __WIDL__") + typedef LONG HRESULT; + cpp_quote("#else") + cpp_quote("typedef __LONG32 HRESULT;") + cpp_quote("#endif") +#endif + cpp_quote("#endif") + + cpp_quote("") + cpp_quote("#ifndef __OBJECTID_DEFINED") + cpp_quote("#define __OBJECTID_DEFINED") + cpp_quote("#define _OBJECTID_DEFINED") +cpp_quote("") + typedef struct _OBJECTID { + GUID Lineage; + unsigned long Uniquifier; + } OBJECTID; + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#if 0") + typedef GUID *REFGUID; + typedef IID *REFIID; + typedef CLSID *REFCLSID; + cpp_quote("#endif") + +cpp_quote("") + typedef enum tagMEMCTX { + MEMCTX_TASK = 1, + MEMCTX_SHARED = 2, + MEMCTX_MACSYSTEM = 3, + MEMCTX_UNKNOWN = -1, + MEMCTX_SAME = -2, + } MEMCTX; + cpp_quote("#ifndef _ROTREGFLAGS_DEFINED") + cpp_quote("#define _ROTREGFLAGS_DEFINED") +cpp_quote("") + cpp_quote("#define ROTREGFLAGS_ALLOWANYCLIENT 0x1") + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _APPIDREGFLAGS_DEFINED") + cpp_quote("#define _APPIDREGFLAGS_DEFINED") +cpp_quote("") + cpp_quote("#define APPIDREGFLAGS_ACTIVATE_IUSERVER_INDESKTOP 0x1") + cpp_quote("#define APPIDREGFLAGS_SECURE_SERVER_PROCESS_SD_AND_BIND 0x2") + cpp_quote("#define APPIDREGFLAGS_ISSUE_ACTIVATION_RPC_AT_IDENTIFY 0x4") + cpp_quote("#define APPIDREGFLAGS_IUSERVER_UNMODIFIED_LOGON_TOKEN 0x8") + cpp_quote("#define APPIDREGFLAGS_IUSERVER_SELF_SID_IN_LAUNCH_PERMISSION 0x10") + cpp_quote("#define APPIDREGFLAGS_IUSERVER_ACTIVATE_IN_CLIENT_SESSION_ONLY 0x20") + cpp_quote("#define APPIDREGFLAGS_RESERVED1 0x40") + cpp_quote("#endif") + +cpp_quote("") + cpp_quote("#ifndef _DCOMSCM_REMOTECALL_FLAGS_DEFINED") + cpp_quote("#define _DCOMSCM_REMOTECALL_FLAGS_DEFINED") +cpp_quote("") + cpp_quote("#define DCOMSCM_ACTIVATION_USE_ALL_AUTHNSERVICES 0x1") + cpp_quote("#define DCOMSCM_ACTIVATION_DISALLOW_UNSECURE_CALL 0x2") + cpp_quote("#define DCOMSCM_RESOLVE_USE_ALL_AUTHNSERVICES 0x4") + cpp_quote("#define DCOMSCM_RESOLVE_DISALLOW_UNSECURE_CALL 0x8") + cpp_quote("#define DCOMSCM_PING_USE_MID_AUTHNSERVICE 0x10") + cpp_quote("#define DCOMSCM_PING_DISALLOW_UNSECURE_CALL 0x20") + cpp_quote("#endif") + +cpp_quote("") + typedef enum tagCLSCTX { + CLSCTX_INPROC_SERVER = 0x01, + CLSCTX_INPROC_HANDLER = 0x02, + CLSCTX_LOCAL_SERVER = 0x04, + CLSCTX_INPROC_SERVER16 = 0x08, + CLSCTX_REMOTE_SERVER = 0x10, + CLSCTX_INPROC_HANDLER16 = 0x20, + CLSCTX_RESERVED1 = 0x40, + CLSCTX_RESERVED2 = 0x80, + CLSCTX_RESERVED3 = 0x100, + CLSCTX_RESERVED4 = 0x200, + CLSCTX_NO_CODE_DOWNLOAD = 0x400, + CLSCTX_RESERVED5 = 0x800, + CLSCTX_NO_CUSTOM_MARSHAL = 0x1000, + CLSCTX_ENABLE_CODE_DOWNLOAD = 0x2000, + CLSCTX_NO_FAILURE_LOG = 0x4000, + CLSCTX_DISABLE_AAA = 0x8000, + CLSCTX_ENABLE_AAA = 0x10000, + CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000, + CLSCTX_ACTIVATE_32_BIT_SERVER = 0x40000, + CLSCTX_ACTIVATE_64_BIT_SERVER = 0x80000, + CLSCTX_ENABLE_CLOAKING = 0x100000, + CLSCTX_APPCONTAINER = 0x400000, + CLSCTX_ACTIVATE_AAA_AS_IU = 0x800000, + CLSCTX_PS_DLL = (int) 0x80000000, + } CLSCTX; +cpp_quote("") + cpp_quote("#define CLSCTX_VALID_MASK (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_INPROC_SERVER16 | CLSCTX_REMOTE_SERVER | CLSCTX_NO_CODE_DOWNLOAD | CLSCTX_NO_CUSTOM_MARSHAL | CLSCTX_ENABLE_CODE_DOWNLOAD | CLSCTX_NO_FAILURE_LOG | CLSCTX_DISABLE_AAA | CLSCTX_ENABLE_AAA | CLSCTX_FROM_DEFAULT_CONTEXT | CLSCTX_ACTIVATE_32_BIT_SERVER | CLSCTX_ACTIVATE_64_BIT_SERVER | CLSCTX_ENABLE_CLOAKING | CLSCTX_APPCONTAINER | CLSCTX_ACTIVATE_AAA_AS_IU | CLSCTX_PS_DLL)") + +cpp_quote("") + typedef enum tagMSHLFLAGS { + MSHLFLAGS_NORMAL = 0, + MSHLFLAGS_TABLESTRONG = 1, + MSHLFLAGS_TABLEWEAK = 2, + MSHLFLAGS_NOPING = 4, + MSHLFLAGS_RESERVED1 = 8, + MSHLFLAGS_RESERVED2 = 16, + MSHLFLAGS_RESERVED3 = 32, + MSHLFLAGS_RESERVED4 = 64 + } MSHLFLAGS; + +cpp_quote("") + typedef enum tagMSHCTX { + MSHCTX_LOCAL = 0, + MSHCTX_NOSHAREDMEM = 1, + MSHCTX_DIFFERENTMACHINE = 2, + MSHCTX_INPROC = 3, + MSHCTX_CROSSCTX = 4 + } MSHCTX; + +cpp_quote("") + typedef struct _BYTE_BLOB { + unsigned long clSize; + [size_is (clSize)] byte abData[]; + } BYTE_BLOB; + +cpp_quote("") + typedef [unique] BYTE_BLOB *UP_BYTE_BLOB; + +cpp_quote("") + typedef struct _WORD_BLOB { + unsigned long clSize; + [size_is (clSize)] unsigned short asData[]; + } WORD_BLOB; + +cpp_quote("") + typedef [unique] WORD_BLOB *UP_WORD_BLOB; + +cpp_quote("") + typedef struct _DWORD_BLOB { + unsigned long clSize; + [size_is (clSize)] unsigned long alData[]; + } DWORD_BLOB; + +cpp_quote("") + typedef [unique] DWORD_BLOB *UP_DWORD_BLOB; + +cpp_quote("") + typedef struct _FLAGGED_BYTE_BLOB { + unsigned long fFlags; + unsigned long clSize; + [size_is (clSize)] byte abData[]; + } FLAGGED_BYTE_BLOB; + +cpp_quote("") + typedef [unique] FLAGGED_BYTE_BLOB *UP_FLAGGED_BYTE_BLOB; + +cpp_quote("") + typedef struct _FLAGGED_WORD_BLOB { + unsigned long fFlags; + unsigned long clSize; + [size_is (clSize)] unsigned short asData[]; + } FLAGGED_WORD_BLOB; + +cpp_quote("") + typedef [unique] FLAGGED_WORD_BLOB *UP_FLAGGED_WORD_BLOB; + +cpp_quote("") + typedef struct _BYTE_SIZEDARR { + unsigned long clSize; + [size_is (clSize)] byte *pData; + } BYTE_SIZEDARR; + +cpp_quote("") + typedef struct _SHORT_SIZEDARR { + unsigned long clSize; + [size_is (clSize)] unsigned short *pData; + } WORD_SIZEDARR; + +cpp_quote("") + typedef struct _LONG_SIZEDARR { + unsigned long clSize; + [size_is (clSize)] unsigned long *pData; + } DWORD_SIZEDARR; + +cpp_quote("") + typedef struct _HYPER_SIZEDARR { + unsigned long clSize; + [size_is (clSize)] hyper *pData; + } HYPER_SIZEDARR; +} + +cpp_quote("") +typedef boolean BOOLEAN; +cpp_quote("#ifndef _tagBLOB_DEFINED") +cpp_quote("#define _tagBLOB_DEFINED") +cpp_quote("#define _BLOB_DEFINED") +cpp_quote("#define _LPBLOB_DEFINED") +cpp_quote("") +typedef struct tagBLOB { + ULONG cbSize; + [size_is (cbSize)] BYTE *pBlobData; +} BLOB,*LPBLOB; +cpp_quote("#endif") + +cpp_quote("") +cpp_quote("#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED") +cpp_quote("#define SID_IDENTIFIER_AUTHORITY_DEFINED") +typedef struct _SID_IDENTIFIER_AUTHORITY { + UCHAR Value[6]; +} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY; +cpp_quote("#endif") + +cpp_quote("") +cpp_quote("#ifndef SID_DEFINED") +cpp_quote("#define SID_DEFINED") +cpp_quote("") +typedef struct _SID { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + [size_is (SubAuthorityCount)] ULONG SubAuthority[*]; +} SID,*PISID; + +cpp_quote("") +typedef struct _SID_AND_ATTRIBUTES { + SID *Sid; + DWORD Attributes; +} SID_AND_ATTRIBUTES,*PSID_AND_ATTRIBUTES; +cpp_quote("#endif") + +#ifdef REDEF_BOOL +#define BOOL WINBOOL +#endif Property changes on: trunk/mingw-w64-headers/include/wtypesbase.idl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kti...@us...> - 2013-08-07 20:06:17
|
Revision: 6042 http://sourceforge.net/p/mingw-w64/code/6042 Author: ktietz70 Date: 2013-08-07 20:06:10 +0000 (Wed, 07 Aug 2013) Log Message: ----------- Factor out base part of unknwn.idl Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am Added Paths: ----------- trunk/mingw-w64-headers/include/unknwnbase.h trunk/mingw-w64-headers/include/unknwnbase.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 20:02:50 UTC (rev 6041) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 20:06:10 UTC (rev 6042) @@ -105,6 +105,7 @@ include/uiautomationclient.idl \ include/uiautomationcore.idl \ include/unknwn.idl \ + include/unknwnbase.idl \ include/urlmon.idl \ include/wincodec.idl \ include/wtypesbase.idl \ Added: trunk/mingw-w64-headers/include/unknwnbase.h =================================================================== --- trunk/mingw-w64-headers/include/unknwnbase.h (rev 0) +++ trunk/mingw-w64-headers/include/unknwnbase.h 2013-08-07 20:06:10 UTC (rev 6042) @@ -0,0 +1,491 @@ +/*** Autogenerated by WIDL 1.5.29 from unknwnbase.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 __unknwnbase_h__ +#define __unknwnbase_h__ + +/* Forward declarations */ + +#ifndef __IUnknown_FWD_DEFINED__ +#define __IUnknown_FWD_DEFINED__ +typedef interface IUnknown IUnknown; +#endif + +#ifndef __AsyncIUnknown_FWD_DEFINED__ +#define __AsyncIUnknown_FWD_DEFINED__ +typedef interface AsyncIUnknown AsyncIUnknown; +#endif + +#ifndef __IClassFactory_FWD_DEFINED__ +#define __IClassFactory_FWD_DEFINED__ +typedef interface IClassFactory IClassFactory; +#endif + +/* Headers for imported files */ + +#include <wtypesbase.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <winapifamily.h> + + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) +/***************************************************************************** + * IUnknown interface + */ +#ifndef __IUnknown_INTERFACE_DEFINED__ +#define __IUnknown_INTERFACE_DEFINED__ + +typedef IUnknown *LPUNKNOWN; + +#if defined(__cplusplus) && !defined(CINTERFACE) +EXTERN_C const IID IID_IUnknown; + +extern "C++" { + MIDL_INTERFACE("00000000-0000-0000-C000-000000000046") + IUnknown { + public: + BEGIN_INTERFACE + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) = 0; + virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0; + virtual ULONG STDMETHODCALLTYPE Release(void) = 0; + + template<class Q> + HRESULT STDMETHODCALLTYPE QueryInterface(Q **pp) { + return QueryInterface(__uuidof(Q), (void **)pp); + } + END_INTERFACE + }; +} +HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject); +void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This); +void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This); +void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +#else +DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("00000000-0000-0000-c000-000000000046") +IUnknown +{ + BEGIN_INTERFACE + + virtual HRESULT STDMETHODCALLTYPE QueryInterface( + REFIID riid, + void **ppvObject) = 0; + + virtual ULONG STDMETHODCALLTYPE AddRef( + ) = 0; + + virtual ULONG STDMETHODCALLTYPE Release( + ) = 0; + + END_INTERFACE +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) +#endif +#else +typedef struct IUnknownVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IUnknown* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IUnknown* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IUnknown* This); + + END_INTERFACE +} IUnknownVtbl; +interface IUnknown { + CONST_VTBL IUnknownVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IUnknown_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IUnknown_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IUnknown_Release(This) (This)->lpVtbl->Release(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IUnknown_QueryInterface(IUnknown* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IUnknown_AddRef(IUnknown* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IUnknown_Release(IUnknown* This) { + return This->lpVtbl->Release(This); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy( + IUnknown* This, + REFIID riid, + void **ppvObject); +void __RPC_STUB IUnknown_QueryInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy( + IUnknown* This); +void __RPC_STUB IUnknown_AddRef_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy( + IUnknown* This); +void __RPC_STUB IUnknown_Release_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IUnknown_INTERFACE_DEFINED__ */ + +#endif +#endif + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +/***************************************************************************** + * AsyncIUnknown interface + */ +#ifndef __AsyncIUnknown_INTERFACE_DEFINED__ +#define __AsyncIUnknown_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_AsyncIUnknown, 0x000e0000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("000e0000-0000-0000-c000-000000000046") +AsyncIUnknown : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE Begin_QueryInterface( + REFIID riid) = 0; + + virtual HRESULT STDMETHODCALLTYPE Finish_QueryInterface( + void **ppvObject) = 0; + + virtual HRESULT STDMETHODCALLTYPE Begin_AddRef( + ) = 0; + + virtual ULONG STDMETHODCALLTYPE Finish_AddRef( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Begin_Release( + ) = 0; + + virtual ULONG STDMETHODCALLTYPE Finish_Release( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(AsyncIUnknown, 0x000e0000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) +#endif +#else +typedef struct AsyncIUnknownVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + AsyncIUnknown* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Release)( + AsyncIUnknown* This); + + /*** AsyncIUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_QueryInterface)( + AsyncIUnknown* This, + REFIID riid); + + HRESULT (STDMETHODCALLTYPE *Finish_QueryInterface)( + AsyncIUnknown* This, + void **ppvObject); + + HRESULT (STDMETHODCALLTYPE *Begin_AddRef)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Finish_AddRef)( + AsyncIUnknown* This); + + HRESULT (STDMETHODCALLTYPE *Begin_Release)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Finish_Release)( + AsyncIUnknown* This); + + END_INTERFACE +} AsyncIUnknownVtbl; +interface AsyncIUnknown { + CONST_VTBL AsyncIUnknownVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define AsyncIUnknown_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define AsyncIUnknown_AddRef(This) (This)->lpVtbl->AddRef(This) +#define AsyncIUnknown_Release(This) (This)->lpVtbl->Release(This) +/*** AsyncIUnknown methods ***/ +#define AsyncIUnknown_Begin_QueryInterface(This,riid) (This)->lpVtbl->Begin_QueryInterface(This,riid) +#define AsyncIUnknown_Finish_QueryInterface(This,ppvObject) (This)->lpVtbl->Finish_QueryInterface(This,ppvObject) +#define AsyncIUnknown_Begin_AddRef(This) (This)->lpVtbl->Begin_AddRef(This) +#define AsyncIUnknown_Finish_AddRef(This) (This)->lpVtbl->Finish_AddRef(This) +#define AsyncIUnknown_Begin_Release(This) (This)->lpVtbl->Begin_Release(This) +#define AsyncIUnknown_Finish_Release(This) (This)->lpVtbl->Finish_Release(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT AsyncIUnknown_QueryInterface(AsyncIUnknown* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG AsyncIUnknown_AddRef(AsyncIUnknown* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG AsyncIUnknown_Release(AsyncIUnknown* This) { + return This->lpVtbl->Release(This); +} +/*** AsyncIUnknown methods ***/ +static FORCEINLINE HRESULT AsyncIUnknown_Begin_QueryInterface(AsyncIUnknown* This,REFIID riid) { + return This->lpVtbl->Begin_QueryInterface(This,riid); +} +static FORCEINLINE HRESULT AsyncIUnknown_Finish_QueryInterface(AsyncIUnknown* This,void **ppvObject) { + return This->lpVtbl->Finish_QueryInterface(This,ppvObject); +} +static FORCEINLINE HRESULT AsyncIUnknown_Begin_AddRef(AsyncIUnknown* This) { + return This->lpVtbl->Begin_AddRef(This); +} +static FORCEINLINE ULONG AsyncIUnknown_Finish_AddRef(AsyncIUnknown* This) { + return This->lpVtbl->Finish_AddRef(This); +} +static FORCEINLINE HRESULT AsyncIUnknown_Begin_Release(AsyncIUnknown* This) { + return This->lpVtbl->Begin_Release(This); +} +static FORCEINLINE ULONG AsyncIUnknown_Finish_Release(AsyncIUnknown* This) { + return This->lpVtbl->Finish_Release(This); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_QueryInterface_Proxy( + AsyncIUnknown* This, + REFIID riid); +void __RPC_STUB AsyncIUnknown_Begin_QueryInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Finish_QueryInterface_Proxy( + AsyncIUnknown* This, + void **ppvObject); +void __RPC_STUB AsyncIUnknown_Finish_QueryInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_AddRef_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Begin_AddRef_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_AddRef_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Finish_AddRef_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_Release_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Begin_Release_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_Release_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Finish_Release_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __AsyncIUnknown_INTERFACE_DEFINED__ */ + +#endif + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) +/***************************************************************************** + * IClassFactory interface + */ +#ifndef __IClassFactory_INTERFACE_DEFINED__ +#define __IClassFactory_INTERFACE_DEFINED__ + +typedef IClassFactory *LPCLASSFACTORY; + +DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("00000001-0000-0000-c000-000000000046") +IClassFactory : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE CreateInstance( + IUnknown *pUnkOuter, + REFIID riid, + void **ppvObject) = 0; + + virtual HRESULT STDMETHODCALLTYPE LockServer( + WINBOOL fLock) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) +#endif +#else +typedef struct IClassFactoryVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IClassFactory* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IClassFactory* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IClassFactory* This); + + /*** IClassFactory methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateInstance)( + IClassFactory* This, + IUnknown *pUnkOuter, + REFIID riid, + void **ppvObject); + + HRESULT (STDMETHODCALLTYPE *LockServer)( + IClassFactory* This, + WINBOOL fLock); + + END_INTERFACE +} IClassFactoryVtbl; +interface IClassFactory { + CONST_VTBL IClassFactoryVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IClassFactory_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IClassFactory_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IClassFactory_Release(This) (This)->lpVtbl->Release(This) +/*** IClassFactory methods ***/ +#define IClassFactory_CreateInstance(This,pUnkOuter,riid,ppvObject) (This)->lpVtbl->CreateInstance(This,pUnkOuter,riid,ppvObject) +#define IClassFactory_LockServer(This,fLock) (This)->lpVtbl->LockServer(This,fLock) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IClassFactory_QueryInterface(IClassFactory* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IClassFactory_AddRef(IClassFactory* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IClassFactory_Release(IClassFactory* This) { + return This->lpVtbl->Release(This); +} +/*** IClassFactory methods ***/ +static FORCEINLINE HRESULT IClassFactory_CreateInstance(IClassFactory* This,IUnknown *pUnkOuter,REFIID riid,void **ppvObject) { + return This->lpVtbl->CreateInstance(This,pUnkOuter,riid,ppvObject); +} +static FORCEINLINE HRESULT IClassFactory_LockServer(IClassFactory* This,WINBOOL fLock) { + return This->lpVtbl->LockServer(This,fLock); +} +#endif +#endif + +#endif + +HRESULT STDMETHODCALLTYPE IClassFactory_RemoteCreateInstance_Proxy( + IClassFactory* This, + REFIID riid, + IUnknown **ppvObject); +void __RPC_STUB IClassFactory_RemoteCreateInstance_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT __stdcall IClassFactory_RemoteLockServer_Proxy( + IClassFactory* This, + WINBOOL fLock); +void __RPC_STUB IClassFactory_RemoteLockServer_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IClassFactory_CreateInstance_Proxy( + IClassFactory* This, + IUnknown *pUnkOuter, + REFIID riid, + void **ppvObject); +HRESULT __RPC_STUB IClassFactory_CreateInstance_Stub( + IClassFactory* This, + REFIID riid, + IUnknown **ppvObject); +HRESULT CALLBACK IClassFactory_LockServer_Proxy( + IClassFactory* This, + WINBOOL fLock); +HRESULT __RPC_STUB IClassFactory_LockServer_Stub( + IClassFactory* This, + WINBOOL fLock); + +#endif /* __IClassFactory_INTERFACE_DEFINED__ */ + +#endif +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __unknwnbase_h__ */ Property changes on: trunk/mingw-w64-headers/include/unknwnbase.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/mingw-w64-headers/include/unknwnbase.idl =================================================================== --- trunk/mingw-w64-headers/include/unknwnbase.idl (rev 0) +++ trunk/mingw-w64-headers/include/unknwnbase.idl 2013-08-07 20:06:10 UTC (rev 6042) @@ -0,0 +1,76 @@ +cpp_quote("/**") +cpp_quote(" * This file is part of the mingw-w64 runtime package.") +cpp_quote(" * No warranty is given; refer to the file DISCLAIMER within this package.") +cpp_quote(" */") +cpp_quote("") +cpp_quote("#include <winapifamily.h>") + +#if !defined (BUILDING_UNKNWN_IDL) && !defined (DO_NO_IMPORTS) +cpp_quote("") +import "wtypesbase.idl"; +#endif + +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)") +[local, object, uuid (00000000-0000-0000-C000-000000000046), pointer_default (unique)] +interface IUnknown { + typedef [unique] IUnknown *LPUNKNOWN; + cpp_quote("") + cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") + cpp_quote("EXTERN_C const IID IID_IUnknown;") + cpp_quote("") + cpp_quote("extern \"C++\" {") + cpp_quote(" MIDL_INTERFACE(\"00000000-0000-0000-C000-000000000046\")") + cpp_quote(" IUnknown {") + cpp_quote(" public:") + cpp_quote(" BEGIN_INTERFACE") + cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) = 0;") + cpp_quote(" virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;") + cpp_quote(" virtual ULONG STDMETHODCALLTYPE Release(void) = 0;") + cpp_quote("") + cpp_quote(" template<class Q>") + cpp_quote(" HRESULT STDMETHODCALLTYPE QueryInterface(Q **pp) {") + cpp_quote(" return QueryInterface(__uuidof(Q), (void **)pp);") + cpp_quote(" }") + cpp_quote(" END_INTERFACE") + cpp_quote(" };") + cpp_quote("}") + cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);") + cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);") + cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);") + cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);") + cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);") + cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);") + cpp_quote("#else") + HRESULT QueryInterface ([in] REFIID riid,[out, iid_is (riid)] void **ppvObject); + ULONG AddRef (); + ULONG Release (); +} +cpp_quote("#endif") +cpp_quote("#endif") + +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") +[local, object, uuid (000e0000-0000-0000-C000-000000000046), pointer_default (unique)] +interface AsyncIUnknown : IUnknown { + HRESULT Begin_QueryInterface ([in] REFIID riid); + HRESULT Finish_QueryInterface ([out] void **ppvObject); + HRESULT Begin_AddRef (); + ULONG Finish_AddRef (); + HRESULT Begin_Release (); + ULONG Finish_Release (); +} +cpp_quote("#endif") + +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)") +[object, uuid (00000001-0000-0000-C000-000000000046), pointer_default (unique)] +interface IClassFactory : IUnknown { + typedef [unique] IClassFactory *LPCLASSFACTORY; +cpp_quote("") + [local] HRESULT CreateInstance ([in, unique] IUnknown *pUnkOuter,[in] REFIID riid,[out, iid_is (riid)] void **ppvObject); + [call_as (CreateInstance)] HRESULT RemoteCreateInstance ([in] REFIID riid,[out, iid_is (riid)] IUnknown **ppvObject); + [local] HRESULT LockServer ([in] WINBOOL fLock); + [call_as (LockServer)] HRESULT __stdcall RemoteLockServer ([in] WINBOOL fLock); +} +cpp_quote("#endif") Property changes on: trunk/mingw-w64-headers/include/unknwnbase.idl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |