February 2021 - Wine-devel - list.winehq.org

[PATCH v2 1/2] mmdevapi: Implement SpatialAudio features.
by Arkadiusz Hiler 02 Feb '21

02 Feb '21

From: Andrew Eikum <aeikum(a)codeweavers.com> This makes car radio / ambient noises audible in Cyberpunk 2077. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 3 +- dlls/mmdevapi/audiovolume.c | 1 + dlls/mmdevapi/devenum.c | 5 + dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 1 + dlls/mmdevapi/spatialaudio.c | 988 +++++++++++++++++++++++++++++++++ include/spatialaudioclient.idl | 121 ++++ 7 files changed, 1119 insertions(+), 1 deletion(-) create mode 100644 dlls/mmdevapi/spatialaudio.c diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 5f44f7ba53b..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ audiovolume.c \ devenum.c \ - main.c + main.c \ + spatialaudio.c IDL_SRCS = mmdevapi_classes.idl diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 9214980120e..6f403cf348a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -33,6 +33,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9e4a29816ce..07b4dca028b 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -35,6 +35,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "devpkey.h" @@ -635,6 +636,10 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSoundCapture_Release((IDirectSoundCapture*)*ppv); } } + else if (IsEqualIID(riid, &IID_ISpatialAudioClient)) + { + hr = SpatialAudioClient_Create(iface, (ISpatialAudioClient**)ppv); + } else ERR("Invalid/unknown iid %s\n", debugstr_guid(riid)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 247ebc3b001..eac1da28f18 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -37,6 +37,7 @@ #include "audiopolicy.h" #include "devpkey.h" #include "winreg.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "wine/debug.h" diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index bc9788e95c8..3bcf568cddf 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -71,5 +71,6 @@ typedef struct MMDevice { extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; +extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c new file mode 100644 index 00000000000..cbca57b4890 --- /dev/null +++ b/dlls/mmdevapi/spatialaudio.c @@ -0,0 +1,988 @@ +/* + * Copyright 2020 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/heap.h" +#include "wine/debug.h" +#include "wine/list.h" + +#include "ole2.h" +#include "mmdeviceapi.h" +#include "mmsystem.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" +#include "spatialaudioclient.h" + +#include "mmdevapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#define MAX_PERIODS 3 + +static UINT32 AudioObjectType_to_index(AudioObjectType type) +{ + UINT32 o = 0; + while(type){ + type >>= 1; + ++o; + } + return o - 2; +} + +typedef struct SpatialAudioImpl SpatialAudioImpl; +typedef struct SpatialAudioStreamImpl SpatialAudioStreamImpl; +typedef struct SpatialAudioObjectImpl SpatialAudioObjectImpl; + +struct SpatialAudioObjectImpl { + ISpatialAudioObject ISpatialAudioObject_iface; + LONG ref; + + SpatialAudioStreamImpl *sa_stream; + AudioObjectType type; + UINT32 static_idx; + + float *buf; + + struct list entry; +}; + +struct SpatialAudioStreamImpl { + ISpatialAudioObjectRenderStream ISpatialAudioObjectRenderStream_iface; + LONG ref; + CRITICAL_SECTION lock; + + SpatialAudioImpl *sa_client; + SpatialAudioObjectRenderStreamActivationParams params; + + IAudioClient *client; + IAudioRenderClient *render; + + UINT32 period_frames, update_frames; + WAVEFORMATEXTENSIBLE stream_fmtex; + + float *buf; + + UINT32 static_object_map[17]; + + struct list objects; +}; + +struct SpatialAudioImpl { + ISpatialAudioClient ISpatialAudioClient_iface; + IAudioFormatEnumerator IAudioFormatEnumerator_iface; + IMMDevice *mmdev; + LONG ref; + WAVEFORMATEXTENSIBLE object_fmtex; +}; + +static inline SpatialAudioObjectImpl *impl_from_ISpatialAudioObject(ISpatialAudioObject *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioObjectImpl, ISpatialAudioObject_iface); +} + +static inline SpatialAudioStreamImpl *impl_from_ISpatialAudioObjectRenderStream(ISpatialAudioObjectRenderStream *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioStreamImpl, ISpatialAudioObjectRenderStream_iface); +} + +static inline SpatialAudioImpl *impl_from_ISpatialAudioClient(ISpatialAudioClient *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, ISpatialAudioClient_iface); +} + +static inline SpatialAudioImpl *impl_from_IAudioFormatEnumerator(IAudioFormatEnumerator *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, IAudioFormatEnumerator_iface); +} + +static HRESULT WINAPI SAO_QueryInterface(ISpatialAudioObject *iface, + REFIID riid, void **ppv) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectBase) || + IsEqualIID(riid, &IID_ISpatialAudioObject)) { + *ppv = &This->ISpatialAudioObject_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAO_AddRef(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAO_Release(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + EnterCriticalSection(&This->sa_stream->lock); + list_remove(&This->entry); + LeaveCriticalSection(&This->sa_stream->lock); + + ISpatialAudioObjectRenderStream_Release(&This->sa_stream->ISpatialAudioObjectRenderStream_iface); + heap_free(This->buf); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAO_GetBuffer(ISpatialAudioObject *iface, + BYTE **buffer, UINT32 *bytes) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p, %p)\n", This, buffer, bytes); + + EnterCriticalSection(&This->sa_stream->lock); + + if(This->sa_stream->update_frames == ~0){ + LeaveCriticalSection(&This->sa_stream->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + *buffer = (BYTE *)This->buf; + *bytes = This->sa_stream->update_frames * + This->sa_stream->sa_client->object_fmtex.Format.nBlockAlign; + + LeaveCriticalSection(&This->sa_stream->lock); + + return S_OK; +} + +static HRESULT WINAPI SAO_SetEndOfStream(ISpatialAudioObject *iface, UINT32 frames) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%u)\n", This, frames); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_IsActive(ISpatialAudioObject *iface, BOOL *active) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%p)\n", This, active); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_GetAudioObjectType(ISpatialAudioObject *iface, + AudioObjectType *type) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p)\n", This, type); + + *type = This->type; + + return S_OK; +} + +static HRESULT WINAPI SAO_SetPosition(ISpatialAudioObject *iface, float x, + float y, float z) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f, %f, %f)\n", This, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_SetVolume(ISpatialAudioObject *iface, float vol) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f)\n", This, vol); + return E_NOTIMPL; +} + +static ISpatialAudioObjectVtbl ISpatialAudioObject_vtbl = { + SAO_QueryInterface, + SAO_AddRef, + SAO_Release, + SAO_GetBuffer, + SAO_SetEndOfStream, + SAO_IsActive, + SAO_GetAudioObjectType, + SAO_SetPosition, + SAO_SetVolume, +}; + +static HRESULT WINAPI SAORS_QueryInterface(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **ppv) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStreamBase) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)) { + *ppv = &This->ISpatialAudioObjectRenderStream_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAORS_AddRef(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAORS_Release(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + IAudioClient_Stop(This->client); + if(This->update_frames != ~0 && This->update_frames > 0) + IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + IAudioRenderClient_Release(This->render); + IAudioClient_Release(This->client); + if(This->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(This->params.NotifyObject); + heap_free((void*)This->params.ObjectFormat); + CloseHandle(This->params.EventHandle); + DeleteCriticalSection(&This->lock); + ISpatialAudioClient_Release(&This->sa_client->ISpatialAudioClient_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( + ISpatialAudioObjectRenderStream *iface, UINT32 *count) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **service) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(riid), service); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_Start(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Start(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Start failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Stop(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Stop(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Stop failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Reset(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface, + UINT32 *dyn_count, UINT32 *frames) +{ + static BOOL fixme_once = FALSE; + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + UINT32 pad; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); + + EnterCriticalSection(&This->lock); + + if(This->update_frames != ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + hr = IAudioClient_GetCurrentPadding(This->client, &pad); + if(FAILED(hr)){ + WARN("GetCurrentPadding failed: %08x\n", hr); + LeaveCriticalSection(&This->lock); + return hr; + } + + if(pad < This->period_frames * MAX_PERIODS){ + This->update_frames = This->period_frames * MAX_PERIODS - pad; + }else{ + This->update_frames = 0; + } + + if(This->update_frames > 0){ + hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + This->update_frames = ~0; + LeaveCriticalSection(&This->lock); + return hr; + } + + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + memset(object->buf, 0, This->update_frames * This->sa_client->object_fmtex.Format.nBlockAlign); + } + }else if (!fixme_once){ + fixme_once = TRUE; + FIXME("Zero frame update.\n"); + } + + *dyn_count = 0; + *frames = This->update_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static void mix_static_object(SpatialAudioStreamImpl *stream, SpatialAudioObjectImpl *object) +{ + float *in = object->buf, *out; + UINT32 i; + if(object->static_idx == ~0 || + stream->static_object_map[object->static_idx] == ~0){ + WARN("Got unmapped static object?! Not mixing. Type: 0x%x\n", object->type); + return; + } + out = stream->buf + stream->static_object_map[object->static_idx]; + for(i = 0; i < stream->update_frames; ++i){ + *out += *in; + ++in; + out += stream->stream_fmtex.Format.nChannels; + } +} + +static HRESULT WINAPI SAORS_EndUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + HRESULT hr; + + TRACE("(%p)->()\n", This); + + EnterCriticalSection(&This->lock); + + if(This->update_frames == ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + if(This->update_frames > 0){ + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + if(object->type != AudioObjectType_Dynamic) + mix_static_object(This, object); + else + WARN("Don't know how to mix dynamic object yet. %p\n", object); + } + + hr = IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + if(FAILED(hr)) + WARN("ReleaseBuffer failed: %08x\n", hr); + } + + This->update_frames = ~0; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRenderStream *iface, + AudioObjectType type, ISpatialAudioObject **object) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *obj; + + TRACE("(%p)->(0x%x, %p)\n", This, type, object); + + if(type == AudioObjectType_Dynamic) + return SPTLAUDCLNT_E_NO_MORE_OBJECTS; + + if(type & ~This->params.StaticObjectTypeMask) + return SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE; + + LIST_FOR_EACH_ENTRY(obj, &This->objects, SpatialAudioObjectImpl, entry){ + if(obj->static_idx == AudioObjectType_to_index(type)) + return SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE; + } + + obj = heap_alloc_zero(sizeof(*obj)); + obj->ISpatialAudioObject_iface.lpVtbl = &ISpatialAudioObject_vtbl; + obj->ref = 1; + obj->type = type; + if(type == AudioObjectType_None){ + FIXME("AudioObjectType_None not implemented yet!\n"); + obj->static_idx = ~0; + }else{ + obj->static_idx = AudioObjectType_to_index(type); + } + + obj->sa_stream = This; + SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); + + obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + + EnterCriticalSection(&This->lock); + + list_add_tail(&This->objects, &obj->entry); + + LeaveCriticalSection(&This->lock); + + *object = &obj->ISpatialAudioObject_iface; + + return S_OK; +} + +static ISpatialAudioObjectRenderStreamVtbl ISpatialAudioObjectRenderStream_vtbl = { + SAORS_QueryInterface, + SAORS_AddRef, + SAORS_Release, + SAORS_GetAvailableDynamicObjectCount, + SAORS_GetService, + SAORS_Start, + SAORS_Stop, + SAORS_Reset, + SAORS_BeginUpdatingAudioObjects, + SAORS_EndUpdatingAudioObjects, + SAORS_ActivateSpatialAudioObject, +}; + +static HRESULT WINAPI SAC_QueryInterface(ISpatialAudioClient *iface, REFIID riid, void **ppv) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioClient)) { + *ppv = &This->ISpatialAudioClient_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAC_AddRef(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAC_Release(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if (!ref) { + IMMDevice_Release(This->mmdev); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAC_GetStaticObjectPosition(ISpatialAudioClient *iface, + AudioObjectType type, float *x, float *y, float *z) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(0x%x, %p, %p, %p)\n", This, type, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetNativeStaticObjectTypeMask(ISpatialAudioClient *iface, + AudioObjectType *mask) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, mask); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetMaxDynamicObjectCount(ISpatialAudioClient *iface, + UINT32 *value) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, value); + + *value = 0; + + return S_OK; +} + +static HRESULT WINAPI SAC_GetSupportedAudioObjectFormatEnumerator( + ISpatialAudioClient *iface, IAudioFormatEnumerator **enumerator) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%p)\n", This, enumerator); + + *enumerator = &This->IAudioFormatEnumerator_iface; + SAC_AddRef(iface); + + return S_OK; +} + +static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, + const WAVEFORMATEX *format, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + /* FIXME: should get device period from the device */ + static const REFERENCE_TIME period = 100000; + + TRACE("(%p)->(%p, %p)\n", This, format, count); + + *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + + return S_OK; +} + +static HRESULT WINAPI SAC_IsAudioObjectFormatSupported(ISpatialAudioClient *iface, + const WAVEFORMATEX *format) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_IsSpatialAudioStreamAvailable(ISpatialAudioClient *iface, + REFIID stream_uuid, const PROPVARIANT *info) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(stream_uuid), info); + return E_NOTIMPL; +} + +static WAVEFORMATEX *clone_fmtex(const WAVEFORMATEX *src) +{ + WAVEFORMATEX *r = heap_alloc(sizeof(WAVEFORMATEX) + src->cbSize); + memcpy(r, src, sizeof(WAVEFORMATEX) + src->cbSize); + return r; +} + +static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) +{ + static char buf[2048]; + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%x), rate: %u, depth: %u", + fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), + fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + }else{ + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %u, depth: %u", + fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + } + return buf; +} + +static void static_mask_to_channels(AudioObjectType static_mask, WORD *count, DWORD *mask, UINT32 *map) +{ + UINT32 out_chan = 0, map_idx = 0; + *count = 0; + *mask = 0; +#define CONVERT_MASK(f, t) \ + if(static_mask & f){ \ + *count += 1; \ + *mask |= t; \ + map[map_idx++] = out_chan++; \ + TRACE("mapping 0x%x to %u\n", f, out_chan - 1); \ + }else{ \ + map[map_idx++] = ~0; \ + } + CONVERT_MASK(AudioObjectType_FrontLeft, SPEAKER_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_FrontRight, SPEAKER_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_FrontCenter, SPEAKER_FRONT_CENTER); + CONVERT_MASK(AudioObjectType_LowFrequency, SPEAKER_LOW_FREQUENCY); + CONVERT_MASK(AudioObjectType_SideLeft, SPEAKER_SIDE_LEFT); + CONVERT_MASK(AudioObjectType_SideRight, SPEAKER_SIDE_RIGHT); + CONVERT_MASK(AudioObjectType_BackLeft, SPEAKER_BACK_LEFT); + CONVERT_MASK(AudioObjectType_BackRight, SPEAKER_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_TopFrontLeft, SPEAKER_TOP_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_TopFrontRight, SPEAKER_TOP_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_TopBackLeft, SPEAKER_TOP_BACK_LEFT); + CONVERT_MASK(AudioObjectType_TopBackRight, SPEAKER_TOP_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_BackCenter, SPEAKER_BACK_CENTER); +} + +static HRESULT activate_stream(SpatialAudioStreamImpl *stream) +{ + WAVEFORMATEXTENSIBLE *object_fmtex = (WAVEFORMATEXTENSIBLE *)stream->params.ObjectFormat; + HRESULT hr; + REFERENCE_TIME period; + + if(!(object_fmtex->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (object_fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&object_fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))){ + FIXME("Only float formats are supported for now\n"); + return E_INVALIDARG; + } + + hr = IMMDevice_Activate(stream->sa_client->mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&stream->client); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + return hr; + } + + hr = IAudioClient_GetDevicePeriod(stream->client, &period, NULL); + if(FAILED(hr)){ + WARN("GetDevicePeriod failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->stream_fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + static_mask_to_channels(stream->params.StaticObjectTypeMask, + &stream->stream_fmtex.Format.nChannels, &stream->stream_fmtex.dwChannelMask, + stream->static_object_map); + stream->stream_fmtex.Format.nSamplesPerSec = stream->params.ObjectFormat->nSamplesPerSec; + stream->stream_fmtex.Format.wBitsPerSample = stream->params.ObjectFormat->wBitsPerSample; + stream->stream_fmtex.Format.nBlockAlign = (stream->stream_fmtex.Format.nChannels * stream->stream_fmtex.Format.wBitsPerSample) / 8; + stream->stream_fmtex.Format.nAvgBytesPerSec = stream->stream_fmtex.Format.nSamplesPerSec * stream->stream_fmtex.Format.nBlockAlign; + stream->stream_fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + stream->stream_fmtex.Samples.wValidBitsPerSample = stream->stream_fmtex.Format.wBitsPerSample; + stream->stream_fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, + period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + if(FAILED(hr)){ + WARN("Initialize failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + hr = IAudioClient_SetEventHandle(stream->client, stream->params.EventHandle); + if(FAILED(hr)){ + WARN("SetEventHandle failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + hr = IAudioClient_GetService(stream->client, &IID_IAudioRenderClient, (void**)&stream->render); + if(FAILED(hr)){ + WARN("GetService(AudioRenderClient) failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->period_frames = MulDiv(period, stream->stream_fmtex.Format.nSamplesPerSec, 10000000); + + return S_OK; +} + +static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, + const PROPVARIANT *prop, REFIID riid, void **stream) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + SpatialAudioObjectRenderStreamActivationParams *params; + HRESULT hr; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), stream); + + if(IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)){ + SpatialAudioStreamImpl *obj; + + if(prop && + (prop->vt != VT_BLOB || + prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + WARN("Got invalid params\n"); + *stream = NULL; + return E_INVALIDARG; + } + + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + + if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ + *stream = NULL; + return E_INVALIDARG; + } + + if(params->EventHandle == INVALID_HANDLE_VALUE || + params->EventHandle == 0){ + *stream = NULL; + return E_INVALIDARG; + } + + if(!params->ObjectFormat || + memcmp(params->ObjectFormat, &This->object_fmtex.Format, sizeof(*params->ObjectFormat) + params->ObjectFormat->cbSize)){ + *stream = NULL; + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + obj = heap_alloc_zero(sizeof(SpatialAudioStreamImpl)); + + obj->ISpatialAudioObjectRenderStream_iface.lpVtbl = &ISpatialAudioObjectRenderStream_vtbl; + obj->ref = 1; + memcpy(&obj->params, params, sizeof(obj->params)); + + obj->update_frames = ~0; + + InitializeCriticalSection(&obj->lock); + list_init(&obj->objects); + + obj->sa_client = This; + SAC_AddRef(&This->ISpatialAudioClient_iface); + + obj->params.ObjectFormat = clone_fmtex(obj->params.ObjectFormat); + + DuplicateHandle(GetCurrentProcess(), obj->params.EventHandle, + GetCurrentProcess(), &obj->params.EventHandle, 0, FALSE, + DUPLICATE_SAME_ACCESS); + + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_AddRef(obj->params.NotifyObject); + + if(TRACE_ON(mmdevapi)){ + TRACE("ObjectFormat: {%s}\n", debugstr_fmtex(obj->params.ObjectFormat)); + TRACE("StaticObjectTypeMask: 0x%x\n", obj->params.StaticObjectTypeMask); + TRACE("MinDynamicObjectCount: 0x%x\n", obj->params.MinDynamicObjectCount); + TRACE("MaxDynamicObjectCount: 0x%x\n", obj->params.MaxDynamicObjectCount); + TRACE("Category: 0x%x\n", obj->params.Category); + TRACE("EventHandle: %p\n", obj->params.EventHandle); + TRACE("NotifyObject: %p\n", obj->params.NotifyObject); + } + + hr = activate_stream(obj); + if(FAILED(hr)){ + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(obj->params.NotifyObject); + DeleteCriticalSection(&obj->lock); + heap_free((void*)obj->params.ObjectFormat); + CloseHandle(obj->params.EventHandle); + ISpatialAudioClient_Release(&obj->sa_client->ISpatialAudioClient_iface); + heap_free(obj); + *stream = NULL; + return hr; + } + + *stream = &obj->ISpatialAudioObjectRenderStream_iface; + }else{ + FIXME("Unsupported audio stream IID: %s\n", debugstr_guid(riid)); + *stream = NULL; + return E_NOTIMPL; + } + + return S_OK; +} + +static ISpatialAudioClientVtbl ISpatialAudioClient_vtbl = { + SAC_QueryInterface, + SAC_AddRef, + SAC_Release, + SAC_GetStaticObjectPosition, + SAC_GetNativeStaticObjectTypeMask, + SAC_GetMaxDynamicObjectCount, + SAC_GetSupportedAudioObjectFormatEnumerator, + SAC_GetMaxFrameCount, + SAC_IsAudioObjectFormatSupported, + SAC_IsSpatialAudioStreamAvailable, + SAC_ActivateSpatialAudioStream, +}; + +static HRESULT WINAPI SAOFE_QueryInterface(IAudioFormatEnumerator *iface, + REFIID riid, void **ppvObject) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_QueryInterface(&This->ISpatialAudioClient_iface, riid, ppvObject); +} + +static ULONG WINAPI SAOFE_AddRef(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_AddRef(&This->ISpatialAudioClient_iface); +} + +static ULONG WINAPI SAOFE_Release(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_Release(&This->ISpatialAudioClient_iface); +} + +static HRESULT WINAPI SAOFE_GetCount(IAudioFormatEnumerator *iface, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%p)\n", This, count); + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI SAOFE_GetFormat(IAudioFormatEnumerator *iface, + UINT32 index, WAVEFORMATEX **format) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%u, %p)\n", This, index, format); + + if(index > 0) + return E_INVALIDARG; + + *format = &This->object_fmtex.Format; + + return S_OK; +} + +static IAudioFormatEnumeratorVtbl IAudioFormatEnumerator_vtbl = { + SAOFE_QueryInterface, + SAOFE_AddRef, + SAOFE_Release, + SAOFE_GetCount, + SAOFE_GetFormat, +}; + +HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) +{ + SpatialAudioImpl *obj; + IAudioClient *aclient; + WAVEFORMATEX *closest; + HRESULT hr; + + obj = heap_alloc_zero(sizeof(*obj)); + + obj->ref = 1; + obj->ISpatialAudioClient_iface.lpVtbl = &ISpatialAudioClient_vtbl; + obj->IAudioFormatEnumerator_iface.lpVtbl = &IAudioFormatEnumerator_vtbl; + + obj->object_fmtex.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + obj->object_fmtex.Format.nChannels = 1; + obj->object_fmtex.Format.nSamplesPerSec = 48000; + obj->object_fmtex.Format.wBitsPerSample = sizeof(float) * 8; + obj->object_fmtex.Format.nBlockAlign = (obj->object_fmtex.Format.nChannels * obj->object_fmtex.Format.wBitsPerSample) / 8; + obj->object_fmtex.Format.nAvgBytesPerSec = obj->object_fmtex.Format.nSamplesPerSec * obj->object_fmtex.Format.nBlockAlign; + obj->object_fmtex.Format.cbSize = 0; + + hr = IMMDevice_Activate(mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&aclient); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + hr = IAudioClient_IsFormatSupported(aclient, AUDCLNT_SHAREMODE_SHARED, &obj->object_fmtex.Format, &closest); + + IAudioClient_Release(aclient); + + if(hr == S_FALSE){ + if(sizeof(WAVEFORMATEX) + closest->cbSize > sizeof(obj->object_fmtex)){ + ERR("Returned format too large: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else if(!((closest->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE *)closest)->SubFormat, + &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) && + closest->wBitsPerSample == 32)){ + ERR("Returned format not 32-bit float: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + WARN("The audio stack doesn't support 48kHz 32bit float. Using the closest match. Audio may be glitchy. %s\n", debugstr_fmtex(closest)); + memcpy(&obj->object_fmtex, + closest, + sizeof(WAVEFORMATEX) + closest->cbSize); + CoTaskMemFree(closest); + } else if(hr != S_OK){ + WARN("Checking supported formats failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + obj->mmdev = mmdev; + IMMDevice_AddRef(mmdev); + + *out = &obj->ISpatialAudioClient_iface; + + return S_OK; +} diff --git a/include/spatialaudioclient.idl b/include/spatialaudioclient.idl index 16a1541fd1d..08c84965566 100644 --- a/include/spatialaudioclient.idl +++ b/include/spatialaudioclient.idl @@ -43,6 +43,47 @@ typedef [v1_enum] enum AudioObjectType AudioObjectType_BackCenter = 0x00020000, } AudioObjectType; +cpp_quote("#define SPTLAUDCLNT_E_DESTROYED AUDCLNT_ERR(0x100)") +cpp_quote("#define SPTLAUDCLNT_E_OUT_OF_ORDER AUDCLNT_ERR(0x101)") +cpp_quote("#define SPTLAUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x102)") +cpp_quote("#define SPTLAUDCLNT_E_NO_MORE_OBJECTS AUDCLNT_ERR(0x103)") +cpp_quote("#define SPTLAUDCLNT_E_PROPERTY_NOT_SUPPORTED AUDCLNT_ERR(0x104)") +cpp_quote("#define SPTLAUDCLNT_E_ERRORS_IN_OBJECT_CALLS AUDCLNT_ERR(0x105)") +cpp_quote("#define SPTLAUDCLNT_E_METADATA_FORMAT_NOT_SUPPORTED AUDCLNT_ERR(0x106)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_AVAILABLE AUDCLNT_ERR(0x107)") +cpp_quote("#define SPTLAUDCLNT_E_INVALID_LICENSE AUDCLNT_ERR(0x108)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_STOPPED AUDCLNT_ERR(0x10a)") +cpp_quote("#define SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE AUDCLNT_ERR(0x10b)") +cpp_quote("#define SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE AUDCLNT_ERR(0x10c)") +cpp_quote("#define SPTLAUDCLNT_E_INTERNAL AUDCLNT_ERR(0x10d)") + +interface ISpatialAudioObjectRenderStreamBase; + +[ + object, + uuid(dddf83e6-68d7-4c70-883f-a1836afb4a50), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamNotify : IUnknown +{ + HRESULT OnAvailableDynamicObjectCountChange( + [in] ISpatialAudioObjectRenderStreamBase *stream, + [in] LONGLONG deadline, + [in] UINT32 object_count); +} + +typedef struct tagSpatialAudioObjectRenderStreamActivationParams +{ + const WAVEFORMATEX *ObjectFormat; + AudioObjectType StaticObjectTypeMask; + UINT32 MinDynamicObjectCount; + UINT32 MaxDynamicObjectCount; + AUDIO_STREAM_CATEGORY Category; + HANDLE EventHandle; + ISpatialAudioObjectRenderStreamNotify *NotifyObject; +} SpatialAudioObjectRenderStreamActivationParams; + [ object, uuid(dcdaa858-895a-4a22-a5eb-67bda506096d), @@ -98,3 +139,83 @@ interface ISpatialAudioClient : IUnknown [in] REFIID riid, [out, iid_is(riid)] void **stream); } + +[ + object, + uuid(cce0b8f2-8d4d-4efb-a8cf-3d6ecf1c30e0), + pointer_default(unique), + local +] +interface ISpatialAudioObjectBase : IUnknown +{ + HRESULT GetBuffer( + [out] BYTE **buffer, + [out] UINT32 *bytes); + + HRESULT SetEndOfStream( + [in] UINT32 frames); + + HRESULT IsActive( + [out] BOOL *active); + + HRESULT GetAudioObjectType( + [out] AudioObjectType *type); +} + +[ + object, + uuid(dde28967-521b-46e5-8f00-bd6f2bc8ab1d), + pointer_default(unique), + local +] +interface ISpatialAudioObject : ISpatialAudioObjectBase +{ + HRESULT SetPosition( + [in] float x, + [in] float y, + [in] float z); + + HRESULT SetVolume( + [in] float vol); +} + +[ + object, + uuid(feaaf403-c1d8-450d-aa05-e0ccee7502a8), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamBase : IUnknown +{ + HRESULT GetAvailableDynamicObjectCount( + [out] UINT32 *count); + + HRESULT GetService( + [in] REFIID riid, + [out] void **service); + + HRESULT Start(); + + HRESULT Stop(); + + HRESULT Reset(); + + HRESULT BeginUpdatingAudioObjects( + [out] UINT32 *count, + [out] UINT32 *frames); + + HRESULT EndUpdatingAudioObjects(); +} + +[ + object, + uuid(bab5f473-b423-477b-85f5-b5a332a04153), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStream : ISpatialAudioObjectRenderStreamBase +{ + HRESULT ActivateSpatialAudioObject( + [in] AudioObjectType type, + [out] ISpatialAudioObject **object); +} -- 2.30.0

1 1

[PATCH 1/2] advapi32/tests: Test implicit DACL_SECURITY_INFORMATION permission on a registry key.
by Dmitry Timoshkov 02 Feb '21

02 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 020e69277e0..91c49378e7f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7878,6 +7878,43 @@ static void test_create_process_token_child(void) } } +static void test_regkey_security(void) +{ + HKEY hkey; + DWORD ret; + PSECURITY_DESCRIPTOR sd; + ACL *dacl; + + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Winetest", &hkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + RegCloseKey(hkey); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Winetest", 0, KEY_QUERY_VALUE, &hkey); + ok(ret == ERROR_SUCCESS, "got %u\n", ret); + + ret = get_obj_access(hkey); + ok(ret == KEY_QUERY_VALUE, "got %#x\n", ret); + + sd = NULL; + dacl = NULL; + ret = GetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, &dacl, NULL, &sd); +todo_wine + ok(ret == ERROR_SUCCESS, "got %u\n", ret); +todo_wine + ok(sd != NULL, "sd should not be NULL\n"); +todo_wine + ok(dacl != NULL, "dacl should not be NULL\n"); + + ret = SetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, dacl, NULL); +todo_wine + ok(ret == ERROR_SUCCESS, "got %u\n", ret); + + LocalFree(sd); + + RegDeleteKeyW(hkey, L""); + RegCloseKey(hkey); +} + START_TEST(security) { init(); @@ -7940,6 +7977,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_regkey_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.29.2

1 0

[tools] testbot/PatchUtils: Add support for .com program tests in _LoadWineFiles().
by Francois Gouget 02 Feb '21

02 Feb '21

_LoadWineFiles() must use the correct module name so that the lookups succeed in _CreateTestInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Wine does not have any .com test so far so this bug did not have any impact yet. testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b2749c4e5..dda855d11 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -107,7 +107,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs"); + $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); $_TestList->{$Module}->{$File} = 1; } } -- 2.20.1

1 0

[PATCH] d2d1/tests: Add return value test (Coverity).
by Nikolay Sivov 02 Feb '21

02 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Only for consistency with other tests. dlls/d2d1/tests/d2d1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c1ff9dc197..8d584605819 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7701,7 +7701,8 @@ static void test_gdi_interop(BOOL d3d11) todo_wine ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ID2D1RenderTarget_Release(rt); -- 2.30.0

2 1

[PATCH 1/5] mfplat/tests: Add some tests for D3D11-aware sample allocator.
by Nikolay Sivov 02 Feb '21

02 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 388 +++++++++++++++++++++++++++++++++++++ include/mfapi.h | 3 + include/mfobjects.idl | 28 +++ 3 files changed, 419 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 77ac299c918..cdd8830bad3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -70,6 +70,13 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -124,6 +131,9 @@ static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_t static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); +static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); +static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); static HWND create_window(void) { @@ -780,12 +790,14 @@ static void init_functions(void) X(MFCopyImage); X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); + X(MFCreateDXGISurfaceBuffer); X(MFCreateDXSurfaceBuffer); X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); X(MFCreateTrackedSample); X(MFCreateTransformActivate); + X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); X(MFMapDXGIFormatToDX9Format); @@ -5246,6 +5258,7 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMF2DBuffer, TRUE); /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); @@ -6025,6 +6038,379 @@ static void test_MFMapDXGIFormatToDX9Format(void) } } +static HRESULT WINAPI test_notify_callback_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_notify_callback_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI test_notify_callback_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI test_notify_callback_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl test_notify_callback_vtbl = +{ + test_notify_callback_QueryInterface, + test_notify_callback_AddRef, + test_notify_callback_Release, + test_notify_callback_NotifyRelease, +}; + +static IMFMediaType * create_video_type(const GUID *subtype) +{ + IMFMediaType *video_type; + HRESULT hr; + + hr = MFCreateMediaType(&video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return video_type; +} + +static ID3D11Device *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + unsigned int feature_level_count; + ID3D11Device *device; + + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + +static void test_dxgi_surface_buffer(void) +{ + IMFDXGIBuffer *dxgi_buffer; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IMFMediaBuffer *buffer; + ID3D11Device *device; + UINT index, size; + IUnknown *obj; + HRESULT hr; + BYTE *data; + + if (!pMFCreateDXGISurfaceBuffer) + { + skip("MFCreateDXGISurfaceBuffer() is not available.\n"); + return; + } + + device = create_d3d11_device(); + + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Failed to create a texture, hr %#x.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 5, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + EXPECT_REF(texture, 2); + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&obj); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + EXPECT_REF(texture, 3); + ok(obj == (IUnknown *)texture, "Unexpected resource pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, &index); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(index == 5, "Unexpected index.\n"); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, (void *)device); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3D11Texture2D_GetPrivateData(texture, &IID_IMFDXGIBuffer, &size, &data); + ok(hr == DXGI_ERROR_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_ID3D11Device, (void **)&obj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(obj == (IUnknown *)device, "Unexpected pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_IUnknown, (void **)&obj); + ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + IMFDXGIBuffer_Release(dxgi_buffer); + + IMFMediaBuffer_Release(buffer); + + ID3D11Texture2D_Release(texture); + + ID3D11Device_Release(device); +} + +static void test_sample_allocator(void) +{ + IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; + IMFVideoSampleAllocatorCallback *allocator_cb; + IMFVideoSampleAllocatorEx *allocatorex; + IMFMediaType *media_type, *video_type; + IMFVideoSampleAllocator *allocator; + IMFDXGIDeviceManager *manager; + IMFSample *sample, *sample2; + IMFMediaBuffer *buffer; + ID3D11Device *device; + LONG refcount, count; + unsigned int token; + IUnknown *unk; + HRESULT hr; + BYTE *data; + + if (!pMFCreateVideoSampleAllocatorEx) + { + skip("MFCreateVideoSampleAllocatorEx() is not available.\n"); + return; + } + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(unk, &IID_IMFVideoSampleAllocator, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorEx, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorCallback, TRUE); + + IUnknown_Release(unk); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 10; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + video_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + /* Frame size is required. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + sample = NULL; + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + refcount = get_refcount(sample); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + /* Reinitialize with active sample. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + check_interface(sample, &IID_IMFTrackedSample, TRUE); + check_interface(sample, &IID_IMFDesiredSample, FALSE); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + + IMFMediaBuffer_Release(buffer); + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocator_Release(allocator); + + /* IMFVideoSampleAllocatorEx */ + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_QueryInterface(allocatorex, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 1, 0, NULL, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, NULL, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocatorEx_Release(allocatorex); + + /* Using device manager */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create device manager, hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IMFDXGIDeviceManager_Release(manager); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { char **argv; @@ -6085,6 +6471,8 @@ START_TEST(mfplat) test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); test_MFMapDXGIFormatToDX9Format(); + test_dxgi_surface_buffer(); + test_sample_allocator(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 77875486e54..7bac3e21fa9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -510,6 +510,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); +HRESULT WINAPI MFCreateDXGISurfaceBuffer(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateDXSurfaceBuffer(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, @@ -522,6 +524,7 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); +HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **allocator); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index ee49be35af0..b2d0e5d06ec 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -167,6 +167,34 @@ interface IMF2DBuffer2 : IMF2DBuffer HRESULT Copy2DTo([in] IMF2DBuffer2 *dest_buffer); } +[ + object, + uuid(e7174cfa-1c9e-48b1-8866-626226bfc258), + local +] +interface IMFDXGIBuffer : IUnknown +{ + HRESULT GetResource( + [in] REFIID riid, + [out] void **object + ); + + HRESULT GetSubresourceIndex( + [out] UINT *index + ); + + HRESULT GetUnknown( + [in] REFIID guid, + [in] REFIID riid, + [out] void **object + ); + + HRESULT SetUnknown( + [in] REFIID guid, + [in] IUnknown *data + ); +} + [ object, uuid(44ae0fa8-ea31-4109-8d2e-4cae4997c555), -- 2.30.0

2 6

[PATCH] wbemprox: Report the real OS version.
by Hans Leidekker 02 Feb '21

02 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50580 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9ae34a50c0d..f1cf75ab380 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3514,13 +3514,13 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct { struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - OSVERSIONINFOEXW ver; + RTL_OSVERSIONINFOEXW ver; UINT row = 0; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; ver.dwOSVersionInfoSize = sizeof(ver); - GetVersionExW( (OSVERSIONINFOW *)&ver ); + RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver ); -- 2.30.0

1 0

[tools] testbot: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/vhost_winetestbot.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 7b84564a5..48a3917ce 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -23,11 +23,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> @@ -61,11 +56,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> -- 2.20.1

1 0

[tools] winetest: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/vhost_winetest.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 797aac3f4..081025b1c 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -32,10 +32,6 @@ RewriteEngine On RewriteRule "^$" "/data/" [R] - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> -- 2.20.1

1 0

[tools] patches: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- patches/doc/vhost_source.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 03c25c6df..01c6dee15 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -6,10 +6,6 @@ ServerAdmin winehq(a)example.com <Directory /home/winehq/opt/source> - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> -- 2.20.1

1 0

[PATCH v2 resend 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang 02 Feb '21

02 Feb '21

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 3 -- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..b8071dc2155 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2783,7 +2783,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0