Updated imported headers to current Wine version.

This commit is contained in:
Jacek Caban 2017-12-18 18:10:18 +01:00
parent 0b2e0aa58e
commit abd02b37ed
10 changed files with 43 additions and 45 deletions

View File

@ -79,7 +79,7 @@ interface IDirectShowStream : IDispatch
[propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal); [propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal);
[propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal);
[propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); [propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal);
}; }
[ [
object, object,

View File

@ -673,4 +673,4 @@ interface ID3D10InfoQueue : IUnknown
[in] BOOL mute [in] BOOL mute
); );
BOOL GetMuteDebugOutput(); BOOL GetMuteDebugOutput();
}; }

View File

@ -26,11 +26,9 @@
/********************************************** /**********************************************
***************** Definitions **************** ***************** Definitions ****************
**********************************************/ **********************************************/
/* D3DX_VERSION will be completely ignored since we are
implementing all dlls from d3dx9_24 to d3dx9_36 */
#define D3DX_VERSION 0x0902 #define D3DX_VERSION 0x0902
#ifndef D3DX_SDK_VERSION #ifndef D3DX_SDK_VERSION
#define D3DX_SDK_VERSION 36 #define D3DX_SDK_VERSION 43
#endif #endif
#define D3DXSPRITE_DONOTSAVESTATE 0x00000001 #define D3DXSPRITE_DONOTSAVESTATE 0x00000001
#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 #define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002

View File

