May 2011 - Wine-Commits - list.winehq.org

Konstantin L. Metlov : gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 834378183ad2dffa84fab63b080c31241ac33cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=834378183ad2dffa84fab63b0… Author: Konstantin L. Metlov <metlov(a)fti.dn.ua> Date: Fri May 6 20:32:03 2011 +0300 gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX. --- dlls/gdi32/freetype.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b329b33..a3e9cec 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4554,8 +4554,14 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100) - glyph = glyph + 0xf000; - glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + { + /* there is a number of old pre-Unicode "broken" TTFs, which + do have symbols at U+00XX instead of U+f0XX */ + if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph + 0xf000))) + glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + } + else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); + return get_GSUB_vert_glyph(font,glyphId); }

1 0

André Hentschel : winedbg: Update a comment.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 71fe9c95a4fc9edf5a19d7eb3d7479094cfc8b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fe9c95a4fc9edf5a19d7eb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 8 21:21:48 2011 +0200 winedbg: Update a comment. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 904581d..c294f2d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #ifdef __i386__ - /* debugger/db_disasm.c */ + /* db_disasm.c */ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display); #define STEP_FLAG 0x00000100 /* single step flag */

1 0

Gerald Pfeifer : wineoss.drv: Support platforms that do not feature AFMT_FLOAT.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: bed73e9e736ef2376e762730a30ad5f2611f969c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed73e9e736ef2376e762730a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:46:37 2011 +0200 wineoss.drv: Support platforms that do not feature AFMT_FLOAT. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 64c06cd..7dec1e0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -532,6 +532,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) return -1; } +#ifdef AFMT_FLOAT if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ @@ -540,6 +541,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) return AFMT_FLOAT; } +#endif return -1; } @@ -1017,9 +1019,11 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(formats & AFMT_S16_LE){ fmt->Format.wBitsPerSample = 16; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; +#ifdef AFMT_FLOAT }else if(formats & AFMT_FLOAT){ fmt->Format.wBitsPerSample = 32; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; +#endif }else if(formats & AFMT_U8){ fmt->Format.wBitsPerSample = 8; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;

1 0

Andrew Eikum : winecoreaudio.drv: Implement volume control interfaces.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: e8f3d4736aa2ac54739eaf463b81a437900613ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f3d4736aa2ac54739eaf463… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:34 2011 -0500 winecoreaudio.drv: Implement volume control interfaces. --- dlls/winecoreaudio.drv/mmdevdrv.c | 547 +++++++++++++++++++++++++++++++++++-- 1 files changed, 521 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8f3d4736aa2ac54739ea…

1 0

Andrew Eikum : winecoreaudio.drv: Move IAudioClock closer to its related interfaces.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 5f4081e1f203154a013fa124e729a4c4bec6b423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4081e1f203154a013fa124e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:29 2011 -0500 winecoreaudio.drv: Move IAudioClock closer to its related interfaces. --- dlls/winecoreaudio.drv/mmdevdrv.c | 326 ++++++++++++++++++------------------ 1 files changed, 163 insertions(+), 163 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fa4d107..503b983 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1756,6 +1756,169 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = AudioCaptureClient_GetNextPacketSize }; +static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if(!ppv) + return E_POINTER; + *ppv = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if(IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->IAudioClock2_iface; + if(*ppv){ + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock_Release(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, freq); + + *freq = This->fmt->nSamplesPerSec; + + return S_OK; +} + +static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, + UINT64 *pos, UINT64 *qpctime, BOOL raw) +{ + AudioTimeStamp time; + OSStatus sc; + + sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &time, NULL); + if(sc == kAudioQueueErr_InvalidRunState){ + *pos = 0; + }else if(sc == noErr){ + if(!(time.mFlags & kAudioTimeStampSampleTimeValid)){ + FIXME("Sample time not valid, should calculate from something else\n"); + return E_FAIL; + } + + if(raw) + *pos = time.mSampleTime; + else + *pos = time.mSampleTime - This->last_time; + }else{ + WARN("Unable to get current time: %lx\n", sc); + return E_FAIL; + } + + if(qpctime){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, + UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock(iface); + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); + + if(!pos) + return E_POINTER; + + OSSpinLockLock(&This->lock); + + hr = AudioClock_GetPosition_nolock(This, pos, qpctime, FALSE); + + OSSpinLockUnlock(&This->lock); + + return hr; +} + +static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, + DWORD *chars) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, chars); + + if(!chars) + return E_POINTER; + + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + + return S_OK; +} + +static const IAudioClockVtbl AudioClock_Vtbl = +{ + AudioClock_QueryInterface, + AudioClock_AddRef, + AudioClock_Release, + AudioClock_GetFrequency, + AudioClock_GetPosition, + AudioClock_GetCharacteristics +}; + +static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); +} + +static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, + UINT64 *pos, UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + + FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); + + return E_NOTIMPL; +} + +static const IAudioClock2Vtbl AudioClock2_Vtbl = +{ + AudioClock2_QueryInterface, + AudioClock2_AddRef, + AudioClock2_Release, + AudioClock2_GetDevicePosition +}; + static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret; @@ -2099,166 +2262,3 @@ static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = SimpleAudioVolume_SetMute, SimpleAudioVolume_GetMute }; - -static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IAudioClock2)) - *ppv = &This->IAudioClock2_iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock_Release(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, freq); - - *freq = This->fmt->nSamplesPerSec; - - return S_OK; -} - -static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, - UINT64 *pos, UINT64 *qpctime, BOOL raw) -{ - AudioTimeStamp time; - OSStatus sc; - - sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &time, NULL); - if(sc == kAudioQueueErr_InvalidRunState){ - *pos = 0; - }else if(sc == noErr){ - if(!(time.mFlags & kAudioTimeStampSampleTimeValid)){ - FIXME("Sample time not valid, should calculate from something else\n"); - return E_FAIL; - } - - if(raw) - *pos = time.mSampleTime; - else - *pos = time.mSampleTime - This->last_time; - }else{ - WARN("Unable to get current time: %lx\n", sc); - return E_FAIL; - } - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, - UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; - - TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); - - if(!pos) - return E_POINTER; - - OSSpinLockLock(&This->lock); - - hr = AudioClock_GetPosition_nolock(This, pos, qpctime, FALSE); - - OSSpinLockUnlock(&This->lock); - - return hr; -} - -static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, - DWORD *chars) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, chars); - - if(!chars) - return E_POINTER; - - *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; - - return S_OK; -} - -static const IAudioClockVtbl AudioClock_Vtbl = -{ - AudioClock_QueryInterface, - AudioClock_AddRef, - AudioClock_Release, - AudioClock_GetFrequency, - AudioClock_GetPosition, - AudioClock_GetCharacteristics -}; - -static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); -} - -static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, - UINT64 *pos, UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - - FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); - - return E_NOTIMPL; -} - -static const IAudioClock2Vtbl AudioClock2_Vtbl = -{ - AudioClock2_QueryInterface, - AudioClock2_AddRef, - AudioClock2_Release, - AudioClock2_GetDevicePosition -};

1 0

Francois Gouget : d3d9/tests: Add a '\n' to a skip() call.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: bfbc015854e112f6c66b7ea124f81c8e4b8a7c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfbc015854e112f6c66b7ea12… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:30 2011 +0200 d3d9/tests: Add a '\n' to a skip() call. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0aef4b8..079ac35 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2874,7 +2874,7 @@ static void test_reset_fullscreen(void) device = create_device(d3d, device_window, focus_window, TRUE); if (!device) { - skip("Unable to create device. Skipping test."); + skip("Unable to create device. Skipping test.\n"); goto cleanup; }

1 0

