Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
25db1c5d
Commit
25db1c5d
authored
Oct 03, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Always allocate dynamically relocatable dlls top-down.
parent
949920a7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
virtual.c
dlls/ntdll/unix/virtual.c
+5
-2
No files found.
dlls/ntdll/unix/virtual.c
View file @
25db1c5d
...
...
@@ -2857,6 +2857,8 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im
void
*
base
=
wine_server_get_ptr
(
image_info
->
base
);
NTSTATUS
status
;
ULONG_PTR
start
,
end
;
BOOL
top_down
=
(
image_info
->
image_charact
&
IMAGE_FILE_DLL
)
&&
(
image_info
->
image_flags
&
IMAGE_FLAGS_ImageDynamicallyRelocated
);
limit_low
=
max
(
limit_low
,
(
ULONG_PTR
)
address_space_start
);
/* make sure the DOS area remains free */
if
(
!
limit_high
)
limit_high
=
(
ULONG_PTR
)
user_space_limit
;
...
...
@@ -2865,6 +2867,7 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im
if
(
base
&&
(
ULONG_PTR
)
base
==
image_info
->
base
)
{
if
(
top_down
)
alloc_type
|=
MEM_TOP_DOWN
;
status
=
map_view
(
view_ret
,
base
,
size
,
alloc_type
,
vprot
,
limit_low
,
limit_high
,
0
);
if
(
!
status
)
return
status
;
}
...
...
@@ -2883,13 +2886,13 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im
}
if
(
start
<
end
&&
(
start
!=
limit_low
||
end
!=
limit_high
))
{
status
=
map_view
(
view_ret
,
NULL
,
size
,
alloc_type
,
vprot
,
start
,
end
,
0
);
status
=
map_view
(
view_ret
,
NULL
,
size
,
top_down
?
MEM_TOP_DOWN
:
0
,
vprot
,
start
,
end
,
0
);
if
(
!
status
)
return
status
;
}
/* then any suitable address */
return
map_view
(
view_ret
,
NULL
,
size
,
alloc_type
,
vprot
,
limit_low
,
limit_high
,
0
);
return
map_view
(
view_ret
,
NULL
,
size
,
top_down
?
MEM_TOP_DOWN
:
0
,
vprot
,
limit_low
,
limit_high
,
0
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment