January 2015 - Wine-commits

Hans Leidekker : wbemdisp: Implement ISWbemObject::Invoke.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: 054b260619b41d9375a3091aff39c32f4864313b URL: http://source.winehq.org/git/wine.git/?a=commit;h=054b260619b41d9375a3091af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:37:56 2015 +0100 wbemdisp: Implement ISWbemObject::Invoke. --- dlls/wbemdisp/locator.c | 29 ++++++++++++++++++++--------- dlls/wbemdisp/tests/wbemdisp.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 989c610..c604983 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -270,6 +270,16 @@ static HRESULT WINAPI object_GetIDsOfNames( return S_OK; } +static BSTR get_member_name( struct object *object, DISPID dispid ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (object->members[i].dispid == dispid) return object->members[i].name; + } + return NULL; +} + static HRESULT WINAPI object_Invoke( ISWbemObject *iface, DISPID member, @@ -282,20 +292,21 @@ static HRESULT WINAPI object_Invoke( UINT *arg_err ) { struct object *object = impl_from_ISWbemObject( iface ); - ITypeInfo *typeinfo; - HRESULT hr; + BSTR name; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); - if (SUCCEEDED(hr)) + if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { - hr = ITypeInfo_Invoke( typeinfo, &object->ISWbemObject_iface, member, flags, - params, result, excep_info, arg_err ); - ITypeInfo_Release( typeinfo ); + FIXME( "flags %x not supported\n", flags ); + return E_NOTIMPL; } - return hr; + if (!(name = get_member_name( object, member ))) + return DISP_E_MEMBERNOTFOUND; + + memset( params, 0, sizeof(*params) ); + return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); } static HRESULT WINAPI object_Put_( diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index d91e5b8..e3d432b 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -130,10 +130,12 @@ static void test_ParseDisplayName(void) if (enumvar) { - VARIANT var; + VARIANT var, res; ULONG fetched; IDispatch *dispatch = NULL; DISPID dispid; + DISPPARAMS params; + UINT arg_err; fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); @@ -183,6 +185,42 @@ static void test_ParseDisplayName(void) ok( hr == S_OK, "got %x\n", hr ); ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + if (dispid == 0x1800001) /* crashes on win2k */ + { + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + params.rgvarg = (VARIANTARG *)0xdeadbeef; + params.rgdispidNamedArgs = (DISPID *)0xdeadbeef; + params.cArgs = params.cNamedArgs = 0xdeadbeef; + arg_err = 0xdeadbeef; + hr = IDispatch_Invoke( dispatch, DISPID_UNKNOWN, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, &arg_err ); + ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %x\n", hr ); + ok( params.rgvarg == (VARIANTARG *)0xdeadbeef, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == (DISPID *)0xdeadbeef, "got %p\n", params.rgdispidNamedArgs ); + ok( params.cArgs == 0xdeadbeef, "got %u\n", params.cArgs ); + ok( params.cNamedArgs == 0xdeadbeef, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_ERROR, "got %u\n", V_VT( &res ) ); + ok( V_ERROR( &res ) == 0xdeadbeef, "got %u\n", V_VT( &res ) ); + ok( arg_err == 0xdeadbeef, "got %u\n", arg_err ); + if (hr == S_OK) VariantClear( &res ); + } + + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + memset( &params, 0, sizeof(params) ); + hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, NULL ); + ok( hr == S_OK, "got %x\n", hr ); + ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); + ok( !params.cArgs, "got %u\n", params.cArgs ); + ok( !params.cNamedArgs, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_BSTR, "got %u\n", V_VT( &res ) ); + ok( V_BSTR( &res ) != (BSTR)0xdeadbeef, "got %u\n", V_VT( &res ) ); + VariantClear( &res ); VariantClear( &var ); fetched = 0xdeadbeef;

1 0

Julian Rüger : German translation for release 1.7.34
by Jeremy Newman 14 Jan '15

14 Jan '15

Module: website Branch: master Commit: 62aead9881527aa482c4df0f3483f015d4c704d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=62aead9881527aa482c4df… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 14 06:47:27 2015 +0100 German translation for release 1.7.34 --- news/de/2015010901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015010901.xml b/news/de/2015010901.xml new file mode 100644 index 0000000..05c3b3e --- /dev/null +++ b/news/de/2015010901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Januar 2015</date> +<title>Wine 1.7.34 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.34 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.34">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Surround-Sound in DirectSound.</li> + <li>Bessere Unterstützung von gleichförmigen Textabschnitten ("text runs") in DirectWrite.</li> + <li>Viele Fehlerkorrekturen an der HTML-Engine.</li> + <li>Mehr Unterstützung von WBEM-Objekten.</li> + <li>Einige zusätzliche C/C++ Laufzeitfunktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.34.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Mark Harmstone : winealsa: Do not destroy remapping info on IsFormatSupported.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: dcf8767b5879f88548ab35de3e65afbef17bd65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf8767b5879f88548ab35de3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:10:28 2015 +0000 winealsa: Do not destroy remapping info on IsFormatSupported. --- dlls/winealsa.drv/mmdevdrv.c | 62 +++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2079dcc..e32cb54 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1130,11 +1130,11 @@ static int alsa_channel_index(DWORD flag) return -1; } -static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt) +static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt, int *map) { unsigned int i; for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] != i) + if(map[i] != i) return TRUE; } return FALSE; @@ -1166,8 +1166,10 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } -static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) +static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt, int *alsa_channels, int *map) { + BOOL need_remap; + if(This->dataflow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; DWORD mask, flag = SPEAKER_FRONT_LEFT; @@ -1179,47 +1181,47 @@ static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) else mask = get_channel_mask(fmt->nChannels); - This->alsa_channels = 0; + *alsa_channels = 0; while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ if(mask & flag){ - This->alsa_channel_map[i] = alsa_channel_index(flag); + map[i] = alsa_channel_index(flag); TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", - i, flag, This->alsa_channel_map[i]); - if(This->alsa_channel_map[i] >= This->alsa_channels) - This->alsa_channels = This->alsa_channel_map[i] + 1; + i, flag, map[i]); + if(map[i] >= *alsa_channels) + *alsa_channels = map[i] + 1; ++i; } flag <<= 1; } while(i < fmt->nChannels){ - This->alsa_channel_map[i] = This->alsa_channels; + map[i] = *alsa_channels; TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); - ++This->alsa_channels; + i, map[i]); + ++*alsa_channels; ++i; } for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] == -1){ - This->alsa_channel_map[i] = This->alsa_channels; - ++This->alsa_channels; + if(map[i] == -1){ + map[i] = *alsa_channels; + ++*alsa_channels; TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); + i, map[i]); } } - This->need_remapping = need_remapping(This, fmt); - - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + need_remap = need_remapping(This, fmt, map); }else{ - This->need_remapping = FALSE; - This->alsa_channels = fmt->nChannels; - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + *alsa_channels = fmt->nChannels; + + need_remap = FALSE; } - return S_OK; + TRACE("need_remapping: %u, alsa_channels: %d\n", need_remap, *alsa_channels); + + return need_remap ? S_OK : S_FALSE; } static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) @@ -1304,11 +1306,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); - if(FAILED(map_channels(This, fmt))){ - WARN("map_channels failed\n"); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } + This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK ? TRUE : FALSE; if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); @@ -1623,6 +1621,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX *closest = NULL; unsigned int max = 0, min = 0; int err; + int alsa_channels, alsa_channel_map[32]; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); @@ -1717,12 +1716,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, closest->nChannels = min; } - if(FAILED(map_channels(This, fmt))){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("map_channels failed\n"); - goto exit; - } - if(This->alsa_channels > max){ + map_channels(This, fmt, &alsa_channels, alsa_channel_map); + + if(alsa_channels > max){ hr = S_FALSE; closest->nChannels = max; }

1 0

Mark Harmstone : dsound: Degrade speaker config if too many channels.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: b5aec2e40ffb3a49134a424e936f38adfa27470e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aec2e40ffb3a49134a424e9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:40:52 2015 +0000 dsound: Degrade speaker config if too many channels. --- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index af2034a..52b2847 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,6 +219,7 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index d3c2689..7d05efd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -93,7 +93,10 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client if (FAILED(hr)) return hr; - if (mixwfe->Format.nChannels > device->num_speakers) { + if (mixwfe->Format.nChannels < device->num_speakers) { + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, mixwfe->Format.nChannels); + DSOUND_ParseSpeakerConfig(device); + } else if (mixwfe->Format.nChannels > device->num_speakers) { mixwfe->Format.nChannels = device->num_speakers; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; @@ -163,7 +166,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) { IPropertyStore *store; HRESULT hr; @@ -198,13 +201,13 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) PropVariantClear(&pv); IPropertyStore_Release(store); - if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) return DSSPEAKER_5POINT1_BACK; - else if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) return DSSPEAKER_5POINT1_SURROUND; - else if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) return DSSPEAKER_QUAD; - else if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) return DSSPEAKER_MONO; @@ -247,7 +250,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, 0); DSOUND_ParseSpeakerConfig(device);

