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
992e3c5d
Commit
992e3c5d
authored
Feb 10, 2016
by
Andrew Eikum
Committed by
Alexandre Julliard
Feb 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winmm: Reset dwUser in mixerGetLineInfo.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8a7e7ec6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
mixer.c
dlls/winmm/tests/mixer.c
+4
-0
waveform.c
dlls/winmm/waveform.c
+2
-0
No files found.
dlls/winmm/tests/mixer.c
View file @
992e3c5d
...
@@ -438,11 +438,13 @@ static void mixer_test_deviceA(int device)
...
@@ -438,11 +438,13 @@ static void mixer_test_deviceA(int device)
mixerlineA
.
cbStruct
=
sizeof
(
mixerlineA
);
mixerlineA
.
cbStruct
=
sizeof
(
mixerlineA
);
mixerlineA
.
dwDestination
=
d
;
mixerlineA
.
dwDestination
=
d
;
mixerlineA
.
dwUser
=
(
ULONG_PTR
)
0xdeadbeef
;
rc
=
mixerGetLineInfoA
(
mix
,
&
mixerlineA
,
MIXER_GETLINEINFOF_DESTINATION
);
rc
=
mixerGetLineInfoA
(
mix
,
&
mixerlineA
,
MIXER_GETLINEINFOF_DESTINATION
);
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): "
"mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
mmsys_error
(
rc
));
ok
(
mixerlineA
.
dwUser
==
0
,
"dwUser was not reset
\n
"
);
if
(
rc
==
MMSYSERR_NODRIVER
)
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
)
{
else
if
(
rc
==
MMSYSERR_NOERROR
)
{
...
@@ -822,11 +824,13 @@ static void mixer_test_deviceW(int device)
...
@@ -822,11 +824,13 @@ static void mixer_test_deviceW(int device)
mixerlineW
.
cbStruct
=
sizeof
(
mixerlineW
);
mixerlineW
.
cbStruct
=
sizeof
(
mixerlineW
);
mixerlineW
.
dwDestination
=
d
;
mixerlineW
.
dwDestination
=
d
;
mixerlineW
.
dwUser
=
(
ULONG_PTR
)
0xdeadbeef
;
rc
=
mixerGetLineInfoW
(
mix
,
&
mixerlineW
,
MIXER_GETLINEINFOF_DESTINATION
);
rc
=
mixerGetLineInfoW
(
mix
,
&
mixerlineW
,
MIXER_GETLINEINFOF_DESTINATION
);
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
ok
(
rc
==
MMSYSERR_NOERROR
||
rc
==
MMSYSERR_NODRIVER
,
"mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): "
"mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s
\n
"
,
"MMSYSERR_NOERROR expected, got %s
\n
"
,
mmsys_error
(
rc
));
mmsys_error
(
rc
));
ok
(
mixerlineW
.
dwUser
==
0
,
"dwUser was not reset
\n
"
);
if
(
rc
==
MMSYSERR_NODRIVER
)
if
(
rc
==
MMSYSERR_NODRIVER
)
trace
(
" No Driver
\n
"
);
trace
(
" No Driver
\n
"
);
else
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
else
if
(
rc
==
MMSYSERR_NOERROR
&&
winetest_interactive
)
{
...
...
dlls/winmm/waveform.c
View file @
992e3c5d
...
@@ -4287,6 +4287,8 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo
...
@@ -4287,6 +4287,8 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo
if
(
!
mmdevice
)
if
(
!
mmdevice
)
return
MMSYSERR_INVALHANDLE
;
return
MMSYSERR_INVALHANDLE
;
lpmliW
->
dwUser
=
0
;
switch
(
fdwInfo
&
MIXER_GETLINEINFOF_QUERYMASK
){
switch
(
fdwInfo
&
MIXER_GETLINEINFOF_QUERYMASK
){
case
MIXER_GETLINEINFOF_DESTINATION
:
case
MIXER_GETLINEINFOF_DESTINATION
:
return
WINMM_GetDestinationLineInfo
(
mmdevice
,
mmdev_index
,
lpmliW
,
return
WINMM_GetDestinationLineInfo
(
mmdevice
,
mmdev_index
,
lpmliW
,
...
...
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