November 2015 - Wine-Commits

Maarten Lankhorst : winepulse: Add session support.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

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

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

Nov. 3, 2015

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 Nov. 3, 2015

Nov. 3, 2015

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: Fixup IsFormatSupported calls.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

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 Nov. 3, 2015

Nov. 3, 2015

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

Ken Thomases : winemac: Cope with multiple seemingly-identical display modes, only some of which work, by trying them in sequence.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 4db8fc394d769b231bf3dc45b89a1ec4906effe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db8fc394d769b231bf3dc45b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 2 19:23:04 2015 -0600 winemac: Cope with multiple seemingly-identical display modes, only some of which work, by trying them in sequence. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7f6ca23..c0581b8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -699,9 +699,9 @@ int macdrv_err_on; return TRUE; } - - (CGDisplayModeRef)modeMatchingMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID + - (NSArray*)modesMatchingMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { - CGDisplayModeRef ret = NULL; + NSMutableArray* ret = [NSMutableArray array]; NSDictionary* options = nil; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 @@ -715,10 +715,7 @@ int macdrv_err_on; { CGDisplayModeRef candidateMode = (CGDisplayModeRef)candidateModeObject; if ([self mode:candidateMode matchesMode:mode]) - { - ret = candidateMode; - break; - } + [ret addObject:candidateModeObject]; } return ret; } @@ -743,11 +740,15 @@ int macdrv_err_on; } else // ... otherwise, try to restore just the one display { - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (mode && CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + for (id modeObject in [self modesMatchingMode:mode forDisplay:displayID]) { - [originalDisplayModes removeObjectForKey:displayIDKey]; - ret = TRUE; + mode = (CGDisplayModeRef)modeObject; + if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + { + [originalDisplayModes removeObjectForKey:displayIDKey]; + ret = TRUE; + break; + } } } } @@ -755,6 +756,7 @@ int macdrv_err_on; { BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; + NSArray* modes; currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); if (!currentMode) @@ -771,8 +773,8 @@ int macdrv_err_on; CGDisplayModeRelease(currentMode); currentMode = NULL; - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (!mode) + modes = [self modesMatchingMode:mode forDisplay:displayID]; + if (!modes.count) return FALSE; if ([originalDisplayModes count] || displaysCapturedForFullscreen || @@ -789,7 +791,17 @@ int macdrv_err_on; originalMode = currentMode = CGDisplayCopyDisplayMode(displayID); if (originalMode) - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + { + for (id modeObject in modes) + { + mode = (CGDisplayModeRef)modeObject; + if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + { + ret = TRUE; + break; + } + } + } if (ret && !(currentMode && [self mode:mode matchesMode:currentMode])) [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; else if (![originalDisplayModes count])

1 0

Dmitry Timoshkov : Revert "msi: Correctly parse double quotes in the token value.".
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 2d7f00c8d38777266dcf585c047c05fa7a7e0fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7f00c8d38777266dcf585c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 18:08:08 2015 +0800 Revert "msi: Correctly parse double quotes in the token value.". This reverts commit 42caac841e1755570ba25c2ce95948fc28f31372. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/install.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2e8e71..df73652 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -245,7 +245,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) { case '"': state = state_quote; - if (in_quotes && p[1] != '\"') count--; + if (in_quotes) count--; else count++; break; case ' ': diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index df6fe9c..6b86cd2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4718,7 +4718,9 @@ static void test_propcase(void) r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); +todo_wine ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); +todo_wine ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

Huw Davies : gdi32: Take into account the mask's offset.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 3d58c354ae1be7567e1571af96d0c92864e31a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d58c354ae1be7567e1571af9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 11:07:44 2015 +0000 gdi32: Take into account the mask's offset. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d427070..d2b3de2 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -800,6 +800,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, /* combine both using the mask as a pattern brush */ SelectObject(hDC2, hbrMask); + SetBrushOrgEx(hDC2, -xMask, -yMask, NULL); BitBlt(hDC2, 0, 0, nWidth, nHeight, hDC1, 0, 0, 0xac0744 ); /* (D & P) | (S & ~P) */ SelectObject(hDC2, hbrTmp);

1 0

