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/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 +- 13 files changed, 223 insertions(+), 223 deletions(-) (limited to 'loader/wine') 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 struct _NT_TIB DWORD Version; } DUMMYUNIONNAME; PVOID ArbitraryUserPointer; - struct _NT_TIB *Self; + struct NT_TIB *Self; } NT_TIB, *PNT_TIB; -struct _TEB; +struct TEB; /* #if defined(__i386__) && defined(__GNUC__) -extern inline struct _TEB * WINAPI NtCurrentTeb(void); -extern inline struct _TEB * WINAPI NtCurrentTeb(void) +extern inline struct TEB * WINAPI NtCurrentTeb(void); +extern inline struct TEB * WINAPI NtCurrentTeb(void) { - struct _TEB *teb; + struct TEB *teb; __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb)); return teb; } #else -extern struct _TEB * WINAPI NtCurrentTeb(void); +extern struct TEB * WINAPI NtCurrentTeb(void); #endif */ @@ -1088,7 +1087,7 @@ extern struct _TEB * WINAPI NtCurrentTeb(void); * File formats definitions */ -typedef struct _IMAGE_DOS_HEADER { +typedef struct IMAGE_DOS_HEADER { WORD e_magic; /* 00: MZ Header signature */ WORD e_cblp; /* 02: Bytes on last page of file */ WORD e_cp; /* 04: Pages in file */ @@ -1155,7 +1154,7 @@ typedef struct WORD ne_expver; /* 3e Expected Windows version number */ } IMAGE_OS2_HEADER,*PIMAGE_OS2_HEADER; -typedef struct _IMAGE_VXD_HEADER { +typedef struct IMAGE_VXD_HEADER { WORD e32_magic; BYTE e32_border; BYTE e32_worder; @@ -1281,7 +1280,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_OS2_CUI 5 #define IMAGE_SUBSYSTEM_POSIX_CUI 7 -typedef struct _IMAGE_FILE_HEADER { +typedef struct IMAGE_FILE_HEADER { WORD Machine; WORD NumberOfSections; DWORD TimeDateStamp; @@ -1291,14 +1290,14 @@ typedef struct _IMAGE_FILE_HEADER { WORD Characteristics; } IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; -typedef struct _IMAGE_DATA_DIRECTORY { +typedef struct IMAGE_DATA_DIRECTORY { DWORD VirtualAddress; DWORD Size; } IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY; #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -typedef struct _IMAGE_OPTIONAL_HEADER { +typedef struct IMAGE_OPTIONAL_HEADER { /* Standard fields */ @@ -1338,7 +1337,7 @@ typedef struct _IMAGE_OPTIONAL_HEADER { IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; } IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER; -typedef struct _IMAGE_NT_HEADERS { +typedef struct IMAGE_NT_HEADERS { DWORD Signature; IMAGE_FILE_HEADER FileHeader; IMAGE_OPTIONAL_HEADER OptionalHeader; @@ -1346,7 +1345,7 @@ typedef struct _IMAGE_NT_HEADERS { #define IMAGE_SIZEOF_SHORT_NAME 8 -typedef struct _IMAGE_SECTION_HEADER { +typedef struct IMAGE_SECTION_HEADER { BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; union { DWORD PhysicalAddress; @@ -1418,7 +1417,7 @@ typedef struct _IMAGE_SECTION_HEADER { #include "pshpack2.h" -typedef struct _IMAGE_SYMBOL { +typedef struct IMAGE_SYMBOL { union { BYTE ShortName[8]; struct { @@ -1437,7 +1436,7 @@ typedef IMAGE_SYMBOL *PIMAGE_SYMBOL; #define IMAGE_SIZEOF_SYMBOL 18 -typedef struct _IMAGE_LINENUMBER { +typedef struct IMAGE_LINENUMBER { union { DWORD SymbolTableIndex; DWORD VirtualAddress; @@ -1448,7 +1447,7 @@ typedef IMAGE_LINENUMBER *PIMAGE_LINENUMBER; #define IMAGE_SIZEOF_LINENUMBER 6 -typedef union _IMAGE_AUX_SYMBOL { +typedef union IMAGE_AUX_SYMBOL { struct { DWORD TagIndex; union { @@ -1589,7 +1588,7 @@ typedef IMAGE_AUX_SYMBOL *PIMAGE_AUX_SYMBOL; /* Export module directory */ -typedef struct _IMAGE_EXPORT_DIRECTORY { +typedef struct IMAGE_EXPORT_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; WORD MajorVersion; @@ -1604,13 +1603,13 @@ typedef struct _IMAGE_EXPORT_DIRECTORY { } IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; /* Import name entry */ -typedef struct _IMAGE_IMPORT_BY_NAME { +typedef struct IMAGE_IMPORT_BY_NAME { WORD Hint; BYTE Name[1]; } IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME; /* Import thunk */ -typedef struct _IMAGE_THUNK_DATA { +typedef struct IMAGE_THUNK_DATA { union { LPBYTE ForwarderString; FARPROC Function; @@ -1621,7 +1620,7 @@ typedef struct _IMAGE_THUNK_DATA { /* Import module directory */ -typedef struct _IMAGE_IMPORT_DESCRIPTOR { +typedef struct IMAGE_IMPORT_DESCRIPTOR { union { DWORD Characteristics; /* 0 for terminating null import descriptor */ PIMAGE_THUNK_DATA OriginalFirstThunk; /* RVA to original unbound IAT */ @@ -1643,7 +1642,7 @@ typedef struct _IMAGE_IMPORT_DESCRIPTOR { #define IMAGE_SNAP_BY_ORDINAL(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG) != 0) #define IMAGE_ORDINAL(Ordinal) (Ordinal & 0xffff) -typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR +typedef struct IMAGE_BOUND_IMPORT_DESCRIPTOR { DWORD TimeDateStamp; WORD OffsetModuleName; @@ -1651,21 +1650,21 @@ typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR /* Array of zero or more IMAGE_BOUND_FORWARDER_REF follows */ } IMAGE_BOUND_IMPORT_DESCRIPTOR, *PIMAGE_BOUND_IMPORT_DESCRIPTOR; -typedef struct _IMAGE_BOUND_FORWARDER_REF +typedef struct IMAGE_BOUND_FORWARDER_REF { DWORD TimeDateStamp; WORD OffsetModuleName; WORD Reserved; } IMAGE_BOUND_FORWARDER_REF, *PIMAGE_BOUND_FORWARDER_REF; -typedef struct _IMAGE_BASE_RELOCATION +typedef struct IMAGE_BASE_RELOCATION { DWORD VirtualAddress; DWORD SizeOfBlock; WORD TypeOffset[1]; } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; -typedef struct _IMAGE_RELOCATION +typedef struct IMAGE_RELOCATION { union { DWORD VirtualAddress; @@ -1839,7 +1838,7 @@ typedef IMAGE_RELOCATION *PIMAGE_RELOCATION; #define IMAGE_ARCHIVE_LINKER_MEMBER "/ " #define IMAGE_ARCHIVE_LONGNAMES_MEMBER "// " -typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER +typedef struct IMAGE_ARCHIVE_MEMBER_HEADER { BYTE Name[16]; BYTE Date[12]; @@ -1855,7 +1854,7 @@ typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER /* * Resource directory stuff */ -typedef struct _IMAGE_RESOURCE_DIRECTORY { +typedef struct IMAGE_RESOURCE_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; WORD MajorVersion; @@ -1868,7 +1867,7 @@ typedef struct _IMAGE_RESOURCE_DIRECTORY { #define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000 #define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000 -typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { +typedef struct IMAGE_RESOURCE_DIRECTORY_ENTRY { union { struct { unsigned NameOffset:31; @@ -1887,17 +1886,17 @@ typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { } IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; -typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING { +typedef struct IMAGE_RESOURCE_DIRECTORY_STRING { WORD Length; CHAR NameString[ 1 ]; } IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING; -typedef struct _IMAGE_RESOURCE_DIR_STRING_U { +typedef struct IMAGE_RESOURCE_DIR_STRING_U { WORD Length; WCHAR NameString[ 1 ]; } IMAGE_RESOURCE_DIR_STRING_U,*PIMAGE_RESOURCE_DIR_STRING_U; -typedef struct _IMAGE_RESOURCE_DATA_ENTRY { +typedef struct IMAGE_RESOURCE_DATA_ENTRY { DWORD OffsetToData; DWORD Size; DWORD CodePage; @@ -1909,7 +1908,7 @@ typedef VOID CALLBACK (*PIMAGE_TLS_CALLBACK)( LPVOID DllHandle,DWORD Reason,LPVOID Reserved ); -typedef struct _IMAGE_TLS_DIRECTORY { +typedef struct IMAGE_TLS_DIRECTORY { DWORD StartAddressOfRawData; DWORD EndAddressOfRawData; LPDWORD AddressOfIndex; @@ -1918,7 +1917,7 @@ typedef struct _IMAGE_TLS_DIRECTORY { DWORD Characteristics; } IMAGE_TLS_DIRECTORY,*PIMAGE_TLS_DIRECTORY; -typedef struct _IMAGE_DEBUG_DIRECTORY { +typedef struct IMAGE_DEBUG_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; WORD MajorVersion; @@ -1941,7 +1940,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 -typedef struct _IMAGE_COFF_SYMBOLS_HEADER { +typedef struct IMAGE_COFF_SYMBOLS_HEADER { DWORD NumberOfSymbols; DWORD LvaToFirstSymbol; DWORD NumberOfLinenumbers; @@ -1957,7 +1956,7 @@ typedef struct _IMAGE_COFF_SYMBOLS_HEADER { #define FRAME_TSS 2 #define FRAME_NONFPO 3 -typedef struct _FPO_DATA { +typedef struct FPO_DATA { DWORD ulOffStart; DWORD cbProcSize; DWORD cdwLocals; @@ -1970,7 +1969,7 @@ typedef struct _FPO_DATA { unsigned cbFrame : 2; } FPO_DATA, *PFPO_DATA; -typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY { +typedef struct IMAGE_LOAD_CONFIG_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; WORD MajorVersion; @@ -1991,7 +1990,7 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY { DWORD Reserved[1]; } IMAGE_LOAD_CONFIG_DIRECTORY, *PIMAGE_LOAD_CONFIG_DIRECTORY; -typedef struct _IMAGE_FUNCTION_ENTRY { +typedef struct IMAGE_FUNCTION_ENTRY { DWORD StartingAddress; DWORD EndingAddress; DWORD EndOfPrologue; @@ -1999,7 +1998,7 @@ typedef struct _IMAGE_FUNCTION_ENTRY { /* This is the structure that appears at the very start of a .DBG file. */ -typedef struct _IMAGE_SEPARATE_DEBUG_HEADER { +typedef struct IMAGE_SEPARATE_DEBUG_HEADER { WORD Signature; WORD Flags; WORD Machine; @@ -2053,7 +2052,7 @@ typedef PVOID PACCESS_TOKEN; * TOKEN_INFORMATION_CLASS */ -typedef enum _TOKEN_INFORMATION_CLASS { +typedef enum TOKEN_INFORMATION_CLASS { TokenUser = 1, TokenGroups, TokenPrivileges, @@ -2066,14 +2065,14 @@ typedef enum _TOKEN_INFORMATION_CLASS { TokenStatistics } TOKEN_INFORMATION_CLASS; -#ifndef _SECURITY_DEFINED -#define _SECURITY_DEFINED +#ifndef SECURITY_DEFINED +#define SECURITY_DEFINED #include "pshpack1.h" typedef DWORD ACCESS_MASK, *PACCESS_MASK; -typedef struct _GENERIC_MAPPING { +typedef struct GENERIC_MAPPING { ACCESS_MASK GenericRead; ACCESS_MASK GenericWrite; ACCESS_MASK GenericExecute; @@ -2089,7 +2088,7 @@ typedef struct { #ifndef SID_DEFINED #define SID_DEFINED -typedef struct _SID { +typedef struct SID { BYTE Revision; BYTE SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; @@ -2114,7 +2113,7 @@ typedef struct _SID { #define MIN_ACL_REVISION ACL_REVISION2 #define MAX_ACL_REVISION ACL_REVISION4 -typedef struct _ACL { +typedef struct ACL { BYTE AclRevision; BYTE Sbz1; WORD AclSize; @@ -2163,7 +2162,7 @@ typedef struct { #include "poppack.h" -#endif /* _SECURITY_DEFINED */ +#endif /* SECURITY_DEFINED */ #include "pshpack1.h" @@ -2171,7 +2170,7 @@ typedef struct { * SID_AND_ATTRIBUTES */ -typedef struct _SID_AND_ATTRIBUTES { +typedef struct SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes; } SID_AND_ATTRIBUTES ; @@ -2234,7 +2233,7 @@ typedef struct _SID_AND_ATTRIBUTES { * TOKEN_USER */ -typedef struct _TOKEN_USER { +typedef struct TOKEN_USER { SID_AND_ATTRIBUTES User; } TOKEN_USER; @@ -2242,7 +2241,7 @@ typedef struct _TOKEN_USER { * TOKEN_GROUPS */ -typedef struct _TOKEN_GROUPS { +typedef struct TOKEN_GROUPS { DWORD GroupCount; SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; } TOKEN_GROUPS; @@ -2251,7 +2250,7 @@ typedef struct _TOKEN_GROUPS { * LUID_AND_ATTRIBUTES */ -typedef union _LARGE_INTEGER { +typedef union LARGE_INTEGER { struct { DWORD LowPart; LONG HighPart; @@ -2259,7 +2258,7 @@ typedef union _LARGE_INTEGER { LONGLONG QuadPart; } LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER; -typedef union _ULARGE_INTEGER { +typedef union ULARGE_INTEGER { struct { DWORD LowPart; LONG HighPart; @@ -2273,7 +2272,7 @@ typedef union _ULARGE_INTEGER { typedef LARGE_INTEGER LUID,*PLUID; -typedef struct _LUID_AND_ATTRIBUTES { +typedef struct LUID_AND_ATTRIBUTES { LUID Luid; DWORD Attributes; } LUID_AND_ATTRIBUTES; @@ -2282,7 +2281,7 @@ typedef struct _LUID_AND_ATTRIBUTES { * PRIVILEGE_SET */ -typedef struct _PRIVILEGE_SET { +typedef struct PRIVILEGE_SET { DWORD PrivilegeCount; DWORD Control; LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY]; @@ -2292,7 +2291,7 @@ typedef struct _PRIVILEGE_SET { * TOKEN_PRIVILEGES */ -typedef struct _TOKEN_PRIVILEGES { +typedef struct TOKEN_PRIVILEGES { DWORD PrivilegeCount; LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; } TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; @@ -2301,7 +2300,7 @@ typedef struct _TOKEN_PRIVILEGES { * TOKEN_OWNER */ -typedef struct _TOKEN_OWNER { +typedef struct TOKEN_OWNER { PSID Owner; } TOKEN_OWNER; @@ -2309,7 +2308,7 @@ typedef struct _TOKEN_OWNER { * TOKEN_PRIMARY_GROUP */ -typedef struct _TOKEN_PRIMARY_GROUP { +typedef struct TOKEN_PRIMARY_GROUP { PSID PrimaryGroup; } TOKEN_PRIMARY_GROUP; @@ -2318,7 +2317,7 @@ typedef struct _TOKEN_PRIMARY_GROUP { * TOKEN_DEFAULT_DACL */ -typedef struct _TOKEN_DEFAULT_DACL { +typedef struct TOKEN_DEFAULT_DACL { PACL DefaultDacl; } TOKEN_DEFAULT_DACL; @@ -2326,7 +2325,7 @@ typedef struct _TOKEN_DEFAULT_DACL { * TOKEN_SOURCEL */ -typedef struct _TOKEN_SOURCE { +typedef struct TOKEN_SOURCE { char Sourcename[8]; LUID SourceIdentifier; } TOKEN_SOURCE; @@ -2344,7 +2343,7 @@ typedef enum tagTOKEN_TYPE { * SECURITY_IMPERSONATION_LEVEL */ -typedef enum _SECURITY_IMPERSONATION_LEVEL { +typedef enum SECURITY_IMPERSONATION_LEVEL { SecurityAnonymous, SecurityIdentification, SecurityImpersonation, @@ -2358,7 +2357,7 @@ typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, * Quality of Service */ -typedef struct _SECURITY_QUALITY_OF_SERVICE { +typedef struct SECURITY_QUALITY_OF_SERVICE { DWORD Length; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; @@ -2369,7 +2368,7 @@ typedef struct _SECURITY_QUALITY_OF_SERVICE { * TOKEN_STATISTICS */ -typedef struct _TOKEN_STATISTICS { +typedef struct TOKEN_STATISTICS { LUID TokenId; LUID AuthenticationId; LARGE_INTEGER ExpirationTime; @@ -2392,7 +2391,7 @@ typedef struct _TOKEN_STATISTICS { #define ACL_REVISION2 2 /* ACEs, directly starting after an ACL */ -typedef struct _ACE_HEADER { +typedef struct ACE_HEADER { BYTE AceType; BYTE AceFlags; WORD AceSize; @@ -2422,25 +2421,25 @@ typedef struct _ACE_HEADER { * 4: ACCESS_MASK * 8... : SID */ -typedef struct _ACCESS_ALLOWED_ACE { +typedef struct ACCESS_ALLOWED_ACE { ACE_HEADER Header; DWORD Mask; DWORD SidStart; } ACCESS_ALLOWED_ACE,*PACCESS_ALLOWED_ACE; -typedef struct _ACCESS_DENIED_ACE { +typedef struct ACCESS_DENIED_ACE { ACE_HEADER Header; DWORD Mask; DWORD SidStart; } ACCESS_DENIED_ACE,*PACCESS_DENIED_ACE; -typedef struct _SYSTEM_AUDIT_ACE { +typedef struct SYSTEM_AUDIT_ACE { ACE_HEADER Header; DWORD Mask; DWORD SidStart; } SYSTEM_AUDIT_ACE,*PSYSTEM_AUDIT_ACE; -typedef struct _SYSTEM_ALARM_ACE { +typedef struct SYSTEM_ALARM_ACE { ACE_HEADER Header; DWORD Mask; DWORD SidStart; diff --git a/loader/wine/winuser.h b/loader/wine/winuser.h index 20520ffa02..47e9e8749e 100644 --- a/loader/wine/winuser.h +++ b/loader/wine/winuser.h @@ -1824,7 +1824,7 @@ typedef struct DECL_WINELIB_TYPE_AW(MSGBOXPARAMS) DECL_WINELIB_TYPE_AW(LPMSGBOXPARAMS) -typedef struct _numberfmt32a { +typedef struct numberfmt32a { UINT NumDigits; UINT LeadingZero; UINT Grouping; @@ -1833,7 +1833,7 @@ typedef struct _numberfmt32a { UINT NegativeOrder; } NUMBERFMTA; -typedef struct _numberfmt32w { +typedef struct numberfmt32w { UINT NumDigits; UINT LeadingZero; UINT Grouping; @@ -1842,7 +1842,7 @@ typedef struct _numberfmt32w { UINT NegativeOrder; } NUMBERFMTW; -typedef struct _currencyfmt32a +typedef struct currencyfmt32a { UINT NumDigits; UINT LeadingZero; @@ -1854,7 +1854,7 @@ typedef struct _currencyfmt32a LPCSTR lpCurrencySymbol; } CURRENCYFMTA; -typedef struct _currencyfmt32w +typedef struct currencyfmt32w { UINT NumDigits; UINT LeadingZero; -- cgit v1.2.3