RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 16:33:02 +00:00
Code Issues Releases Wiki Activity

Directly mark structs as WINE_PACKED where all members are marked as packed.

Browse Source 
This fixes a ton of gcc warnings about ignored packed attributes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30581 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-02-14 14:49:44 +00:00
parent 5522068821
commit 4b6ce33628
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
loader/wine/mmreg.h
View File

@ -89,19 +89,19 @@ typedef struct {
#ifndef _MPEGLAYER3WAVEFORMAT_
#define _MPEGLAYER3WAVEFORMAT_
typedef struct mpeglayer3waveformat_tag {
WORD wFormatTag WINE_PACKED;
WORD nChannels WINE_PACKED;
DWORD nSamplesPerSec WINE_PACKED;
DWORD nAvgBytesPerSec WINE_PACKED;
WORD nBlockAlign WINE_PACKED;
WORD wBitsPerSample WINE_PACKED;
WORD cbSize WINE_PACKED;
WORD wID WINE_PACKED;
DWORD fdwFlags WINE_PACKED;
WORD nBlockSize WINE_PACKED;
WORD nFramesPerBlock WINE_PACKED;
WORD nCodecDelay WINE_PACKED;
typedef struct WINE_PACKED mpeglayer3waveformat_tag {
WORD wFormatTag;
WORD nChannels;
DWORD nSamplesPerSec;
DWORD nAvgBytesPerSec;
WORD nBlockAlign;
WORD wBitsPerSample;
WORD cbSize;
WORD wID;
DWORD fdwFlags;
WORD nBlockSize;
WORD nFramesPerBlock;
WORD nCodecDelay;
} MPEGLAYER3WAVEFORMAT;
#endif /* !_MPEGLAYER3WAVEFORMAT_ */

26
loader/wine/pe_image.h
View File

@ -54,19 +54,19 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DW
typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
typedef struct {
WORD popl WINE_PACKED; /* 0x8f 0x05 */
DWORD addr_popped WINE_PACKED;/* ... */
BYTE pushl1 WINE_PACKED; /* 0x68 */
DWORD newret WINE_PACKED; /* ... */
BYTE pushl2 WINE_PACKED; /* 0x68 */
DWORD origfun WINE_PACKED; /* original function */
BYTE ret1 WINE_PACKED; /* 0xc3 */
WORD addesp WINE_PACKED; /* 0x83 0xc4 */
BYTE nrofargs WINE_PACKED; /* nr of arguments to add esp, */
BYTE pushl3 WINE_PACKED; /* 0x68 */
DWORD oldret WINE_PACKED; /* Filled out from popl above */
BYTE ret2 WINE_PACKED; /* 0xc3 */
typedef struct WINE_PACKED {
WORD popl; /* 0x8f 0x05 */
DWORD addr_popped; /* ... */
BYTE pushl1; /* 0x68 */
DWORD newret; /* ... */
BYTE pushl2; /* 0x68 */
DWORD origfun; /* original function */
BYTE ret1; /* 0xc3 */
WORD addesp; /* 0x83 0xc4 */
BYTE nrofargs; /* nr of arguments to add esp, */
BYTE pushl3; /* 0x68 */
DWORD oldret; /* Filled out from popl above */
BYTE ret2; /* 0xc3 */
} ELF_STDCALL_STUB;
typedef struct {