@ -213,7 +213,7 @@ interface IMediaObject : IUnknown
); );
HRESULT Lock(LONG bLock); HRESULT Lock(LONG bLock);
}; }
/***************************************************************************** /*****************************************************************************
* IMediaObjectInPlace interface * IMediaObjectInPlace interface

View File

@ -78,7 +78,7 @@ interface ISampleGrabber: IUnknown
ISampleGrabberCB * pCallback, ISampleGrabberCB * pCallback,
LONG WhichMethodToCallback LONG WhichMethodToCallback
); );
}; }
[ [
object, object,
@ -157,7 +157,7 @@ interface IMediaDet : IUnknown
HRESULT EnterBitmapGrabMode( HRESULT EnterBitmapGrabMode(
double SeekTime double SeekTime
); );
}; }
[ [
uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA),
@ -165,7 +165,7 @@ interface IMediaDet : IUnknown
coclass MediaDet coclass MediaDet
{ {
[default] interface IMediaDet; [default] interface IMediaDet;
}; }
[ [
object, object,
@ -185,7 +185,7 @@ interface IMediaLocator : IUnknown
HRESULT AddFoundLocation( HRESULT AddFoundLocation(
BSTR dir BSTR dir
); );
}; }
typedef struct typedef struct
{ {
@ -258,7 +258,7 @@ interface IPropertySetter : IUnknown
[in] IUnknown * target, [in] IUnknown * target,
[in] REFERENCE_TIME now [in] REFERENCE_TIME now
); );
}; }
[ [
object, object,
@ -275,7 +275,7 @@ interface IAMErrorLog : IUnknown
long hresult, long hresult,
[in] VARIANT * extra [in] VARIANT * extra
); );
}; }
[ [
object, object,
@ -292,7 +292,7 @@ interface IAMSetErrorLog : IUnknown
[propput] HRESULT ErrorLog( [propput] HRESULT ErrorLog(
[in] IAMErrorLog * log [in] IAMErrorLog * log
); );
}; }
interface IAMTimeline; interface IAMTimeline;
interface IAMTimelineGroup; interface IAMTimelineGroup;
@ -439,7 +439,7 @@ interface IAMTimeline : IUnknown
HRESULT GetDefaultEffectB( HRESULT GetDefaultEffectB(
[out,retval] BSTR * guidb [out,retval] BSTR * guidb
); );
}; }
[ [
uuid(78530B75-61F9-11D2-8CAD-00A024580902) uuid(78530B75-61F9-11D2-8CAD-00A024580902)
@ -449,7 +449,7 @@ coclass AMTimeline
[default] interface IAMTimeline; [default] interface IAMTimeline;
interface IPersistStream; interface IPersistStream;
interface IAMSetErrorLog; interface IAMSetErrorLog;
}; }
[ [
object, object,
@ -536,7 +536,7 @@ interface IAMTimelineGroup : IUnknown
HRESULT SetRecompFormatFromSource( HRESULT SetRecompFormatFromSource(
IAMTimelineSrc * source IAMTimelineSrc * source
); );
}; }
[ [
object, object,
@ -701,7 +701,7 @@ interface IAMTimelineObj : IUnknown
HRESULT GetEmbedDepth( HRESULT GetEmbedDepth(
long * depth long * depth
); );
}; }
[ [
object, object,
@ -804,7 +804,7 @@ interface IAMTimelineSrc : IUnknown
HRESULT SetStretchMode( HRESULT SetStretchMode(
int mode int mode
); );
}; }
enum enum
{ {

View File

@ -604,7 +604,7 @@ interface IPart : IUnknown
HRESULT UnregisterControlChangeCallback( HRESULT UnregisterControlChangeCallback(
[in] IControlChangeNotify *pNotify [in] IControlChangeNotify *pNotify
); );
}; }
[ [
pointer_default(unique), pointer_default(unique),

View File

@ -183,7 +183,7 @@ interface ICorRuntimeHost : IUnknown
HRESULT UnloadDomain([in] IUnknown* appDomain); HRESULT UnloadDomain([in] IUnknown* appDomain);
HRESULT CurrentDomain([out] IUnknown** appDomain); HRESULT CurrentDomain([out] IUnknown** appDomain);
}; }
cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);") cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);")

View File

@ -77,5 +77,5 @@ library WMDRMContentEnablerLib
coclass WMDRMContentEnablerActivate coclass WMDRMContentEnablerActivate
{ {
[default] interface IPersistStream; [default] interface IPersistStream;
}; }
}; }

View File

@ -40,4 +40,4 @@ interface INSSBuffer : IUnknown
HRESULT GetBufferAndLength( HRESULT GetBufferAndLength(
[out] BYTE **ppdwBuffer, [out] BYTE **ppdwBuffer,
[out] DWORD *pdwLength); [out] DWORD *pdwLength);
}; }

View File

@ -233,7 +233,7 @@ interface IWMStatusCallback : IUnknown
[in] WMT_ATTR_DATATYPE dwType, [in] WMT_ATTR_DATATYPE dwType,
[in] BYTE *pValue, [in] BYTE *pValue,
[in] void *pvContext); [in] void *pvContext);
}; }
[ [
object, object,
@ -250,7 +250,7 @@ interface IWMReaderCallback : IWMStatusCallback
[in] DWORD dwFlags, [in] DWORD dwFlags,
[in] INSSBuffer *pSample, [in] INSSBuffer *pSample,
[in] void *pvContext); [in] void *pvContext);
}; }
[ [
object, object,
@ -298,7 +298,7 @@ interface IWMBandwidthSharing : IWMStreamList
HRESULT SetBandwidth( HRESULT SetBandwidth(
[in] DWORD bitrate, [in] DWORD bitrate,
[in] DWORD buffer); [in] DWORD buffer);
}; }
[ [
object, object,
@ -460,7 +460,7 @@ interface IWMProfile3 : IWMProfile2
HRESULT GetExpectedPacketCount( HRESULT GetExpectedPacketCount(
[in] QWORD duration, [in] QWORD duration,
[out] QWORD *packets); [out] QWORD *packets);
}; }
[ [
object, object,
@ -514,7 +514,7 @@ interface IWMMediaProps : IUnknown
HRESULT SetMediaType( HRESULT SetMediaType(
[in] WM_MEDIA_TYPE *pType); [in] WM_MEDIA_TYPE *pType);
}; }
[ [
object, object,
@ -531,7 +531,7 @@ interface IWMOutputMediaProps : IWMMediaProps
HRESULT GetConnectionName( HRESULT GetConnectionName(
[out, size_is(*pcchName)] WCHAR *pwszName, [out, size_is(*pcchName)] WCHAR *pwszName,
[in, out] WORD *pcchName); [in, out] WORD *pcchName);
}; }
[ [
object, object,
@ -547,7 +547,7 @@ interface IWMMetadataEditor : IUnknown
HRESULT Close(); HRESULT Close();
HRESULT Flush(); HRESULT Flush();
}; }
[ [
object, object,
@ -595,7 +595,7 @@ interface IWMReader : IUnknown
HRESULT Pause(); HRESULT Pause();
HRESULT Resume(); HRESULT Resume();
}; }
[ [
object, object,
@ -950,7 +950,7 @@ interface IWMSyncReader : IUnknown
HRESULT OpenStream( HRESULT OpenStream(
[in] IStream *pStream); [in] IStream *pStream);
}; }
[ [
object, object,
@ -1203,7 +1203,7 @@ interface IWMHeaderInfo : IUnknown
HRESULT RemoveScript( HRESULT RemoveScript(
[in] WORD index ); [in] WORD index );
}; }
[ [
object, object,
@ -1225,7 +1225,7 @@ interface IWMHeaderInfo2 : IWMHeaderInfo
[out] WMT_CODEC_INFO_TYPE *codec_type, [out] WMT_CODEC_INFO_TYPE *codec_type,
[in, out] WORD *codec_info_cnt, [in, out] WORD *codec_info_cnt,
[out, size_is( *codec_info_cnt )] BYTE *codec_info ); [out, size_is( *codec_info_cnt )] BYTE *codec_info );
}; }
[ [
object, object,
@ -1283,7 +1283,7 @@ interface IWMHeaderInfo3 : IWMHeaderInfo2
[in] WMT_CODEC_INFO_TYPE codec_type, [in] WMT_CODEC_INFO_TYPE codec_type,
[in] WORD codec_info_cnt, [in] WORD codec_info_cnt,
[in, size_is( codec_info_cnt )] BYTE *codec_info ); [in, size_is( codec_info_cnt )] BYTE *codec_info );
}; }
[ [
object, object,
@ -1442,7 +1442,7 @@ interface IWMPacketSize : IUnknown
{ {
HRESULT GetMaxPacketSize([out] DWORD *size); HRESULT GetMaxPacketSize([out] DWORD *size);
HRESULT SetMaxPacketSize([in] DWORD size); HRESULT SetMaxPacketSize([in] DWORD size);
}; }
[ [
object, object,
@ -1454,7 +1454,7 @@ interface IWMPacketSize2 : IWMPacketSize
{ {
HRESULT GetMinPacketSize([out] DWORD *size); HRESULT GetMinPacketSize([out] DWORD *size);
HRESULT SetMinPacketSize([in] DWORD size); HRESULT SetMinPacketSize([in] DWORD size);
}; }
[ [
object, object,
@ -1484,7 +1484,7 @@ interface IWMDRMReader : IUnknown
[out] WMT_ATTR_DATATYPE *type, [out] WMT_ATTR_DATATYPE *type,
[out, size_is( *length )] BYTE *value, [out, size_is( *length )] BYTE *value,
[in, out] WORD *length); [in, out] WORD *length);
}; }
[ [
object, object,
@ -1506,7 +1506,7 @@ interface IWMDRMReader2 : IWMDRMReader
[out] DWORD *level); [out] DWORD *level);
HRESULT TryNextLicense(); HRESULT TryNextLicense();
}; }
[ [
object, object,
@ -1519,7 +1519,7 @@ interface IWMDRMReader3 : IWMDRMReader2
HRESULT GetInclusionList( HRESULT GetInclusionList(
[out] GUID **guids, [out] GUID **guids,
[out] DWORD *count); [out] DWORD *count);
}; }
[ [
object, object,
@ -1537,7 +1537,7 @@ interface IWMReaderAccelerator : IUnknown
HRESULT Notify( HRESULT Notify(
[in] DWORD output, [in] DWORD output,
[in] WM_MEDIA_TYPE *subtype); [in] WM_MEDIA_TYPE *subtype);
}; }
[ [
object, object,
@ -1556,7 +1556,7 @@ interface IWMReaderTimecode : IUnknown
[in] WORD range, [in] WORD range,
[out] DWORD *start_timecode, [out] DWORD *start_timecode,
[out] DWORD *end_timecode); [out] DWORD *end_timecode);
}; }
[ [
object, object,
@ -1569,7 +1569,7 @@ interface IWMReaderTypeNegotiation : IUnknown
HRESULT TryOutputProps( HRESULT TryOutputProps(
[in] DWORD output, [in] DWORD output,
[in] IWMOutputMediaProps *props); [in] IWMOutputMediaProps *props);
}; }
[ [
object, object,
@ -1590,7 +1590,7 @@ interface IWMLanguageList : IUnknown
HRESULT AddLanguageByRFC1766String( HRESULT AddLanguageByRFC1766String(
[in] LPCWSTR_WMSDK_TYPE_SAFE language, [in] LPCWSTR_WMSDK_TYPE_SAFE language,
[out] WORD *index); [out] WORD *index);
}; }
[ [
object, object,
@ -1613,7 +1613,7 @@ interface IWMReaderPlaylistBurn : IUnknown
HRESULT Cancel(); HRESULT Cancel();
HRESULT EndPlaylistBurn([in] HRESULT result); HRESULT EndPlaylistBurn([in] HRESULT result);
}; }
cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);")