Alistair Leslie-Hughes : d3dx9: Don' t always fail if an ID3DXAnimationController pointer is passed to D3DXLoadMeshHierarchyFromXInMemory.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 418a7c6c7316f3803c38b1e2b6bdfe4a5347b7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418a7c6c7316f3803c38b1e2b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 00:52:30 2015 +0100 d3dx9: Don't always fail if an ID3DXAnimationController pointer is passed to D3DXLoadMeshHierarchyFromXInMemory. D3DXLoadMeshHierarchyFromXInMemory will only return an AnimationController when the xfile has an AnimationSet. 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> --- dlls/d3dx9_36/mesh.c | 14 +++-- dlls/d3dx9_36/tests/mesh.c | 145 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294036..c597e8e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3912,11 +3912,9 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo if (!memory || !memory_size || !device || !frame_hierarchy || !alloc_hier) return D3DERR_INVALIDCALL; - if (load_user_data || anim_controller) { - if (load_user_data) - FIXME("Loading user data not implemented\n"); - if (anim_controller) - FIXME("Animation controller creation not implemented\n"); + if (load_user_data) + { + FIXME("Loading user data not implemented.\n"); return E_NOTIMPL; } @@ -3986,6 +3984,12 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo hr = D3D_OK; } + if (anim_controller) + { + *anim_controller = NULL; + FIXME("Animation controller creation not implemented.\n"); + } + cleanup: if (FAILED(hr) && first_frame) D3DXFrameDestroy(first_frame, alloc_hier); if (filedata) filedata->lpVtbl->Release(filedata); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3b1fafa..588654d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2205,6 +2205,127 @@ static void D3DXLoadMeshTest(void) (char *)"texture.jpg", /* pTextureFilename */ }, }; + static const char box_anim_xfile[] = + "xof 0303txt 0032" + "Mesh CubeMesh {" + "8;" /* DWORD nVertices; */ + /* array Vector vertices[nVertices]; */ + "0.0; 0.0; 0.0;," + "0.0; 0.0; 1.0;," + "0.0; 1.0; 0.0;," + "0.0; 1.0; 1.0;," + "1.0; 0.0; 0.0;," + "1.0; 0.0; 1.0;," + "1.0; 1.0; 0.0;," + "1.0; 1.0; 1.0;;" + "6;" /* DWORD nFaces; */ + /* array MeshFace faces[nFaces]; */ + "4; 0, 1, 3, 2;," /* left side */ + "4; 2, 3, 7, 6;," /* top side */ + "4; 6, 7, 5, 4;," /* right side */ + "4; 1, 0, 4, 5;," /* bottom side */ + "4; 1, 5, 7, 3;," /* back side */ + "4; 0, 2, 6, 4;;" /* front side */ + "MeshNormals {" + "6;" /* DWORD nNormals; */ + /* array Vector normals[nNormals]; */ + "-1.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 0.0; 0.0;," + "0.0; -1.0; 0.0;," + "0.0; 0.0; 1.0;," + "0.0; 0.0; -1.0;;" + "6;" /* DWORD nFaceNormals; */ + /* array MeshFace faceNormals[nFaceNormals]; */ + "4; 0, 0, 0, 0;," + "4; 1, 1, 1, 1;," + "4; 2, 2, 2, 2;," + "4; 3, 3, 3, 3;," + "4; 4, 4, 4, 4;," + "4; 5, 5, 5, 5;;" + "}" + "MeshMaterialList materials {" + "2;" /* DWORD nMaterials; */ + "6;" /* DWORD nFaceIndexes; */ + /* array DWORD faceIndexes[nFaceIndexes]; */ + "0, 0, 0, 1, 1, 1;;" + "Material {" + /* ColorRGBA faceColor; */ + "0.0; 0.0; 1.0; 1.0;;" + /* FLOAT power; */ + "0.5;" + /* ColorRGB specularColor; */ + "1.0; 1.0; 1.0;;" + /* ColorRGB emissiveColor; */ + "0.0; 0.0; 0.0;;" + "}" + "Material {" + /* ColorRGBA faceColor; */ + "1.0; 1.0; 1.0; 1.0;;" + /* FLOAT power; */ + "1.0;" + /* ColorRGB specularColor; */ + "1.0; 1.0; 1.0;;" + /* ColorRGB emissiveColor; */ + "0.0; 0.0; 0.0;;" + "TextureFilename { \"texture.jpg\"; }" + "}" + "}" + "MeshVertexColors {" + "8;" /* DWORD nVertexColors; */ + /* array IndexedColor vertexColors[nVertexColors]; */ + "0; 0.0; 0.0; 0.0; 0.0;;" + "1; 0.0; 0.0; 1.0; 0.1;;" + "2; 0.0; 1.0; 0.0; 0.2;;" + "3; 0.0; 1.0; 1.0; 0.3;;" + "4; 1.0; 0.0; 0.0; 0.4;;" + "5; 1.0; 0.0; 1.0; 0.5;;" + "6; 1.0; 1.0; 0.0; 0.6;;" + "7; 1.0; 1.0; 1.0; 0.7;;" + "}" + "MeshTextureCoords {" + "8;" /* DWORD nTextureCoords; */ + /* array Coords2d textureCoords[nTextureCoords]; */ + "0.0; 1.0;," + "1.0; 1.0;," + "0.0; 0.0;," + "1.0; 0.0;," + "1.0; 1.0;," + "0.0; 1.0;," + "1.0; 0.0;," + "0.0; 0.0;;" + "}" + "}" + "Frame CubeFrame {" + "FrameTransformMatrix {" + /* Matrix4x4 frameMatrix; */ + "1.0, 0.0, 0.0, 0.0," + "0.0, 1.0, 0.0, 0.0," + "0.0, 0.0, 1.0, 0.0," + "0.0, 0.0, 0.0, 1.0;;" + "}" + "{CubeMesh}" + "}" + "AnimationSet AnimationSet0 {" + "Animation Animation0 {" + "{CubeFrame}" + "AnimationKey {" + "2;" /* DWORD keyType; */ + "9;" /* DWORD nKeys; */ + /* array TimedFloatKeys keys[nKeys]; */ + "10; 3; -100.0, 0.0, 0.0;;," + "20; 3; -75.0, 0.0, 0.0;;," + "30; 3; -50.0, 0.0, 0.0;;," + "40; 3; -25.5, 0.0, 0.0;;," + "50; 3; 0.0, 0.0, 0.0;;," + "60; 3; 25.5, 0.0, 0.0;;," + "70; 3; 50.0, 0.0, 0.0;;," + "80; 3; 75.5, 0.0, 0.0;;," + "90; 3; 100.0, 0.0, 0.0;;;" + "}" + "}" + "}"; + const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1; /*________________________*/ static const D3DXMATERIAL default_materials[] = { @@ -2225,6 +2346,7 @@ static void D3DXLoadMeshTest(void) D3DXFRAME *frame_hier = NULL; D3DXMATRIX transform; struct test_context *test_context; + ID3DXAnimationController *controller; if (!(test_context = new_test_context())) { @@ -2281,12 +2403,31 @@ static void D3DXLoadMeshTest(void) frame_hier = NULL; } + controller = (ID3DXAnimationController *)0xdeadbeef; + hr = D3DXLoadMeshHierarchyFromXInMemory(box_anim_xfile, sizeof(box_anim_xfile) - 1, + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller); + todo_wine ok(hr == D3D_OK, "Expected D3D_OK, got %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(controller != NULL, "Animation Controller NULL.\n"); + + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x.\n", hr); + if (controller) + controller->lpVtbl->Release(controller); + + frame_hier = NULL; + } + + controller = (ID3DXAnimationController *)0xdeadbeef; hr = D3DXLoadMeshHierarchyFromXInMemory(box_xfile, sizeof(box_xfile) - 1, - D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller); ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) + { D3DXMESHCONTAINER *container = frame_hier->pMeshContainer; + ok(!controller, "Animation Controller returned.\n"); ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); D3DXMatrixIdentity(&transform); check_matrix(&frame_hier->TransformationMatrix, &transform);

