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

winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR.

This commit is contained in:
André Hentschel 2013-08-22 18:58:59 +02:00 committed by Alexandre Julliard
parent 4a1d4acd29
commit d9a6deff4b
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/winnt.h
View File

@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION
#define IMAGE_SIZEOF_RELOCATION 10 #define IMAGE_SIZEOF_RELOCATION 10
typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR
{
union
{
DWORD AllAttributes;
struct
{
DWORD RvaBased:1;
DWORD ReservedAttributes:31;
} DUMMYSTRUCTNAME;
} Attributes;
DWORD DllNameRVA;
DWORD ModuleHandleRVA;
DWORD ImportAddressTableRVA;
DWORD ImportNameTableRVA;
DWORD BoundImportAddressTableRVA;
DWORD UnloadInformationTableRVA;
DWORD TimeDateStamp;
} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR;
typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR;
/* generic relocation types */ /* generic relocation types */
#define IMAGE_REL_BASED_ABSOLUTE 0 #define IMAGE_REL_BASED_ABSOLUTE 0
#define IMAGE_REL_BASED_HIGH 1 #define IMAGE_REL_BASED_HIGH 1

26
tools/winedump/pe.c
View File

@ -864,17 +864,7 @@ static void dump_dir_imported_functions(void)
static void dump_dir_delay_imported_functions(void) static void dump_dir_delay_imported_functions(void)
{ {
unsigned directorySize; unsigned directorySize;
const struct ImgDelayDescr const IMAGE_DELAYLOAD_DESCRIPTOR *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize);
{
DWORD grAttrs;
DWORD szName;
DWORD phmod;
DWORD pIAT;
DWORD pINT;
DWORD pBoundIAT;
DWORD pUnloadIAT;
DWORD dwTimeStamp;
} *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize);
if (!importDesc) return; if (!importDesc) return;
@ -883,19 +873,19 @@ static void dump_dir_delay_imported_functions(void)
for (;;) for (;;)
{ {
const IMAGE_THUNK_DATA32* il; const IMAGE_THUNK_DATA32* il;
int offset = (importDesc->grAttrs & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; int offset = (importDesc->Attributes.AllAttributes & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase;
if (!importDesc->szName || !importDesc->pIAT || !importDesc->pINT) break; if (!importDesc->DllNameRVA || !importDesc->ImportAddressTableRVA || !importDesc->ImportNameTableRVA) break;
printf(" grAttrs %08x offset %08lx %s\n", importDesc->grAttrs, Offset(importDesc), printf(" grAttrs %08x offset %08lx %s\n", importDesc->Attributes.AllAttributes, Offset(importDesc),
(const char *)RVA(importDesc->szName - offset, sizeof(DWORD))); (const char *)RVA(importDesc->DllNameRVA - offset, sizeof(DWORD)));
printf(" Hint/Name Table: %08x\n", importDesc->pINT); printf(" Hint/Name Table: %08x\n", importDesc->ImportNameTableRVA);
printf(" TimeDateStamp: %08X (%s)\n", printf(" TimeDateStamp: %08X (%s)\n",
importDesc->dwTimeStamp, get_time_str(importDesc->dwTimeStamp)); importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp));
printf(" Ordn Name\n"); printf(" Ordn Name\n");
il = RVA(importDesc->pINT - offset, sizeof(DWORD)); il = RVA(importDesc->ImportNameTableRVA - offset, sizeof(DWORD));
if (!il) if (!il)
printf("Can't grab thunk data, going to next imported DLL\n"); printf("Can't grab thunk data, going to next imported DLL\n");