Mercurial > mplayer.hg
annotate loader/wine/pe_image.h @ 34266:a6a1c973de4e
vo direct3d: fix crash in osd drawing code
The crash occurred when the video window was minimized and
the OSD should be drawn. This caused the OSD textures creation
to fail and later the OSD drawing code would assume they exist
and cause the crash.
When the video window is minimized a size change event with
the new size 0x0 is reported. This is now handled by deferring
the textures recreation. If the OSD should be drawn in the
meantime it will be checked if the OSD textures have been
allocated.
This commit is done with the permission of the vo direct3d
maintainer.
This is based on patches from Roger Pack (rogerdpack2 (gmail))
and Patrick Dinh (patrickdinh33 (yahoo)).
author | al |
---|---|
date | Sat, 19 Nov 2011 14:04:11 +0000 |
parents | 437b251e4194 |
children |
rev | line source |
---|---|
26045 | 1 #ifndef MPLAYER_PE_IMAGE_H |
2 #define MPLAYER_PE_IMAGE_H | |
1 | 3 |
7386 | 4 #include "winnt.h" |
1 | 5 #include "winbase.h" |
6 | |
7 #define PE_HEADER(module) \ | |
8 ((IMAGE_NT_HEADERS*)((LPBYTE)(module) + \ | |
9 (((IMAGE_DOS_HEADER*)(module))->e_lfanew))) | |
10 | |
11 #define PE_SECTIONS(module) \ | |
12 ((IMAGE_SECTION_HEADER*)((LPBYTE)&PE_HEADER(module)->OptionalHeader + \ | |
13 PE_HEADER(module)->FileHeader.SizeOfOptionalHeader)) | |
14 | |
15 #define RVA_PTR(module,field) ((LPBYTE)(module) + PE_HEADER(module)->field) | |
16 | |
17 /* modreference used for attached processes | |
18 * all section are calculated here, relocations etc. | |
19 */ | |
20 typedef struct { | |
21 PIMAGE_IMPORT_DESCRIPTOR pe_import; | |
22 PIMAGE_EXPORT_DIRECTORY pe_export; | |
23 PIMAGE_RESOURCE_DIRECTORY pe_resource; | |
24 int tlsindex; | |
25 } PE_MODREF; | |
26 | |
25794
2c8cdb9123b8
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
diego
parents:
24422
diff
changeset
|
27 struct wine_modref; |
28051 | 28 int PE_unloadImage(HMODULE hModule); |
29 FARPROC PE_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop); | |
30 WIN_BOOL PE_EnumResourceTypesA(HMODULE, ENUMRESTYPEPROCA, LONG); | |
31 WIN_BOOL PE_EnumResourceTypesW(HMODULE, ENUMRESTYPEPROCW, LONG); | |
32 WIN_BOOL PE_EnumResourceNamesA(HMODULE, LPCSTR, ENUMRESNAMEPROCA, LONG); | |
33 WIN_BOOL PE_EnumResourceNamesW(HMODULE, LPCWSTR, ENUMRESNAMEPROCW, LONG); | |
34 WIN_BOOL PE_EnumResourceLanguagesA(HMODULE, LPCSTR, LPCSTR, ENUMRESLANGPROCA, LONG); | |
35 WIN_BOOL PE_EnumResourceLanguagesW(HMODULE, LPCWSTR, LPCWSTR, ENUMRESLANGPROCW, LONG); | |
36 HRSRC PE_FindResourceExW(struct wine_modref*, LPCWSTR, LPCWSTR, WORD); | |
37 DWORD PE_SizeofResource(HMODULE, HRSRC); | |
38 struct wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD); | |
39 void PE_UnloadLibrary(struct wine_modref *); | |
40 HGLOBAL PE_LoadResource(struct wine_modref *wm, HRSRC); | |
41 HMODULE PE_LoadImage(int hFile, LPCSTR filename, WORD *version); | |
42 struct wine_modref *PE_CreateModule(HMODULE hModule, LPCSTR filename, | |
43 DWORD flags, WIN_BOOL builtin); | |
44 WIN_BOOL PE_CreateProcess(HANDLE hFile, LPCSTR filename, LPCSTR cmd_line, LPCSTR env, | |
45 LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, | |
46 WIN_BOOL inherit, DWORD flags, LPSTARTUPINFOA startup, | |
47 LPPROCESS_INFORMATION info); | |
1 | 48 |
28051 | 49 void PE_InitTls(void); |
50 WIN_BOOL PE_InitDLL(struct wine_modref *wm, DWORD type, LPVOID lpReserved); | |
1 | 51 |
28051 | 52 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY, LPCSTR, DWORD, WIN_BOOL); |
53 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DWORD, WIN_BOOL); | |
1 | 54 |
55 typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID); | |
56 | |
30539
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
57 typedef struct WINE_PACKED { |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
58 WORD popl; /* 0x8f 0x05 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
59 DWORD addr_popped; /* ... */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
60 BYTE pushl1; /* 0x68 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
61 DWORD newret; /* ... */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
62 BYTE pushl2; /* 0x68 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
63 DWORD origfun; /* original function */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
64 BYTE ret1; /* 0xc3 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
65 WORD addesp; /* 0x83 0xc4 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
66 BYTE nrofargs; /* nr of arguments to add esp, */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
67 BYTE pushl3; /* 0x68 */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
68 DWORD oldret; /* Filled out from popl above */ |
437b251e4194
Directly mark structs as WINE_PACKED where all members are marked as packed.
diego
parents:
28051
diff
changeset
|
69 BYTE ret2; /* 0xc3 */ |
1 | 70 } ELF_STDCALL_STUB; |
71 | |
72 typedef struct { | |
73 void* dlhandle; | |
74 ELF_STDCALL_STUB *stubs; | |
75 } ELF_MODREF; | |
76 | |
28051 | 77 struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags); |
78 void ELF_UnloadLibrary(struct wine_modref *); | |
79 FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName); | |
1 | 80 |
26045 | 81 #endif /* MPLAYER_PE_IMAGE_H */ |