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

kernel32: Return the binary type from get_binary_info(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-09-27 14:44:47 +02:00
parent da40de3ced
commit df637816bc
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
dlls/kernel32/process.c
View File

@ -207,7 +207,7 @@ static NTSTATUS get_pe_info( HANDLE handle, pe_image_info_t *info )
/*********************************************************************** /***********************************************************************
* get_binary_info * get_binary_info
*/ */
static void get_binary_info( HANDLE hfile, struct binary_info *info ) static enum binary_type get_binary_info( HANDLE hfile, struct binary_info *info )
{ {
union union
{ {
@ -256,24 +256,21 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info )
switch (status) switch (status)
{ {
case STATUS_SUCCESS: case STATUS_SUCCESS:
info->type = BINARY_PE; return BINARY_PE;
return;
case STATUS_INVALID_IMAGE_WIN_32: case STATUS_INVALID_IMAGE_WIN_32:
info->type = BINARY_PE; return BINARY_PE;
return;
case STATUS_INVALID_IMAGE_WIN_64: case STATUS_INVALID_IMAGE_WIN_64:
info->type = BINARY_PE; return BINARY_PE;
return;
case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_WIN_16:
case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_NE_FORMAT:
case STATUS_INVALID_IMAGE_PROTECT: case STATUS_INVALID_IMAGE_PROTECT:
info->type = BINARY_WIN16; return BINARY_WIN16;
return;
} }
/* Seek to the start of the file and read the header information. */ /* Seek to the start of the file and read the header information. */
if (SetFilePointer( hfile, 0, NULL, SEEK_SET ) == -1) return; if (SetFilePointer( hfile, 0, NULL, SEEK_SET ) == -1) return BINARY_UNKNOWN;
if (!ReadFile( hfile, &header, sizeof(header), &len, NULL ) || len != sizeof(header)) return; if (!ReadFile( hfile, &header, sizeof(header), &len, NULL ) || len != sizeof(header))
return BINARY_UNKNOWN;
if (!memcmp( header.elf.magic, "\177ELF", 4 )) if (!memcmp( header.elf.magic, "\177ELF", 4 ))
{ {
@ -287,11 +284,19 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info )
header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.type = RtlUshortByteSwap( header.elf.type );
header.elf.machine = RtlUshortByteSwap( header.elf.machine ); header.elf.machine = RtlUshortByteSwap( header.elf.machine );
} }
switch(header.elf.machine)
{
case 3: info->pe.machine = IMAGE_FILE_MACHINE_I386; break;
case 20: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break;
case 40: info->pe.machine = IMAGE_FILE_MACHINE_ARMNT; break;
case 50: info->pe.machine = IMAGE_FILE_MACHINE_IA64; break;
case 62: info->pe.machine = IMAGE_FILE_MACHINE_AMD64; break;
case 183: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break;
}
switch(header.elf.type) switch(header.elf.type)
{ {
case 2: case 2:
info->type = BINARY_UNIX_EXE; return BINARY_UNIX_EXE;
break;
case 3: case 3:
{ {
LARGE_INTEGER phoff; LARGE_INTEGER phoff;
@ -309,30 +314,15 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info )
} }
while (phnum--) while (phnum--)
{ {
if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return BINARY_UNKNOWN;
if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type))
return BINARY_UNKNOWN;
if (byteswap) type = RtlUlongByteSwap( type ); if (byteswap) type = RtlUlongByteSwap( type );
if (type == 3) if (type == 3) return BINARY_UNIX_EXE;
{
info->type = BINARY_UNIX_EXE;
break;
}
phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; phoff.QuadPart += (header.elf.class == 2) ? 56 : 32;
} }
if (!info->type) info->type = BINARY_UNIX_LIB; return BINARY_UNIX_LIB;
break;
} }
default:
return;
}
switch(header.elf.machine)
{
case 3: info->pe.machine = IMAGE_FILE_MACHINE_I386; break;
case 20: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break;
case 40: info->pe.machine = IMAGE_FILE_MACHINE_ARMNT; break;
case 50: info->pe.machine = IMAGE_FILE_MACHINE_IA64; break;
case 62: info->pe.machine = IMAGE_FILE_MACHINE_AMD64; break;
case 183: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break;
} }
} }
/* Mach-o File with Endian set to Big Endian or Little Endian */ /* Mach-o File with Endian set to Big Endian or Little Endian */
@ -344,11 +334,6 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info )
header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); header.macho.filetype = RtlUlongByteSwap( header.macho.filetype );
header.macho.cputype = RtlUlongByteSwap( header.macho.cputype ); header.macho.cputype = RtlUlongByteSwap( header.macho.cputype );
} }
switch(header.macho.filetype)
{
case 2: info->type = BINARY_UNIX_EXE; break;
case 8: info->type = BINARY_UNIX_LIB; break;
}
switch(header.macho.cputype) switch(header.macho.cputype)
{ {
case 0x00000007: info->pe.machine = IMAGE_FILE_MACHINE_I386; break; case 0x00000007: info->pe.machine = IMAGE_FILE_MACHINE_I386; break;
@ -357,7 +342,13 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info )
case 0x0100000c: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break; case 0x0100000c: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break;
case 0x00000012: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break; case 0x00000012: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break;
} }
switch(header.macho.filetype)
{
case 2: return BINARY_UNIX_EXE;
case 8: return BINARY_UNIX_LIB;
}
} }
return BINARY_UNKNOWN;
} }
@ -452,7 +443,7 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info
if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer), binary_info )) if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer), binary_info ))
handle = 0; handle = 0;
} }
else get_binary_info( handle, binary_info ); else binary_info->type = get_binary_info( handle, binary_info );
return handle; return handle;
} }
@ -477,7 +468,7 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen,
if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE)
{ {
get_binary_info( *handle, binary_info ); binary_info->type = get_binary_info( *handle, binary_info );
return TRUE; return TRUE;
} }
return FALSE; return FALSE;