Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
d9a6deff
Commit
d9a6deff
authored
11 years ago
by
André Zwing
Committed by
Alexandre Julliard
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR.
parent
4a1d4acd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/winnt.h
+22
-0
22 additions, 0 deletions
include/winnt.h
tools/winedump/pe.c
+8
-18
8 additions, 18 deletions
tools/winedump/pe.c
with
30 additions
and
18 deletions
include/winnt.h
+
22
−
0
View file @
d9a6deff
...
...
@@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION
#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 */
#define IMAGE_REL_BASED_ABSOLUTE 0
#define IMAGE_REL_BASED_HIGH 1
...
...
This diff is collapsed.
Click to expand it.
tools/winedump/pe.c
+
8
−
18
View file @
d9a6deff
...
...
@@ -864,17 +864,7 @@ static void dump_dir_imported_functions(void)
static
void
dump_dir_delay_imported_functions
(
void
)
{
unsigned
directorySize
;
const
struct
ImgDelayDescr
{
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
);
const
IMAGE_DELAYLOAD_DESCRIPTOR
*
importDesc
=
get_dir_and_size
(
IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT
,
&
directorySize
);
if
(
!
importDesc
)
return
;
...
...
@@ -883,19 +873,19 @@ static void dump_dir_delay_imported_functions(void)
for
(;;)
{
const
IMAGE_THUNK_DATA32
*
il
;
int
offset
=
(
importDesc
->
gr
Attrs
&
1
)
?
0
:
PE_nt_headers
->
OptionalHeader
.
ImageBase
;
int
offset
=
(
importDesc
->
Attr
ibutes
.
AllAttribute
s
&
1
)
?
0
:
PE_nt_headers
->
OptionalHeader
.
ImageBase
;
if
(
!
importDesc
->
sz
Name
||
!
importDesc
->
pIAT
||
!
importDesc
->
pINT
)
break
;
if
(
!
importDesc
->
Dll
Name
RVA
||
!
importDesc
->
ImportAddressTableRVA
||
!
importDesc
->
ImportNameTableRVA
)
break
;
printf
(
" grAttrs %08x offset %08lx %s
\n
"
,
importDesc
->
gr
Attrs
,
Offset
(
importDesc
),
(
const
char
*
)
RVA
(
importDesc
->
sz
Name
-
offset
,
sizeof
(
DWORD
)));
printf
(
" Hint/Name Table: %08x
\n
"
,
importDesc
->
pINT
);
printf
(
" grAttrs %08x offset %08lx %s
\n
"
,
importDesc
->
Attr
ibutes
.
AllAttribute
s
,
Offset
(
importDesc
),
(
const
char
*
)
RVA
(
importDesc
->
Dll
Name
RVA
-
offset
,
sizeof
(
DWORD
)));
printf
(
" Hint/Name Table: %08x
\n
"
,
importDesc
->
ImportNameTableRVA
);
printf
(
" TimeDateStamp: %08X (%s)
\n
"
,
importDesc
->
dw
TimeStamp
,
get_time_str
(
importDesc
->
dw
TimeStamp
));
importDesc
->
Time
Date
Stamp
,
get_time_str
(
importDesc
->
Time
Date
Stamp
));
printf
(
" Ordn Name
\n
"
);
il
=
RVA
(
importDesc
->
pINT
-
offset
,
sizeof
(
DWORD
));
il
=
RVA
(
importDesc
->
ImportNameTableRVA
-
offset
,
sizeof
(
DWORD
));
if
(
!
il
)
printf
(
"Can't grab thunk data, going to next imported DLL
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment