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
4f0743bf
Commit
4f0743bf
authored
Feb 20, 2013
by
Jörg Höhle
Committed by
Alexandre Julliard
Feb 22, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winmm: WAVE_OPEN_QUERY causes no WIM/WOM_OPEN notification.
parent
c5e129a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
wave.c
dlls/winmm/tests/wave.c
+10
-0
waveform.c
dlls/winmm/waveform.c
+2
-2
No files found.
dlls/winmm/tests/wave.c
View file @
4f0743bf
...
...
@@ -854,6 +854,16 @@ static void wave_out_test_deviceOut(int device, double duration,
rc
=
WaitForSingleObject
(
hevent
,
1500
);
ok
(
rc
==
WAIT_OBJECT_0
,
"missing WOM_CLOSE notification
\n
"
);
wout
=
(
HWAVEOUT
)
0xdeadf00d
;
rc
=
waveOutOpen
(
&
wout
,
device
,
pwfx
,
callback
,
callback_instance
,
flags
|
WAVE_FORMAT_QUERY
);
ok
(
rc
==
MMSYSERR_NOERROR
,
"WAVE_FORMAT_QUERY(%s): rc=%s
\n
"
,
dev_name
(
device
),
wave_out_error
(
rc
));
ok
(
wout
==
(
HWAVEOUT
)
0xdeadf00d
,
"WAVE_FORMAT_QUERY handle %p
\n
"
,
wout
);
rc
=
WaitForSingleObject
(
hevent
,
20
);
ok
(
rc
==
WAIT_TIMEOUT
,
"Notification from %s rc=%x
\n
"
,
wave_open_flags
(
flags
|
WAVE_FORMAT_QUERY
),
rc
);
HeapFree
(
GetProcessHeap
(),
0
,
buffer
);
EXIT:
if
((
flags
&
CALLBACK_TYPEMASK
)
==
CALLBACK_THREAD
)
{
...
...
dlls/winmm/waveform.c
View file @
4f0743bf
...
...
@@ -2726,7 +2726,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID,
info
.
reset
=
TRUE
;
res
=
SendMessageW
(
g_devices_hwnd
,
WODM_OPEN
,
(
DWORD_PTR
)
&
info
,
0
);
if
(
res
!=
MMSYSERR_NOERROR
)
if
(
res
!=
MMSYSERR_NOERROR
||
(
dwFlags
&
WAVE_FORMAT_QUERY
)
)
return
res
;
if
(
lphWaveOut
)
...
...
@@ -3356,7 +3356,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID,
info
.
reset
=
TRUE
;
res
=
SendMessageW
(
g_devices_hwnd
,
WIDM_OPEN
,
(
DWORD_PTR
)
&
info
,
0
);
if
(
res
!=
MMSYSERR_NOERROR
)
if
(
res
!=
MMSYSERR_NOERROR
||
(
dwFlags
&
WAVE_FORMAT_QUERY
)
)
return
res
;
if
(
lphWaveIn
)
...
...
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