November 2015 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDOMAttribute2::put_value implementation.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: b73f9d2e46f4e6dadcc5b92b12796b505c94ee15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73f9d2e46f4e6dadcc5b92b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 25 11:56:59 2015 +0100 mshtml: Added IHTMLDOMAttribute2::put_value implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 0302ee9..446cb6f 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -296,8 +296,13 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_name(IHTMLDOMAttribute2 *iface, BSTR static HRESULT WINAPI HTMLDOMAttribute2_put_value(IHTMLDOMAttribute2 *iface, BSTR v) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + VARIANT var; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = v; + return IHTMLDOMAttribute_put_nodeValue(&This->IHTMLDOMAttribute_iface, var); } static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bc60ff0..b9f7935 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4762,6 +4762,20 @@ static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); } +#define put_attr_value(a,b) _put_attr_value(__LINE__,a,b) +static void _put_attr_value(unsigned line, IHTMLDOMAttribute *attr, const char *value) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + BSTR str = a2bstr(value); + HRESULT hres; + + hres = IHTMLDOMAttribute2_put_value(attr2, str); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); + + IHTMLDOMAttribute2_Release(attr2); + SysFreeString(str); +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -8385,6 +8399,12 @@ static void test_attr(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + put_attr_value(attr, "divid3"); + + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "divid3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); @@ -8420,6 +8440,11 @@ static void test_attr(IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); + put_attr_value(attr, "160"); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "160"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE);

1 0

Alistair Leslie-Hughes : include: Add d3dx10async.h.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 66f4015781f9b36036ca232167affef04ea15e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f4015781f9b36036ca23216… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 19 17:48:00 2015 +1100 include: Add d3dx10async.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10async.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 27f0ef6..ea0e3fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -246,6 +246,7 @@ HEADER_SRCS = \ d3dtypes.h \ d3dvec.inl \ d3dx10.h \ + d3dx10async.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 6333349..df7cdb1 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -28,5 +28,6 @@ #include "d3d10.h" #include "d3dx10core.h" +#include "d3dx10async.h" #endif diff --git a/include/d3dx10async.h b/include/d3dx10async.h new file mode 100644 index 0000000..85219d2 --- /dev/null +++ b/include/d3dx10async.h @@ -0,0 +1,43 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX10ASYNC_H__ +#define __D3DX10ASYNC_H__ + + +HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, + ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, + ID3D10Blob **errors, HRESULT *hresult); + +#endif

1 0

Stefan Dösinger : d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int).
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 1e7825710964d3c654815c780cd09e21e114a580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7825710964d3c654815c780… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:57 2015 +0100 d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 09c055e..5e8d51a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2138,21 +2138,21 @@ unsigned short float_32_to_16(const float in) if (isnan(in)) return (sign ? 0xffff : 0x7fff); if (in == 0.0f) return (sign ? 0x8000 : 0x0000); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp *= 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } exp += 10; /* Normalize the mantissa */ @@ -2190,7 +2190,7 @@ unsigned short float_32_to_16(const float in) exp = origexp; /* the 13 extra bits from single precision are used for rounding */ - mantissa = (unsigned int)(tmp * powf(2, 13)); + mantissa = (unsigned int)(tmp * (1u << 13)); mantissa >>= 1 - exp; /* denormalize */ mantissa -= ~(mantissa >> 13) & 1; /* round half to even */

1 0

Francois Gouget : xaudio2_7: Make some functions static.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: c9a040b5106c5b3ac21eaadb39186d69b5608401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a040b5106c5b3ac21eaadb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:01 2015 +0100 xaudio2_7: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 14 +++++++------- dlls/xaudio2_7/xapofx.c | 2 +- dlls/xaudio2_7/xaudio_dll.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 8eb0efc..ffe6531 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -94,7 +94,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); -XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); } @@ -581,7 +581,7 @@ const IXAudio27Vtbl XAudio27_Vtbl = { XA27_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio23SourceVoice_iface); } @@ -830,7 +830,7 @@ const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl = { XA23SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio23SubmixVoice_iface); } @@ -1007,7 +1007,7 @@ const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl = { XA23SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23MasteringVoice_iface); } @@ -1436,7 +1436,7 @@ const IXAudio22Vtbl XAudio22_Vtbl = { XA22_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio20SourceVoice_iface); } @@ -1686,7 +1686,7 @@ const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl = { XA20SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio20SubmixVoice_iface); } @@ -1864,7 +1864,7 @@ const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl = { XA20SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio20MasteringVoice_iface); } diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 0fd008a..e4e4bf8 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -648,7 +648,7 @@ struct xapo_cf { const CLSID *class; }; -struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) +static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 15b3ab9..73cf63d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1801,7 +1801,7 @@ struct xaudio2_cf { DWORD version; }; -struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) +static struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xaudio2_cf, IClassFactory_iface); }

1 0

Bruno Jesus : msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: cb5ba51f94eb6e61e50763d149154d210df8bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5ba51f94eb6e61e50763d14… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 24 17:08:00 2015 +0800 msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4c9dca0..bb4ccc5 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -527,7 +527,7 @@ static void test_prepareheader(void) WAVEFORMATEX dst; MMRESULT mr; ACMSTREAMHEADER hdr; - BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[2048], input[512]; ADPCMCOEFSET *coef; src = (ADPCMWAVEFORMAT*)buf; @@ -567,6 +567,7 @@ static void test_prepareheader(void) mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + memset(input, 0, sizeof(input)); memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); hdr.pbSrc = input; @@ -594,6 +595,95 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + /* The 2 next tests are related to Lost Horizon (bug 24723) */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + if (sizeof(void *) == 4) /* 64 bit fails on this test */ + { + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + } + else + ok(mr == MMSYSERR_INVALPARAM, "expected 11, got %d\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = 24; + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + mr = acmStreamPrepareHeader(has, &hdr, 0); +todo_wine { + ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); + ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); +} + /* Less output space than required */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = 32; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); +todo_wine + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); + mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus);

1 0

Bruno Jesus : ws2_32/tests: Add more tests related to WSACleanup.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 7f06cd4ca27cc99787929438d413d0ed1f290489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f06cd4ca27cc99787929438d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 25 11:12:11 2015 +0800 ws2_32/tests: Add more tests related to WSACleanup. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 73 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8676b07..045b991 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -213,11 +213,11 @@ static int tcp_socketpair(SOCKET *src, SOCKET *dst) *src = INVALID_SOCKET; *dst = INVALID_SOCKET; - *src = socket(AF_INET, SOCK_STREAM, 0); + *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (*src == INVALID_SOCKET) goto end; - server = socket(AF_INET, SOCK_STREAM, 0); + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (server == INVALID_SOCKET) goto end; @@ -1101,9 +1101,13 @@ static void test_WithWSAStartup(void) { WSADATA data; WORD version = MAKEWORD( 2, 2 ); - INT res; + INT res, socks, i, j; + SOCKET sock; LPVOID ptr; - SOCKET src, dst; + struct + { + SOCKET src, dst, dup_src, dup_dst; + } pairs[128]; DWORD error; res = WSAStartup( version, &data ); @@ -1112,9 +1116,26 @@ static void test_WithWSAStartup(void) ptr = gethostbyname("localhost"); ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); - ok(!tcp_socketpair(&src, &dst), "creating socket pair failed\n"); + /* Alloc some sockets to check if they are destroyed on WSACleanup */ + for (socks = 0; socks < sizeof(pairs) / sizeof(pairs[0]); socks++) + { + WSAPROTOCOL_INFOA info; + if (tcp_socketpair(&pairs[socks].src, &pairs[socks].dst)) break; + + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(pairs[socks].src, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + pairs[socks].dup_src = WSASocketA(0, 0, 0, &info, 0, 0); + ok(pairs[socks].dup_src != SOCKET_ERROR, "expected != -1\n"); - res = send(src, "TEST", 4, 0); + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(pairs[socks].dst, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + pairs[socks].dup_dst = WSASocketA(0, 0, 0, &info, 0, 0); + ok(pairs[socks].dup_dst != SOCKET_ERROR, "expected != -1\n"); + } + + res = send(pairs[0].src, "TEST", 4, 0); ok(res == 4, "send failed with error %d\n", WSAGetLastError()); WSACleanup(); @@ -1125,20 +1146,50 @@ static void test_WithWSAStartup(void) /* show that sockets are destroyed automatically after WSACleanup */ todo_wine { SetLastError(0xdeadbeef); - res = send(src, "TEST", 4, 0); + res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "send should have failed\n"); ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); SetLastError(0xdeadbeef); - res = closesocket(dst); + res = send(pairs[0].dst, "TEST", 4, 0); error = WSAGetLastError(); - ok(res == SOCKET_ERROR, "closesocket should have failed\n"); + ok(res == SOCKET_ERROR, "send should have failed\n"); ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + + /* Check that all sockets were destroyed */ + for (i = 0; i < socks; i++) + { + for (j = 0; j < 4; j++) + { + struct sockaddr_in saddr; + int size = sizeof(saddr); + switch(j) + { + case 0: sock = pairs[i].src; break; + case 1: sock = pairs[i].dup_src; break; + case 2: sock = pairs[i].dst; break; + case 3: sock = pairs[i].dup_dst; break; + } + + SetLastError(0xdeadbeef); + res = getsockname(sock, (struct sockaddr *)&saddr, &size); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); + ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); + } } - closesocket(src); - closesocket(dst); + } + + /* While wine is not fixed, close all sockets manually */ + for (i = 0; i < socks; i++) + { + closesocket(pairs[i].src); + closesocket(pairs[i].dst); + closesocket(pairs[i].dup_src); + closesocket(pairs[i].dup_dst); + } res = WSACleanup(); ok(res == 0, "expected 0, got %d\n", res);

1 0

Alexandre Julliard : Revert "oleaut32: Implement a better stub for IPicture::SaveAsFile."
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 28598cca7a50a3885cb8147861263153458a6fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=28598cca7a50a3885cb814786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 14:09:13 2015 +0900 Revert "oleaut32: Implement a better stub for IPicture::SaveAsFile." This reverts commit 212dd9c226c7f20c28697592468b3e631c250809. It's causing test failures in gdiplus. This will need to be redone properly after 1.8. --- dlls/oleaut32/olepicture.c | 92 ++++++---------------------------------- dlls/oleaut32/tests/olepicture.c | 9 ++++ 2 files changed, 22 insertions(+), 79 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 47430e3..5ce83e0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -834,6 +834,19 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) } /************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *pstream, + BOOL SaveMemCopy, + LONG *pcbSize) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); + return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); +} + +/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -1846,85 +1859,6 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } -/************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *stream, BOOL mem_copy, LONG *size) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - void *data; - unsigned data_size; - ULONG written; - HRESULT hr; - - FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); - - switch (This->desc.picType) - { - case PICTYPE_NONE: - return S_OK; - - case PICTYPE_ICON: - if (!mem_copy) return E_FAIL; - - if (This->bIsDirty || !This->data) - { - if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) - return E_FAIL; - HeapFree(GetProcessHeap(), 0, This->data); - This->data = data; - This->datalen = data_size; - } - hr = IStream_Write(stream, This->data, This->datalen, &written); - if (hr == S_OK && size) *size = written; - return hr; - - case PICTYPE_BITMAP: - if (!mem_copy) return E_FAIL; - - if (This->bIsDirty || !This->data) - { - switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) - { - case BITMAP_FORMAT_BMP: - if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) - return E_FAIL; - break; - case BITMAP_FORMAT_JPEG: - FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); - return E_NOTIMPL; - case BITMAP_FORMAT_GIF: - FIXME("BITMAP_FORMAT_GIF is not implemented\n"); - return E_NOTIMPL; - case BITMAP_FORMAT_PNG: - FIXME("BITMAP_FORMAT_PNG is not implemented\n"); - return E_NOTIMPL; - default: - FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); - return E_NOTIMPL; - } - - HeapFree(GetProcessHeap(), 0, This->data); - This->data = data; - This->datalen = data_size; - } - hr = IStream_Write(stream, This->data, This->datalen, &written); - if (hr == S_OK && size) *size = written; - return hr; - - case PICTYPE_METAFILE: - FIXME("PICTYPE_METAFILE is not implemented\n"); - return E_NOTIMPL; - case PICTYPE_ENHMETAFILE: - FIXME("ENHMETAFILE is not implemented\n"); - return E_NOTIMPL; - default: - FIXME("%#x is not implemented\n", This->desc.picType); - break; - } - return E_NOTIMPL; -} /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0c69cbd..0903298 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1079,14 +1079,18 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); +todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1153,12 +1157,15 @@ static void test_load_save_icon(void) todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); +todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1224,11 +1231,13 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);

1 0

