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
796cd56f
Commit
796cd56f
authored
Oct 03, 2020
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Oct 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mciwave: Use wide-char string literals.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
521f954d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
9 deletions
+4
-9
mciwave.c
dlls/mciwave/mciwave.c
+4
-9
No files found.
dlls/mciwave/mciwave.c
View file @
796cd56f
...
@@ -1683,15 +1683,11 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l
...
@@ -1683,15 +1683,11 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l
if
(
wmw
==
NULL
)
{
if
(
wmw
==
NULL
)
{
ret
=
MCIERR_INVALID_DEVICE_ID
;
ret
=
MCIERR_INVALID_DEVICE_ID
;
}
else
{
}
else
{
static
const
WCHAR
wszAudio
[]
=
{
'W'
,
'i'
,
'n'
,
'e'
,
'\''
,
's'
,
' '
,
'a'
,
'u'
,
'd'
,
'i'
,
'o'
,
' '
,
'p'
,
'l'
,
'a'
,
'y'
,
'e'
,
'r'
,
0
};
static
const
WCHAR
wszWaveIn
[]
=
{
'W'
,
'i'
,
'n'
,
'e'
,
' '
,
'W'
,
'a'
,
'v'
,
'e'
,
' '
,
'I'
,
'n'
,
0
};
static
const
WCHAR
wszWaveOut
[]
=
{
'W'
,
'i'
,
'n'
,
'e'
,
' '
,
'W'
,
'a'
,
'v'
,
'e'
,
' '
,
'O'
,
'u'
,
't'
,
0
};
switch
(
dwFlags
&
~
(
MCI_WAIT
|
MCI_NOTIFY
))
{
switch
(
dwFlags
&
~
(
MCI_WAIT
|
MCI_NOTIFY
))
{
case
MCI_INFO_PRODUCT
:
str
=
wszAudio
;
break
;
case
MCI_INFO_PRODUCT
:
str
=
L"Wine's audio player"
;
break
;
case
MCI_INFO_FILE
:
str
=
wmw
->
lpFileName
;
break
;
case
MCI_INFO_FILE
:
str
=
wmw
->
lpFileName
;
break
;
case
MCI_WAVE_INPUT
:
str
=
wszWaveIn
;
break
;
case
MCI_WAVE_INPUT
:
str
=
L"Wine Wave In"
;
break
;
case
MCI_WAVE_OUTPUT
:
str
=
wszWaveOut
;
break
;
case
MCI_WAVE_OUTPUT
:
str
=
L"Wine Wave Out"
;
break
;
default:
default:
WARN
(
"Don't know this info command (%u)
\n
"
,
dwFlags
);
WARN
(
"Don't know this info command (%u)
\n
"
,
dwFlags
);
ret
=
MCIERR_UNRECOGNIZED_KEYWORD
;
ret
=
MCIERR_UNRECOGNIZED_KEYWORD
;
...
@@ -1699,10 +1695,9 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l
...
@@ -1699,10 +1695,9 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l
}
}
if
(
!
ret
)
{
if
(
!
ret
)
{
if
(
lpParms
->
dwRetSize
)
{
if
(
lpParms
->
dwRetSize
)
{
WCHAR
zero
=
0
;
/* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize
/* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize
* to the number of characters written, excluding \0. */
* to the number of characters written, excluding \0. */
lstrcpynW
(
lpParms
->
lpstrReturn
,
str
?
str
:
&
zero
,
lpParms
->
dwRetSize
);
lstrcpynW
(
lpParms
->
lpstrReturn
,
str
?
str
:
L""
,
lpParms
->
dwRetSize
);
}
else
ret
=
MCIERR_PARAM_OVERFLOW
;
}
else
ret
=
MCIERR_PARAM_OVERFLOW
;
}
}
if
(
MMSYSERR_NOERROR
==
ret
&&
(
dwFlags
&
MCI_NOTIFY
))
if
(
MMSYSERR_NOERROR
==
ret
&&
(
dwFlags
&
MCI_NOTIFY
))
...
...
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