1 0

Mark Harmstone : dsound: Pretend we have hardware buffers.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: d4d14cdef0adf150143173f1dd7f9b9f42aaa81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d14cdef0adf150143173f1d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 21:42:44 2015 +0000 dsound: Pretend we have hardware buffers. When running in Windows XP mode, XAudio2 will refuse to output surround sound unless it can open a buffer with DSBCAPS_LOCHARDWARE. --- dlls/dsound/buffer.c | 3 +++ dlls/dsound/dsound.c | 32 +++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 36ec132..b1eb9a3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -994,6 +994,9 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) if (ref > 1) WARN("Destroying buffer with %u in use interfaces\n", ref - 1); + if (This->dsbd.dwFlags & DSBCAPS_LOCHARDWARE) + This->device->drvcaps.dwFreeHwMixingAllBuffers++; + DirectSoundDevice_RemoveBuffer(This->device, This); RtlDeleteResource(&This->lock); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8df778a..ab050b5 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -271,8 +271,15 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers; dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers; dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; - dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; - dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; + + if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) { + dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; + dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; + } else { + dscaps->dwFreeHwMixingStaticBuffers = 0; + dscaps->dwFreeHwMixingStreamingBuffers = 0; + } + dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers; dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers; dscaps->dwMaxHw3DStreamingBuffers = This->device->drvcaps.dwMaxHw3DStreamingBuffers; @@ -913,9 +920,12 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - device->drvcaps.dwMaxHwMixingAllBuffers = 1; + device->drvcaps.dwMaxHwMixingAllBuffers = 16; device->drvcaps.dwMaxHwMixingStaticBuffers = 1; device->drvcaps.dwMaxHwMixingStreamingBuffers = 1; + device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; + device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; + device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; ZeroMemory(&device->volpan, sizeof(device->volpan)); @@ -975,10 +985,12 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); } - if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE && - !(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { - TRACE("LOCHARDWARE is not supported, returning E_NOTIMPL\n"); - return E_NOTIMPL; + if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) && + dsbd->dwFlags & DSBCAPS_LOCHARDWARE && + device->drvcaps.dwFreeHwMixingAllBuffers == 0) + { + WARN("ran out of emulated hardware buffers\n"); + return DSERR_ALLOCATED; } if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) { @@ -1062,9 +1074,11 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); - if (dsb) + if (dsb) { *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; - else + if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE) + device->drvcaps.dwFreeHwMixingAllBuffers--; + } else WARN("IDirectSoundBufferImpl_Create failed\n"); }

1 0

