November 2015 - Wine-commits

Austin English : sfc: Add SfcGetNextProtectedFile stub.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: c715127536a78166e58b165c390a57b704899d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c715127536a78166e58b165c3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 27 00:12:04 2015 -0500 sfc: Add SfcGetNextProtectedFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 2 +- dlls/sfc_os/sfc_os.c | 9 +++++++++ dlls/sfc_os/sfc_os.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 04307d2..bdd66db 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -7,7 +7,7 @@ 7 stub @ 8 stub @ 9 stub @ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected @ stub SfcWLEventLogoff diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 5805342..9df38f8 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -49,6 +49,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /****************************************************************** + * SfcGetNextProtectedFile [sfc_os.@] + */ +BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) +{ + FIXME("%p %p\n", handle, data); + return FALSE; +} + +/****************************************************************** * SfcIsFileProtected [sfc_os.@] * * Check, if the given File is protected by the System diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 1edcb83..6b216e0 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,3 +1,3 @@ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long)

1 0

Alexandre Julliard : configure: Fix the libpulse check for when the library exists but doesn't work.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: bfb5f26f10f3a220b8ea6a957a65be38abc016fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb5f26f10f3a220b8ea6a957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 10:49:44 2015 +0900 configure: Fix the libpulse check for when the library exists but doesn't work. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14 +++++++------- configure.ac | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 1e7e28f..31f54a3 100755 --- a/configure +++ b/configure @@ -654,8 +654,8 @@ OSS4_CFLAGS ALSA_LIBS GSTREAMER_LIBS GSTREAMER_CFLAGS -PULSE_CFLAGS PULSE_LIBS +PULSE_CFLAGS GETTEXTPO_LIBS Z_LIBS FREETYPE_LIBS @@ -12592,10 +12592,6 @@ esac fi fi -PULSE_LIBS="" - -PULSE_CFLAGS="" - if test "x$with_pulse" != "xno"; then if ${PULSE_CFLAGS:+false} :; then : @@ -12660,8 +12656,12 @@ fi $as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; } if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then : : +else + PULSE_LIBS="" fi +else + PULSE_LIBS="" fi done @@ -12671,7 +12671,7 @@ test -z "$PULSE_CFLAGS" || PULSE_CFLAGS=`echo " $PULSE_CFLAGS" | sed 's/ -I$[^/ test -z "$PULSE_LIBS" || PULSE_LIBS=`echo " $PULSE_LIBS" | sed 's/ -L\([^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"; then : +if test -z "$PULSE_LIBS"; then : case "x$with_pulse" in x) as_fn_append wine_notices "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;; xno) ;; @@ -17282,8 +17282,8 @@ FREETYPE_CFLAGS = $FREETYPE_CFLAGS FREETYPE_LIBS = $FREETYPE_LIBS Z_LIBS = $Z_LIBS GETTEXTPO_LIBS = $GETTEXTPO_LIBS -PULSE_LIBS = $PULSE_LIBS PULSE_CFLAGS = $PULSE_CFLAGS +PULSE_LIBS = $PULSE_LIBS GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS GSTREAMER_LIBS = $GSTREAMER_LIBS ALSA_LIBS = $ALSA_LIBS diff --git a/configure.ac b/configure.ac index 722230d..0814400 100644 --- a/configure.ac +++ b/configure.ac @@ -1549,15 +1549,14 @@ then fi dnl **** Check for PulseAudio **** -AC_SUBST(PULSE_LIBS,"") -AC_SUBST(PULSE_CFLAGS,"") if test "x$with_pulse" != "xno"; then WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,, [AC_CHECK_HEADERS(pulse/pulseaudio.h, - [AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],,[$PULSE_LIBS])])]) + [AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],[PULSE_LIBS=""],[$PULSE_LIBS])], + [PULSE_LIBS=""])]) fi -WINE_NOTICE_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"], +WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"], [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) dnl **** Check for gstreamer ****

1 0

Maarten Lankhorst : winepulse: Add audiostreamvolume.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 94d88e000a2a460aa0bca4951b0ee1e342bd8af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d88e000a2a460aa0bca4951… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:50:35 2015 -0600 winepulse: Add audiostreamvolume. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 2c26c99..de49dfc 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -130,6 +130,7 @@ struct ACImpl { IAudioCaptureClient IAudioCaptureClient_iface; IAudioClock IAudioClock_iface; IAudioClock2 IAudioClock2_iface; + IAudioStreamVolume IAudioStreamVolume_iface; IMMDevice *parent; struct list entry; float vol[PA_CHANNELS_MAX]; @@ -160,6 +161,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; +static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) { @@ -186,6 +188,11 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) +{ + return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface); +} + /* Following pulseaudio design here, mainloop has the lock taken whenever * it is handling something for pulse, and the lock is required whenever * doing any pa_* call that can affect the state in any way @@ -799,6 +806,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; + This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; This->dataflow = dataflow; This->parent = dev; for (i = 0; i < PA_CHANNELS_MAX; ++i) @@ -1599,6 +1607,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, *ppv = &This->IAudioCaptureClient_iface; } else if (IsEqualIID(riid, &IID_IAudioClock)) { *ppv = &This->IAudioClock_iface; + } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) { + *ppv = &This->IAudioStreamVolume_iface; } if (*ppv) { @@ -2056,6 +2066,170 @@ static const IAudioClock2Vtbl AudioClock2_Vtbl = AudioClock2_GetDevicePosition }; +static HRESULT WINAPI AudioStreamVolume_QueryInterface( + IAudioStreamVolume *iface, REFIID riid, void **ppv) +{ + 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_IAudioStreamVolume)) + *ppv = iface; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioStreamVolume_GetChannelCount( + IAudioStreamVolume *iface, UINT32 *out) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + + TRACE("(%p)->(%p)\n", This, out); + + if (!out) + return E_POINTER; + + *out = This->ss.channels; + + return S_OK; +} + +struct pulse_info_cb_data { + UINT32 n; + float *levels; +}; + +static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( + IAudioStreamVolume *iface, UINT32 count, const float *levels) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + HRESULT hr; + int i; + + TRACE("(%p)->(%d, %p)\n", This, count, levels); + + if (!levels) + return E_POINTER; + + if (count != This->ss.channels) + return E_INVALIDARG; + + pthread_mutex_lock(&pulse_lock); + hr = pulse_stream_valid(This); + if (FAILED(hr)) + goto out; + + for (i = 0; i < count; ++i) + This->vol[i] = levels[i]; + +out: + pthread_mutex_unlock(&pulse_lock); + return hr; +} + +static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( + IAudioStreamVolume *iface, UINT32 count, float *levels) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + HRESULT hr; + int i; + + TRACE("(%p)->(%d, %p)\n", This, count, levels); + + if (!levels) + return E_POINTER; + + if (count != This->ss.channels) + return E_INVALIDARG; + + pthread_mutex_lock(&pulse_lock); + hr = pulse_stream_valid(This); + if (FAILED(hr)) + goto out; + + for (i = 0; i < count; ++i) + levels[i] = This->vol[i]; + +out: + pthread_mutex_unlock(&pulse_lock); + return hr; +} + +static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( + IAudioStreamVolume *iface, UINT32 index, float level) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + HRESULT hr; + float volumes[PA_CHANNELS_MAX]; + + TRACE("(%p)->(%d, %f)\n", This, index, level); + + if (level < 0.f || level > 1.f) + return E_INVALIDARG; + + if (index >= This->ss.channels) + return E_INVALIDARG; + + hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); + volumes[index] = level; + if (SUCCEEDED(hr)) + hr = AudioStreamVolume_SetAllVolumes(iface, This->ss.channels, volumes); + return hr; +} + +static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( + IAudioStreamVolume *iface, UINT32 index, float *level) +{ + ACImpl *This = impl_from_IAudioStreamVolume(iface); + float volumes[PA_CHANNELS_MAX]; + HRESULT hr; + + TRACE("(%p)->(%d, %p)\n", This, index, level); + + if (!level) + return E_POINTER; + + if (index >= This->ss.channels) + return E_INVALIDARG; + + hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); + if (SUCCEEDED(hr)) + *level = volumes[index]; + return hr; +} + +static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = +{ + AudioStreamVolume_QueryInterface, + AudioStreamVolume_AddRef, + AudioStreamVolume_Release, + AudioStreamVolume_GetChannelCount, + AudioStreamVolume_SetChannelVolume, + AudioStreamVolume_GetChannelVolume, + AudioStreamVolume_SetAllVolumes, + AudioStreamVolume_GetAllVolumes +}; + HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, IAudioSessionManager2 **out) {

1 0

Maarten Lankhorst : winepulse: Add session support.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 63ce6219b50a2389b4091bea52cee7a9c94084b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ce6219b50a2389b4091bea5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:51:04 2015 -0600 winepulse: Add session support. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 849 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 848 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63ce6219b50a2389b4091…

1 0

Maarten Lankhorst : winepulse: Forward winmm functions to winealsa.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 10c72255f2602a895e474d0f629b84e96ebdc479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c72255f2602a895e474d0f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:52:40 2015 -0600 winepulse: Forward winmm functions to winealsa. PulseAudio doesn't support MIDI, so we forward to ALSA to provide MIDI support for winepulse users. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/winepulse.drv.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 612bf46..288de87 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -3,3 +3,8 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager + +# WinMM driver functions +@ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc +@ stdcall -private midMessage(long long long long long) winealsa.drv.midMessage +@ stdcall -private modMessage(long long long long long) winealsa.drv.modMessage

1 0

Maarten Lankhorst : winepulse: Fixup IsFormatSupported calls.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: cbbe26ea88f182ef45f977879c568901aa489746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbe26ea88f182ef45f977879… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:53:12 2015 -0600 winepulse: Fixup IsFormatSupported calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 174 +++++++++++++++++++++++++++++------------- 1 file changed, 120 insertions(+), 54 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35453af..9f933ef 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1144,10 +1144,8 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) } } This->map.channels = fmt->nChannels; - if (!mask || mask == SPEAKER_ALL) + if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) mask = get_channel_mask(fmt->nChannels); - else if (mask == ~0U && fmt->nChannels == 1) - mask = SPEAKER_FRONT_CENTER; for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { if (mask & (1 << j)) This->map.map[i++] = pulse_pos_from_wfx[j]; @@ -1430,79 +1428,147 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ACImpl *This = impl_from_IAudioClient(iface); HRESULT hr = S_OK; WAVEFORMATEX *closest = NULL; + BOOL exclusive; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); - if (!fmt || (mode == AUDCLNT_SHAREMODE_SHARED && !out)) + if (!fmt) return E_POINTER; if (out) *out = NULL; - if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) + + if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) { + exclusive = 1; + out = NULL; + } else if (mode == AUDCLNT_SHAREMODE_SHARED) { + exclusive = 0; + if (!out) + return E_POINTER; + } else return E_INVALIDARG; - if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; - switch (fmt->wFormatTag) { - case WAVE_FORMAT_EXTENSIBLE: - if (fmt->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - dump_fmt(fmt); - break; - case WAVE_FORMAT_ALAW: - case WAVE_FORMAT_MULAW: - case WAVE_FORMAT_IEEE_FLOAT: - case WAVE_FORMAT_PCM: - dump_fmt(fmt); - break; - default: - dump_fmt(fmt); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } + if (fmt->nChannels == 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; + closest = clone_format(fmt); - if (!closest) { - if (out) - *out = NULL; + if (!closest) return E_OUTOFMEMORY; - } - if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - UINT32 mask = 0, i, channels = 0; + dump_fmt(fmt); + + switch (fmt->wFormatTag) { + case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *ext = (WAVEFORMATEXTENSIBLE*)closest; - if ((fmt->nChannels > 1 && ext->dwChannelMask == SPEAKER_ALL) || - (fmt->nChannels == 1 && ext->dwChannelMask == ~0U)) { - mask = ext->dwChannelMask; - channels = fmt->nChannels; - } else if (ext->dwChannelMask) { - for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) { - if (i & ext->dwChannelMask) { - mask |= i; - channels++; + if ((fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX) && + fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE)) || + fmt->nBlockAlign != fmt->wBitsPerSample / 8 * fmt->nChannels || + ext->Samples.wValidBitsPerSample > fmt->wBitsPerSample || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec) { + hr = E_INVALIDARG; + break; + } + + if (exclusive) { + UINT32 mask = 0, i, channels = 0; + + if (!(ext->dwChannelMask & (SPEAKER_ALL | SPEAKER_RESERVED))) { + for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) { + if (i & ext->dwChannelMask) { + mask |= i; + channels++; + } } + + if (channels != fmt->nChannels || (ext->dwChannelMask & ~mask)) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + } else { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; } - if (channels < fmt->nChannels) - mask = get_channel_mask(fmt->nChannels); - } else - mask = ext->dwChannelMask; - if (ext->dwChannelMask != mask) { - ext->dwChannelMask = mask; - hr = S_FALSE; } + + if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { + if (fmt->wBitsPerSample != 32) { + hr = E_INVALIDARG; + break; + } + + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample) { + hr = S_FALSE; + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; + } + } else if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { + if (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8) { + hr = E_INVALIDARG; + break; + } + + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample && + !(fmt->wBitsPerSample == 32 && + ext->Samples.wValidBitsPerSample == 24)) { + hr = S_FALSE; + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; + break; + } + } else { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + + break; } - if (hr == S_OK || !out) { + case WAVE_FORMAT_ALAW: + case WAVE_FORMAT_MULAW: + if (fmt->wBitsPerSample != 8) { + hr = E_INVALIDARG; + break; + } + /* Fall-through */ + case WAVE_FORMAT_IEEE_FLOAT: + if (fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT && fmt->wBitsPerSample != 32) { + hr = E_INVALIDARG; + break; + } + /* Fall-through */ + case WAVE_FORMAT_PCM: + if (fmt->wFormatTag == WAVE_FORMAT_PCM && + (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8)) { + hr = E_INVALIDARG; + break; + } + + if (fmt->nChannels > 2) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + /* + * fmt->cbSize, fmt->nBlockAlign and fmt->nAvgBytesPerSec seem to be + * ignored, invalid values are happily accepted. + */ + break; + default: + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + + if (exclusive && hr != S_OK) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + CoTaskMemFree(closest); + } else if (hr != S_FALSE) CoTaskMemFree(closest); - if (out) - *out = NULL; - } else if (closest) { - closest->nBlockAlign = - closest->nChannels * closest->wBitsPerSample / 8; - closest->nAvgBytesPerSec = - closest->nBlockAlign * closest->nSamplesPerSec; + else *out = closest; - } + + /* Winepulse does not currently support exclusive mode, if you know of an + * application that uses it, I will correct this.. + */ + if (hr == S_OK && exclusive) + return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; TRACE("returning: %08x %p\n", hr, out ? *out : NULL); return hr;