Gerald Pfeifer : configure: Use the -Wempty-body compiler option if present .
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 8213f5410bdae8a0148636f4f879cf1a1367522a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8213f5410bdae8a0148636f4f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:53:23 2011 +0200 configure: Use the -Wempty-body compiler option if present. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4866321..2d6df8c 100755 --- a/configure +++ b/configure @@ -12273,6 +12273,31 @@ $as_echo "$ac_cv_cflags__Wdeclaration_after_statement" >&6; } if test $ac_cv_cflags__Wdeclaration_after_statement = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wempty-body" >&5 +$as_echo_n "checking whether the compiler supports -Wempty-body... " >&6; } +if ${ac_cv_cflags__Wempty_body+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wempty-body" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wempty_body=yes +else + ac_cv_cflags__Wempty_body=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wempty_body" >&5 +$as_echo "$ac_cv_cflags__Wempty_body" >&6; } +if test $ac_cv_cflags__Wempty_body = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wempty-body" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index 057035f..eff1550 100644 --- a/configure.ac +++ b/configure.ac @@ -1728,6 +1728,7 @@ then WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) + WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Andrew Eikum : winecoreaudio.drv: Store the PropertyScope in ACImpl.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: b9a66b1bc364c316249a4c11e5499c1c5c29e7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a66b1bc364c316249a4c11e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:31 2011 -0500 winecoreaudio.drv: Store the PropertyScope in ACImpl. --- dlls/winecoreaudio.drv/mmdevdrv.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 503b983..d5c064d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -112,6 +112,7 @@ struct ACImpl { AudioDeviceID adevid; AudioQueueRef aqueue; + AudioObjectPropertyScope scope; HANDLE timer; UINT32 period_ms, bufsize_frames, inbuf_frames, written_frames; UINT64 last_time; @@ -402,6 +403,15 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, This->dataflow = dataflow; + if(dataflow == eRender) + This->scope = kAudioDevicePropertyScopeOutput; + else if(dataflow == eCapture) + This->scope = kAudioDevicePropertyScopeInput; + else{ + HeapFree(GetProcessHeap(), 0, This); + return E_INVALIDARG; + } + This->lock = 0; This->parent = dev; @@ -872,12 +882,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) OSStatus sc; int nstreams, i; - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else - return E_UNEXPECTED; + addr.mScope = This->scope; addr.mElement = 0; addr.mSelector = kAudioDevicePropertyStreams; @@ -944,14 +949,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else{ - OSSpinLockUnlock(&This->lock); - return E_UNEXPECTED; - } + addr.mScope = This->scope; addr.mSelector = kAudioDevicePropertyLatency; addr.mElement = 0; @@ -1077,14 +1075,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else{ - OSSpinLockUnlock(&This->lock); - return E_UNEXPECTED; - } + addr.mScope = This->scope; addr.mElement = 0; addr.mSelector = kAudioDevicePropertyStreamConfiguration;

1 0

Marcus Meissner : shdocvw: Check safearray dimension too (Coverity).
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 1bb985fb277d1c39983884907728c5afde30d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb985fb277d1c39983884907… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 7 20:36:20 2011 +0200 shdocvw: Check safearray dimension too (Coverity). --- dlls/shdocvw/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 3c0dbd2..edbd3c2 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -479,7 +479,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, LONG ind; HRESULT hres; - if(V_VT(pvaIn) != VT_ARRAY || !sa) + if(V_VT(pvaIn) != VT_ARRAY || !sa || (SafeArrayGetDim(sa) != 1)) return E_INVALIDARG; ind = 0;

1 0

Gerald Pfeifer : wineoss.drv: Use AFMT_S24_LE instead of AFMT_S24_PACKED.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 051b64b66f82801d43016068639468575dc3974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=051b64b66f82801d430160686… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:04:06 2011 +0200 wineoss.drv: Use AFMT_S24_LE instead of AFMT_S24_PACKED. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b9af940..64c06cd 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -525,7 +525,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) case 16: return AFMT_S16_LE; case 24: - return AFMT_S24_PACKED; + return AFMT_S24_LE; case 32: return AFMT_S32_LE; } @@ -1026,7 +1026,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, }else if(formats & AFMT_S32_LE){ fmt->Format.wBitsPerSample = 32; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S24_PACKED){ + }else if(formats & AFMT_S24_LE){ fmt->Format.wBitsPerSample = 24; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{

1 0