Mercurial > mplayer.hg

comparison loader/wine/pe_image.h @ 30539:437b251e4194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Directly mark structs as WINE_PACKED where all members are marked as packed. This fixes a ton of gcc warnings about ignored packed attributes.
author diego
date Sun, 14 Feb 2010 14:49:44 +0000
parents 9e739bdb049c
children
comparison
equal deleted inserted replaced
30538:571231765512 30539:437b251e4194
52 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY, LPCSTR, DWORD, WIN_BOOL); 52 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY, LPCSTR, DWORD, WIN_BOOL);
53 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DWORD, WIN_BOOL); 53 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DWORD, WIN_BOOL);
54 54
55 typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID); 55 typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
56 56
57 typedef struct { 57 typedef struct WINE_PACKED {
58 WORD popl WINE_PACKED; /* 0x8f 0x05 */ 58 WORD popl; /* 0x8f 0x05 */
59 DWORD addr_popped WINE_PACKED;/* ... */ 59 DWORD addr_popped; /* ... */
60 BYTE pushl1 WINE_PACKED; /* 0x68 */ 60 BYTE pushl1; /* 0x68 */
61 DWORD newret WINE_PACKED; /* ... */ 61 DWORD newret; /* ... */
62 BYTE pushl2 WINE_PACKED; /* 0x68 */ 62 BYTE pushl2; /* 0x68 */
63 DWORD origfun WINE_PACKED; /* original function */ 63 DWORD origfun; /* original function */
64 BYTE ret1 WINE_PACKED; /* 0xc3 */ 64 BYTE ret1; /* 0xc3 */
65 WORD addesp WINE_PACKED; /* 0x83 0xc4 */ 65 WORD addesp; /* 0x83 0xc4 */
66 BYTE nrofargs WINE_PACKED; /* nr of arguments to add esp, */ 66 BYTE nrofargs; /* nr of arguments to add esp, */
67 BYTE pushl3 WINE_PACKED; /* 0x68 */ 67 BYTE pushl3; /* 0x68 */
68 DWORD oldret WINE_PACKED; /* Filled out from popl above */ 68 DWORD oldret; /* Filled out from popl above */
69 BYTE ret2 WINE_PACKED; /* 0xc3 */ 69 BYTE ret2; /* 0xc3 */
70 } ELF_STDCALL_STUB; 70 } ELF_STDCALL_STUB;
71 71
72 typedef struct { 72 typedef struct {
73 void* dlhandle; 73 void* dlhandle;
74 ELF_STDCALL_STUB *stubs; 74 ELF_STDCALL_STUB *stubs;