1 0

Maarten Lankhorst : winepulse: Add support for IMarshal.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: e1933acb7b018d392df7401a5392047bad9d4125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1933acb7b018d392df7401a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:54:51 2015 -0600 winepulse: Add support for IMarshal. Based on Jeff Klein's patches for the other drivers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 9f933ef..cf94d05 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -157,6 +157,7 @@ struct ACImpl { IAudioClock IAudioClock_iface; IAudioClock2 IAudioClock2_iface; IAudioStreamVolume IAudioStreamVolume_iface; + IUnknown *marshal; IMMDevice *parent; struct list entry; float vol[PA_CHANNELS_MAX]; @@ -834,6 +835,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int i; EDataFlow dataflow; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); if (IsEqualGUID(guid, &pulse_render_guid)) @@ -859,6 +861,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; for (i = 0; i < PA_CHANNELS_MAX; ++i) This->vol[i] = 1.f; + + hr = CoCreateFreeThreadedMarshaler((IUnknown*)This, &This->marshal); + if (hr) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } IMMDevice_AddRef(This->parent); *out = &This->IAudioClient_iface; @@ -870,10 +878,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(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_IAudioClient)) *ppv = iface; @@ -881,6 +892,10 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -913,6 +928,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) list_remove(&This->entry); pthread_mutex_unlock(&pulse_lock); } + IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This); @@ -1853,6 +1869,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -1867,6 +1884,9 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1991,6 +2011,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -2005,6 +2026,9 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2145,6 +2169,9 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2280,6 +2307,8 @@ static const IAudioClock2Vtbl AudioClock2_Vtbl = static HRESULT WINAPI AudioStreamVolume_QueryInterface( IAudioStreamVolume *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioStreamVolume(iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -2294,6 +2323,9 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Sebastian Lackner : winepulse.drv: Add a missing linebreak to ERR message.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 64e83ddcad40d3f2ec5c290d71cd06689a9229b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e83ddcad40d3f2ec5c290d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 3 01:25:21 2015 +0100 winepulse.drv: Add a missing linebreak to ERR message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cf94d05..6b69488 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -434,7 +434,7 @@ static HRESULT pulse_connect(void) { if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, NULL, 0, NULL))) { - ERR("Failed to create mainloop thread."); + ERR("Failed to create mainloop thread.\n"); return E_FAIL; } SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL);

