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

fusion: The VersionLength member is not constant, so dynamically load the metadata header.

This commit is contained in:
James Hawkins 2008-07-16 10:51:54 -05:00 committed by Alexandre Julliard
parent 378fde9acf
commit 8f985a338a
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/fusion/assembly.c
View File

@ -271,22 +271,54 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset)
return S_OK;
}
static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz)
{
METADATAHDR *metadatahdr;
BYTE *ptr, *dest;
DWORD size, ofs;
ULONG rva;
rva = assembly->corhdr->MetaData.VirtualAddress;
ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL);
if (!ptr)
return E_FAIL;
metadatahdr = (METADATAHDR *)ptr;
assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR));
if (!assembly->metadatahdr)
return E_OUTOFMEMORY;
size = FIELD_OFFSET(METADATAHDR, Version);
memcpy(assembly->metadatahdr, metadatahdr, size);
/* we don't care about the version string */
ofs = FIELD_OFFSET(METADATAHDR, Flags);
ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1;
dest = (BYTE *)assembly->metadatahdr + ofs;
memcpy(dest, ptr, sizeof(METADATAHDR) - ofs);
*hdrsz = sizeof(METADATAHDR) - sizeof(LPSTR) + metadatahdr->VersionLength + 1;
return S_OK;
}
static HRESULT parse_clr_metadata(ASSEMBLY *assembly)
{
METADATASTREAMHDR *streamhdr;
ULONG rva, i, ofs;
LPSTR stream;
HRESULT hr;
DWORD hdrsz;
BYTE *ptr;
rva = assembly->corhdr->MetaData.VirtualAddress;
assembly->metadatahdr = ImageRvaToVa(assembly->nthdr, assembly->data,
rva, NULL);
if (!assembly->metadatahdr)
return E_FAIL;
hr = parse_metadata_header(assembly, &hdrsz);
if (FAILED(hr))
return hr;
ptr = ImageRvaToVa(assembly->nthdr, assembly->data,
rva + sizeof(METADATAHDR), NULL);
rva = assembly->corhdr->MetaData.VirtualAddress;
ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva + hdrsz, NULL);
if (!ptr)
return E_FAIL;
@ -393,7 +425,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file)
return S_OK;
failed:
assembly_release( assembly );
assembly_release(assembly);
return hr;
}
@ -402,6 +434,7 @@ HRESULT assembly_release(ASSEMBLY *assembly)
if (!assembly)
return S_OK;
HeapFree(GetProcessHeap(), 0, assembly->metadatahdr);
HeapFree(GetProcessHeap(), 0, assembly->path);
UnmapViewOfFile(assembly->data);
CloseHandle(assembly->hmap);

6
dlls/fusion/fusionpriv.h
View File

@ -27,6 +27,8 @@
#include "winbase.h"
#include "winuser.h"
#include <pshpack1.h>
typedef struct
{
ULONG Signature;
@ -34,13 +36,11 @@ typedef struct
USHORT MinorVersion;
ULONG Reserved;
ULONG VersionLength;
BYTE Version[12];
LPSTR Version;
BYTE Flags;
WORD Streams;
} METADATAHDR;
#include <pshpack1.h>
typedef struct
{
DWORD Offset;