ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernelbase: Make sure that last error is set on LOAD_LIBRARY_AS_DATAFILE failure. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-03-31 22:15:39 +02:00
parent 2a8a4cbbe6
commit 9f4c47501d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/kernelbase/loader.c
View File

@ -95,7 +95,6 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na
file = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, file = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE,
NULL, OPEN_EXISTING, 0, 0 ); NULL, OPEN_EXISTING, 0, 0 );
} }
if (file == INVALID_HANDLE_VALUE) ERR("can't load %s\n", debugstr_w(name));
if (file == INVALID_HANDLE_VALUE) return FALSE; if (file == INVALID_HANDLE_VALUE) return FALSE;
mapping = CreateFileMappingW( file, NULL, protect, 0, 0, NULL ); mapping = CreateFileMappingW( file, NULL, protect, 0, 0, NULL );
@ -108,7 +107,11 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na
if (!(flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE)) if (!(flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE))
{ {
/* make sure it's a valid PE file */ /* make sure it's a valid PE file */
if (!RtlImageNtHeader( module )) goto failed; if (!RtlImageNtHeader( module ))
{
SetLastError( ERROR_BAD_EXE_FORMAT );
goto failed;
}
*mod_ret = (HMODULE)((char *)module + 1); /* set bit 0 for data file module */ *mod_ret = (HMODULE)((char *)module + 1); /* set bit 0 for data file module */
if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE) if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)