summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-10 18:55:52 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-10 18:55:52 +0000
commit78c2694b4807df0fcf68c0ce8fbc4b2fc9767527 (patch)
treeac0b42628e502de57ba7c21a7ade3062bf00e300
parent903cbd2fc75f40d95a15f2781374890758accb43 (diff)
downloadmpv-78c2694b4807df0fcf68c0ce8fbc4b2fc9767527.tar.bz2
mpv-78c2694b4807df0fcf68c0ce8fbc4b2fc9767527.tar.xz
Revert r24424.
Fix is wrong, because 'packed' attribute can be placed before structure definition only when all members have this attribute. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24426 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--loader/wine/mmreg.h26
-rw-r--r--loader/wine/module.h12
-rw-r--r--loader/wine/pe_image.h26
-rw-r--r--loader/wine/winbase.h12
-rw-r--r--loader/wine/winuser.h20
5 files changed, 48 insertions, 48 deletions
diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h
index 8b115dbd6a..bc5fc0c10d 100644
--- a/loader/wine/mmreg.h
+++ b/loader/wine/mmreg.h
@@ -90,19 +90,19 @@ typedef struct {
#ifndef _MPEGLAYER3WAVEFORMAT_
#define _MPEGLAYER3WAVEFORMAT_
-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;
+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;
} MPEGLAYER3WAVEFORMAT;
#endif /* !_MPEGLAYER3WAVEFORMAT_ */
diff --git a/loader/wine/module.h b/loader/wine/module.h
index 4fac90671e..6f6b31a0a7 100644
--- a/loader/wine/module.h
+++ b/loader/wine/module.h
@@ -11,11 +11,11 @@
#include "pe_image.h"
-typedef struct WINE_PACKED {
+typedef struct {
BYTE type;
BYTE flags;
BYTE segnum;
- WORD offs;
+ WORD offs WINE_PACKED;
} ET_ENTRY;
typedef struct {
@@ -57,12 +57,12 @@ typedef struct
} SELFLOADHEADER;
/* Parameters for LoadModule() */
-typedef struct WINE_PACKED
+typedef struct
{
HGLOBAL16 hEnvironment; /* Environment segment */
- SEGPTR cmdLine; /* Command-line */
- SEGPTR showCmd; /* Code for ShowWindow() */
- SEGPTR reserved;
+ SEGPTR cmdLine WINE_PACKED; /* Command-line */
+ SEGPTR showCmd WINE_PACKED; /* Code for ShowWindow() */
+ SEGPTR reserved WINE_PACKED;
} LOADPARAMS16;
typedef struct
diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h
index 4891d3e302..3f550ba467 100644
--- a/loader/wine/pe_image.h
+++ b/loader/wine/pe_image.h
@@ -54,19 +54,19 @@ extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWS
typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
-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 */
+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 */
} ELF_STDCALL_STUB;
typedef struct {
diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h
index 1be313c12e..1047bdcd50 100644
--- a/loader/wine/winbase.h
+++ b/loader/wine/winbase.h
@@ -536,14 +536,14 @@ typedef struct tagMEMORYSTATUS
/* Debugging support (DEBUG SYSTEM ONLY) */
-typedef struct WINE_PACKED
+typedef struct
{
UINT16 flags;
- DWORD dwOptions;
- DWORD dwFilter;
- CHAR achAllocModule[8];
- DWORD dwAllocBreak;
- DWORD dwAllocCount;
+ DWORD dwOptions WINE_PACKED;
+ DWORD dwFilter WINE_PACKED;
+ CHAR achAllocModule[8] WINE_PACKED;
+ DWORD dwAllocBreak WINE_PACKED;
+ DWORD dwAllocCount WINE_PACKED;
} WINDEBUGINFO, *LPWINDEBUGINFO;
/* WINDEBUGINFO flags values */
diff --git a/loader/wine/winuser.h b/loader/wine/winuser.h
index ab0e176b2e..d74864ef7d 100644
--- a/loader/wine/winuser.h
+++ b/loader/wine/winuser.h
@@ -172,14 +172,14 @@ typedef struct
HWND hwnd;
} CWPRETSTRUCT, *LPCWPRETSTRUCT;
-typedef struct WINE_PACKED
+typedef struct
{
UINT length;
UINT flags;
UINT showCmd;
- POINT ptMinPosition;
- POINT ptMaxPosition;
- RECT rcNormalPosition;
+ POINT ptMinPosition WINE_PACKED;
+ POINT ptMaxPosition WINE_PACKED;
+ RECT rcNormalPosition WINE_PACKED;
} WINDOWPLACEMENT, *LPWINDOWPLACEMENT;
@@ -2545,7 +2545,7 @@ typedef struct
#define DSS_MONO 0x0080
#define DSS_RIGHT 0x8000
-typedef struct WINE_PACKED
+typedef struct
{
UINT CtlType;
UINT CtlID;
@@ -2554,8 +2554,8 @@ typedef struct WINE_PACKED
UINT itemState;
HWND hwndItem;
HDC hDC;
- RECT rcItem;
- DWORD itemData;
+ RECT rcItem WINE_PACKED;
+ DWORD itemData WINE_PACKED;
} DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;
@@ -2836,15 +2836,15 @@ typedef struct
/* DragObject stuff */
-typedef struct WINE_PACKED
+typedef struct
{
HWND16 hWnd;
HANDLE16 hScope;
WORD wFlags;
HANDLE16 hList;
HANDLE16 hOfStruct;
- POINT16 pt;
- LONG l;
+ POINT16 pt WINE_PACKED;
+ LONG l WINE_PACKED;
} DRAGINFO, *LPDRAGINFO;
#define DRAGOBJ_PROGRAM 0x0001