From 3bbe897e247d128cf63f1fad665fdfc086bab5ab Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 20 Jan 2008 17:16:39 +0000 Subject: 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 --- loader/com.h | 14 +-- loader/dmo/DMO_AudioDecoder.c | 2 +- loader/dmo/DMO_AudioDecoder.h | 2 +- loader/dmo/DMO_Filter.h | 4 +- loader/dmo/DMO_VideoDecoder.c | 6 +- loader/dmo/DMO_VideoDecoder.h | 2 +- loader/dmo/buffer.c | 2 +- loader/dmo/dmo.h | 16 +-- loader/dmo/dmo_interfaces.h | 26 ++--- loader/dshow/DS_AudioDecoder.c | 2 +- loader/dshow/DS_AudioDecoder.h | 2 +- loader/dshow/DS_Filter.h | 4 +- loader/dshow/DS_VideoDecoder.c | 6 +- loader/dshow/DS_VideoDecoder.h | 2 +- loader/dshow/allocator.c | 6 +- loader/dshow/allocator.h | 6 +- loader/dshow/cmediasample.c | 12 +-- loader/dshow/cmediasample.h | 6 +- loader/dshow/inputpin.h | 8 +- loader/dshow/interfaces.h | 46 ++++---- loader/dshow/libwin32.h | 12 +-- loader/dshow/mediatype.h | 2 +- loader/dshow/outputpin.c | 2 +- loader/dshow/outputpin.h | 6 +- loader/loader.h | 6 +- loader/module.c | 8 +- loader/pe_image.c | 2 +- loader/qtx/qtxload.c | 4 +- loader/resource.c | 4 +- loader/win32.c | 16 +-- loader/wine/debugtools.h | 29 ++--- loader/wine/ldt.h | 10 +- loader/wine/mmreg.h | 12 +-- loader/wine/module.h | 8 +- loader/wine/msacm.h | 44 ++++---- loader/wine/msacmdrv.h | 24 ++--- loader/wine/ntdef.h | 8 +- loader/wine/pe_image.h | 22 ++-- loader/wine/vfw.h | 8 +- loader/wine/winbase.h | 34 +++--- loader/wine/windef.h | 6 +- loader/wine/winnt.h | 233 ++++++++++++++++++++--------------------- loader/wine/winuser.h | 8 +- loader/wineacm.h | 12 +-- 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 #include -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 +++ b/loader/dshow/libwin32.h @@ -14,21 +14,21 @@ typedef uint32_t fourcc_t; /* -typedef struct _FatalError +typedef struct FatalError { FatalError(); void PrintAll() {} }FatalError; */ -typedef struct _CodecInfo +typedef struct CodecInfo { char* dll; GUID* guid; }CodecInfo; -typedef struct _CImage // public your_libvo_mem +typedef struct CImage // public your_libvo_mem { char* ptr; @@ -53,7 +53,7 @@ struct BitmapInfo : public BITMAPINFOHEADER }; #endif -typedef struct _IAudioDecoder +typedef struct IAudioDecoder { WAVEFORMATEX in_fmt; CodecInfo record; @@ -96,7 +96,7 @@ struct IAudioEncoder START, }; -typedef struct _BitmapInfo +typedef struct BitmapInfo { long biSize; long biWidth; @@ -112,7 +112,7 @@ typedef struct _BitmapInfo int colors[3]; } BitmapInfo; -typedef struct _IVideoDecoder +typedef struct IVideoDecoder { int VBUFSIZE; int QMARKHI; diff --git a/loader/dshow/mediatype.h b/loader/dshow/mediatype.h index 91b52d92ab..9e3734545c 100644 --- a/loader/dshow/mediatype.h +++ b/loader/dshow/mediatype.h @@ -7,7 +7,7 @@ #define DS_MEDIATYPE_H #include "guids.h" -typedef struct __attribute__((__packed__)) _MediaType +typedef struct __attribute__((__packed__)) MediaType { GUID majortype; //0x0 GUID subtype; //0x10 diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index f979dd5a6f..dd715ef02d 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -33,7 +33,7 @@ typedef struct CEnumMediaTypes /** IMemOutput interface implementation */ -struct _COutputMemPin +struct COutputMemPin { IMemInputPin_vt* vt; DECLARE_IUNKNOWN(); diff --git a/loader/dshow/outputpin.h b/loader/dshow/outputpin.h index aa60ca049b..03c5134f8b 100644 --- a/loader/dshow/outputpin.h +++ b/loader/dshow/outputpin.h @@ -5,8 +5,8 @@ #include "allocator.h" -typedef struct _COutputMemPin COutputMemPin; -typedef struct _COutputPin COutputPin; +typedef struct COutputMemPin COutputMemPin; +typedef struct COutputPin COutputPin; /** Callback routine for copying samples from pin into filter @@ -15,7 +15,7 @@ typedef struct _COutputPin COutputPin; */ typedef HRESULT STDCALL (*SAMPLEPROC)(void* pUserData,IMediaSample*sample); -struct _COutputPin +struct COutputPin { IPin_vt* vt; DECLARE_IUNKNOWN(); diff --git a/loader/loader.h b/loader/loader.h index 7fafc632f9..4581a0306d 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -25,10 +25,10 @@ extern "C" { #include "wine/vfw.h" #include "wine/msacm.h" -unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, int default_value, const char* filename); -int _GetPrivateProfileStringA(const char* appname, const char* keyname, +unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, int default_value, const char* filename); +int GetPrivateProfileStringA_(const char* appname, const char* keyname, const char* def_val, char* dest, unsigned int len, const char* filename); -int _WritePrivateProfileStringA(const char* appname, const char* keyname, +int WritePrivateProfileStringA_(const char* appname, const char* keyname, const char* string, const char* filename); INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, diff --git a/loader/module.c b/loader/module.c index 4f2acf4a66..1be8892da4 100644 --- a/loader/module.c +++ b/loader/module.c @@ -704,8 +704,8 @@ return "???"; static int c_level=0; -static int dump_component(char* name,int type,void* _orig, ComponentParameters *params,void** glob){ - int ( *orig)(ComponentParameters *params, void** glob) = _orig; +static int dump_component(char* name, int type, void* orig, ComponentParameters *params,void** glob){ + int ( *orig)(ComponentParameters *params, void** glob) = orig; int ret,i; fprintf(stderr,"%*sComponentCall: %s flags=0x%X size=%d what=0x%X %s\n",3*c_level,"",name,params->flags, params->paramSize, params->what, component_func(params->what)); @@ -1051,8 +1051,8 @@ FARPROC MODULE_GetProcAddress( #endif if(!strcmp(function,"theQuickTimeDispatcher") -// || !strcmp(function,"_CallComponentFunctionWithStorage") -// || !strcmp(function,"_CallComponent") +// || !strcmp(function,"CallComponentFunctionWithStorage") +// || !strcmp(function,"CallComponent") ){ fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc); report_entry = report_func; diff --git a/loader/pe_image.c b/loader/pe_image.c index 623eb917a8..6a4c9174d3 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -954,7 +954,7 @@ WIN_BOOL PE_InitDLL( WINE_MODREF *wm, DWORD type, LPVOID lpReserved ) } static LPVOID -_fixup_address(PIMAGE_OPTIONAL_HEADER opt,int delta,LPVOID addr) { +fixup_address(PIMAGE_OPTIONAL_HEADER opt,int delta,LPVOID addr) { if ( ((DWORD)addr>opt->ImageBase) && ((DWORD)addrImageBase+opt->SizeOfImage) ) diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index 265ad916e7..d17c3138d9 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -53,8 +53,8 @@ int main(int argc, char *argv[]){ // handler = LoadLibraryA("/root/.wine/fake_windows/Windows/System/QuickTime.qts"); handler = LoadLibraryA("QuickTime.qts"); theqtdp = GetProcAddress(handler, "theQuickTimeDispatcher"); - compcall = GetProcAddress(handler, "_CallComponent"); - compcallws = GetProcAddress(handler, "_CallComponentFunctionWithStorage"); + compcall = GetProcAddress(handler, "CallComponent"); + compcallws = GetProcAddress(handler, "CallComponentFunctionWithStorage"); InitializeQTML = 0x6299e590;//GetProcAddress(handler, "InitializeQTML"); InitializeQTML(6+16); diff --git a/loader/resource.c b/loader/resource.c index d14b5dce22..bd96ccfcf2 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -36,13 +36,13 @@ WORD WINE_LanguageId=0x409;//english #define HRSRC_MAP_BLOCKSIZE 16 -typedef struct _HRSRC_ELEM +typedef struct HRSRC_ELEM { HANDLE hRsrc; WORD type; } HRSRC_ELEM; -typedef struct _HRSRC_MAP +typedef struct HRSRC_MAP { int nAlloc; int nUsed; diff --git a/loader/win32.c b/loader/win32.c index 09bd300edc..5478b342de 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -2800,16 +2800,16 @@ static int WINAPI expWritePrivateProfileStringA(const char* appname, return 0; } -unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, INT default_value, const char* filename) +unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, INT default_value, const char* filename) { return expGetPrivateProfileIntA(appname, keyname, default_value, filename); } -int _GetPrivateProfileStringA(const char* appname, const char* keyname, +int GetPrivateProfileStringA_(const char* appname, const char* keyname, const char* def_val, char* dest, unsigned int len, const char* filename) { return expGetPrivateProfileStringA(appname, keyname, def_val, dest, len, filename); } -int _WritePrivateProfileStringA(const char* appname, const char* keyname, +int WritePrivateProfileStringA_(const char* appname, const char* keyname, const char* string, const char* filename) { return expWritePrivateProfileStringA(appname, keyname, string, filename); @@ -2817,9 +2817,9 @@ int _WritePrivateProfileStringA(const char* appname, const char* keyname, -static int WINAPI expDefDriverProc(int _private, int id, int msg, int arg1, int arg2) +static int WINAPI expDefDriverProc(int private, int id, int msg, int arg1, int arg2) { - dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", _private, id, msg, arg1, arg2); + dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", private, id, msg, arg1, arg2); return 0; } @@ -3038,7 +3038,7 @@ static int WINAPI expGetSystemPaletteEntries(int hdc, int iStartIndex, int nEntr } /* - typedef struct _TIME_ZONE_INFORMATION { + typedef struct TIME_ZONE_INFORMATION { long Bias; char StandardName[32]; SYSTEMTIME StandardDate; @@ -4004,8 +4004,8 @@ static int exp_initterm(int v1, int v2) } #else /* merged from wine - 2002.04.21 */ -typedef void (*_INITTERMFUNC)(); -static int exp_initterm(_INITTERMFUNC *start, _INITTERMFUNC *end) +typedef void (*INITTERMFUNC)(); +static int exp_initterm(INITTERMFUNC *start, INITTERMFUNC *end) { dbgprintf("_initterm(0x%x, 0x%x) %p\n", start, end, *start); while (start < end) diff --git a/loader/wine/debugtools.h b/loader/wine/debugtools.h index d9ab591412..3afee5c3eb 100644 --- a/loader/wine/debugtools.h +++ b/loader/wine/debugtools.h @@ -6,39 +6,40 @@ #include "config.h" #include "windef.h" -struct _GUID; +struct GUID; /* Internal definitions (do not use these directly) */ -enum __DEBUG_CLASS { __DBCL_FIXME, __DBCL_ERR, __DBCL_WARN, __DBCL_TRACE, __DBCL_COUNT }; +enum DEBUG_CLASS { DBCL_FIXME, DBCL_ERR, DBCL_WARN, DBCL_TRACE, DBCL_COUNT }; #ifndef NO_TRACE_MSGS -# define __GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << __DBCL_TRACE)) +# define GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << DBCL_TRACE)) #else -# define __GET_DEBUGGING_trace(dbch) 0 +# define GET_DEBUGGING_trace(dbch) 0 #endif #ifndef NO_DEBUG_MSGS -# define __GET_DEBUGGING_warn(dbch) ((dbch)[0] & (1 << __DBCL_WARN)) -# define __GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << __DBCL_FIXME)) +# define GET_DEBUGGING_warn(dbch) ((dbch)[0] & (1 << DBCL_WARN)) +# define GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << DBCL_FIXME)) #else -# define __GET_DEBUGGING_warn(dbch) 0 -# define __GET_DEBUGGING_fixme(dbch) 0 +# define GET_DEBUGGING_warn(dbch) 0 +# define GET_DEBUGGING_fixme(dbch) 0 #endif /* define error macro regardless of what is configured */ -#define __GET_DEBUGGING_err(dbch) ((dbch)[0] & (1 << __DBCL_ERR)) +#define GET_DEBUGGING_err(dbch) ((dbch)[0] & (1 << DBCL_ERR)) -#define __GET_DEBUGGING(dbcl,dbch) __GET_DEBUGGING_##dbcl(dbch) -#define __SET_DEBUGGING(dbcl,dbch,on) \ +#define GET_DEBUGGING(dbcl,dbch) GET_DEBUGGING_##dbcl(dbch) +#define SET_DEBUGGING(dbcl,dbch,on) \ ((on) ? ((dbch)[0] |= 1 << (dbcl)) : ((dbch)[0] &= ~(1 << (dbcl)))) #ifndef __GNUC__ #define __FUNCTION__ "" #endif -#define __DPRINTF(dbcl,dbch) \ - (!__GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \ +// illegal identifier +#define DPRINTF__(dbcl,dbch) \ + (!GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \ (void)0 : (void)dbg_printf /* Exported definitions and macros */ @@ -50,7 +51,7 @@ extern LPCSTR debugstr_an (LPCSTR s, int n); extern LPCSTR debugstr_wn (LPCWSTR s, int n); extern LPCSTR debugres_a (LPCSTR res); extern LPCSTR debugres_w (LPCWSTR res); -extern LPCSTR debugstr_guid( const struct _GUID *id ); +extern LPCSTR debugstr_guid( const struct GUID *id ); extern LPCSTR debugstr_hex_dump (const void *ptr, int len); extern int dbg_header_err( const char *dbg_channel, const char *func ); extern int dbg_header_warn( const char *dbg_channel, const char *func ); diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h index 0304ccbf9a..b750302540 100644 --- a/loader/wine/ldt.h +++ b/loader/wine/ldt.h @@ -48,11 +48,11 @@ typedef struct extern ldt_copy_entry ldt_copy[LDT_SIZE]; -#define __AHSHIFT 3 /* don't change! */ -#define __AHINCR (1 << __AHSHIFT) +#define AHSHIFT 3 /* don't change! */ +#define AHINCR (1 << AHSHIFT) -#define SELECTOR_TO_ENTRY(sel) (((int)(sel) & 0xffff) >> __AHSHIFT) -#define ENTRY_TO_SELECTOR(i) ((i) ? (((int)(i) << __AHSHIFT) | 7) : 0) +#define SELECTOR_TO_ENTRY(sel) (((int)(sel) & 0xffff) >> AHSHIFT) +#define ENTRY_TO_SELECTOR(i) ((i) ? (((int)(i) << AHSHIFT) | 7) : 0) #define IS_LDT_ENTRY_FREE(i) (!(ldt_flags_copy[(i)] & LDT_FLAGS_ALLOCATED)) #define IS_SELECTOR_FREE(sel) (IS_LDT_ENTRY_FREE(SELECTOR_TO_ENTRY(sel))) #define GET_SEL_BASE(sel) (ldt_copy[SELECTOR_TO_ENTRY(sel)].base) @@ -67,7 +67,7 @@ extern ldt_copy_entry ldt_copy[LDT_SIZE]; #define PTR_SEG_OFF_TO_SEGPTR(seg,off) \ ((SEGPTR)MAKELONG(off,seg)) #define PTR_SEG_OFF_TO_HUGEPTR(seg,off) \ - PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << __AHSHIFT), LOWORD(off) ) + PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << AHSHIFT), LOWORD(off) ) #define W32S_APPLICATION() (PROCESS_Current()->flags & PDB32_WIN32S_PROC) #define W32S_OFFSET 0x10000 diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index 95efea5285..1ac50c782c 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -14,26 +14,26 @@ * Defines/Enums */ -#ifndef _ACM_WAVEFILTER -#define _ACM_WAVEFILTER +#ifndef ACM_WAVEFILTER +#define ACM_WAVEFILTER #include "windef.h" #define WAVE_FILTER_UNKNOWN 0x0000 #define WAVE_FILTER_DEVELOPMENT 0xFFFF -typedef struct __attribute__((__packed__)) _WAVEFILTER { +typedef struct __attribute__((__packed__)) WAVEFILTER { DWORD cbStruct; DWORD dwFilterTag; DWORD fdwFilter; DWORD dwReserved[5]; } WAVEFILTER, *PWAVEFILTER, *NPWAVEFILTER, *LPWAVEFILTER; -#endif /* _ACM_WAVEFILTER */ +#endif /* ACM_WAVEFILTER */ #ifndef WAVE_FILTER_VOLUME #define WAVE_FILTER_VOLUME 0x0001 -typedef struct __attribute__((__packed__)) _WAVEFILTER_VOLUME { +typedef struct __attribute__((__packed__)) WAVEFILTER_VOLUME { WAVEFILTER wfltr; DWORD dwVolume; } VOLUMEWAVEFILTER, *PVOLUMEWAVEFILTER, *NPVOLUMEWAVEFILTER, *LPVOLUMEWAVEFILTER; @@ -51,7 +51,7 @@ typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO { #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ -typedef struct __attribute__((__packed__)) _WAVEFORMATEX { +typedef struct __attribute__((__packed__)) WAVEFORMATEX { WORD wFormatTag; WORD nChannels; DWORD nSamplesPerSec; diff --git a/loader/wine/module.h b/loader/wine/module.h index 0ff8396f8e..6954d9c5ed 100644 --- a/loader/wine/module.h +++ b/loader/wine/module.h @@ -82,10 +82,10 @@ typedef enum { MODULE32_ELFDLL } MODULE32_TYPE; -typedef struct _wine_modref +typedef struct wine_modref { - struct _wine_modref *next; - struct _wine_modref *prev; + struct wine_modref *next; + struct wine_modref *prev; MODULE32_TYPE type; union { PE_MODREF pe; @@ -95,7 +95,7 @@ typedef struct _wine_modref HMODULE module; int nDeps; - struct _wine_modref **deps; + struct wine_modref **deps; int flags; int refCount; diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h index 730e4ed9f4..5bc8b079e3 100644 --- a/loader/wine/msacm.h +++ b/loader/wine/msacm.h @@ -242,7 +242,7 @@ typedef UINT16 CALLBACK ( *ACMFORMATCHOOSEHOOKPROC16)( * Structures */ -typedef struct _ACMDRIVERDETAILSA +typedef struct ACMDRIVERDETAILSA { DWORD cbStruct; @@ -268,7 +268,7 @@ typedef struct _ACMDRIVERDETAILSA CHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA; -typedef struct _ACMDRIVERDETAILSW +typedef struct ACMDRIVERDETAILSW { DWORD cbStruct; @@ -294,7 +294,7 @@ typedef struct _ACMDRIVERDETAILSW WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW; -typedef struct _ACMDRIVERDETAILS16 +typedef struct ACMDRIVERDETAILS16 { DWORD cbStruct; @@ -320,7 +320,7 @@ typedef struct _ACMDRIVERDETAILS16 CHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16; -typedef struct _ACMFILTERCHOOSEA +typedef struct ACMFILTERCHOOSEA { DWORD cbStruct; DWORD fdwStyle; @@ -346,7 +346,7 @@ typedef struct _ACMFILTERCHOOSEA ACMFILTERCHOOSEHOOKPROCA pfnHook; } ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA; -typedef struct _ACMFILTERCHOOSEW +typedef struct ACMFILTERCHOOSEW { DWORD cbStruct; DWORD fdwStyle; @@ -372,7 +372,7 @@ typedef struct _ACMFILTERCHOOSEW ACMFILTERCHOOSEHOOKPROCW pfnHook; } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW; -typedef struct _ACMFILTERCHOOSE16 +typedef struct ACMFILTERCHOOSE16 { DWORD cbStruct; DWORD fdwStyle; @@ -398,7 +398,7 @@ typedef struct _ACMFILTERCHOOSE16 ACMFILTERCHOOSEHOOKPROC16 pfnHook; } ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16; -typedef struct _ACMFILTERDETAILSA +typedef struct ACMFILTERDETAILSA { DWORD cbStruct; DWORD dwFilterIndex; @@ -409,7 +409,7 @@ typedef struct _ACMFILTERDETAILSA CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILSA, *PACMFILTERDETAILSA; -typedef struct _ACMFILTERDETAILSW +typedef struct ACMFILTERDETAILSW { DWORD cbStruct; DWORD dwFilterIndex; @@ -420,7 +420,7 @@ typedef struct _ACMFILTERDETAILSW WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILSW, *PACMFILTERDETAILSW; -typedef struct _ACMFILTERDETAILS16 +typedef struct ACMFILTERDETAILS16 { DWORD cbStruct; DWORD dwFilterIndex; @@ -431,7 +431,7 @@ typedef struct _ACMFILTERDETAILS16 CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16; -typedef struct _ACMFILTERTAGDETAILSA +typedef struct ACMFILTERTAGDETAILSA { DWORD cbStruct; DWORD dwFilterTagIndex; @@ -442,7 +442,7 @@ typedef struct _ACMFILTERTAGDETAILSA CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA; -typedef struct _ACMFILTERTAGDETAILSW +typedef struct ACMFILTERTAGDETAILSW { DWORD cbStruct; DWORD dwFilterTagIndex; @@ -453,7 +453,7 @@ typedef struct _ACMFILTERTAGDETAILSW WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW; -typedef struct _ACMFILTERTAGDETAILS16 +typedef struct ACMFILTERTAGDETAILS16 { DWORD cbStruct; DWORD dwFilterTagIndex; @@ -464,7 +464,7 @@ typedef struct _ACMFILTERTAGDETAILS16 CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16; -typedef struct _ACMFORMATCHOOSEA +typedef struct ACMFORMATCHOOSEA { DWORD cbStruct; DWORD fdwStyle; @@ -490,7 +490,7 @@ typedef struct _ACMFORMATCHOOSEA ACMFORMATCHOOSEHOOKPROCA pfnHook; } ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA; -typedef struct _ACMFORMATCHOOSEW +typedef struct ACMFORMATCHOOSEW { DWORD cbStruct; DWORD fdwStyle; @@ -516,7 +516,7 @@ typedef struct _ACMFORMATCHOOSEW ACMFORMATCHOOSEHOOKPROCW pfnHook; } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW; -typedef struct _ACMFORMATCHOOSE16 +typedef struct ACMFORMATCHOOSE16 { DWORD cbStruct; DWORD fdwStyle; @@ -542,7 +542,7 @@ typedef struct _ACMFORMATCHOOSE16 ACMFORMATCHOOSEHOOKPROC16 pfnHook; } ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16; -typedef struct _ACMFORMATDETAILSA +typedef struct ACMFORMATDETAILSA { DWORD cbStruct; DWORD dwFormatIndex; @@ -553,7 +553,7 @@ typedef struct _ACMFORMATDETAILSA CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILSA, *PACMFORMATDETAILSA; -typedef struct _ACMFORMATDETAILSW +typedef struct ACMFORMATDETAILSW { DWORD cbStruct; DWORD dwFormatIndex; @@ -564,7 +564,7 @@ typedef struct _ACMFORMATDETAILSW WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILSW, *PACMFORMATDETAILSW; -typedef struct _ACMFORMATDETAILS16 +typedef struct ACMFORMATDETAILS16 { DWORD cbStruct; DWORD dwFormatIndex; @@ -575,7 +575,7 @@ typedef struct _ACMFORMATDETAILS16 CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16; -typedef struct _ACMFORMATTAGDETAILSA +typedef struct ACMFORMATTAGDETAILSA { DWORD cbStruct; DWORD dwFormatTagIndex; @@ -586,7 +586,7 @@ typedef struct _ACMFORMATTAGDETAILSA CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA; -typedef struct _ACMFORMATTAGDETAILSW +typedef struct ACMFORMATTAGDETAILSW { DWORD cbStruct; DWORD dwFormatTagIndex; @@ -597,7 +597,7 @@ typedef struct _ACMFORMATTAGDETAILSW WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW; -typedef struct _ACMFORMATTAGDETAILS16 +typedef struct ACMFORMATTAGDETAILS16 { DWORD cbStruct; DWORD dwFormatTagIndex; @@ -608,7 +608,7 @@ typedef struct _ACMFORMATTAGDETAILS16 CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILS16, *NPACMFORMATTAGDETAILS16, *LPACMFORMATTAGDETAILS16; -typedef struct _ACMSTREAMHEADER +typedef struct ACMSTREAMHEADER { DWORD cbStruct; DWORD fdwStatus; diff --git a/loader/wine/msacmdrv.h b/loader/wine/msacmdrv.h index 7d867ed26b..c9cadef04e 100644 --- a/loader/wine/msacmdrv.h +++ b/loader/wine/msacmdrv.h @@ -47,7 +47,7 @@ * Structures */ -typedef struct _ACMDRVOPENDESCA +typedef struct ACMDRVOPENDESCA { DWORD cbStruct; FOURCC fccType; @@ -60,7 +60,7 @@ typedef struct _ACMDRVOPENDESCA DWORD dnDevNode; } ACMDRVOPENDESCA, *PACMDRVOPENDESCA; -typedef struct _ACMDRVOPENDESCW +typedef struct ACMDRVOPENDESCW { DWORD cbStruct; FOURCC fccType; @@ -73,7 +73,7 @@ typedef struct _ACMDRVOPENDESCW DWORD dnDevNode; } ACMDRVOPENDESCW, *PACMDRVOPENDESCW; -typedef struct _ACMDRVOPENDESC16 +typedef struct ACMDRVOPENDESC16 { DWORD cbStruct; FOURCC fccType; @@ -86,7 +86,7 @@ typedef struct _ACMDRVOPENDESC16 DWORD dnDevNode; } ACMDRVOPENDESC16, *NPACMDRVOPENDESC16, *LPACMDRVOPENDESC16; -typedef struct _ACMDRVSTREAMINSTANCE16 +typedef struct ACMDRVSTREAMINSTANCE16 { DWORD cbStruct; LPWAVEFORMATEX pwfxSrc; @@ -100,7 +100,7 @@ typedef struct _ACMDRVSTREAMINSTANCE16 HACMSTREAM16 has; } ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16; -typedef struct _ACMDRVSTREAMINSTANCE +typedef struct ACMDRVSTREAMINSTANCE { DWORD cbStruct; PWAVEFORMATEX pwfxSrc; @@ -115,8 +115,8 @@ typedef struct _ACMDRVSTREAMINSTANCE } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; -typedef struct _ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16; -typedef struct _ACMDRVSTREAMHEADER16 { +typedef struct ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16; +typedef struct ACMDRVSTREAMHEADER16 { DWORD cbStruct; DWORD fdwStatus; DWORD dwUser; @@ -143,8 +143,8 @@ typedef struct _ACMDRVSTREAMHEADER16 { DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER16, *NPACMDRVSTREAMHEADER16; -typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; -typedef struct _ACMDRVSTREAMHEADER { +typedef struct ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; +typedef struct ACMDRVSTREAMHEADER { DWORD cbStruct; DWORD fdwStatus; DWORD dwUser; @@ -171,7 +171,7 @@ typedef struct _ACMDRVSTREAMHEADER { DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; -typedef struct _ACMDRVSTREAMSIZE +typedef struct ACMDRVSTREAMSIZE { DWORD cbStruct; DWORD fdwSize; @@ -180,7 +180,7 @@ typedef struct _ACMDRVSTREAMSIZE } ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16, ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE; -typedef struct _ACMDRVFORMATSUGGEST16 +typedef struct ACMDRVFORMATSUGGEST16 { DWORD cbStruct; DWORD fdwSuggest; @@ -190,7 +190,7 @@ typedef struct _ACMDRVFORMATSUGGEST16 DWORD cbwfxDst; } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST; -typedef struct _ACMDRVFORMATSUGGEST +typedef struct ACMDRVFORMATSUGGEST { DWORD cbStruct; DWORD fdwSuggest; diff --git a/loader/wine/ntdef.h b/loader/wine/ntdef.h index 0ee20f5c59..734fb65b6d 100644 --- a/loader/wine/ntdef.h +++ b/loader/wine/ntdef.h @@ -40,19 +40,19 @@ typedef WCHAR * PWCHAR; * If they are zero terminated, Length does not include the terminating 0. */ -typedef struct _STRING { +typedef struct STRING { USHORT Length; USHORT MaximumLength; PSTR Buffer; } STRING,*PSTRING,ANSI_STRING,*PANSI_STRING; -typedef struct _CSTRING { +typedef struct CSTRING { USHORT Length; USHORT MaximumLength; PCSTR Buffer; } CSTRING,*PCSTRING; -typedef struct _UNICODE_STRING { +typedef struct UNICODE_STRING { USHORT Length; /* bytes */ USHORT MaximumLength; /* bytes */ PWSTR Buffer; @@ -71,7 +71,7 @@ typedef struct _UNICODE_STRING { #define OBJ_KERNEL_HANDLE 0x00000200L #define OBJ_VALID_ATTRIBUTES 0x000003F2L -typedef struct _OBJECT_ATTRIBUTES +typedef struct OBJECT_ATTRIBUTES { ULONG Length; HANDLE RootDirectory; PUNICODE_STRING ObjectName; diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h index e7f924de80..f8d0139d3a 100644 --- a/loader/wine/pe_image.h +++ b/loader/wine/pe_image.h @@ -24,22 +24,22 @@ typedef struct { int tlsindex; } PE_MODREF; -struct _wine_modref; +struct wine_modref; extern int PE_unloadImage(HMODULE hModule); -extern FARPROC PE_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop); +extern FARPROC PE_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop); extern WIN_BOOL PE_EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG); extern WIN_BOOL PE_EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG); extern WIN_BOOL PE_EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG); extern WIN_BOOL PE_EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG); extern WIN_BOOL PE_EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG); extern WIN_BOOL PE_EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG); -extern HRSRC PE_FindResourceExW(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD); +extern HRSRC PE_FindResourceExW(struct wine_modref*, LPCWSTR, LPCWSTR, WORD); extern DWORD PE_SizeofResource(HMODULE,HRSRC); -extern struct _wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD); -extern void PE_UnloadLibrary(struct _wine_modref *); -extern HGLOBAL PE_LoadResource(struct _wine_modref *wm,HRSRC); +extern struct wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD); +extern void PE_UnloadLibrary(struct wine_modref *); +extern HGLOBAL PE_LoadResource(struct wine_modref *wm, HRSRC); extern HMODULE PE_LoadImage( int hFile, LPCSTR filename, WORD *version ); -extern struct _wine_modref *PE_CreateModule( HMODULE hModule, LPCSTR filename, +extern struct wine_modref *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags, WIN_BOOL builtin ); extern WIN_BOOL PE_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmd_line, LPCSTR env, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, @@ -47,7 +47,7 @@ extern WIN_BOOL PE_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmd_line LPPROCESS_INFORMATION info ); extern void PE_InitTls(void); -extern WIN_BOOL PE_InitDLL(struct _wine_modref *wm, DWORD type, LPVOID lpReserved); +extern WIN_BOOL PE_InitDLL(struct wine_modref *wm, DWORD type, LPVOID lpReserved); extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY,LPCSTR,DWORD,WIN_BOOL); extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWSTR,DWORD,WIN_BOOL); @@ -74,8 +74,8 @@ typedef struct { ELF_STDCALL_STUB *stubs; } ELF_MODREF; -extern struct _wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags); -extern void ELF_UnloadLibrary(struct _wine_modref *); -extern FARPROC ELF_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName); +extern struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags); +extern void ELF_UnloadLibrary(struct wine_modref *); +extern FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName); #endif /* WINE_PE_IMAGE_H */ diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 489674e622..4b50055798 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -502,7 +502,7 @@ long VFWAPIV ICDraw(HIC hic,long dwFlags,void* lpFormat,void* lpData,long cbData #define AVIGETFRAMEF_BESTDISPLAYFMT 1 -typedef struct _AVISTREAMINFOA { +typedef struct AVISTREAMINFOA { long fccType; long fccHandler; long dwFlags; /* AVIIF_* */ @@ -523,7 +523,7 @@ typedef struct _AVISTREAMINFOA { char szName[64]; } AVISTREAMINFOA, * LPAVISTREAMINFOA, *PAVISTREAMINFOA; -typedef struct _AVISTREAMINFOW { +typedef struct AVISTREAMINFOW { long fccType; long fccHandler; long dwFlags; @@ -563,7 +563,7 @@ DECL_WINELIB_TYPE_AW(PAVISTREAMINFO) #define AVIFILECAPS_ALLKEYFRAMES 0x00000010 #define AVIFILECAPS_NOCOMPRESSION 0x00000020 -typedef struct _AVIFILEINFOW { +typedef struct AVIFILEINFOW { long dwMaxBytesPerSec; long dwFlags; long dwCaps; @@ -578,7 +578,7 @@ typedef struct _AVIFILEINFOW { short szFileType[64]; } AVIFILEINFOW, * LPAVIFILEINFOW, *PAVIFILEINFOW; -typedef struct _AVIFILEINFOA { +typedef struct AVIFILEINFOA { long dwMaxBytesPerSec; long dwFlags; long dwCaps; diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h index 39517f853f..297aeb5bed 100644 --- a/loader/wine/winbase.h +++ b/loader/wine/winbase.h @@ -33,18 +33,18 @@ typedef DWORD CALLBACK (*LPTHREAD_START_ROUTINE)(LPVOID); #define OUTPUT_DEBUG_STRING_EVENT 8 #define RIP_EVENT 9 -typedef struct _EXCEPTION_DEBUG_INFO { +typedef struct EXCEPTION_DEBUG_INFO { EXCEPTION_RECORD ExceptionRecord; DWORD dwFirstChance; } EXCEPTION_DEBUG_INFO; -typedef struct _CREATE_THREAD_DEBUG_INFO { +typedef struct CREATE_THREAD_DEBUG_INFO { HANDLE hThread; LPVOID lpThreadLocalBase; LPTHREAD_START_ROUTINE lpStartAddress; } CREATE_THREAD_DEBUG_INFO; -typedef struct _CREATE_PROCESS_DEBUG_INFO { +typedef struct CREATE_PROCESS_DEBUG_INFO { HANDLE hFile; HANDLE hProcess; HANDLE hThread; @@ -57,15 +57,15 @@ typedef struct _CREATE_PROCESS_DEBUG_INFO { WORD fUnicode; } CREATE_PROCESS_DEBUG_INFO; -typedef struct _EXIT_THREAD_DEBUG_INFO { +typedef struct EXIT_THREAD_DEBUG_INFO { DWORD dwExitCode; } EXIT_THREAD_DEBUG_INFO; -typedef struct _EXIT_PROCESS_DEBUG_INFO { +typedef struct EXIT_PROCESS_DEBUG_INFO { DWORD dwExitCode; } EXIT_PROCESS_DEBUG_INFO; -typedef struct _LOAD_DLL_DEBUG_INFO { +typedef struct LOAD_DLL_DEBUG_INFO { HANDLE hFile; LPVOID lpBaseOfDll; DWORD dwDebugInfoFileOffset; @@ -74,22 +74,22 @@ typedef struct _LOAD_DLL_DEBUG_INFO { WORD fUnicode; } LOAD_DLL_DEBUG_INFO; -typedef struct _UNLOAD_DLL_DEBUG_INFO { +typedef struct UNLOAD_DLL_DEBUG_INFO { LPVOID lpBaseOfDll; } UNLOAD_DLL_DEBUG_INFO; -typedef struct _OUTPUT_DEBUG_STRING_INFO { +typedef struct OUTPUT_DEBUG_STRING_INFO { LPSTR lpDebugStringData; WORD fUnicode; WORD nDebugStringLength; } OUTPUT_DEBUG_STRING_INFO; -typedef struct _RIP_INFO { +typedef struct RIP_INFO { DWORD dwError; DWORD dwType; } RIP_INFO; -typedef struct _DEBUG_EVENT { +typedef struct DEBUG_EVENT { DWORD dwDebugEventCode; DWORD dwProcessId; DWORD dwThreadId; @@ -158,7 +158,7 @@ typedef struct #define DRIVE_RAMDISK 6 /* The security attributes structure */ -typedef struct _SECURITY_ATTRIBUTES +typedef struct SECURITY_ATTRIBUTES { DWORD nLength; LPVOID lpSecurityDescriptor; @@ -754,7 +754,7 @@ typedef struct } BY_HANDLE_FILE_INFORMATION ; -typedef struct _SYSTEM_POWER_STATUS +typedef struct SYSTEM_POWER_STATUS { WIN_BOOL16 ACLineStatus; BYTE BatteryFlag; @@ -764,7 +764,7 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; -typedef struct _MEMORY_BASIC_INFORMATION +typedef struct MEMORY_BASIC_INFORMATION { LPVOID BaseAddress; LPVOID AllocationBase; @@ -826,7 +826,7 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) #define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008 /* ifdef _x86_ ... */ -typedef struct _LDT_ENTRY { +typedef struct LDT_ENTRY { WORD LimitLow; WORD BaseLow; union { @@ -852,11 +852,11 @@ typedef struct _LDT_ENTRY { } LDT_ENTRY, *LPLDT_ENTRY; -typedef enum _GET_FILEEX_INFO_LEVELS { +typedef enum GET_FILEEX_INFO_LEVELS { GetFileExInfoStandard } GET_FILEEX_INFO_LEVELS; -typedef struct _WIN32_FILE_ATTRIBUTES_DATA { +typedef struct WIN32_FILE_ATTRIBUTES_DATA { DWORD dwFileAttributes; FILETIME ftCreationTime; FILETIME ftLastAccessTime; @@ -865,7 +865,7 @@ typedef struct _WIN32_FILE_ATTRIBUTES_DATA { DWORD nFileSizeLow; } WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA; -typedef struct _DllVersionInfo { +typedef struct DllVersionInfo { DWORD cbSize; DWORD dwMajorVersion; DWORD dwMinorVersion; diff --git a/loader/wine/windef.h b/loader/wine/windef.h index 88783e1928..e0fe82a1b3 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -95,7 +95,7 @@ extern "C" { # ifndef _EGCS_ #define __stdcall __attribute__((__stdcall__)) #define __cdecl __attribute__((__cdecl__)) -# define __RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es") +# define RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es") # endif # else // # error You need gcc >= 2.7 to build Wine on a 386 @@ -103,7 +103,7 @@ extern "C" { #else # define __stdcall # define __cdecl -# define __RESTORE_ES +# define RESTORE_ES #endif #define CALLBACK __stdcall @@ -581,7 +581,7 @@ typedef struct tagPOINT LONG y; } POINT, *PPOINT, *LPPOINT; -typedef struct _POINTL +typedef struct POINTL { LONG x; LONG y; diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index be7c6db79a..4560c6de1e 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -85,25 +85,24 @@ typedef WCHAR TCHAR, *PTCHAR; typedef LPWSTR PTSTR, LPTSTR; typedef LPCWSTR PCTSTR, LPCTSTR; -#define __TEXT(string) L##string /*probably wrong */ +#define TEXT(string) L##string /*probably wrong */ # else /* UNICODE */ typedef char TCHAR, *PTCHAR; typedef LPSTR PTSTR, LPTSTR; typedef LPCSTR PCTSTR, LPCTSTR; -#define __TEXT(string) string +#define TEXT(string) string # endif /* UNICODE */ -#define TEXT(quote) __TEXT(quote) typedef BYTE BOOLEAN; typedef BOOLEAN *PBOOLEAN; -typedef struct _LIST_ENTRY { - struct _LIST_ENTRY *Flink; - struct _LIST_ENTRY *Blink; +typedef struct LIST_ENTRY { + struct LIST_ENTRY *Flink; + struct LIST_ENTRY *Blink; } LIST_ENTRY, *PLIST_ENTRY; -typedef struct _SINGLE_LIST_ENTRY { - struct _SINGLE_LIST_ENTRY *Next; +typedef struct SINGLE_LIST_ENTRY { + struct SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY; /* Heap flags */ @@ -149,7 +148,7 @@ typedef struct _SINGLE_LIST_ENTRY { #define SIZE_OF_80387_REGISTERS 80 -typedef struct _FLOATING_SAVE_AREA +typedef struct FLOATING_SAVE_AREA { DWORD ControlWord; DWORD StatusWord; @@ -162,7 +161,7 @@ typedef struct _FLOATING_SAVE_AREA DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; -typedef struct _CONTEXT86 +typedef struct CONTEXT86 { DWORD ContextFlags; @@ -235,7 +234,7 @@ typedef CONTEXT86 CONTEXT; #define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -typedef struct _CONTEXT +typedef struct CONTEXT { /* selected by CONTEXT_FLOATING_POINT */ ULONGLONG FltF0; @@ -316,8 +315,8 @@ typedef struct _CONTEXT DWORD Fill[4]; } CONTEXT; -#define _QUAD_PSR_OFFSET HighSoftFpcr -#define _QUAD_FLAGS_OFFSET HighFir +#define QUAD_PSR_OFFSET HighSoftFpcr +#define QUAD_FLAGS_OFFSET HighFir #endif /* _ALPHA_ */ @@ -332,7 +331,7 @@ typedef struct _CONTEXT #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -typedef struct _CONTEXT +typedef struct CONTEXT { DWORD Argument[4]; /* These are selected by CONTEXT_FLOATING_POINT */ @@ -521,7 +520,7 @@ typedef struct DWORD Dr7; } CONTEXT; -typedef struct _STACK_FRAME_HEADER +typedef struct STACK_FRAME_HEADER { DWORD BackChain; DWORD GlueSaved1; @@ -568,7 +567,7 @@ typedef struct _STACK_FRAME_HEADER #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -typedef struct _CONTEXT +typedef struct CONTEXT { DWORD ContextFlags; @@ -679,50 +678,50 @@ typedef HANDLE *PHANDLE; #ifdef __i386__ #ifdef NEED_UNDERSCORE_PREFIX -# define __ASM_NAME(name) "_" name +# define ASM_NAME(name) "_" name #else -# define __ASM_NAME(name) name +# define ASM_NAME(name) name #endif #ifdef __GNUC__ -# define __ASM_GLOBAL_FUNC(name,code) \ +# define ASM_GLOBAL_FUNC(name,code) \ __asm__( ".align 4\n\t" \ - ".globl " __ASM_NAME(#name) "\n\t" \ - ".type " __ASM_NAME(#name) ",@function\n" \ - __ASM_NAME(#name) ":\n\t" \ + ".globl " ASM_NAME(#name) "\n\t" \ + ".type " ASM_NAME(#name) ",@function\n" \ + ASM_NAME(#name) ":\n\t" \ code ); #else /* __GNUC__ */ -# define __ASM_GLOBAL_FUNC(name,code) \ - void __asm_dummy_##name(void) { \ +# define ASM_GLOBAL_FUNC(name,code) \ + void asm_dummy_##name(void) { \ asm( ".align 4\n\t" \ - ".globl " __ASM_NAME(#name) "\n\t" \ - ".type " __ASM_NAME(#name) ",@function\n" \ - __ASM_NAME(#name) ":\n\t" \ + ".globl " ASM_NAME(#name) "\n\t" \ + ".type " ASM_NAME(#name) ",@function\n" \ + ASM_NAME(#name) ":\n\t" \ code ); \ } #endif /* __GNUC__ */ -#define _DEFINE_REGS_ENTRYPOINT( name, fn, args ) \ - __ASM_GLOBAL_FUNC( name, \ - "call " __ASM_NAME("CALL32_Regs") "\n\t" \ - ".long " __ASM_NAME(#fn) "\n\t" \ - ".byte " #args ", " #args ) +#define DEFINE_REGS_ENTRYPOINT( name, fn, args ) \ + ASM_GLOBAL_FUNC( name, \ + "call " ASM_NAME("CALL32_Regs") "\n\t" \ + ".long " ASM_NAME(#fn) "\n\t" \ + ".byte " #args ", " #args ) #define DEFINE_REGS_ENTRYPOINT_0( name, fn ) \ - _DEFINE_REGS_ENTRYPOINT( name, fn, 0 ) + DEFINE_REGS_ENTRYPOINT( name, fn, 0 ) #define DEFINE_REGS_ENTRYPOINT_1( name, fn, t1 ) \ - _DEFINE_REGS_ENTRYPOINT( name, fn, 4 ) + DEFINE_REGS_ENTRYPOINT( name, fn, 4 ) #define DEFINE_REGS_ENTRYPOINT_2( name, fn, t1, t2 ) \ - _DEFINE_REGS_ENTRYPOINT( name, fn, 8 ) + DEFINE_REGS_ENTRYPOINT( name, fn, 8 ) #define DEFINE_REGS_ENTRYPOINT_3( name, fn, t1, t2, t3 ) \ - _DEFINE_REGS_ENTRYPOINT( name, fn, 12 ) + DEFINE_REGS_ENTRYPOINT( name, fn, 12 ) #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \ - _DEFINE_REGS_ENTRYPOINT( name, fn, 16 ) + DEFINE_REGS_ENTRYPOINT( name, fn, 16 ) #endif /* __i386__ */ #ifdef __sparc__ /* FIXME: use getcontext() to retrieve full context */ -#define _GET_CONTEXT \ +#define GET_CONTEXT \ CONTEXT context; \ do { memset(&context, 0, sizeof(CONTEXT)); \ context.ContextFlags = CONTEXT_CONTROL; \ @@ -731,19 +730,19 @@ typedef HANDLE *PHANDLE; #define DEFINE_REGS_ENTRYPOINT_0( name, fn ) \ void WINAPI name ( void ) \ - { _GET_CONTEXT; fn( &context ); } + { GET_CONTEXT; fn( &context ); } #define DEFINE_REGS_ENTRYPOINT_1( name, fn, t1 ) \ void WINAPI name ( t1 a1 ) \ - { _GET_CONTEXT; fn( a1, &context ); } + { GET_CONTEXT; fn( a1, &context ); } #define DEFINE_REGS_ENTRYPOINT_2( name, fn, t1, t2 ) \ void WINAPI name ( t1 a1, t2 a2 ) \ - { _GET_CONTEXT; fn( a1, a2, &context ); } + { GET_CONTEXT; fn( a1, a2, &context ); } #define DEFINE_REGS_ENTRYPOINT_3( name, fn, t1, t2, t3 ) \ void WINAPI name ( t1 a1, t2 a2, t3 a3 ) \ - { _GET_CONTEXT; fn( a1, a2, a3, &context ); } + { GET_CONTEXT; fn( a1, a2, a3, &context ); } #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \ void WINAPI name ( t1 a1, t2 a2, t3 a3, t4 a4 ) \ - { _GET_CONTEXT; fn( a1, a2, a3, a4, &context ); } + { GET_CONTEXT; fn( a1, a2, a3, a4, &context ); } #endif /* __sparc__ */ @@ -994,11 +993,11 @@ typedef HANDLE *PHANDLE; #define EXCEPTION_MAXIMUM_PARAMETERS 15 -typedef struct __EXCEPTION_RECORD +typedef struct EXCEPTION_RECORD { DWORD ExceptionCode; DWORD ExceptionFlags; - struct __EXCEPTION_RECORD *ExceptionRecord; + struct EXCEPTION_RECORD *ExceptionRecord; LPVOID ExceptionAddress; DWORD NumberParameters; @@ -1010,7 +1009,7 @@ typedef struct __EXCEPTION_RECORD * in except() and the UnhandledExceptionFilter(). */ -typedef struct _EXCEPTION_POINTERS +typedef struct EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord; PCONTEXT ContextRecord; @@ -1023,14 +1022,14 @@ typedef struct _EXCEPTION_POINTERS * larger exception frames for their own use. */ -struct __EXCEPTION_FRAME; +struct EXCEPTION_FRAME; -typedef DWORD (*PEXCEPTION_HANDLER)(PEXCEPTION_RECORD,struct __EXCEPTION_FRAME*, - PCONTEXT,struct __EXCEPTION_FRAME **); +typedef DWORD (*PEXCEPTION_HANDLER)(PEXCEPTION_RECORD, struct EXCEPTION_FRAME*, + PCONTEXT, struct EXCEPTION_FRAME **); -typedef struct __EXCEPTION_FRAME +typedef struct EXCEPTION_FRAME { - struct __EXCEPTION_FRAME *Prev; + struct EXCEPTION_FRAME *Prev; PEXCEPTION_HANDLER Handler; } EXCEPTION_FRAME, *PEXCEPTION_FRAME; @@ -1055,9 +1054,9 @@ WINAPI SetUnhandledExceptionFilter( LPTOP_LEVEL_EXCEPTION_FILTER filter ); #define DBG_CONTROL_BREAK 0x40010008 #define DBG_EXCEPTION_NOT_HANDLED 0x80010001 -typedef struct _NT_TIB +typedef struct NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + struct EXCEPTION_REGISTRATION_RECORD *ExceptionList; PVOID StackBase; PVOID StackLimit; PVOID SubSystemTib; @@ -1066,21 +1065,21 @@ typedef str