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
Yoann Laissus
wine
Commits
2abe47bd
Commit
2abe47bd
authored
26 years ago
by
Peter Hunnisett
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Small, suboptimal, fix for 32 bit cdaudio open routines. Needs proper
32bit cdaudio bit support before it can be removed...
parent
34499cc6
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
multimedia/mcicda.c
+23
-2
23 additions, 2 deletions
multimedia/mcicda.c
with
23 additions
and
2 deletions
multimedia/mcicda.c
+
23
−
2
View file @
2abe47bd
...
...
@@ -5,6 +5,7 @@
* Copyright 1994 Martin Ayotte
*/
#include
<errno.h>
#include
<stdlib.h>
#include
<unistd.h>
#include
<string.h>
...
...
@@ -249,11 +250,31 @@ static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, void* lp, BOOL32 is32
TRACE
(
cdaudio
,
"MCI_OPEN_ELEMENT !
\n
"
);
/* return MCIERR_NO_ELEMENT_ALLOWED; */
}
memcpy
(
&
CDADev
[
wDevID
].
openParms
,
lp
,
sizeof
(
MCI_OPEN_PARMS16
));
if
(
is32
)
{
/* memcpy(&CDADev[wDevID].openParms, lp, sizeof(MCI_OPEN_PARMS32A)); */
/* This is an ugly temporary, hopefully, fix. Slap it in....*/
LPMCI_OPEN_PARMS32A
lpOpenParams
=
(
LPMCI_OPEN_PARMS32A
)
lp
;
CDADev
[
wDevID
].
openParms
.
dwCallback
=
lpOpenParams
->
dwCallback
;
CDADev
[
wDevID
].
openParms
.
wDeviceID
=
(
WORD
)
lpOpenParams
->
wDeviceID
;
CDADev
[
wDevID
].
openParms
.
wReserved0
=
0
;
/*????*/
CDADev
[
wDevID
].
openParms
.
lpstrDeviceType
=
lpOpenParams
->
lpstrDeviceType
;
CDADev
[
wDevID
].
openParms
.
lpstrElementName
=
lpOpenParams
->
lpstrElementName
;
CDADev
[
wDevID
].
openParms
.
lpstrAlias
=
lpOpenParams
->
lpstrAlias
;
}
else
{
memcpy
(
&
CDADev
[
wDevID
].
openParms
,
lp
,
sizeof
(
MCI_OPEN_PARMS16
));
}
CDADev
[
wDevID
].
wNotifyDeviceID
=
dwDeviceID
;
CDADev
[
wDevID
].
unixdev
=
open
(
CDAUDIO_DEV
,
O_RDONLY
,
0
);
if
(
CDADev
[
wDevID
].
unixdev
==
-
1
)
{
WARN
(
cdaudio
,
"can't open '%s' !
\n
"
,
CDAUDIO_DEV
);
WARN
(
cdaudio
,
"can't open '%s'!. errno=%d
\n
"
,
CDAUDIO_DEV
,
errno
);
perror
(
"can't open
\n
"
);
return
MCIERR_HARDWARE
;
}
CDADev
[
wDevID
].
mode
=
0
;
...
...
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