Bruno Jesus : ws2_32: Ensure recv functions set last error to zero when they succeed.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: ab1eee505bebe93a7d35254a967d2831d1ff4761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1eee505bebe93a7d35254a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 11 20:20:28 2015 -0200 ws2_32: Ensure recv functions set last error to zero when they succeed. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1b2a05..b4dcd76 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6776,6 +6776,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + SetLastError(ERROR_SUCCESS); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ce47712..78ae609 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5136,14 +5136,12 @@ static void test_events(int useMessages) SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, MSG_PEEK); ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); SetLastError(0xdeadbeef); ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); @@ -5171,7 +5169,6 @@ todo_wine SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, 0); ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, empty_seq, NULL, 0); @@ -5603,7 +5600,6 @@ static void test_WSASendMsg(void) ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); /* A successful call to WSASendMsg must have bound the socket */ @@ -5634,7 +5630,6 @@ todo_wine ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); closesocket(sock); @@ -5770,14 +5765,12 @@ static void test_WSARecv(void) iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = 4; @@ -5790,7 +5783,6 @@ todo_wine iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = sizeof(buf);

1 0

Nikolay Sivov : user32: Handle NULL argument in GetKeyboardLayoutNameW().
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 151694a0bce3160387f6d8c54ebaa2b726dbd4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151694a0bce3160387f6d8c54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 01:24:20 2015 +0300 user32: Handle NULL argument in GetKeyboardLayoutNameW(). --- dlls/user32/input.c | 5 +++++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ec81e60..1f05f34 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -966,6 +966,11 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) { + if (!pwszKLID) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } return USER_Driver->pGetKeyboardLayoutName(pwszKLID); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 39afeb7..76d0821 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1595,6 +1595,14 @@ static void test_keyboard_layout_name(void) BOOL ret; char klid[KL_NAMELENGTH]; +if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); + + SetLastError(0xdeadbeef); + ret = GetKeyboardLayoutNameW(NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; klid[0] = 0;

1 0

Axel Davy : d3d8/tests: Fix volume_dxt5_test getPixelColor check.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 58083dfb12655ee0e23fc0d2cc248db1d647f220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58083dfb12655ee0e23fc0d2c… Author: Axel Davy <axel.davy(a)ens.fr> Date: Sun Jan 11 11:29:13 2015 +0100 d3d8/tests: Fix volume_dxt5_test getPixelColor check. getPixelColor should be called before Present, because the device swapchain was created with discard mode. --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a8a771e..68c3319 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4507,8 +4507,6 @@ static void volume_dxt5_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; i++) { color = getPixelColor(device, 80 + 160 * i, 240); @@ -4516,6 +4514,8 @@ static void volume_dxt5_test(void) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Axel Davy : d3d8/tests: Fix test_3dc_formats getPixelColor check.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: c5d420b35a53e282e670d027febd16209c2e4fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d420b35a53e282e670d027f… Author: Axel Davy <axel.davy(a)ens.fr> Date: Sun Jan 11 11:29:14 2015 +0100 d3d8/tests: Fix test_3dc_formats getPixelColor check. --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 68c3319..e47e6a8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5197,8 +5197,6 @@ static void test_3dc_formats(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); @@ -5207,6 +5205,8 @@ static void test_3dc_formats(void) expected_colors[i].amd, expected_colors[i].nvidia, color, i); } + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DTexture8_Release(ati2n_texture); IDirect3DTexture8_Release(ati1n_texture); refcount = IDirect3DDevice8_Release(device);

1 0

Michael Stefaniuc : strmbase: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 762eb676989e8af5bb7198c14d040d55e9e2ef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=762eb676989e8af5bb7198c14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 10:59:51 2015 +0100 strmbase: Remove an unused variable (PVS-Studio). --- dlls/strmbase/enumpins.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 6993bae..55fa7ec 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -125,7 +125,6 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - HRESULT hr = S_OK; ULONG i = 0; TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); @@ -142,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; - while (i < cPins && hr == S_OK) + while (i < cPins) { IPin *pin; pin = This->receive_pin(This->base, This->uIndex + i);

1 0