No subject

=3D?utf-8?q?J=3DC3=3DB6rg=3D20H=3DC3=3DB6hle?=3D hoehle at users.source=
Thu Feb 24 14:23:06 CST 2011


forge.net>
Date: Tue, 8 Mar 2011 09:28:58 +0100
Subject: [PATCH 4/4] winmm: waveOutOpen succeeds despite bad callback flags=
.

---
 dlls/winmm/tests/wave.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index c85f13c..5c5dbe6 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -1149,6 +1149,23 @@ static void wave_out_test_device(UINT_PTR device)
         waveOutClose(wout);
     }
=20
+    /* Testing invalid callback flags */
+    format.wFormatTag=3DWAVE_FORMAT_PCM;
+    format.nChannels=3D2;
+    format.wBitsPerSample=3D16;
+    format.nSamplesPerSec=3D22050;
+    format.nBlockAlign=3Dformat.nChannels*format.wBitsPerSample/8;
+    format.nAvgBytesPerSec=3Dformat.nSamplesPerSec*format.nBlockAlign;
+    format.cbSize=3D0;
+    oformat=3Dformat;
+    rc=3DwaveOutOpen(&wout,device,&format,0,0,CALLBACK_TYPEMASK);
+    ok(rc=3D=3DMMSYSERR_NOERROR,
+       "waveOutOpen(%s) with bad callback flags: returned %s\n",dev_name(d=
evice),wave_out_error(rc));
+    if (rc=3D=3DMMSYSERR_NOERROR) {
+        rc =3D waveOutClose(wout);
+        ok(rc=3D=3DMMSYSERR_NOERROR,"waveOutClose(%s): rc=3D%s\n",dev_name=
(device),wave_out_error(rc));
+    }
+
     /* try some non PCM formats */
     format.wFormatTag=3DWAVE_FORMAT_MULAW;
     format.nChannels=3D1;
--=20
1.5.6.3


--_002_97D47811BFBA4B48A7089A20E4C7AF0208AD6CCBACHE110881EMEA1_
Content-Type: application/octet-stream;
	name="0003-winmm-Audio-drivers-unconditionally-invoke-DriverCa.patch"
Content-Description: 0003-winmm-Audio-drivers-unconditionally-invoke-DriverCa.patch
Content-Disposition: attachment;
	filename="0003-winmm-Audio-drivers-unconditionally-invoke-DriverCa.patch";
	size=5456; creation-date="Mon, 11 Apr 2011 07:58:30 GMT";
	modification-date="Mon, 11 Apr 2011 07:58:00 GMT"
Content-Transfer-Encoding: base64

