Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
b7fafabc
Commit
b7fafabc
authored
Sep 23, 2021
by
Paul Gofman
Committed by
Alexandre Julliard
Sep 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Factor out get_vprot_range_size() function.
Signed-off-by:
Paul Gofman
<
pgofman@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4deaed0f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
11 deletions
+29
-11
virtual.c
dlls/ntdll/unix/virtual.c
+29
-11
No files found.
dlls/ntdll/unix/virtual.c
View file @
b7fafabc
...
...
@@ -944,6 +944,24 @@ static BYTE get_page_vprot( const void *addr )
/***********************************************************************
* get_vprot_range_size
*
* Return the size of the region with equal masked vprot byte.
* Also return the protections for the first page.
* The function assumes that base and size are page aligned and
* base + size does not wrap around. */
static
SIZE_T
get_vprot_range_size
(
char
*
base
,
SIZE_T
size
,
BYTE
mask
,
BYTE
*
vprot
)
{
char
*
addr
;
*
vprot
=
get_page_vprot
(
base
);
for
(
addr
=
base
+
page_size
;
addr
!=
base
+
size
;
addr
+=
page_size
)
if
((
*
vprot
^
get_page_vprot
(
addr
))
&
mask
)
break
;
return
addr
-
base
;
}
/***********************************************************************
* set_page_vprot
*
* Set a range of page protection bytes.
...
...
@@ -2047,18 +2065,21 @@ done:
*/
static
SIZE_T
get_committed_size
(
struct
file_view
*
view
,
void
*
base
,
BYTE
*
vprot
)
{
SIZE_T
i
,
star
t
;
SIZE_T
offse
t
;
start
=
((
char
*
)
base
-
(
char
*
)
view
->
base
)
>>
page_shift
;
*
vprot
=
get_page_vprot
(
base
)
;
base
=
ROUND_ADDR
(
base
,
page_mask
)
;
offset
=
(
char
*
)
base
-
(
char
*
)
view
->
base
;
if
(
view
->
protect
&
SEC_RESERVE
)
{
SIZE_T
ret
=
0
;
*
vprot
=
get_page_vprot
(
base
);
SERVER_START_REQ
(
get_mapping_committed_range
)
{
req
->
base
=
wine_server_client_ptr
(
view
->
base
);
req
->
offset
=
start
<<
page_shif
t
;
req
->
offset
=
offse
t
;
if
(
!
wine_server_call
(
req
))
{
ret
=
reply
->
size
;
...
...
@@ -2072,9 +2093,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro
SERVER_END_REQ
;
return
ret
;
}
for
(
i
=
start
+
1
;
i
<
view
->
size
>>
page_shift
;
i
++
)
if
((
*
vprot
^
get_page_vprot
(
(
char
*
)
view
->
base
+
(
i
<<
page_shift
)
))
&
VPROT_COMMITTED
)
break
;
return
(
i
-
start
)
<<
page_shift
;
return
get_vprot_range_size
(
base
,
view
->
size
-
offset
,
VPROT_COMMITTED
,
vprot
);
}
...
...
@@ -4196,7 +4216,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr,
else
{
BYTE
vprot
;
char
*
ptr
;
SIZE_T
range_size
=
get_committed_size
(
view
,
base
,
&
vprot
);
info
->
State
=
(
vprot
&
VPROT_COMMITTED
)
?
MEM_COMMIT
:
MEM_RESERVE
;
...
...
@@ -4205,9 +4224,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr,
if
(
view
->
protect
&
SEC_IMAGE
)
info
->
Type
=
MEM_IMAGE
;
else
if
(
view
->
protect
&
(
SEC_FILE
|
SEC_RESERVE
|
SEC_COMMIT
))
info
->
Type
=
MEM_MAPPED
;
else
info
->
Type
=
MEM_PRIVATE
;
for
(
ptr
=
base
;
ptr
<
base
+
range_size
;
ptr
+=
page_size
)
if
((
get_page_vprot
(
ptr
)
^
vprot
)
&
~
VPROT_WRITEWATCH
)
break
;
info
->
RegionSize
=
ptr
-
base
;
info
->
RegionSize
=
get_vprot_range_size
(
base
,
range_size
,
~
VPROT_WRITEWATCH
,
&
vprot
);
}
server_leave_uninterrupted_section
(
&
virtual_mutex
,
&
sigset
);
...
...
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