diff options
Diffstat (limited to 'loader/wine')
| -rw-r--r-- | loader/wine/avifmt.h | 34 | ||||
| -rw-r--r-- | loader/wine/driver.h | 2 | ||||
| -rw-r--r-- | loader/wine/ldt.h | 2 | ||||
| -rw-r--r-- | loader/wine/mmreg.h | 2 | ||||
| -rw-r--r-- | loader/wine/module.h | 4 | ||||
| -rw-r--r-- | loader/wine/msacm.h | 40 | ||||
| -rw-r--r-- | loader/wine/msacmdrv.h | 2 | ||||
| -rw-r--r-- | loader/wine/ntdef.h | 4 | ||||
| -rw-r--r-- | loader/wine/vfw.h | 14 | ||||
| -rw-r--r-- | loader/wine/winbase.h | 20 | ||||
| -rw-r--r-- | loader/wine/windef.h | 20 | ||||
| -rw-r--r-- | loader/wine/winnt.h | 188 | ||||
| -rw-r--r-- | loader/wine/winreg.h | 2 | ||||
| -rw-r--r-- | loader/wine/winuser.h | 74 |
14 files changed, 204 insertions, 204 deletions
diff --git a/loader/wine/avifmt.h b/loader/wine/avifmt.h index 8522ae508d..0fe347539a 100644 --- a/loader/wine/avifmt.h +++ b/loader/wine/avifmt.h @@ -18,24 +18,24 @@ typedef DWORD FOURCC; #ifdef _MSC_VER #pragma warning(disable:4200) #endif - + /* The following is a short description of the AVI file format. Please * see the accompanying documentation for a full explanation. * * An AVI file is the following RIFF form: * - * RIFF('AVI' + * RIFF('AVI' * LIST('hdrl' * avih(<MainAVIHeader>) * LIST ('strl' * strh(<Stream header>) * strf(<Stream format>) * ... additional header data - * LIST('movi' - * { LIST('rec' + * LIST('movi' + * { LIST('rec' * SubChunk... * ) - * | SubChunk } .... + * | SubChunk } .... * ) * [ <AVIIndex> ] * ) @@ -47,7 +47,7 @@ typedef DWORD FOURCC; * be a BITMAPINFO structure, including palette. For an audio stream, * this should be a WAVEFORMAT (or PCMWAVEFORMAT) structure. * - * The actual data is contained in subchunks within the 'movi' LIST + * The actual data is contained in subchunks within the 'movi' LIST * chunk. The first two characters of each data chunk are the * stream number with which that data is associated. * @@ -62,17 +62,17 @@ typedef DWORD FOURCC; * * The grouping into LIST 'rec' chunks implies only that the contents of * the chunk should be read into memory at the same time. This - * grouping is used for files specifically intended to be played from + * grouping is used for files specifically intended to be played from * CD-ROM. * - * The index chunk at the end of the file should contain one entry for + * The index chunk at the end of the file should contain one entry for * each data chunk in the file. - * + * * Limitations for the current software: * Only one video stream and one audio stream are allowed. * The streams must start at the beginning of the file. * - * + * * To register codec types please obtain a copy of the Multimedia * Developer Registration Kit from: * @@ -153,9 +153,9 @@ typedef WORD TWOCC; (ToHex(((stream) & 0xf0) >> 4)), tcc) /* -** Main AVI File Header -*/ - +** Main AVI File Header +*/ + /* flags for use in <dwFlags> in AVIFileHdr */ #define AVIF_HASINDEX 0x00000010 // Index at end of file? #define AVIF_MUSTUSEINDEX 0x00000020 @@ -178,10 +178,10 @@ typedef struct DWORD dwInitialFrames; DWORD dwStreams; DWORD dwSuggestedBufferSize; - + DWORD dwWidth; DWORD dwHeight; - + DWORD dwReserved[4]; } MainAVIHeader; @@ -193,7 +193,7 @@ typedef struct #define AVISF_VIDEO_PALCHANGES 0x00010000 - + typedef struct { FOURCC fccType; FOURCC fccHandler; @@ -201,7 +201,7 @@ typedef struct { WORD wPriority; WORD wLanguage; DWORD dwInitialFrames; - DWORD dwScale; + DWORD dwScale; DWORD dwRate; /* dwRate / dwScale == samples/second */ DWORD dwStart; DWORD dwLength; /* In units above... */ diff --git a/loader/wine/driver.h b/loader/wine/driver.h index a5aa6304b3..e10934bc28 100644 --- a/loader/wine/driver.h +++ b/loader/wine/driver.h @@ -80,7 +80,7 @@ typedef struct CHAR szAliasName[128]; } DRIVERINFOSTRUCT16, *LPDRIVERINFOSTRUCT16; -LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, +LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM dwParam1, LPARAM dwParam2); LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hdrvr, UINT Msg, LPARAM lParam1, LPARAM lParam2); diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h index fb4c5351ff..e3f511b062 100644 --- a/loader/wine/ldt.h +++ b/loader/wine/ldt.h @@ -27,7 +27,7 @@ typedef struct enum seg_type type; /* segment type */ } ldt_entry; #ifdef __cplusplus -extern "C" +extern "C" { #endif void LDT_BytesToEntry( const unsigned long *buffer, ldt_entry *content ); diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index 5f6b460ef5..4ab6b7a2ff 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -47,7 +47,7 @@ typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO { DWORD dwDelay; } ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER; #endif /* WAVEFILTER_ECHO */ - + #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct __attribute__((__packed__)) WAVEFORMATEX { diff --git a/loader/wine/module.h b/loader/wine/module.h index cba53f61a1..9db4c9808c 100644 --- a/loader/wine/module.h +++ b/loader/wine/module.h @@ -48,7 +48,7 @@ typedef struct FARPROC16 BootApp; /* startup procedure */ FARPROC16 LoadAppSeg; /* procedure to load a segment */ FARPROC16 reserved2; - FARPROC16 MyAlloc; /* memory allocation procedure, + FARPROC16 MyAlloc; /* memory allocation procedure, * wine must write this field */ FARPROC16 EntryAddrProc; FARPROC16 ExitProc; /* exit procedure */ @@ -65,7 +65,7 @@ typedef struct SEGPTR reserved WINE_PACKED; } LOADPARAMS16; -typedef struct +typedef struct { LPSTR lpEnvAddress; LPSTR lpCmdLine; diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h index 5e3b0df79b..6a0be7c068 100644 --- a/loader/wine/msacm.h +++ b/loader/wine/msacm.h @@ -339,7 +339,7 @@ typedef struct ACMFILTERCHOOSEA DWORD fdwEnum; PWAVEFILTER pwfltrEnum; - + HINSTANCE hInstance; LPCSTR pszTemplateName; LPARAM lCustData; @@ -365,7 +365,7 @@ typedef struct ACMFILTERCHOOSEW DWORD fdwEnum; PWAVEFILTER pwfltrEnum; - + HINSTANCE hInstance; LPCWSTR pszTemplateName; LPARAM lCustData; @@ -391,7 +391,7 @@ typedef struct ACMFILTERCHOOSE16 DWORD fdwEnum; LPWAVEFILTER pwfltrEnum; - + HINSTANCE16 hInstance; LPCSTR pszTemplateName; LPARAM lCustData; @@ -468,22 +468,22 @@ typedef struct ACMFORMATCHOOSEA { DWORD cbStruct; DWORD fdwStyle; - + HWND hwndOwner; PWAVEFORMATEX pwfx; DWORD cbwfx; LPCSTR pszTitle; - + CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; + CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; LPSTR pszName; DWORD cchName; DWORD fdwEnum; PWAVEFORMATEX pwfxEnum; - + HINSTANCE hInstance; LPCSTR pszTemplateName; LPARAM lCustData; @@ -494,22 +494,22 @@ typedef struct ACMFORMATCHOOSEW { DWORD cbStruct; DWORD fdwStyle; - + HWND hwndOwner; PWAVEFORMATEX pwfx; DWORD cbwfx; LPCWSTR pszTitle; - + WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; + WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; LPWSTR pszName; DWORD cchName; DWORD fdwEnum; LPWAVEFORMATEX pwfxEnum; - + HINSTANCE hInstance; LPCWSTR pszTemplateName; LPARAM lCustData; @@ -520,22 +520,22 @@ typedef struct ACMFORMATCHOOSE16 { DWORD cbStruct; DWORD fdwStyle; - + HWND16 hwndOwner; LPWAVEFORMATEX pwfx; DWORD cbwfx; LPCSTR pszTitle; - + CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; + CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; LPSTR pszName; DWORD cchName; DWORD fdwEnum; LPWAVEFORMATEX pwfxEnum; - + HINSTANCE16 hInstance; LPCSTR pszTemplateName; LPARAM lCustData; @@ -744,7 +744,7 @@ MMRESULT16 WINAPI acmFormatEnum16( ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum ); MMRESULT16 WINAPI acmFormatSuggest16( - HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, + HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest ); MMRESULT16 WINAPI acmFilterTagDetails16( @@ -774,7 +774,7 @@ MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose ); MMRESULT16 WINAPI acmStreamSize16( - HACMSTREAM16 has, DWORD cbInput, + HACMSTREAM16 has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize ); MMRESULT16 WINAPI acmStreamConvert16( @@ -842,11 +842,11 @@ MMRESULT WINAPI acmFilterDetailsW( HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails ); MMRESULT WINAPI acmFilterEnumA( - HACMDRIVER had, PACMFILTERDETAILSA pafd, + HACMDRIVER had, PACMFILTERDETAILSA pafd, ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterEnumW( - HACMDRIVER had, PACMFILTERDETAILSW pafd, + HACMDRIVER had, PACMFILTERDETAILSW pafd, ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterTagDetailsA( @@ -927,7 +927,7 @@ MMRESULT WINAPI acmStreamReset( HACMSTREAM has, DWORD fdwReset ); MMRESULT WINAPI acmStreamSize( - HACMSTREAM has, DWORD cbInput, + HACMSTREAM has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize ); MMRESULT WINAPI acmStreamUnprepareHeader( diff --git a/loader/wine/msacmdrv.h b/loader/wine/msacmdrv.h index a80587060e..b830eeff2a 100644 --- a/loader/wine/msacmdrv.h +++ b/loader/wine/msacmdrv.h @@ -19,7 +19,7 @@ #define MAKE_ACM_VERSION(mjr, mnr, bld) \ (((long)(mjr)<<24) | ((long)(mnr)<<16) | ((long)bld)) -#define ACMDRVOPENDESC_SECTIONNAME_CHARS +#define ACMDRVOPENDESC_SECTIONNAME_CHARS #define ACMDM_DRIVER_NOTIFY (ACMDM_BASE + 1) #define ACMDM_DRIVER_DETAILS (ACMDM_BASE + 10) diff --git a/loader/wine/ntdef.h b/loader/wine/ntdef.h index 189ba0a922..9e68828bbf 100644 --- a/loader/wine/ntdef.h +++ b/loader/wine/ntdef.h @@ -10,7 +10,7 @@ extern "C" { #endif -#define NTAPI __stdcall +#define NTAPI __stdcall #ifndef IN #define IN @@ -32,7 +32,7 @@ typedef LONG NTSTATUS; typedef NTSTATUS *PNTSTATUS; typedef short CSHORT; -typedef CSHORT *PCSHORT; +typedef CSHORT *PCSHORT; typedef WCHAR * PWCHAR; diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index e663129c82..a3b05daff3 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -41,8 +41,8 @@ typedef struct { } BITMAPINFO, *LPBITMAPINFO; #endif -#define VFWAPI -#define VFWAPIV +#define VFWAPI +#define VFWAPIV #ifndef MPLAYER_WINDEF_H typedef long (__stdcall__ *DRIVERPROC)(long,HDRVR,unsigned int,long,long); #endif @@ -229,14 +229,14 @@ long VFWAPIV ICCompress( ICSendMessage( \ hic, ICM_GETDEFAULTKEYFRAMERATE, \ (long)(void*)(lpint), \ - 0 ) + 0 ) #define ICGetDefaultQuality(hic,lpint) \ ICSendMessage( \ hic, ICM_GETDEFAULTQUALITY, \ (long)(void*)(lpint), \ - 0 ) - + 0 ) + #define ICCompressBegin(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ @@ -570,7 +570,7 @@ typedef struct AVIFILEINFOW { long dwSuggestedBufferSize; long dwWidth; long dwHeight; - long dwScale; + long dwScale; long dwRate; long dwLength; long dwEditCount; @@ -585,7 +585,7 @@ typedef struct AVIFILEINFOA { long dwSuggestedBufferSize; long dwWidth; long dwHeight; - long dwScale; + long dwScale; long dwRate; long dwLength; long dwEditCount; diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h index 60664b1928..b7ae733553 100644 --- a/loader/wine/winbase.h +++ b/loader/wine/winbase.h @@ -321,9 +321,9 @@ typedef struct #define GETBASEIRQ 10 /* Purge functions for Comm Port */ -#define PURGE_TXABORT 0x0001 /* Kill the pending/current writes to the +#define PURGE_TXABORT 0x0001 /* Kill the pending/current writes to the comm port */ -#define PURGE_RXABORT 0x0002 /*Kill the pending/current reads to +#define PURGE_RXABORT 0x0002 /*Kill the pending/current reads to the comm port */ #define PURGE_TXCLEAR 0x0004 /* Kill the transmit queue if there*/ #define PURGE_RXCLEAR 0x0008 /* Kill the typeahead buffer if there*/ @@ -398,7 +398,7 @@ typedef struct #define RT_GROUP_ICON WINELIB_NAME_AW(RT_GROUP_ICON) -#define LMEM_FIXED 0 +#define LMEM_FIXED 0 #define LMEM_MOVEABLE 0x0002 #define LMEM_NOCOMPACT 0x0010 #define LMEM_NODISCARD 0x0020 @@ -833,10 +833,10 @@ typedef struct LDT_ENTRY { struct { BYTE BaseMid; BYTE Flags1;/*Declare as bytes to avoid alignment problems */ - BYTE Flags2; + BYTE Flags2; BYTE BaseHi; } Bytes; - struct { + struct { unsigned BaseMid : 8; unsigned Type : 5; unsigned Dpl : 2; @@ -877,7 +877,7 @@ typedef struct DllVersionInfo { * This one seems to be a Win32 only definition. It also is defined with * WINAPI instead of CALLBACK in the windows headers. */ -typedef DWORD WINAPI (*LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, +typedef DWORD WINAPI (*LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, DWORD, DWORD, HANDLE, HANDLE, LPVOID); @@ -1075,7 +1075,7 @@ typedef struct tagCOMMTIMEOUTS { DWORD WriteTotalTimeoutMultiplier; DWORD WriteTotalTimeoutConstant; } COMMTIMEOUTS,*LPCOMMTIMEOUTS; - + #include "poppack.h" typedef void CALLBACK (*PAPCFUNC)(ULONG_PTR); @@ -1095,7 +1095,7 @@ WIN_BOOL WINAPI SetCommState(INT,LPDCB); WIN_BOOL WINAPI TransmitCommChar(INT,CHAR); WIN_BOOL WINAPI SetupComm(HANDLE, DWORD, DWORD); WIN_BOOL WINAPI GetCommProperties(HANDLE, LPDCB *); - + /*DWORD WINAPI GetVersion( void );*/ WIN_BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16*); WIN_BOOL WINAPI GetVersionExA(OSVERSIONINFOA*); @@ -1116,7 +1116,7 @@ void WINAPI RaiseException(DWORD,DWORD,DWORD,const LPDWORD); WIN_BOOL WINAPI SetProcessWorkingSetSize(HANDLE,DWORD,DWORD); WIN_BOOL WINAPI TerminateProcess(HANDLE,DWORD); WIN_BOOL WINAPI TerminateThread(HANDLE,DWORD); -WIN_BOOL WINAPI GetExitCodeThread(HANDLE,LPDWORD); +WIN_BOOL WINAPI GetExitCodeThread(HANDLE,LPDWORD); /* GetBinaryType return values. */ @@ -1368,7 +1368,7 @@ WIN_BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDW #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSidW) WIN_BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WIN_BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); -WIN_BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED); +WIN_BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED); WIN_BOOL WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID); WIN_BOOL WINAPI LookupPrivilegeValueW(LPCWSTR,LPCWSTR,LPVOID); #define LookupPrivilegeValue WINELIB_NAME_AW(LookupPrivilegeValue) diff --git a/loader/wine/windef.h b/loader/wine/windef.h index 9d90a42257..ddf0228dd0 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -91,7 +91,7 @@ extern "C" { #ifdef __i386__ # if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) -# ifndef _EGCS_ +# ifndef _EGCS_ #define __stdcall __attribute__((__stdcall__)) #define __cdecl __attribute__((__cdecl__)) # define RESTORE_ES __asm__ volatile("pushl %ds\n\tpopl %es") @@ -99,7 +99,7 @@ extern "C" { # else // # error You need gcc >= 2.7 to build Wine on a 386 # endif -#else +#else # define __stdcall # define __cdecl # define RESTORE_ES @@ -360,7 +360,7 @@ typedef UINT16 *LPUINT16; typedef HANDLE16 a##16; \ typedef a##16 *P##a##16; \ typedef a##16 *NP##a##16; \ - typedef a##16 *LP##a##16 + typedef a##16 *LP##a##16 DECLARE_HANDLE16(HACMDRIVERID); DECLARE_HANDLE16(HACMDRIVER); @@ -500,15 +500,15 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); /* Macros to access unaligned or wrong-endian WORDs and DWORDs. */ /* Note: These macros are semantically broken, at least for wrc. wrc - spits out data in the platform's current binary format, *not* in + spits out data in the platform's current binary format, *not* in little-endian format. These macros are used throughout the resource - code to load and store data to the resources. Since it is unlikely - that we'll ever be dealing with little-endian resource data, the - byte-swapping nature of these macros has been disabled. Rather than + code to load and store data to the resources. Since it is unlikely + that we'll ever be dealing with little-endian resource data, the + byte-swapping nature of these macros has been disabled. Rather than remove the use of these macros from the resource loading code, the - macros have simply been disabled. In the future, someone may want + macros have simply been disabled. In the future, someone may want to reactivate these macros for other purposes. In that case, the - resource code will have to be modified to use different macros. */ + resource code will have to be modified to use different macros. */ #if 1 #define PUT_WORD(ptr,w) (*(WORD *)(ptr) = (w)) @@ -619,7 +619,7 @@ typedef const RECT *LPCRECT; typedef struct tagRECTL { LONG left; - LONG top; + LONG top; LONG right; LONG bottom; } RECTL, *PRECTL, *LPRECTL; diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index dd0f0b05c5..b4c8ee1573 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -152,11 +152,11 @@ typedef struct FLOATING_SAVE_AREA { DWORD ControlWord; DWORD StatusWord; - DWORD TagWord; + DWORD TagWord; DWORD ErrorOffset; DWORD ErrorSelector; DWORD DataOffset; - DWORD DataSelector; + DWORD DataSelector; BYTE RegisterArea[SIZE_OF_80387_REGISTERS]; DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; @@ -180,18 +180,18 @@ typedef struct CONTEXT86 DWORD SegGs; DWORD SegFs; DWORD SegEs; - DWORD SegDs; + DWORD SegDs; /* These are selected by CONTEXT_INTEGER */ DWORD Edi; DWORD Esi; DWORD Ebx; - DWORD Edx; + DWORD Edx; DWORD Ecx; DWORD Eax; /* These are selected by CONTEXT_CONTROL */ - DWORD Ebp; + DWORD Ebp; DWORD Eip; DWORD SegCs; DWORD EFlags; @@ -228,7 +228,7 @@ typedef CONTEXT86 CONTEXT; #if defined(_ALPHA_) || defined(__alpha__) #define CONTEXT_ALPHA 0x00020000 - + #define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001L) #define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002L) #define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L) @@ -543,10 +543,10 @@ typedef struct STACK_FRAME_HEADER #ifdef __sparc__ -/* - * FIXME: +/* + * FIXME: * - * There is no official CONTEXT structure defined for the SPARC + * There is no official CONTEXT structure defined for the SPARC * architecture, so I just made one up. * * This structure is valid only for 32-bit SPARC architectures, @@ -556,8 +556,8 @@ typedef struct STACK_FRAME_HEADER * the rest of the register window chain is not visible. * * The layout follows the Solaris 'prgregset_t' structure. - * - */ + * + */ #define CONTEXT_SPARC 0x10000000 @@ -663,7 +663,7 @@ typedef HANDLE *PHANDLE; #define CH_reg(context) (*((BYTE*)&ECX_reg(context)+1)) #define DL_reg(context) (*(BYTE*)&EDX_reg(context)) #define DH_reg(context) (*((BYTE*)&EDX_reg(context)+1)) - + #define SET_CFLAG(context) (EFL_reg(context) |= 0x0001) #define RESET_CFLAG(context) (EFL_reg(context) &= ~0x0001) #define SET_ZFLAG(context) (EFL_reg(context) |= 0x0040) @@ -756,7 +756,7 @@ typedef HANDLE *PHANDLE; #ifdef __sparc__ # define GET_IP(context) ((LPVOID)(context)->pc) #endif - + #if !defined(GET_IP) && !defined(RC_INVOKED) # error You must define GET_IP for this CPU #endif @@ -772,7 +772,7 @@ typedef HANDLE *PHANDLE; #define STATUS_TIMEOUT 0x00000102 #define STATUS_PENDING 0x00000103 -#define STATUS_GUARD_PAGE_VIOLATION 0x80000001 +#define STATUS_GUARD_PAGE_VIOLATION 0x80000001 #define STATUS_DATATYPE_MISALIGNMENT 0x80000002 #define STATUS_BREAKPOINT 0x80000003 #define STATUS_SINGLE_STEP 0x80000004 @@ -885,7 +885,7 @@ typedef HANDLE *PHANDLE; #define STATUS_FILE_LOCK_CONFLICT 0xC0000055 /* FIXME: not sure */ #define STATUS_UNKNOWN_REVISION 0xC0000058 #define STATUS_INVALID_SECURITY_DESCR 0xC0000079 -#define STATUS_DISK_FULL 0xC000007F +#define STATUS_DISK_FULL 0xC000007F #define STATUS_SECTION_NOT_EXTENDED 0xC0000087 #define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C #define STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D @@ -963,11 +963,11 @@ typedef HANDLE *PHANDLE; #define ExceptionContinueSearch 1 #define ExceptionNestedException 2 #define ExceptionCollidedUnwind 3 - + /* * Return values from filters in except() and from UnhandledExceptionFilter */ - + #define EXCEPTION_EXECUTE_HANDLER 1 #define EXCEPTION_CONTINUE_SEARCH 0 #define EXCEPTION_CONTINUE_EXECUTION -1 @@ -985,9 +985,9 @@ typedef HANDLE *PHANDLE; #define EXCEPTION_CONTINUABLE 0 #define EXCEPTION_NONCONTINUABLE EH_NONCONTINUABLE - + /* - * The exception record used by Win32 to give additional information + * The exception record used by Win32 to give additional information * about exception to exception handlers. */ @@ -1008,7 +1008,7 @@ typedef struct EXCEPTION_RECORD * The exception pointers structure passed to exception filters * in except() and the UnhandledExceptionFilter(). */ - + typedef struct EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord; @@ -1017,8 +1017,8 @@ typedef struct EXCEPTION_POINTERS /* - * The exception frame, used for registering exception handlers - * Win32 cares only about this, but compilers generally emit + * The exception frame, used for registering exception handlers + * Win32 cares only about this, but compilers generally emit * larger exception frames for their own use. */ @@ -1120,7 +1120,7 @@ typedef struct IMAGE_DOS_HEADER { * This is the Windows executable (NE) header. * the name IMAGE_OS2_HEADER is misleading, but in the SDK this way. */ -typedef struct +typedef struct { WORD ne_magic; /* 00 NE signature 'NE' */ BYTE ne_ver; /* 02 Linker version number */ @@ -1232,7 +1232,7 @@ typedef struct IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_R4000 0x166 #define IMAGE_FILE_MACHINE_R10000 0x168 #define IMAGE_FILE_MACHINE_ALPHA 0x184 -#define IMAGE_FILE_MACHINE_POWERPC 0x1F0 +#define IMAGE_FILE_MACHINE_POWERPC 0x1F0 #define IMAGE_SIZEOF_FILE_HEADER 20 @@ -1379,8 +1379,8 @@ typedef struct IMAGE_SECTION_HEADER { #define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 #define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 -#define IMAGE_SCN_LNK_OTHER 0x00000100 -#define IMAGE_SCN_LNK_INFO 0x00000200 +#define IMAGE_SCN_LNK_OTHER 0x00000100 +#define IMAGE_SCN_LNK_INFO 0x00000200 /* #define IMAGE_SCN_TYPE_OVER 0x00000400 - Reserved */ #define IMAGE_SCN_LNK_REMOVE 0x00000800 #define IMAGE_SCN_LNK_COMDAT 0x00001000 @@ -1635,7 +1635,7 @@ typedef struct IMAGE_IMPORT_DESCRIPTOR { DWORD ForwarderChain; /* -1 if no forwarders */ DWORD Name; /* RVA to IAT (if bound this IAT has actual addresses) */ - PIMAGE_THUNK_DATA FirstThunk; + PIMAGE_THUNK_DATA FirstThunk; } IMAGE_IMPORT_DESCRIPTOR,*PIMAGE_IMPORT_DESCRIPTOR; #define IMAGE_ORDINAL_FLAG 0x80000000 @@ -2037,7 +2037,7 @@ typedef struct tagMESSAGE_RESOURCE_DATA { /* * Here follows typedefs for security and tokens. - */ + */ /* * First a constant for the following typdefs. @@ -2053,17 +2053,17 @@ typedef PVOID PACCESS_TOKEN; */ typedef enum TOKEN_INFORMATION_CLASS { - TokenUser = 1, - TokenGroups, - TokenPrivileges, - TokenOwner, - TokenPrimaryGroup, - TokenDefaultDacl, - TokenSource, - TokenType, - TokenImpersonationLevel, - TokenStatistics -} TOKEN_INFORMATION_CLASS; + TokenUser = 1, + TokenGroups, + TokenPrivileges, + TokenOwner, + TokenPrimaryGroup, + TokenDefaultDacl, + TokenSource, + TokenType, + TokenImpersonationLevel, + TokenStatistics +} TOKEN_INFORMATION_CLASS; #ifndef SECURITY_DEFINED #define SECURITY_DEFINED @@ -2101,8 +2101,8 @@ typedef struct SID { #define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */ -/* - * ACL +/* + * ACL */ #define ACL_REVISION1 1 @@ -2158,7 +2158,7 @@ typedef struct { PACL Dacl; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; -#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR)) +#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR)) #include "poppack.h" @@ -2166,15 +2166,15 @@ typedef struct { #include "pshpack1.h" -/* +/* * SID_AND_ATTRIBUTES */ typedef struct SID_AND_ATTRIBUTES { - PSID Sid; - DWORD Attributes; -} SID_AND_ATTRIBUTES ; - + PSID Sid; + DWORD Attributes; +} SID_AND_ATTRIBUTES ; + /* security entities */ #define SECURITY_NULL_RID (0x00000000L) #define SECURITY_WORLD_RID (0x00000000L) @@ -2190,7 +2190,7 @@ typedef struct SID_AND_ATTRIBUTES { /* S-1-3 */ #define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} -#define SECURITY_CREATOR_OWNER_RID (0x00000000L) +#define SECURITY_CREATOR_OWNER_RID (0x00000000L) #define SECURITY_CREATOR_GROUP_RID (0x00000001L) #define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L) #define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L) @@ -2199,7 +2199,7 @@ typedef struct SID_AND_ATTRIBUTES { #define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} /* S-1-5 */ -#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} +#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} #define SECURITY_DIALUP_RID 0x00000001L #define SECURITY_NETWORK_RID 0x00000002L #define SECURITY_BATCH_RID 0x00000003L @@ -2234,17 +2234,17 @@ typedef struct SID_AND_ATTRIBUTES { */ typedef struct TOKEN_USER { - SID_AND_ATTRIBUTES User; -} TOKEN_USER; + SID_AND_ATTRIBUTES User; +} TOKEN_USER; /* * TOKEN_GROUPS */ typedef struct TOKEN_GROUPS { - DWORD GroupCount; - SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; -} TOKEN_GROUPS; + DWORD GroupCount; + SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; +} TOKEN_GROUPS; /* * LUID_AND_ATTRIBUTES @@ -2273,9 +2273,9 @@ typedef union ULARGE_INTEGER { typedef LARGE_INTEGER LUID,*PLUID; typedef struct LUID_AND_ATTRIBUTES { - LUID Luid; - DWORD Attributes; -} LUID_AND_ATTRIBUTES; + LUID Luid; + DWORD Attributes; +} LUID_AND_ATTRIBUTES; /* * PRIVILEGE_SET @@ -2292,25 +2292,25 @@ typedef struct PRIVILEGE_SET { */ typedef struct TOKEN_PRIVILEGES { - DWORD PrivilegeCount; - LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; -} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; + DWORD PrivilegeCount; + LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; +} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; /* * TOKEN_OWNER */ typedef struct TOKEN_OWNER { - PSID Owner; -} TOKEN_OWNER; + PSID Owner; +} TOKEN_OWNER; /* * TOKEN_PRIMARY_GROUP */ typedef struct TOKEN_PRIMARY_GROUP { - PSID PrimaryGroup; -} TOKEN_PRIMARY_GROUP; + PSID PrimaryGroup; +} TOKEN_PRIMARY_GROUP; /* @@ -2318,37 +2318,37 @@ typedef struct TOKEN_PRIMARY_GROUP { */ typedef struct TOKEN_DEFAULT_DACL { - PACL DefaultDacl; -} TOKEN_DEFAULT_DACL; + PACL DefaultDacl; +} TOKEN_DEFAULT_DACL; /* * TOKEN_SOURCEL */ typedef struct TOKEN_SOURCE { - char Sourcename[8]; - LUID SourceIdentifier; -} TOKEN_SOURCE; + char Sourcename[8]; + LUID SourceIdentifier; +} TOKEN_SOURCE; /* * TOKEN_TYPE */ typedef enum tagTOKEN_TYPE { - TokenPrimary = 1, - TokenImpersonation -} TOKEN_TYPE; + TokenPrimary = 1, + TokenImpersonation +} TOKEN_TYPE; /* * SECURITY_IMPERSONATION_LEVEL */ typedef enum SECURITY_IMPERSONATION_LEVEL { - SecurityAnonymous, - SecurityIdentification, - SecurityImpersonation, - SecurityDelegation -} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; + SecurityAnonymous, + SecurityIdentification, + SecurityImpersonation, + SecurityDelegation +} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, @@ -2369,20 +2369,20 @@ typedef struct SECURITY_QUALITY_OF_SERVICE { */ typedef struct TOKEN_STATISTICS { - LUID TokenId; - LUID AuthenticationId; - LARGE_INTEGER ExpirationTime; - TOKEN_TYPE TokenType; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - DWORD DynamicCharged; - DWORD DynamicAvailable; - DWORD GroupCount; - DWORD PrivilegeCount; - LUID ModifiedId; -} TOKEN_STATISTICS; - -/* - * ACLs of NT + LUID TokenId; + LUID AuthenticationId; + LARGE_INTEGER ExpirationTime; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + DWORD DynamicCharged; + DWORD DynamicAvailable; + DWORD GroupCount; + DWORD PrivilegeCount; + LUID ModifiedId; +} TOKEN_STATISTICS; + +/* + * ACLs of NT */ #define ACL_REVISION 2 @@ -2414,7 +2414,7 @@ typedef struct ACE_HEADER { #define SUCCESSFUL_ACCESS_ACE_FLAG 0x40 #define FAILED_ACCESS_ACE_FLAG 0x80 -/* different ACEs depending on AceType +/* different ACEs depending on AceType * SidStart marks the begin of a SID * so the thing finally looks like this: * 0: ACE_HEADER @@ -2513,8 +2513,8 @@ typedef enum tagSID_NAME_USE { #define THREAD_DIRECT_IMPERSONATION 0x0200 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3ff) -#define THREAD_BASE_PRIORITY_LOWRT 15 -#define THREAD_BASE_PRIORITY_MAX 2 +#define THREAD_BASE_PRIORITY_LOWRT 15 +#define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN -2 #define THREAD_BASE_PRIORITY_IDLE -15 diff --git a/loader/wine/winreg.h b/loader/wine/winreg.h index 31d36fcb10..ede64c0fd5 100644 --- a/loader/wine/winreg.h +++ b/loader/wine/winreg.h @@ -34,7 +34,7 @@ extern "C" { /* * registry provider structs */ -typedef struct value_entA +typedef struct value_entA { LPSTR ve_valuename; DWORD ve_valuelen; DWORD_PTR ve_valueptr; diff --git a/loader/wine/winuser.h b/loader/wine/winuser.h index f42fbd7bba..bf60f873f0 100644 --- a/loader/wine/winuser.h +++ b/loader/wine/winuser.h @@ -599,7 +599,7 @@ typedef struct #define WM_IME_COMPOSITION 0x010f #define WM_IME_KEYLAST 0x010f -#define WM_INITDIALOG 0x0110 +#define WM_INITDIALOG 0x0110 #define WM_COMMAND 0x0111 #define WM_SYSCOMMAND 0x0112 #define WM_TIMER 0x0113 @@ -644,7 +644,7 @@ typedef struct #define WM_MOUSELAST WM_MOUSEWHEEL - + #define WHEEL_DELTA 120 #define WHEEL_PAGESCROLL (UINT_MAX) #define WM_PARENTNOTIFY 0x0210 @@ -733,19 +733,19 @@ typedef struct #define WM_QUERYAFXWNDPROC 0x0360 #define WM_SIZEPARENT 0x0361 #define WM_SETMESSAGESTRING 0x0362 -#define WM_IDLEUPDATECMDUI 0x0363 +#define WM_IDLEUPDATECMDUI 0x0363 #define WM_INITIALUPDATE 0x0364 #define WM_COMMANDHELP 0x0365 #define WM_HELPHITTEST 0x0366 #define WM_EXITHELPMODE 0x0367 #define WM_RECALCPARENT 0x0368 #define WM_SIZECHILD 0x0369 -#define WM_KICKIDLE 0x036A +#define WM_KICKIDLE 0x036A #define WM_QUERYCENTERWND 0x036B #define WM_DISABLEMODAL 0x036C -#define WM_FLOATSTATUS 0x036D -#define WM_ACTIVATETOPLEVEL 0x036E -#define WM_QUERY3DCONTROLS 0x036F +#define WM_FLOATSTATUS 0x036D +#define WM_ACTIVATETOPLEVEL 0x036E +#define WM_QUERY3DCONTROLS 0x036F #define WM_SOCKET_NOTIFY 0x0373 #define WM_SOCKET_DEAD 0x0374 #define WM_POPMESSAGESTRING 0x0375 @@ -789,7 +789,7 @@ typedef struct #define IDYES 6 #define IDNO 7 #define IDCLOSE 8 -#define IDHELP 9 +#define IDHELP 9 /****** Window classes ******/ @@ -838,7 +838,7 @@ typedef struct BYTE rgbReserved[32]; } PAINTSTRUCT, *PPAINTSTRUCT, *LPPAINTSTRUCT; -typedef struct +typedef struct { HMENU hWindowMenu; UINT idFirstChild; @@ -874,7 +874,7 @@ typedef struct DECL_WINELIB_TYPE_AW(MDICREATESTRUCT) DECL_WINELIB_TYPE_AW(LPMDICREATESTRUCT) -#define MDITILE_VERTICAL 0x0000 +#define MDITILE_VERTICAL 0x0000 #define MDITILE_HORIZONTAL 0x0001 #define MDITILE_SKIPDISABLED 0x0002 @@ -1058,7 +1058,7 @@ typedef struct #define PRF_ERASEBKGND 0x00000008L #define PRF_CHILDREN 0x00000010L #define PRF_OWNED 0x00000020L - + /* Offsets for GetClassLong() and GetClassWord() */ #define GCL_MENUNAME (-8) #define GCW_HBRBACKGROUND (-10) @@ -1295,7 +1295,7 @@ typedef struct tagMSG #define POINTSTOPOINT(pt, pts) \ { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts); \ - (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); } + (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); } #define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y))) @@ -1345,7 +1345,7 @@ typedef struct #define TPM_NONOTIFY 0x0080 #define TPM_RETURNCMD 0x0100 -typedef struct +typedef struct { UINT cbSize; RECT rcExclude; @@ -1518,7 +1518,7 @@ typedef WIN_BOOL CALLBACK (*DRAWSTATEPROC)(HDC,LPARAM,WPARAM,INT,INT); #define BST_CHECKED 0x0001 #define BST_INDETERMINATE 0x0002 #define BST_PUSHED 0x0004 -#define BST_FOCUS 0x0008 +#define BST_FOCUS 0x0008 /* Static Control Styles */ #define SS_LEFT 0x00000000L @@ -1578,8 +1578,8 @@ typedef struct INT nPos; INT nTrackPos; } SCROLLINFO, *LPSCROLLINFO; - -/* GetScrollInfo() flags */ + +/* GetScrollInfo() flags */ #define SIF_RANGE 0x0001 #define SIF_PAGE 0x0002 #define SIF_POS 0x0004 @@ -1781,7 +1781,7 @@ typedef struct #define HELPINFO_MENUITEM 0x0002 /* Structure pointed to by lParam of WM_HELP */ -typedef struct +typedef struct { UINT cbSize; /* Size in bytes of this struct */ INT iContextType; /* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */ @@ -1843,28 +1843,28 @@ typedef struct numberfmt32w { } NUMBERFMTW; typedef struct currencyfmt32a -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPCSTR lpDecimalSep; - LPCSTR lpThousandSep; - UINT NegativeOrder; - UINT PositiveOrder; +{ + UINT NumDigits; + UINT LeadingZero; + UINT Grouping; + LPCSTR lpDecimalSep; + LPCSTR lpThousandSep; + UINT NegativeOrder; + UINT PositiveOrder; LPCSTR lpCurrencySymbol; -} CURRENCYFMTA; +} CURRENCYFMTA; typedef struct currencyfmt32w -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPCWSTR lpDecimalSep; - LPCWSTR lpThousandSep; - UINT NegativeOrder; - UINT PositiveOrder; +{ + UINT NumDigits; + UINT LeadingZero; + UINT Grouping; + LPCWSTR lpDecimalSep; + LPCWSTR lpThousandSep; + UINT NegativeOrder; + UINT PositiveOrder; LPCWSTR lpCurrencySymbol; -} CURRENCYFMTW; +} CURRENCYFMTW; #define MONITOR_DEFAULTTONULL 0x00000000 #define MONITOR_DEFAULTTOPRIMARY 0x00000001 @@ -2070,7 +2070,7 @@ typedef struct #define MNC_IGNORE 0 #define MNC_CLOSE 1 #define MNC_EXECUTE 2 -#define MNC_SELECT 3 +#define MNC_SELECT 3 /* SystemParametersInfo */ /* defines below are for all win versions */ @@ -2764,7 +2764,7 @@ typedef struct #define VK_NONAME 0xFC #define VK_PA1 0xFD #define VK_OEM_CLEAR 0xFE - + /* Key status flags for mouse events */ #define MK_LBUTTON 0x0001 #define MK_RBUTTON 0x0002 |