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
Releases
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
Johnny Cai
wine
Commits
7632452e
Commit
7632452e
authored
22 years ago
by
Andreas Mohr
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
- Improve error messages.
- Add error code mapping EPERM -> STATUS_ACCESS_DENIED.
parent
4532cc83
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/ntdll/cdrom.c
+4
-2
4 additions, 2 deletions
dlls/ntdll/cdrom.c
with
4 additions
and
2 deletions
dlls/ntdll/cdrom.c
+
4
−
2
View file @
7632452e
...
...
@@ -134,7 +134,7 @@ static int CDROM_GetIdeInterface(int dev, int* iface, int* device)
case
IDE6_MAJOR
:
*
iface
=
6
;
break
;
case
IDE7_MAJOR
:
*
iface
=
7
;
break
;
default:
FIXME
(
"major %d not supported
\n
"
,
major
(
st
.
st_rdev
));
FIXME
(
"
CD-ROM device with
major
ID
%d not supported
\n
"
,
major
(
st
.
st_rdev
));
}
*
device
=
(
minor
(
st
.
st_rdev
)
==
63
?
1
:
0
);
return
1
;
...
...
@@ -304,7 +304,7 @@ static int CDROM_Open(HANDLE hDevice, DWORD clientID)
cdrom_cache
[
dev
].
fd
=
open
(
DRIVE_GetDevice
(
dev
),
O_RDONLY
|
O_NONBLOCK
);
if
(
cdrom_cache
[
dev
].
fd
==
-
1
)
{
FIXME
(
"Can't open
%s: %s
\n
"
,
root
,
strerror
(
errno
));
FIXME
(
"Can't open
configured CD-ROM drive at %s (device %s): %s
\n
"
,
root
,
DRIVE_GetDevice
(
dev
)
,
strerror
(
errno
));
return
-
1
;
}
}
...
...
@@ -341,6 +341,8 @@ static DWORD CDROM_GetStatusCode(int io)
case
ENOMEDIUM
:
#endif
return
STATUS_NO_MEDIA_IN_DEVICE
;
case
EPERM
:
return
STATUS_ACCESS_DENIED
;
}
FIXME
(
"Unmapped error code %d: %s
\n
"
,
errno
,
strerror
(
errno
));
return
STATUS_IO_DEVICE_ERROR
;
...
...
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