Alexandre Julliard : user32/tests: Fix a few more menu test failures on Windows.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 5e38c8743dca8a8cd70b6b993cdcdc7c64fc3e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e38c8743dca8a8cd70b6b993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 17:35:20 2015 +0900 user32/tests: Fix a few more menu test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index f469212..33d8eb8 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1041,7 +1041,7 @@ static void test_menu_bmp_and_string(void) mii.dwItemData = 0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_RESTORE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); - ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); + ok((mii.fType & ~(MFT_RIGHTJUSTIFY|MFT_RIGHTORDER)) == MFT_STRING, "expected MFT_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); @@ -1055,7 +1055,7 @@ static void test_menu_bmp_and_string(void) mii.hbmpItem = (HBITMAP)0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_CLOSE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); - ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); + ok((mii.fType & ~(MFT_RIGHTJUSTIFY|MFT_RIGHTORDER)) == MFT_STRING, "expected MFT_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); @@ -2731,7 +2731,8 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, if (mii.hSubMenu) { - ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID %x should be equal to hSubMenu %p\n", + checked_cmd, mii.wID, mii.hSubMenu); if (!GetMenuItemCount(mii.hSubMenu)) { ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); @@ -3872,6 +3873,12 @@ static void test_emptypopup(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); } +static HMENU get_bad_hmenu( UINT_PTR id ) +{ + while (IsMenu( (HMENU)id )) id++; + return (HMENU)id; +} + static void test_AppendMenu(void) { static char string[] = "string"; @@ -3890,16 +3897,18 @@ static void test_AppendMenu(void) hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); - ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); + hsubmenu = get_bad_hmenu( 202 ); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); ok(ret, "AppendMenu failed\n"); - check_menu_items(hmenu, 202, MF_STRING, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); - ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); + hsubmenu = get_bad_hmenu( 203 ); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); ok(ret, "AppendMenu failed\n"); - check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); @@ -3967,15 +3976,14 @@ static void test_AppendMenu(void) ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1"); ok(ret, "AppendMenu failed\n"); check_menu_items(hmenu, 204, MF_STRING, 0); - ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); + hsubmenu = get_bad_hmenu( 205 ); + ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, (UINT_PTR)hsubmenu, "item 2"); ok(ret, "ModifyMenu failed\n"); - check_menu_items(hmenu, 205, MF_STRING, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU; - mii.hSubMenu = (HMENU)204; - /* make sure the menu handle is truly invalid */ - while (IsMenu( mii.hSubMenu )) mii.hSubMenu = (HMENU)((ULONG_PTR)mii.hSubMenu + 1); + mii.hSubMenu = get_bad_hmenu( 204 ); ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(!ret, "InsertMenuItem should fail\n"); ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);

1 0

Nikolay Sivov : wineoss: Initialized wReserved1 field returned to auxGetDevCapsW().
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 074d909235ed6f0081a2a921b84c27e7c1075e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=074d909235ed6f0081a2a921b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:35 2015 +0300 wineoss: Initialized wReserved1 field returned to auxGetDevCapsW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmaux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 216d2e2..9554ee7 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -97,6 +97,7 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) strcpyW(lpCaps->szPname, ini); lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; + lpCaps->wReserved1 = 0; lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; return MMSYSERR_NOERROR;

1 0

Nikolay Sivov : winmm/tests: Remove unreliable tests.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: b22fa89dac0bdfab99aeec9bd4ca7cb72d8de082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22fa89dac0bdfab99aeec9bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:37 2015 +0300 winmm/tests: Remove unreliable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 4 ---- dlls/winmm/tests/wave.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index bc17ce3..54c3793 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -316,7 +316,6 @@ static void wave_in_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; - memset(&capsA, 0xff, sizeof(capsA)); rc=waveInGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -324,14 +323,11 @@ static void wave_in_test_device(UINT_PTR device) dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; - ok(capsA.wReserved1 != 0xffff, "got %u\n", capsA.wReserved1); - memset(&capsW, 0xcc, sizeof(capsW)); rc=waveInGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); - ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveInGetDevCapsA(device,NULL,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 896f332..a2fe8bb 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -893,7 +893,6 @@ static void wave_out_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; - memset(&capsA, 0xcc, sizeof(capsA)); rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -901,14 +900,11 @@ static void wave_out_test_device(UINT_PTR device) dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; - ok(capsA.wReserved1 == 0, "got %u\n", capsA.wReserved1); - memset(&capsW, 0xcc, sizeof(capsW)); rc=waveOutGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_out_error(rc)); - ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveOutGetDevCapsA(device,0,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM,

1 0