RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-31 15:59:34 +00:00
Code Issues Releases Wiki Activity

Fix for a lot of

Browse Source 
"'packed' attribute ignored for field of type 'BYTE'" warnings.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24424 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-09-10 18:07:25 +00:00
parent dcc2e2e5ea
commit 169a837b18
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
loader/wine/mmreg.h
View File

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

12
loader/wine/module.h
View File

@ -11,11 +11,11 @@
#include "pe_image.h" #include "pe_image.h"
typedef struct { typedef struct WINE_PACKED {
BYTE type; BYTE type;
BYTE flags; BYTE flags;
BYTE segnum; BYTE segnum;
WORD offs WINE_PACKED; WORD offs;
} ET_ENTRY; } ET_ENTRY;
typedef struct { typedef struct {
@ -57,12 +57,12 @@ typedef struct
} SELFLOADHEADER; } SELFLOADHEADER;
/* Parameters for LoadModule() */ /* Parameters for LoadModule() */
typedef struct typedef struct WINE_PACKED
{ {
HGLOBAL16 hEnvironment; /* Environment segment */ HGLOBAL16 hEnvironment; /* Environment segment */
SEGPTR cmdLine WINE_PACKED; /* Command-line */ SEGPTR cmdLine; /* Command-line */
SEGPTR showCmd WINE_PACKED; /* Code for ShowWindow() */ SEGPTR showCmd; /* Code for ShowWindow() */
SEGPTR reserved WINE_PACKED; SEGPTR reserved;
} LOADPARAMS16; } LOADPARAMS16;
typedef struct typedef struct

26
loader/wine/pe_image.h
View File

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

12
loader/wine/winbase.h
View File

@ -536,14 +536,14 @@ typedef struct tagMEMORYSTATUS
/* Debugging support (DEBUG SYSTEM ONLY) */ /* Debugging support (DEBUG SYSTEM ONLY) */
typedef struct typedef struct WINE_PACKED
{ {
UINT16 flags; UINT16 flags;
DWORD dwOptions WINE_PACKED; DWORD dwOptions;
DWORD dwFilter WINE_PACKED; DWORD dwFilter;
CHAR achAllocModule[8] WINE_PACKED; CHAR achAllocModule[8];
DWORD dwAllocBreak WINE_PACKED; DWORD dwAllocBreak;
DWORD dwAllocCount WINE_PACKED; DWORD dwAllocCount;
} WINDEBUGINFO, *LPWINDEBUGINFO; } WINDEBUGINFO, *LPWINDEBUGINFO;
/* WINDEBUGINFO flags values */ /* WINDEBUGINFO flags values */

20
loader/wine/winuser.h
View File

@ -172,14 +172,14 @@ typedef struct
HWND hwnd; HWND hwnd;
} CWPRETSTRUCT, *LPCWPRETSTRUCT; } CWPRETSTRUCT, *LPCWPRETSTRUCT;
typedef struct typedef struct WINE_PACKED
{ {
UINT length; UINT length;
UINT flags; UINT flags;
UINT showCmd; UINT showCmd;
POINT ptMinPosition WINE_PACKED; POINT ptMinPosition;
POINT ptMaxPosition WINE_PACKED; POINT ptMaxPosition;
RECT rcNormalPosition WINE_PACKED; RECT rcNormalPosition;
} WINDOWPLACEMENT, *LPWINDOWPLACEMENT; } WINDOWPLACEMENT, *LPWINDOWPLACEMENT;
@ -2545,7 +2545,7 @@ typedef struct
#define DSS_MONO 0x0080 #define DSS_MONO 0x0080
#define DSS_RIGHT 0x8000 #define DSS_RIGHT 0x8000
typedef struct typedef struct WINE_PACKED
{ {
UINT CtlType; UINT CtlType;
UINT CtlID; UINT CtlID;
@ -2554,8 +2554,8 @@ typedef struct
UINT itemState; UINT itemState;
HWND hwndItem; HWND hwndItem;
HDC hDC; HDC hDC;
RECT rcItem WINE_PACKED; RECT rcItem;
DWORD itemData WINE_PACKED; DWORD itemData;
} DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT; } DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;
@ -2836,15 +2836,15 @@ typedef struct
/* DragObject stuff */ /* DragObject stuff */
typedef struct typedef struct WINE_PACKED
{ {
HWND16 hWnd; HWND16 hWnd;
HANDLE16 hScope; HANDLE16 hScope;
WORD wFlags; WORD wFlags;
HANDLE16 hList; HANDLE16 hList;
HANDLE16 hOfStruct; HANDLE16 hOfStruct;
POINT16 pt WINE_PACKED; POINT16 pt;
LONG l WINE_PACKED; LONG l;
} DRAGINFO, *LPDRAGINFO; } DRAGINFO, *LPDRAGINFO;
#define DRAGOBJ_PROGRAM 0x0001 #define DRAGOBJ_PROGRAM 0x0001