diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-20 17:16:39 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-20 17:16:39 +0000 |
commit | 3bbe897e247d128cf63f1fad665fdfc086bab5ab (patch) | |
tree | 567f6ff88d6dfa186a9184676793512b85743c22 /loader | |
parent | 8fb418635ee3511971ab3bc923b2f95228669906 (diff) | |
download | mpv-3bbe897e247d128cf63f1fad665fdfc086bab5ab.tar.bz2 mpv-3bbe897e247d128cf63f1fad665fdfc086bab5ab.tar.xz |
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
capital letter are reserved for the system, those starting with _ are
reserved at the file level.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
44 files changed, 347 insertions, 347 deletions
diff --git a/loader/com.h b/loader/com.h index 316538479a..9cf2ea15c3 100644 --- a/loader/com.h +++ b/loader/com.h @@ -51,9 +51,9 @@ struct IUnknown; struct IClassFactory; struct IUnknown_vt { - long STDCALL (*QueryInterface)(struct IUnknown* _this, const GUID* iid, void** ppv); - long STDCALL (*AddRef)(struct IUnknown* _this) ; - long STDCALL (*Release)(struct IUnknown* _this) ; + long STDCALL (*QueryInterface)(struct IUnknown* this, const GUID* iid, void** ppv); + long STDCALL (*AddRef)(struct IUnknown* this) ; + long STDCALL (*Release)(struct IUnknown* this) ; } ; typedef struct IUnknown @@ -63,10 +63,10 @@ typedef struct IUnknown struct IClassFactory_vt { - long STDCALL (*QueryInterface)(struct IUnknown* _this, const GUID* iid, void** ppv); - long STDCALL (*AddRef)(struct IUnknown* _this) ; - long STDCALL (*Release)(struct IUnknown* _this) ; - long STDCALL (*CreateInstance)(struct IClassFactory* _this, struct IUnknown* pUnkOuter, const GUID* riid, void** ppvObject); + long STDCALL (*QueryInterface)(struct IUnknown* this, const GUID* iid, void** ppv); + long STDCALL (*AddRef)(struct IUnknown* this) ; + long STDCALL (*Release)(struct IUnknown* this) ; + long STDCALL (*CreateInstance)(struct IClassFactory* this, struct IUnknown* pUnkOuter, const GUID* riid, void** ppvObject); }; struct IClassFactory diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c index 83a90659ba..398cd86f51 100644 --- a/loader/dmo/DMO_AudioDecoder.c +++ b/loader/dmo/DMO_AudioDecoder.c @@ -13,7 +13,7 @@ #include "DMO_Filter.h" #include "DMO_AudioDecoder.h" -struct _DMO_AudioDecoder +struct DMO_AudioDecoder { DMO_MEDIA_TYPE m_sOurType, m_sDestType; DMO_Filter* m_pDMO_Filter; diff --git a/loader/dmo/DMO_AudioDecoder.h b/loader/dmo/DMO_AudioDecoder.h index c2202b4a31..9ad00d1193 100644 --- a/loader/dmo/DMO_AudioDecoder.h +++ b/loader/dmo/DMO_AudioDecoder.h @@ -1,7 +1,7 @@ #ifndef AVIFILE_DMO_AUDIODECODER_H #define AVIFILE_DMO_AUDIODECODER_H -typedef struct _DMO_AudioDecoder DMO_AudioDecoder; +typedef struct DMO_AudioDecoder DMO_AudioDecoder; //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels); diff --git a/loader/dmo/DMO_Filter.h b/loader/dmo/DMO_Filter.h index ee7a38b1c7..090bc2f4c0 100644 --- a/loader/dmo/DMO_Filter.h +++ b/loader/dmo/DMO_Filter.h @@ -8,7 +8,7 @@ extern "C" { #endif -typedef struct _DMO_Filter +typedef struct DMO_Filter { int m_iHandle; IDMOVideoOutputOptimizations* m_pOptim; @@ -17,7 +17,7 @@ typedef struct _DMO_Filter AM_MEDIA_TYPE *m_pOurType, *m_pDestType; } DMO_Filter; -typedef struct _CMediaBuffer CMediaBuffer; +typedef struct CMediaBuffer CMediaBuffer; /** * Create DMO_Filter object - similar syntax as for DS_Filter diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index 89017453eb..2304917145 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -17,7 +17,7 @@ #include "DMO_VideoDecoder.h" -struct _DMO_VideoDecoder +struct DMO_VideoDecoder { IVideoDecoder iv; @@ -54,9 +54,9 @@ struct _DMO_VideoDecoder //int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this){return this->m_Caps;} -typedef struct _ct ct; +typedef struct ct ct; -struct _ct { +struct ct { fourcc_t fcc; unsigned int bits; const GUID* subtype; diff --git a/loader/dmo/DMO_VideoDecoder.h b/loader/dmo/DMO_VideoDecoder.h index 1f48523a1e..53d971d762 100644 --- a/loader/dmo/DMO_VideoDecoder.h +++ b/loader/dmo/DMO_VideoDecoder.h @@ -1,7 +1,7 @@ #ifndef AVIFILE_DMO_VIDEODECODER_H #define AVIFILE_DMO_VIDEODECODER_H -typedef struct _DMO_VideoDecoder DMO_VideoDecoder; +typedef struct DMO_VideoDecoder DMO_VideoDecoder; int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this); diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c index 3d53c3ce99..0a74fe6c8a 100644 --- a/loader/dmo/buffer.c +++ b/loader/dmo/buffer.c @@ -7,7 +7,7 @@ #include <string.h> #include <stdlib.h> -struct _CMediaBuffer +struct CMediaBuffer { IMediaBuffer_vt* vt; DECLARE_IUNKNOWN(); diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h index bd94e75022..845a853e5c 100644 --- a/loader/dmo/dmo.h +++ b/loader/dmo/dmo.h @@ -16,14 +16,14 @@ typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE; -enum _DMO_INPUT_DATA_BUFFER_FLAGS +enum DMO_INPUT_DATA_BUFFER_FLAGS { DMO_INPUT_DATA_BUFFERF_SYNCPOINT = 0x1, DMO_INPUT_DATA_BUFFERF_TIME = 0x2, DMO_INPUT_DATA_BUFFERF_TIMELENGTH = 0x4 }; -enum _DMO_OUTPUT_DATA_BUFFER_FLAGS +enum DMO_OUTPUT_DATA_BUFFER_FLAGS { DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x1, DMO_OUTPUT_DATA_BUFFERF_TIME = 0x2, @@ -31,12 +31,12 @@ enum _DMO_OUTPUT_DATA_BUFFER_FLAGS DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x1000000 }; -enum _DMO_INPUT_STATUS_FLAGS +enum DMO_INPUT_STATUS_FLAGS { DMO_INPUT_STATUSF_ACCEPT_DATA = 0x1 }; -enum _DMO_INPUT_STREAM_INFO_FLAGS +enum DMO_INPUT_STREAM_INFO_FLAGS { DMO_INPUT_STREAMF_WHOLE_SAMPLES = 0x1, DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2, @@ -44,7 +44,7 @@ enum _DMO_INPUT_STREAM_INFO_FLAGS DMO_INPUT_STREAMF_HOLDS_BUFFERS = 0x8 }; -enum _DMO_OUTPUT_STREAM_INFO_FLAGS +enum DMO_OUTPUT_STREAM_INFO_FLAGS { DMO_OUTPUT_STREAMF_WHOLE_SAMPLES = 0x1, DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2, @@ -53,18 +53,18 @@ enum _DMO_OUTPUT_STREAM_INFO_FLAGS DMO_OUTPUT_STREAMF_OPTIONAL = 0x10 }; -enum _DMO_SET_TYPE_FLAGS +enum DMO_SET_TYPE_FLAGS { DMO_SET_TYPEF_TEST_ONLY = 0x1, DMO_SET_TYPEF_CLEAR = 0x2 }; -enum _DMO_PROCESS_OUTPUT_FLAGS +enum DMO_PROCESS_OUTPUT_FLAGS { DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x1 }; -enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS +enum DMO_VIDEO_OUTPUT_STREAM_FLAGS { DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x1 }; diff --git a/loader/dmo/dmo_interfaces.h b/loader/dmo/dmo_interfaces.h index 474dc06ceb..01ccc2e339 100644 --- a/loader/dmo/dmo_interfaces.h +++ b/loader/dmo/dmo_interfaces.h @@ -6,7 +6,7 @@ /* * IMediaBuffer interface */ -typedef struct _IMediaBuffer IMediaBuffer; +typedef struct IMediaBuffer IMediaBuffer; typedef struct IMediaBuffer_vt { INHERIT_IUNKNOWN(); @@ -19,10 +19,10 @@ typedef struct IMediaBuffer_vt /* [out] */ char** ppBuffer, /* [out] */ unsigned long* pcbLength); } IMediaBuffer_vt; -struct _IMediaBuffer { IMediaBuffer_vt* vt; }; +struct IMediaBuffer { IMediaBuffer_vt* vt; }; -typedef struct _DMO_OUTPUT_DATA_BUFFER +typedef struct DMO_OUTPUT_DATA_BUFFER { IMediaBuffer *pBuffer; unsigned long dwStatus; @@ -34,7 +34,7 @@ typedef struct _DMO_OUTPUT_DATA_BUFFER /* * IMediaObject interface */ -typedef struct _IMediaObject IMediaObject; +typedef struct IMediaObject IMediaObject; typedef struct IMediaObject_vt { INHERIT_IUNKNOWN(); @@ -106,12 +106,12 @@ typedef struct IMediaObject_vt /* [out] */ unsigned long *pdwStatus); HRESULT STDCALL ( *Lock )(IMediaObject * This, long bLock); } IMediaObject_vt; -struct _IMediaObject { IMediaObject_vt* vt; }; +struct IMediaObject { IMediaObject_vt* vt; }; /* * IEnumDMO interface */ -typedef struct _IEnumDMO IEnumDMO; +typedef struct IEnumDMO IEnumDMO; typedef struct IEnumDMO_vt { INHERIT_IUNKNOWN(); @@ -127,12 +127,12 @@ typedef struct IEnumDMO_vt HRESULT STDCALL ( *Clone )(IEnumDMO * This, /* [out] */ IEnumDMO **ppEnum); } IEnumDMO_vt; -struct _IEnumDMO { IEnumDMO_vt* vt; }; +struct IEnumDMO { IEnumDMO_vt* vt; }; /* * IMediaObjectInPlace interface */ -typedef struct _IMediaObjectInPlace IMediaObjectInPlace; +typedef struct IMediaObjectInPlace IMediaObjectInPlace; typedef struct IMediaObjectInPlace_vt { INHERIT_IUNKNOWN(); @@ -148,13 +148,13 @@ typedef struct IMediaObjectInPlace_vt /* [out] */ REFERENCE_TIME *pLatencyTime); } IMediaObjectInPlace_vt; -struct _IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; }; +struct IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; }; /* * IDMOQualityControl interface */ -typedef struct _IDMOQualityControl IDMOQualityControl; +typedef struct IDMOQualityControl IDMOQualityControl; typedef struct IDMOQualityControl_vt { INHERIT_IUNKNOWN(); @@ -166,12 +166,12 @@ typedef struct IDMOQualityControl_vt HRESULT STDCALL ( *GetStatus )(IDMOQualityControl * This, /* [out] */ unsigned long *pdwFlags); } IDMOQualityControl_vt; -struct _IDMOQualityControl { IDMOQualityControl_vt* vt; }; +struct IDMOQualityControl { IDMOQualityControl_vt* vt; }; /* * IDMOVideoOutputOptimizations interface */ -typedef struct _IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations; +typedef struct IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations; typedef struct IDMOVideoOutputOptimizations_vt { INHERIT_IUNKNOWN(); @@ -189,6 +189,6 @@ typedef struct IDMOVideoOutputOptimizations_vt unsigned long ulOutputStreamIndex, unsigned long *pdwRequestedFeatures); } IDMOVideoOutputOptimizations_vt; -struct _IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; }; +struct IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; }; #endif /* DMO_INTERFACE_H */ diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index b739d68711..73e7abcecb 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -10,7 +10,7 @@ #include "DS_Filter.h" -struct _DS_AudioDecoder +struct DS_AudioDecoder { WAVEFORMATEX in_fmt; AM_MEDIA_TYPE m_sOurType, m_sDestType; diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h index 47fd384a04..6b3196ff76 100644 --- a/loader/dshow/DS_AudioDecoder.h +++ b/loader/dshow/DS_AudioDecoder.h @@ -1,7 +1,7 @@ #ifndef AVIFILE_DS_AUDIODECODER_H #define AVIFILE_DS_AUDIODECODER_H -typedef struct _DS_AudioDecoder DS_AudioDecoder; +typedef struct DS_AudioDecoder DS_AudioDecoder; //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf); diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h index 6fb643dc67..69f9918424 100644 --- a/loader/dshow/DS_Filter.h +++ b/loader/dshow/DS_Filter.h @@ -18,8 +18,8 @@ typedef struct { and then set up m_pAll. **/ -typedef struct _DS_Filter DS_Filter; -struct _DS_Filter +typedef struct DS_Filter DS_Filter; +struct DS_Filter { int m_iHandle; IBaseFilter* m_pFilter; diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index 60170e6385..0b83419f98 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -11,7 +11,7 @@ #include "libwin32.h" #include "DS_Filter.h" -struct _DS_VideoDecoder +struct DS_VideoDecoder { IVideoDecoder iv; @@ -54,9 +54,9 @@ static SampleProcUserData sampleProcData; int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this) {return this->m_Caps;} -typedef struct _ct ct; +typedef struct ct ct; -struct _ct { +struct ct { unsigned int bits; fourcc_t fcc; const GUID *subtype; diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h index 388f075126..b68c808836 100644 --- a/loader/dshow/DS_VideoDecoder.h +++ b/loader/dshow/DS_VideoDecoder.h @@ -1,7 +1,7 @@ #ifndef AVIFILE_DS_VIDEODECODER_H #define AVIFILE_DS_VIDEODECODER_H -typedef struct _DS_VideoDecoder DS_VideoDecoder; +typedef struct DS_VideoDecoder DS_VideoDecoder; int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this); diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 7eef9ada0f..e68c5e5a2d 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -13,10 +13,10 @@ static int AllocatorKeeper = 0; -struct _avm_list_t +struct avm_list_t { - struct _avm_list_t* next; - struct _avm_list_t* prev; + struct avm_list_t* next; + struct avm_list_t* prev; void* member; }; diff --git a/loader/dshow/allocator.h b/loader/dshow/allocator.h index ef1efd7370..0efa3d886f 100644 --- a/loader/dshow/allocator.h +++ b/loader/dshow/allocator.h @@ -4,10 +4,10 @@ #include "interfaces.h" #include "cmediasample.h" -typedef struct _avm_list_t avm_list_t; -typedef struct _MemAllocator MemAllocator; +typedef struct avm_list_t avm_list_t; +typedef struct MemAllocator MemAllocator; -struct _MemAllocator +struct MemAllocator { IMemAllocator_vt* vt; DECLARE_IUNKNOWN(); diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index f4234bf3d5..53fd8124cd 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -504,12 +504,12 @@ static void CMediaSample_ResetPointer(CMediaSample* This) * \brief CMediaSample constructor * * \param[in] allocator IMemallocator interface of allocator to use - * \param[in] _size size of internal buffer + * \param[in] size size of internal buffer * * \return pointer to CMediaSample object of NULL if error occured * */ -CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) +CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size) { CMediaSample* This = (CMediaSample*) malloc(sizeof(CMediaSample)); if (!This) @@ -522,11 +522,11 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) // anyway this is fixes the problem somehow with some reserves // // using different trick for now - in DS_Audio modify sample size - //if (_size < 0x1000) - // _size = (_size + 0xfff) & ~0xfff; + //if (size < 0x1000) + // size = (size + 0xfff) & ~0xfff; This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt)); - This->own_block = (char*) malloc((size_t)_size + SAFETY_ACEL); + This->own_block = (char*) malloc((size_t)size + SAFETY_ACEL); This->media_type.pbFormat = 0; This->media_type.pUnk = 0; @@ -557,7 +557,7 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) This->vt->SetMediaTime = CMediaSample_SetMediaTime; This->all = allocator; - This->size = _size; + This->size = size; This->refcount = 0; // increased by MemAllocator This->actual_size = 0; This->isPreroll = 0; diff --git a/loader/dshow/cmediasample.h b/loader/dshow/cmediasample.h index 3d6e1218ca..e16fd613db 100644 --- a/loader/dshow/cmediasample.h +++ b/loader/dshow/cmediasample.h @@ -4,8 +4,8 @@ #include "interfaces.h" #include "guids.h" -typedef struct _CMediaSample CMediaSample; -struct _CMediaSample +typedef struct CMediaSample CMediaSample; +struct CMediaSample { IMediaSample_vt* vt; DECLARE_IUNKNOWN(); @@ -25,7 +25,7 @@ struct _CMediaSample void ( *ResetPointer) (CMediaSample* This); // FIXME replace with Set & 0 }; -CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size); +CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size); // called from allocator void CMediaSample_Destroy(CMediaSample* This); diff --git a/loader/dshow/inputpin.h b/loader/dshow/inputpin.h index a8ccdcccf9..b36b2f0739 100644 --- a/loader/dshow/inputpin.h +++ b/loader/dshow/inputpin.h @@ -3,8 +3,8 @@ #include "interfaces.h" -typedef struct _CBaseFilter2 CBaseFilter2; -struct _CBaseFilter2 +typedef struct CBaseFilter2 CBaseFilter2; +struct CBaseFilter2 { IBaseFilter_vt* vt; DECLARE_IUNKNOWN(); @@ -17,8 +17,8 @@ struct _CBaseFilter2 CBaseFilter2* CBaseFilter2Create(void); -typedef struct _CBaseFilter CBaseFilter; -struct _CBaseFilter +typedef struct CBaseFilter CBaseFilter; +struct CBaseFilter { IBaseFilter_vt* vt; DECLARE_IUNKNOWN(); // has to match CBaseFilter2 - INHERITANCE!! diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h index 92a7718cd0..ffa5753370 100644 --- a/loader/dshow/interfaces.h +++ b/loader/dshow/interfaces.h @@ -12,10 +12,10 @@ /* Sh*t. MSVC++ and g++ use different methods of storing vtables. */ -typedef struct _IReferenceClock IReferenceClock; -typedef struct _IFilterGraph IFilterGraph; +typedef struct IReferenceClock IReferenceClock; +typedef struct IFilterGraph IFilterGraph; -typedef struct _IBaseFilter IBaseFilter; +typedef struct IBaseFilter IBaseFilter; typedef enum { @@ -23,14 +23,14 @@ typedef enum PINDIR_OUTPUT } PIN_DIRECTION; -typedef struct _PinInfo +typedef struct PinInfo { IBaseFilter* pFilter; PIN_DIRECTION dir; unsigned short achName[128]; } PIN_INFO; -typedef struct _AllocatorProperties +typedef struct AllocatorProperties { long cBuffers; long cbBuffer; @@ -38,7 +38,7 @@ typedef struct _AllocatorProperties long cbPrefix; } ALLOCATOR_PROPERTIES; -typedef struct _IEnumMediaTypes IEnumMediaTypes; +typedef struct IEnumMediaTypes IEnumMediaTypes; typedef struct IEnumMediaTypes_vt { INHERIT_IUNKNOWN(); @@ -53,11 +53,11 @@ typedef struct IEnumMediaTypes_vt HRESULT STDCALL ( *Clone )(IEnumMediaTypes* This, /* [out] */ IEnumMediaTypes** ppEnum); } IEnumMediaTypes_vt; -struct _IEnumMediaTypes { IEnumMediaTypes_vt* vt; }; +struct IEnumMediaTypes { IEnumMediaTypes_vt* vt; }; -typedef struct _IPin IPin; +typedef struct IPin IPin; typedef struct IPin_vt { INHERIT_IUNKNOWN(); @@ -91,10 +91,10 @@ typedef struct IPin_vt /* [in] */ REFERENCE_TIME tStop, /* [in] */ double dRate); } IPin_vt; -struct _IPin { IPin_vt *vt; }; +struct IPin { IPin_vt *vt; }; -typedef struct _IEnumPins IEnumPins; +typedef struct IEnumPins IEnumPins; typedef struct IEnumPins_vt { INHERIT_IUNKNOWN(); @@ -113,10 +113,10 @@ typedef struct IEnumPins_vt HRESULT STDCALL ( *Clone )(IEnumPins* This, /* [out] */ IEnumPins** ppEnum); } IEnumPins_vt; -struct _IEnumPins { struct IEnumPins_vt* vt; }; +struct IEnumPins { struct IEnumPins_vt* vt; }; -typedef struct _IMediaSample IMediaSample; +typedef struct IMediaSample IMediaSample; typedef struct IMediaSample_vt { INHERIT_IUNKNOWN(); @@ -174,11 +174,11 @@ typedef struct IMediaSample_vt /* [in] */ long long* pTimeStart, /* [in] */ long long* pTimeEnd); } IMediaSample_vt; -struct _IMediaSample { struct IMediaSample_vt* vt; }; +struct IMediaSample { struct IMediaSample_vt* vt; }; -//typedef struct _IBaseFilter IBaseFilter; +//typedef struct IBaseFilter IBaseFilter; typedef struct IBaseFilter_vt { INHERIT_IUNKNOWN(); @@ -211,11 +211,11 @@ typedef struct IBaseFilter_vt HRESULT STDCALL ( *QueryVendorInfo )(IBaseFilter* This, /* [string][out] */ unsigned short** pVendorInfo); } IBaseFilter_vt; -struct _IBaseFilter { struct IBaseFilter_vt* vt; }; +struct IBaseFilter { struct IBaseFilter_vt* vt; }; -typedef struct _IMemAllocator IMemAllocator; +typedef struct IMemAllocator IMemAllocator; typedef struct IMemAllocator_vt { INHERIT_IUNKNOWN(); @@ -241,11 +241,11 @@ typedef struct IMemAllocator_vt HRESULT STDCALL ( *ReleaseBuffer )(IMemAllocator* This, /* [in] */ IMediaSample* pBuffer); } IMemAllocator_vt; -struct _IMemAllocator { IMemAllocator_vt* vt; }; +struct IMemAllocator { IMemAllocator_vt* vt; }; -typedef struct _IMemInputPin IMemInputPin; +typedef struct IMemInputPin IMemInputPin; typedef struct IMemInputPin_vt { INHERIT_IUNKNOWN(); @@ -265,10 +265,10 @@ typedef struct IMemInputPin_vt /* [out] */ long *nSamplesProcessed); HRESULT STDCALL ( *ReceiveCanBlock )(IMemInputPin * This); } IMemInputPin_vt; -struct _IMemInputPin { IMemInputPin_vt* vt; }; +struct IMemInputPin { IMemInputPin_vt* vt; }; -typedef struct _IHidden IHidden; +typedef struct IHidden IHidden; typedef struct IHidden_vt { INHERIT_IUNKNOWN(); @@ -285,10 +285,10 @@ typedef struct IHidden_vt HRESULT STDCALL ( *SetSmth5 )(IHidden* This, int v1, int v2); HRESULT STDCALL ( *GetSmth6 )(IHidden* This, int* pv); } IHidden_vt; -struct _IHidden { struct IHidden_vt* vt; }; +struct IHidden { struct IHidden_vt* vt; }; -typedef struct _IHidden2 IHidden2; +typedef struct IHidden2 IHidden2; typedef struct IHidden2_vt { INHERIT_IUNKNOWN(); @@ -302,7 +302,7 @@ typedef struct IHidden2_vt HRESULT STDCALL ( *unk7 )(void); HRESULT STDCALL ( *unk8 )(void); } IHidden2_vt; -struct _IHidden2 { struct IHidden2_vt* vt; }; +struct IHidden2 { struct IHidden2_vt* vt; }; // fixme diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index fa7d601abd..762c8e86b5 100644 --- a/loader/dshow/libwin32.h< |