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
fd5acd68
Commit
fd5acd68
authored
Nov 29, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mountmgr: Move the macOS device access check to the Unix library.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e54f6d8f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
device.c
dlls/mountmgr.sys/device.c
+1
-7
unixlib.c
dlls/mountmgr.sys/unixlib.c
+10
-0
unixlib.h
dlls/mountmgr.sys/unixlib.h
+1
-0
No files found.
dlls/mountmgr.sys/device.c
View file @
fd5acd68
...
...
@@ -915,13 +915,7 @@ static BOOL get_volume_device_info( struct volume *volume )
if
(
!
unix_device
)
return
FALSE
;
#ifdef __APPLE__
if
(
access
(
unix_device
,
R_OK
))
{
WARN
(
"Unable to open %s, not accessible
\n
"
,
debugstr_a
(
unix_device
));
return
FALSE
;
}
#endif
if
(
MOUNTMGR_CALL
(
check_device_access
,
volume
->
device
->
unix_device
))
return
FALSE
;
if
(
!
(
name
=
wine_get_dos_file_name
(
unix_device
)))
{
...
...
dlls/mountmgr.sys/unixlib.c
View file @
fd5acd68
...
...
@@ -319,6 +319,15 @@ static NTSTATUS match_unixdev( void *args )
return
!
stat
(
params
->
device
,
&
st
)
&&
st
.
st_rdev
==
params
->
unix_dev
;
}
static
NTSTATUS
check_device_access
(
void
*
args
)
{
#ifdef __APPLE__
const
char
*
unix_device
=
args
;
if
(
access
(
unix_device
,
R_OK
))
return
STATUS_ACCESS_DENIED
;
#endif
return
STATUS_SUCCESS
;
}
static
NTSTATUS
detect_serial_ports
(
void
*
args
)
{
const
struct
detect_ports_params
*
params
=
args
;
...
...
@@ -434,6 +443,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
get_volume_dos_devices
,
read_volume_file
,
match_unixdev
,
check_device_access
,
detect_serial_ports
,
detect_parallel_ports
,
set_shell_folder
,
...
...
dlls/mountmgr.sys/unixlib.h
View file @
fd5acd68
...
...
@@ -145,6 +145,7 @@ enum mountmgr_funcs
unix_get_volume_dos_devices
,
unix_read_volume_file
,
unix_match_unixdev
,
unix_check_device_access
,
unix_detect_serial_ports
,
unix_detect_parallel_ports
,
unix_set_shell_folder
,
...
...
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