1 0

Dmitry Timoshkov : ole32/tests: Add some tests for loading and drawing various OLE formats.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: b8800c237b31741f2d88490414cd7783c3ced47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8800c237b31741f2d8849041… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 17:01:06 2015 +0800 ole32/tests: Add some tests for loading and drawing various OLE formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 39680af..ed6157f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "objbase.h" #include "shlguid.h" @@ -115,6 +116,32 @@ static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; +/**************************************************************************** + * PresentationDataHeader + * + * This structure represents the header of the \002OlePresXXX stream in + * the OLE object storage. + */ +typedef struct PresentationDataHeader +{ + /* clipformat: + * - standard clipformat: + * DWORD length = 0xffffffff; + * DWORD cfFormat; + * - or custom clipformat: + * DWORD length; + * CHAR format_name[length]; (null-terminated) + */ + DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DVASPECT dvAspect; + DWORD lindex; + DWORD tymed; + DWORD unknown7; /* 0 */ + DWORD dwObjectExtentX; + DWORD dwObjectExtentY; + DWORD dwSize; +} PresentationDataHeader; + #define CHECK_EXPECTED_METHOD(method_name) \ do { \ trace("%s\n", method_name); \ @@ -1042,6 +1069,7 @@ static void test_OleLoad(IStorage *pStorage) { HRESULT hr; IOleObject *pObject; + DWORD fmt; static const struct expected_method methods_oleload[] = { @@ -1099,6 +1127,111 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + + for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) + { + static const WCHAR olrepres[] = { 2,'O','l','e','P','r','e','s','0','0','0',0 }; + IStorage *stg; + IStream *stream; + IUnknown *obj; + DWORD data, i, tymed, data_size; + PresentationDataHeader header; + HDC hdc; + HGDIOBJ hobj; + RECT rc; + char buf[256]; + + for (i = 0; i < 7; i++) + { + hr = StgCreateDocfile(NULL, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &stg); + ok(hr == S_OK, "StgCreateDocfile error %#x\n", hr); + + hr = IStorage_SetClass(stg, &CLSID_WineTest); + ok(hr == S_OK, "SetClass error %#x\n", hr); + + hr = IStorage_CreateStream(stg, olrepres, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + data = ~0; + hr = IStream_Write(stream, &data, sizeof(data), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + data = fmt; + hr = IStream_Write(stream, &data, sizeof(data), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + switch (fmt) + { + case CF_BITMAP: + /* FIXME: figure out stream format */ + hobj = CreateBitmap(1, 1, 1, 1, NULL); + data_size = GetBitmapBits(hobj, sizeof(buf), buf); + DeleteObject(hobj); + break; + + case CF_METAFILEPICT: + case CF_ENHMETAFILE: + hdc = CreateMetaFileA(NULL); + hobj = CloseMetaFile(hdc); + data_size = GetMetaFileBitsEx(hobj, sizeof(buf), buf); + DeleteMetaFile(hobj); + break; + + default: + data_size = sizeof(buf); + memset(buf, 'A', sizeof(buf)); + break; + } + + tymed = 1 << i; + + header.unknown3 = 4; + header.dvAspect = DVASPECT_CONTENT; + header.lindex = -1; + header.tymed = tymed; + header.unknown7 = 0; + header.dwObjectExtentX = 1; + header.dwObjectExtentY = 1; + header.dwSize = data_size; + hr = IStream_Write(stream, &header, sizeof(header), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + hr = IStream_Write(stream, buf, data_size, NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + IStream_Release(stream); + + hr = OleLoad(stg, &IID_IUnknown, NULL, (void **)&obj); + /* FIXME: figure out stream format */ + if (fmt == CF_BITMAP && hr != S_OK) + { + IStorage_Release(stg); + continue; + } + ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + + hdc = CreateCompatibleDC(0); + SetRect(&rc, 0, 0, 100, 100); + hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); + DeleteDC(hdc); + if (fmt == CF_METAFILEPICT) + { + if (tymed == TYMED_HGLOBAL || tymed == TYMED_MFPICT) + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + else +todo_wine + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + } + else if (fmt == CF_ENHMETAFILE) +todo_wine + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + else + ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, tymed = %u\n", hr, fmt, header.tymed); + + IUnknown_Release(obj); + IStorage_Release(stg); + } + } } static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param)

1 0