diff options
author | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-05 11:14:07 +0000 |
---|---|---|
committer | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-05 11:14:07 +0000 |
commit | c27b99441b75a8a6c49583c70e4e27d4f61a35a5 (patch) | |
tree | 1b64b95f46fa32c42aa29f319555b0858adfe748 /loader/win32.c | |
parent | 61f351dc908b4868290aa69629e22befcb633ee4 (diff) | |
download | mpv-c27b99441b75a8a6c49583c70e4e27d4f61a35a5.tar.bz2 mpv-c27b99441b75a8a6c49583c70e4e27d4f61a35a5.tar.xz |
Partial revert of r30843.
Some extra changes snuck into my commit; they'll probably be reviewed
and committed to Subversion eventually, but were not part of the fix
for WaitForSingleObject on thread handles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30844 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/win32.c')
-rw-r--r-- | loader/win32.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/loader/win32.c b/loader/win32.c index 2282258d8d..e224d24aec 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -569,28 +569,16 @@ static HMODULE WINAPI expGetDriverModuleHandle(DRVR* pdrv) #define MODULE_HANDLE_winmm ((HMODULE)0x128) #define MODULE_HANDLE_psapi ((HMODULE)0x129) -/* fake EXE struct to make msvcrt8+ not to crash: - it checks all exe sections for a section named .mixcrt - we fake a section with that name, so the crt will avoid - using Encode/Decode Pointer, as we was a posix binary */ -static const struct { - IMAGE_DOS_HEADER doshdr; - IMAGE_NT_HEADERS nthdr; - IMAGE_SECTION_HEADER opthdr; -} __attribute__((__packed__)) mp_exe = { - .doshdr.e_lfanew = sizeof(IMAGE_DOS_HEADER), - .nthdr.FileHeader.NumberOfSections = 1, - .nthdr.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_NT_HEADERS) - FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader), /* 0xe0 */ - .opthdr.Name = ".mixcrt" -}; - static HMODULE WINAPI expGetModuleHandleA(const char* name) { WINE_MODREF* wm; HMODULE result; if(!name) - result=(HMODULE)&mp_exe.doshdr; - +#ifdef CONFIG_QTX_CODECS + result=1; +#else + result=0; +#endif else { wm=MODULE_FindModule(name); |