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

fusion: Handle loading 64-bit .NET assemblies.

This commit is contained in:
James Hawkins 2008-08-18 22:54:43 -05:00 committed by Alexandre Julliard
parent 48524c9b92
commit dd9b0edb6f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/fusion/assembly.c
View File

@ -58,7 +58,7 @@ struct tagASSEMBLY
HANDLE hmap;
BYTE *data;
IMAGE_NT_HEADERS32 *nthdr;
IMAGE_NT_HEADERS *nthdr;
IMAGE_COR20_HEADER *corhdr;
METADATAHDR *metadatahdr;
@ -647,7 +647,15 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly)
if (!assembly->nthdr)
return E_FAIL;
datadirs = assembly->nthdr->OptionalHeader.DataDirectory;
if (assembly->nthdr->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
{
IMAGE_OPTIONAL_HEADER64 *opthdr =
(IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader;
datadirs = opthdr->DataDirectory;
}
else
datadirs = assembly->nthdr->OptionalHeader.DataDirectory;
if (!datadirs)
return E_FAIL;