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
Alexey Alyaev
wine
Commits
2951862b
Commit
2951862b
authored
24 years ago
by
Andreas Mohr
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed verbose CD-ROM serial number warnings and some spelling errors.
parent
5b6bf340
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/winmm/mcicda/mcicda.c
+2
-2
2 additions, 2 deletions
dlls/winmm/mcicda/mcicda.c
misc/cdrom.c
+8
-8
8 additions, 8 deletions
misc/cdrom.c
with
10 additions
and
10 deletions
dlls/winmm/mcicda/mcicda.c
+
2
−
2
View file @
2951862b
...
...
@@ -503,7 +503,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm
TRACE
(
"MCI_STATUS_TIME_FORMAT=%08x!
\n
"
,
LOWORD
(
lpParms
->
dwReturn
));
ret
=
MCI_RESOURCE_RETURNED
;
break
;
case
4001
:
/* FIXME: for bog
g
us FullCD */
case
4001
:
/* FIXME: for bogus FullCD */
case
MCI_CDA_STATUS_TYPE_TRACK
:
if
(
!
(
dwFlags
&
MCI_TRACK
))
ret
=
MCIERR_MISSING_PARAMETER
;
...
...
@@ -711,7 +711,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
TRACE
(
"(%04X, %08lX, %p);
\n
"
,
wDevID
,
dwFlags
,
lpParms
);
if
(
wmcda
==
NULL
)
return
MCIERR_INVALID_DEVICE_ID
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
;
if
(
lpParms
==
NULL
)
return
MCIERR_NULL_PARAMETER_BLOCK
;
/*
TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat);
TRACE("dwAudio=%08lX\n", lpParms->dwAudio);
...
...
This diff is collapsed.
Click to expand it.
misc/cdrom.c
+
8
−
8
View file @
2951862b
...
...
@@ -362,13 +362,13 @@ BOOL CDROM_Audio_GetCDStatus(WINE_CDAUDIO* wcda)
wcda
->
sc
.
what
.
position
.
absaddr
.
msf
.
frame
;
#endif
#ifdef linux
TRACE
(
"%02u-%02u:%02u:%02u
\n
"
,
TRACE
(
"%02u-%02u:%02u:%02u
\n
"
,
wcda
->
sc
.
cdsc_trk
,
wcda
->
sc
.
cdsc_absaddr
.
msf
.
minute
,
wcda
->
sc
.
cdsc_absaddr
.
msf
.
second
,
wcda
->
sc
.
cdsc_absaddr
.
msf
.
frame
);
#else
TRACE
(
"%02u-%02u:%02u:%02u
\n
"
,
TRACE
(
"%02u-%02u:%02u:%02u
\n
"
,
wcda
->
sc
.
what
.
position
.
track_number
,
wcda
->
sc
.
what
.
position
.
absaddr
.
msf
.
minute
,
wcda
->
sc
.
what
.
position
.
absaddr
.
msf
.
second
,
...
...
@@ -588,9 +588,9 @@ DWORD CDROM_Audio_GetSerial(WINE_CDAUDIO* wcda)
/*
* wMagic collects the wFrames from track 1
* dwStart, dwEnd collect the begining and end of the disc respectively, in
* dwStart, dwEnd collect the begin
n
ing and end of the disc respectively, in
* frames.
* There i
s
is collected for correcting the serial when there are less than
* There i
t
is collected for correcting the serial when there are less than
* 3 tracks.
*/
wMagic
=
0
;
...
...
@@ -676,9 +676,9 @@ DWORD CDROM_GetSerial(int drive)
WINE_CDAUDIO
wcda
;
DWORD
serial
=
0
;
/* EXPIRES 01.01.200
1
*/
FIXME
(
"CD-ROM serial number calculation might fail.
\n
"
);
FIXME
(
"Please test with as many exotic CDs as possible !
\n
"
);
/* EXPIRES 01.01.200
2
*/
WARN
(
"CD-ROM serial number calculation might fail.
\n
"
);
WARN
(
"Please test with as many exotic CDs as possible !
\n
"
);
if
(
!
(
CDROM_Open
(
&
wcda
,
drive
)))
{
...
...
@@ -706,7 +706,7 @@ DWORD CDROM_GetSerial(int drive)
p
=
(
media
==
CDS_AUDIO
)
?
"Audio "
:
(
media
>
CDS_AUDIO
)
?
"Data "
:
""
;
if
(
serial
)
FIXM
E
(
"%sCD serial number is %04x-%04x.
\n
"
,
TRAC
E
(
"%sCD serial number is %04x-%04x.
\n
"
,
p
,
HIWORD
(
serial
),
LOWORD
(
serial
));
else
ERR
(
"couldn't get %sCD serial !
\n
"
,
p
);
...
...
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