RnJvbSA3NGI5YTBlNjExYzA2NTMyOGI3NWM1NDM0ZDM0NDlmMDEyZDYyMzA4IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiA9P3V0Zi04P3E/Sj1DMz1CNnJnPTIwSD1DMz1CNmhsZT89IDxo
b2VobGVAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRlOiBUdWUsIDIyIE1hciAyMDExIDIwOjM3
OjE3ICswMTAwClN1YmplY3Q6IFtQQVRDSCAzLzRdIHdpbm1tOiBBdWRpbyBkcml2ZXJzIHVuY29u
ZGl0aW9uYWxseSBpbnZva2UgRHJpdmVyQ2FsbGJhY2suCgotLS0KIGRsbHMvd2luZWFsc2EuZHJ2
L3dhdmVpbi5jICAgICB8ICAgIDcgKystLS0tLQogZGxscy93aW5lYWxzYS5kcnYvd2F2ZW91dC5j
ICAgIHwgICAgNyArKy0tLS0tCiBkbGxzL3dpbmVjb3JlYXVkaW8uZHJ2L2F1ZGlvLmMgfCAgIDIw
ICsrKysrKy0tLS0tLS0tLS0tLS0tCiBkbGxzL3dpbmVvc3MuZHJ2L2F1ZGlvLmMgICAgICAgfCAg
IDE4ICsrKysrKy0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCsp
LCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kbGxzL3dpbmVhbHNhLmRydi93YXZlaW4u
YyBiL2RsbHMvd2luZWFsc2EuZHJ2L3dhdmVpbi5jCmluZGV4IDNhMmZhZDguLjY3NzU5YTYgMTAw
NjQ0Ci0tLSBhL2RsbHMvd2luZWFsc2EuZHJ2L3dhdmVpbi5jCisrKyBiL2RsbHMvd2luZWFsc2Eu
ZHJ2L3dhdmVpbi5jCkBAIC03NCwxMSArNzQsOCBAQCBzdGF0aWMgdm9pZCB3aWROb3RpZnlDbGll
bnQoV0lORV9XQVZFREVWKiB3d2ksIFdPUkQgd01zZywgRFdPUkRfUFRSIGR3UGFyYW0xLCBEVwog
ICAgY2FzZSBXSU1fT1BFTjoKICAgIGNhc2UgV0lNX0NMT1NFOgogICAgY2FzZSBXSU1fREFUQToK
LSAgICAgICBpZiAod3dpLT53RmxhZ3MgIT0gRENCX05VTEwgJiYKLQkgICAhRHJpdmVyQ2FsbGJh
Y2sod3dpLT53YXZlRGVzYy5kd0NhbGxiYWNrLCB3d2ktPndGbGFncywgKEhEUlZSKXd3aS0+d2F2
ZURlc2MuaFdhdmUsCi0JCQkgICB3TXNnLCB3d2ktPndhdmVEZXNjLmR3SW5zdGFuY2UsIGR3UGFy
YW0xLCBkd1BhcmFtMikpIHsKLQkgICBXQVJOKCJjYW4ndCBub3RpZnkgY2xpZW50ICFcbiIpOwot
ICAgICAgIH0KKyAgICAgICBEcml2ZXJDYWxsYmFjayh3d2ktPndhdmVEZXNjLmR3Q2FsbGJhY2ss
IHd3aS0+d0ZsYWdzLCAoSERSVlIpd3dpLT53YXZlRGVzYy5oV2F2ZSwKKyAgICAgICAgICAgICAg
ICAgICAgICB3TXNnLCB3d2ktPndhdmVEZXNjLmR3SW5zdGFuY2UsIGR3UGFyYW0xLCBkd1BhcmFt
Mik7CiAgICAgICAgYnJlYWs7CiAgICBkZWZhdWx0OgogICAgICAgIEZJWE1FKCJVbmtub3duIGNh
bGxiYWNrIG1lc3NhZ2UgJXVcbiIsIHdNc2cpOwpkaWZmIC0tZ2l0IGEvZGxscy93aW5lYWxzYS5k
cnYvd2F2ZW91dC5jIGIvZGxscy93aW5lYWxzYS5kcnYvd2F2ZW91dC5jCmluZGV4IDEyN2U1MGUu
LjkyOTA3NzggMTAwNjQ0Ci0tLSBhL2RsbHMvd2luZWFsc2EuZHJ2L3dhdmVvdXQuYworKysgYi9k
bGxzL3dpbmVhbHNhLmRydi93YXZlb3V0LmMKQEAgLTc1LDExICs3NSw4IEBAIHN0YXRpYyB2b2lk
IHdvZE5vdGlmeUNsaWVudChXSU5FX1dBVkVERVYqIHd3bywgV09SRCB3TXNnLCBEV09SRF9QVFIg
ZHdQYXJhbTEsIERXCiAgICAgY2FzZSBXT01fT1BFTjoKICAgICBjYXNlIFdPTV9DTE9TRToKICAg
ICBjYXNlIFdPTV9ET05FOgotCWlmICh3d28tPndGbGFncyAhPSBEQ0JfTlVMTCAmJgotCSAgICAh
RHJpdmVyQ2FsbGJhY2sod3dvLT53YXZlRGVzYy5kd0NhbGxiYWNrLCB3d28tPndGbGFncywgKEhE
UlZSKXd3by0+d2F2ZURlc2MuaFdhdmUsCi0JCQkgICAgd01zZywgd3dvLT53YXZlRGVzYy5kd0lu
c3RhbmNlLCBkd1BhcmFtMSwgZHdQYXJhbTIpKSB7Ci0JICAgIFdBUk4oImNhbid0IG5vdGlmeSBj
bGllbnQgIVxuIik7Ci0JfQorICAgICAgICBEcml2ZXJDYWxsYmFjayh3d28tPndhdmVEZXNjLmR3
Q2FsbGJhY2ssIHd3by0+d0ZsYWdzLCAoSERSVlIpd3dvLT53YXZlRGVzYy5oV2F2ZSwKKyAgICAg
ICAgICAgICAgICAgICAgICAgd01zZywgd3dvLT53YXZlRGVzYy5kd0luc3RhbmNlLCBkd1BhcmFt
MSwgZHdQYXJhbTIpOwogCWJyZWFrOwogICAgIGRlZmF1bHQ6CiAJRklYTUUoIlVua25vd24gY2Fs
bGJhY2sgbWVzc2FnZSAldVxuIiwgd01zZyk7CmRpZmYgLS1naXQgYS9kbGxzL3dpbmVjb3JlYXVk
aW8uZHJ2L2F1ZGlvLmMgYi9kbGxzL3dpbmVjb3JlYXVkaW8uZHJ2L2F1ZGlvLmMKaW5kZXggZmFm
NGY1NC4uNDM0MjBiMSAxMDA2NDQKLS0tIGEvZGxscy93aW5lY29yZWF1ZGlvLmRydi9hdWRpby5j
CisrKyBiL2RsbHMvd2luZWNvcmVhdWRpby5kcnYvYXVkaW8uYwpAQCAtNzkyLDEzICs3OTIsOSBA
QCBzdGF0aWMgdm9pZCB3b2ROb3RpZnlDbGllbnQoV0lORV9XQVZFT1VUX0lOU1RBTkNFKiB3d28s
IFdPUkQgd01zZywgRFdPUkRfUFRSIGR3UAogICAgICAgICBjYXNlIFdPTV9PUEVOOgogICAgICAg
ICBjYXNlIFdPTV9DTE9TRToKICAgICAgICAgY2FzZSBXT01fRE9ORToKLSAgICAgICAgICAgIGlm
ICh3d28tPndGbGFncyAhPSBEQ0JfTlVMTCAmJgotICAgICAgICAgICAgICAgICFEcml2ZXJDYWxs
YmFjayh3d28tPndhdmVEZXNjLmR3Q2FsbGJhY2ssIHd3by0+d0ZsYWdzLAotICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAoSERSVlIpd3dvLT53YXZlRGVzYy5oV2F2ZSwgd01zZywgd3dv
LT53YXZlRGVzYy5kd0luc3RhbmNlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk
d1BhcmFtMSwgZHdQYXJhbTIpKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIFdBUk4o
ImNhbid0IG5vdGlmeSBjbGllbnQgIVxuIik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBE
cml2ZXJDYWxsYmFjayh3d28tPndhdmVEZXNjLmR3Q2FsbGJhY2ssIHd3by0+d0ZsYWdzLAorICAg
ICAgICAgICAgICAgICAgICAgICAgICAgKEhEUlZSKXd3by0+d2F2ZURlc2MuaFdhdmUsIHdNc2cs
IHd3by0+d2F2ZURlc2MuZHdJbnN0YW5jZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGR3
UGFyYW0xLCBkd1BhcmFtMik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoK
ICAgICAgICAgICAgIEZJWE1FKCJVbmtub3duIGNhbGxiYWNrIG1lc3NhZ2UgJXVcbiIsIHdNc2cp
OwpAQCAtMTc1MiwxMyArMTc0OCw5IEBAIHN0YXRpYyB2b2lkIHdpZE5vdGlmeUNsaWVudChXSU5F
X1dBVkVJTiogd3dpLCBXT1JEIHdNc2csIERXT1JEX1BUUiBkd1BhcmFtMSwgRFdPCiAgICAgICAg
IGNhc2UgV0lNX09QRU46CiAgICAgICAgIGNhc2UgV0lNX0NMT1NFOgogICAgICAgICBjYXNlIFdJ
TV9EQVRBOgotICAgICAgICAgICAgaWYgKHd3aS0+d0ZsYWdzICE9IERDQl9OVUxMICYmCi0gICAg
ICAgICAgICAgICAgIURyaXZlckNhbGxiYWNrKHd3aS0+d2F2ZURlc2MuZHdDYWxsYmFjaywgd3dp
LT53RmxhZ3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChIRFJWUil3d2ktPndh
dmVEZXNjLmhXYXZlLCB3TXNnLCB3d2ktPndhdmVEZXNjLmR3SW5zdGFuY2UsCi0gICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIGR3UGFyYW0xLCBkd1BhcmFtMikpCi0gICAgICAgICAgICB7
Ci0gICAgICAgICAgICAgICAgV0FSTigiY2FuJ3Qgbm90aWZ5IGNsaWVudCAhXG4iKTsKLSAgICAg
ICAgICAgIH0KKyAgICAgICAgICAgIERyaXZlckNhbGxiYWNrKHd3aS0+d2F2ZURlc2MuZHdDYWxs
YmFjaywgd3dpLT53RmxhZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAoSERSVlIpd3dp
LT53YXZlRGVzYy5oV2F2ZSwgd01zZywgd3dpLT53YXZlRGVzYy5kd0luc3RhbmNlLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICAgZHdQYXJhbTEsIGR3UGFyYW0yKTsKICAgICAgICAgICAgIGJy
ZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgRklYTUUoIlVua25vd24gY2FsbGJh
Y2sgbWVzc2FnZSAldVxuIiwgd01zZyk7CmRpZmYgLS1naXQgYS9kbGxzL3dpbmVvc3MuZHJ2L2F1
ZGlvLmMgYi9kbGxzL3dpbmVvc3MuZHJ2L2F1ZGlvLmMKaW5kZXggN2UxY2E0My4uMGUyN2UyMSAx
MDA2NDQKLS0tIGEvZGxscy93aW5lb3NzLmRydi9hdWRpby5jCisrKyBiL2RsbHMvd2luZW9zcy5k
cnYvYXVkaW8uYwpAQCAtMTQ0NCwxMiArMTQ0NCw5IEBAIHN0YXRpYyB2b2lkIHdvZE5vdGlmeUNs
aWVudChXSU5FX1dBVkVPVVQqIHd3bywgV09SRCB3TXNnLCBEV09SRF9QVFIgZHdQYXJhbTEsIERX
CiAgICAgY2FzZSBXT01fT1BFTjoKICAgICBjYXNlIFdPTV9DTE9TRToKICAgICBjYXNlIFdPTV9E
T05FOgotCWlmICh3d28tPndGbGFncyAhPSBEQ0JfTlVMTCAmJgotCSAgICAhRHJpdmVyQ2FsbGJh
Y2sod3dvLT53YXZlRGVzYy5kd0NhbGxiYWNrLCB3d28tPndGbGFncywKLQkJCSAgICAoSERSVlIp
d3dvLT53YXZlRGVzYy5oV2F2ZSwgd01zZywKLQkJCSAgICB3d28tPndhdmVEZXNjLmR3SW5zdGFu
Y2UsIGR3UGFyYW0xLCBkd1BhcmFtMikpIHsKLQkgICAgV0FSTigiY2FuJ3Qgbm90aWZ5IGNsaWVu
dCAhXG4iKTsKLQl9CisgICAgICAgIERyaXZlckNhbGxiYWNrKHd3by0+d2F2ZURlc2MuZHdDYWxs
YmFjaywgd3dvLT53RmxhZ3MsCisgICAgICAgICAgICAgICAgICAgICAgIChIRFJWUil3d28tPndh
dmVEZXNjLmhXYXZlLCB3TXNnLAorICAgICAgICAgICAgICAgICAgICAgICB3d28tPndhdmVEZXNj
LmR3SW5zdGFuY2UsIGR3UGFyYW0xLCBkd1BhcmFtMik7CiAJYnJlYWs7CiAgICAgZGVmYXVsdDoK
IAlGSVhNRSgiVW5rbm93biBjYWxsYmFjayBtZXNzYWdlICV1XG4iLCB3TXNnKTsKQEAgLTI0Nzgs
MTIgKzI0NzUsOSBAQCBzdGF0aWMgdm9pZCB3aWROb3RpZnlDbGllbnQoV0lORV9XQVZFSU4qIHd3
aSwgV09SRCB3TXNnLCBEV09SRF9QVFIgZHdQYXJhbTEsIERXTwogICAgIGNhc2UgV0lNX09QRU46
CiAgICAgY2FzZSBXSU1fQ0xPU0U6CiAgICAgY2FzZSBXSU1fREFUQToKLQlpZiAod3dpLT53Rmxh
Z3MgIT0gRENCX05VTEwgJiYKLQkgICAgIURyaXZlckNhbGxiYWNrKHd3aS0+d2F2ZURlc2MuZHdD
YWxsYmFjaywgd3dpLT53RmxhZ3MsCi0JCQkgICAgKEhEUlZSKXd3aS0+d2F2ZURlc2MuaFdhdmUs
IHdNc2csCi0JCQkgICAgd3dpLT53YXZlRGVzYy5kd0luc3RhbmNlLCBkd1BhcmFtMSwgZHdQYXJh
bTIpKSB7Ci0JICAgIFdBUk4oImNhbid0IG5vdGlmeSBjbGllbnQgIVxuIik7Ci0JfQorICAgICAg
ICBEcml2ZXJDYWxsYmFjayh3d2ktPndhdmVEZXNjLmR3Q2FsbGJhY2ssIHd3aS0+d0ZsYWdzLAor
ICAgICAgICAgICAgICAgICAgICAgICAoSERSVlIpd3dpLT53YXZlRGVzYy5oV2F2ZSwgd01zZywK
KyAgICAgICAgICAgICAgICAgICAgICAgd3dpLT53YXZlRGVzYy5kd0luc3RhbmNlLCBkd1BhcmFt
MSwgZHdQYXJhbTIpOwogCWJyZWFrOwogICAgIGRlZmF1bHQ6CiAJRklYTUUoIlVua25vd24gY2Fs
bGJhY2sgbWVzc2FnZSAldVxuIiwgd01zZyk7Ci0tIAoxLjUuNi4zCgo=

--_002_97D47811BFBA4B48A7089A20E4C7AF0208AD6CCBACHE110881EMEA1_--



More information about the wine-patches mailing list