1 0

Andrew Eikum : mmdevapi/tests: Remove todo_wine on some tests for winepulse.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 69da3a24d24c8d995177aaaba601d63a75840519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69da3a24d24c8d995177aaaba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 2 11:55:24 2015 -0600 mmdevapi/tests: Remove todo_wine on some tests for winepulse. winepulse succeeds where other drivers fail. Avoid todo_wine failures when running winepulse. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index afb99fc..865859b 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,7 +244,11 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + if(qpc2 != qpc) + /* FIXME: Some drivers fail */ + todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + else + ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ @@ -307,14 +311,23 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + /* FIXME: Some drivers fail */ + todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + todo_wine ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + }else{ + ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + + /* Native's position is one period further than what we read. + * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: + * signal when the position jump left a gap. */ + ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + } + ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - /* Native's position is one period further than what we read. - * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: - * signal when the position jump left a gap. */ - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) sum = pos; }

1 0

Nikolay Sivov : dwrite: When assembling run bitmap combine instead of overwriting.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: d3b6b437ed17928b5c567f1d6af337dffbe73543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b6b437ed17928b5c567f1d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 23:34:21 2015 +0300 dwrite: When assembling run bitmap combine instead of overwriting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c00aeed..2c52840 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4269,7 +4269,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[3*x] = dst[3*x+1] = dst[3*x+2] = DWRITE_ALPHA_MAX; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; } @@ -4277,7 +4278,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW else { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[x] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[x] = DWRITE_ALPHA_MAX; src += get_dib_stride(width, 1); dst += analysis->bounds.right - analysis->bounds.left; } @@ -4287,7 +4289,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW /* at this point it's DWRITE_TEXTURE_CLEARTYPE_3x1 with 8bpp src bitmap */ for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x]; + dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x] | dst[3*x]; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; }

1 0