diff options
| author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-10 18:55:52 +0000 |
|---|---|---|
| committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-10 18:55:52 +0000 |
| commit | 78c2694b4807df0fcf68c0ce8fbc4b2fc9767527 (patch) | |
| tree | ac0b42628e502de57ba7c21a7ade3062bf00e300 /loader/wine/pe_image.h | |
| parent | 903cbd2fc75f40d95a15f2781374890758accb43 (diff) | |
| download | mpv-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
Diffstat (limited to 'loader/wine/pe_image.h')
| -rw-r--r-- | loader/wine/pe_image.h | 26 |
1 files changed, 13 insertions, 13 deletions
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 { |