wine-devel October 2018

60 participants
608 discussions

[PATCH] testbot/build: Fix a typo in WineReconfig.pl.

by Francois Gouget

The build is now derived directly from the mission. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I have updated the debian9 VM already so no patch has been impacted. testbot/bin/build/WineReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 53ce319032..898f72c5b6 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -108,12 +108,12 @@ sub UpdateWinePrefixes($) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Build); + SetupWineEnvironment($Mission->{Build}); InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Build, "wait"); + my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; -- 2.19.1

5 years, 6 months

[PATCH] mfplat: Add IMFAttributes interface to IMFByteStream

by Sven Baars

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch follows suggestions from Nicolay and Zebediah to first implement a separate IMFAttributes interface for IMFByteStream. I will update the rest of my patches later. I used --patience to format the patch to make it a bit easier to review. dlls/mfplat/main.c | 979 ++++++++++++++++++++++++------------- dlls/mfplat/tests/mfplat.c | 53 +- 2 files changed, 697 insertions(+), 335 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..620d5e251c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -448,339 +448,6 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } -typedef struct _mfbytestream -{ - IMFByteStream IMFByteStream_iface; - LONG ref; -} mfbytestream; - -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) -{ - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); -} - -static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFByteStream)) - { - *out = &This->IMFByteStream_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, capabilities); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, length); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, endstream); - - if(endstream) - *endstream = TRUE; - - return S_OK; -} - -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static const IMFByteStreamVtbl mfbytesteam_vtbl = -{ - mfbytestream_QueryInterface, - mfbytestream_AddRef, - mfbytestream_Release, - mfbytestream_GetCapabilities, - mfbytestream_GetLength, - mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, - mfbytestream_Read, - mfbytestream_BeginRead, - mfbytestream_EndRead, - mfbytestream_Write, - mfbytestream_BeginWrite, - mfbytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close -}; - -HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) -{ - mfbytestream *object; - - TRACE("(%p, %p): stub\n", stream, bytestream); - - object = heap_alloc( sizeof(*object) ); - if(!object) - return E_OUTOFMEMORY; - - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; - - *bytestream = &object->IMFByteStream_iface; - - return S_OK; -} - -static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { - TRACE("(IID_IMFPluginControl %p)\n", ppv); - *ppv = iface; - }else { - FIXME("(%s %p)\n", debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) -{ - TRACE("\n"); - return 2; -} - -static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) -{ - TRACE("\n"); - return 1; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, CLSID *clsid) -{ - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, - DWORD index, WCHAR **selector, CLSID *clsid) -{ - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, const CLSID *clsid) -{ - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) -{ - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) -{ - FIXME("(%d %d %p)\n", plugin_type, index, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) -{ - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); - return E_NOTIMPL; -} - -static const IMFPluginControlVtbl MFPluginControlVtbl = { - MFPluginControl_QueryInterface, - MFPluginControl_AddRef, - MFPluginControl_Release, - MFPluginControl_GetPreferredClsid, - MFPluginControl_GetPreferredClsidByIndex, - MFPluginControl_SetPreferredClsid, - MFPluginControl_IsDisabled, - MFPluginControl_GetDisabledByIndex, - MFPluginControl_SetDisabled -}; - -static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; - -/*********************************************************************** - * MFGetPluginControl (mfplat.@) - */ -HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) -{ - TRACE("(%p)\n", ret); - - *ret = &plugin_control; - return S_OK; -} - typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; @@ -1178,6 +845,652 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) return S_OK; } +typedef struct _mfbytestream +{ + mfattributes attributes; + IMFByteStream IMFByteStream_iface; + IMFAttributes IMFAttributes_iface; + LONG ref; + +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->IMFAttributes_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytestream_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_QueryInterface( + IMFAttributes *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->IMFAttributes_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_mfattributes_AddRef(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_mfattributes_Release(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItem( + IMFAttributes *iface, REFGUID key, PROPVARIANT *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItemType( + IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); +} + +static HRESULT WINAPI mfbytestream_mfattributes_CompareItem( + IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); +} + +static HRESULT WINAPI mfbytestream_mfattributes_Compare( + IMFAttributes *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUINT32( + IMFAttributes *iface, REFGUID key, UINT32 *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUINT64( + IMFAttributes *iface, REFGUID key, UINT64 *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetDouble( + IMFAttributes *iface, REFGUID key, double *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetGUID( + IMFAttributes *iface, REFGUID key, GUID *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetStringLength( + IMFAttributes *iface, REFGUID key, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetString( + IMFAttributes *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetAllocatedString( + IMFAttributes *iface, REFGUID key, WCHAR **value, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetBlobSize( + IMFAttributes *iface, REFGUID key, UINT32 *size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetBlob( + IMFAttributes *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetAllocatedBlob( + IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUnknown( + IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetItem( + IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_DeleteItem( + IMFAttributes *iface, REFGUID key) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); +} + +static HRESULT WINAPI mfbytestream_mfattributes_DeleteAllItems( + IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUINT32( + IMFAttributes *iface, REFGUID key, UINT32 value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUINT64( + IMFAttributes *iface, REFGUID key, UINT64 value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetDouble( + IMFAttributes *iface, REFGUID key, double value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetGUID( + IMFAttributes *iface, REFGUID key, REFGUID value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetString( + IMFAttributes *iface, REFGUID key, const WCHAR *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetBlob( + IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUnknown( + IMFAttributes *iface, REFGUID key, IUnknown *unknown) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); +} + +static HRESULT WINAPI mfbytestream_mfattributes_LockStore(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_UnlockStore(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItemByIndex( + IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_CopyAllItems( + IMFAttributes *iface, IMFAttributes *dest) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + + FIXME("%p, %p\n", This, dest); + + return E_NOTIMPL; +} + +static const IMFAttributesVtbl mfbytestream_mfattributes_vtbl = +{ + mfbytestream_mfattributes_QueryInterface, + mfbytestream_mfattributes_AddRef, + mfbytestream_mfattributes_Release, + mfbytestream_mfattributes_GetItem, + mfbytestream_mfattributes_GetItemType, + mfbytestream_mfattributes_CompareItem, + mfbytestream_mfattributes_Compare, + mfbytestream_mfattributes_GetUINT32, + mfbytestream_mfattributes_GetUINT64, + mfbytestream_mfattributes_GetDouble, + mfbytestream_mfattributes_GetGUID, + mfbytestream_mfattributes_GetStringLength, + mfbytestream_mfattributes_GetString, + mfbytestream_mfattributes_GetAllocatedString, + mfbytestream_mfattributes_GetBlobSize, + mfbytestream_mfattributes_GetBlob, + mfbytestream_mfattributes_GetAllocatedBlob, + mfbytestream_mfattributes_GetUnknown, + mfbytestream_mfattributes_SetItem, + mfbytestream_mfattributes_DeleteItem, + mfbytestream_mfattributes_DeleteAllItems, + mfbytestream_mfattributes_SetUINT32, + mfbytestream_mfattributes_SetUINT64, + mfbytestream_mfattributes_SetDouble, + mfbytestream_mfattributes_SetGUID, + mfbytestream_mfattributes_SetString, + mfbytestream_mfattributes_SetBlob, + mfbytestream_mfattributes_SetUnknown, + mfbytestream_mfattributes_LockStore, + mfbytestream_mfattributes_UnlockStore, + mfbytestream_mfattributes_GetCount, + mfbytestream_mfattributes_GetItemByIndex, + mfbytestream_mfattributes_CopyAllItems +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + init_attribute_object(&object->attributes, 0); + object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFAttributes_iface.lpVtbl = &mfbytestream_mfattributes_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +} + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46579..4605e20f32 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -258,8 +258,12 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; HRESULT hr; + ULONG ref; if(!pMFCreateMFByteStreamOnStream) { @@ -270,11 +274,56 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - IStream_Release(stream); + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(unknown, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + + if (hr != S_OK) + { + win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + IStream_Release(stream); + IMFByteStream_Release(bytestream); + return; + } + + ok(attributes != NULL, "got NULL\n"); + + hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 2, "got %u\n", ref); + + hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 2, "got %u\n", ref); + + IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); + IStream_Release(stream); } static void test_MFCreateMemoryBuffer(void) -- 2.17.1

5 years, 6 months

[PATCH 4/6] ntdll/tests: Add more I/O blocking and completion tests.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 334 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 1 deletion(-)

5 years, 6 months

[PATCH v2 1/3] shell32/iconcache: Prevent the imagelists from going out of sync by generating invalid icons from available icons

by Gabriel Ivăncescu

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Therefore, for icons that failed to load, create them from another icon that succeeded by resizing it, favoring icons that are the closest and larger (to reduce pixelation artefacts) and with the closest aspect ratio as the source of this operation (to be as generic as possible). For example, if the icon that needs to be created must be 16x16, an 18x18 icon would get picked over either a 32x32 (it's further from 16x16) or a 15x15 (icons larger than 16x16 are favored since they're larger than the result, so smaller icons are only picked if no other available icon is larger). This also fixes a regression, because at some point, we stopped failing if one icon failed to extract (even if PrivateExtractIconsW returned success, icon handle could still be NULL), so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync and the icons would be totally screwed up until the application is restarted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add test. dlls/shell32/iconcache.c | 72 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..5ffb293 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -345,13 +345,6 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons return ret; } -static BOOL get_imagelist_icon_size(int list, SIZE *size) -{ - if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE; - - return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); -} - /**************************************************************************** * SIC_LoadIcon [internal] * @@ -362,15 +355,68 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) { HICON hicons[ARRAY_SIZE(shell_imagelists)] = { 0 }; HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; + SIZE size[ARRAY_SIZE(shell_imagelists)]; unsigned int i; - SIZE size; - int ret; + INT ret = -1; + /* Keep track of the sizes in case any icon fails to get extracted */ for (i = 0; i < ARRAY_SIZE(hicons); i++) { - get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) - WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + ImageList_GetIconSize(shell_imagelists[i], &size[i].cx, &size[i].cy); + PrivateExtractIconsW(sourcefile, index, size[i].cx, size[i].cy, &hicons[i], 0, 1, 0); + } + + /* Fill any icon handles that failed to get extracted, by resizing + another icon handle that succeeded and creating the icon from it. + Use a dumb O(n^2) algorithm since ARRAY_SIZE(hicons) is small */ + for (i = 0; i < ARRAY_SIZE(hicons); i++) + { + unsigned int k, ix, iy; + BOOL failed = TRUE; + if (hicons[i]) continue; + + for (k = 0; k < ARRAY_SIZE(hicons); k++) + { + if (hicons[k]) + { + ix = iy = k; + failed = FALSE; + break; + } + } + if (failed) goto fail; + + for (k++; k < ARRAY_SIZE(hicons); k++) + { + if (!hicons[k]) continue; + + /* Find closest-sized icon, but favor larger icons to resize from */ + if (size[k].cx >= size[i].cx) + ix = (size[ix].cx < size[i].cx || size[ix].cx > size[k].cx) ? k : ix; + else + ix = (size[ix].cx < size[i].cx && size[ix].cx < size[k].cx) ? k : ix; + + if (size[k].cy >= size[i].cy) + iy = (size[iy].cy < size[i].cy || size[iy].cy > size[k].cy) ? k : iy; + else + iy = (size[iy].cy < size[i].cy && size[iy].cy < size[k].cy) ? k : iy; + } + + /* Use the closest icon in aspect ratio if ix and iy differ */ + if (ix != iy) + { + float i_ratio, ix_ratio, iy_ratio; + i_ratio = (float)size[i].cx / (float)size[i].cy; + ix_ratio = (float)size[ix].cx / (float)size[ix].cy; + iy_ratio = (float)size[iy].cx / (float)size[iy].cy; + if (fabsf(ix_ratio - i_ratio) > fabsf(iy_ratio - i_ratio)) + ix = iy; + } + + /* If this fails, we have to abort to prevent the image lists from + becoming out of sync and completely screwing the icons up */ + hicons[i] = CopyImage(hicons[ix], IMAGE_ICON, size[i].cx, size[i].cy, 0); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +449,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 1.9.1

5 years, 6 months

[PATCH 6/6] server: Use file mode flags in async_handoff to decide if request is blocking.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 22 +++++++--------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 22 deletions(-)

5 years, 6 months

[PATCH vkd3d 7/7] vkd3d-shader: Add structure type fields to public API structures.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++++++++++++ libs/vkd3d/state.c | 10 +++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index e97e185158cb..f96e5055c7cb 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -25,6 +25,15 @@ extern "C" { #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +enum vkd3d_shader_structure_type +{ + VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, + VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, + VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), +}; + enum vkd3d_result { VKD3D_OK = 0, @@ -130,6 +139,9 @@ struct vkd3d_shader_push_constant_buffer struct vkd3d_shader_interface { + enum vkd3d_shader_structure_type type; + const void *next; + const struct vkd3d_shader_resource_binding *bindings; unsigned int binding_count; @@ -160,8 +172,11 @@ enum vkd3d_shader_target struct vkd3d_shader_compile_arguments { + enum vkd3d_shader_structure_type type; + const void *next; + enum vkd3d_shader_target target; - unsigned int *output_swizzles; + const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; @@ -366,6 +381,9 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc struct vkd3d_shader_scan_info { + enum vkd3d_shader_structure_type type; + void *next; + unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int sampler_comparison_mode_mask; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f81320879e8f..5e292c7eccd9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -61,6 +61,12 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ if (!compile_args) return VKD3D_OK; + if (compile_args->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS) + { + WARN("Invalid structure type %#x.\n", compile_args->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + switch (compile_args->target) { case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: @@ -88,9 +94,17 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + if (shader_interface && shader_interface->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE) + { + WARN("Invalid structure type %#x.\n", shader_interface->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) return ret; + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + scan_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) return ret; @@ -209,6 +223,12 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, scan_info %p.\n", dxbc->code, dxbc->size, scan_info); + if (scan_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO) + { + WARN("Invalid structure type %#x.\n", scan_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4800ff316308..3f3de4de29be 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1439,6 +1439,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st dxbc.code = desc->CS.pShaderBytecode; dxbc.size = desc->CS.BytecodeLength; + shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + shader_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(&dxbc, &shader_info)) < 0) { WARN("Failed to scan shader bytecode, vkd3d result %d.\n", ret); @@ -1452,6 +1454,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2027,10 +2031,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; + ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2044,8 +2052,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); + struct vkd3d_shader_scan_info shader_info = {VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO}; const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; - struct vkd3d_shader_scan_info shader_info; if (!b->pShaderBytecode) continue; -- 2.18.1

5 years, 6 months

[PATCH vkd3d 6/7] vkd3d-shader: Require shader signature elements for shader inputs.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4fc25ee40764..dee561ac033c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3206,6 +3206,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } + if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, + NULL, reg_idx, dst->write_mask))) + { + FIXME("No signature element for shader input, ignoring shader input.\n"); + return 0; + } + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -3217,9 +3224,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } else { - signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, - NULL, reg_idx, dst->write_mask); - component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT; + component_type = signature_element->component_type; input_component_count = component_count; } assert(component_count <= input_component_count); @@ -4187,18 +4192,18 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *co { uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE); - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + if ((input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE))) + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); - if (!instruction->declaration.register_semantic.sysval_semantic) + input_id = vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic); + if (input_id && !semantic->sysval_semantic) vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } -- 2.18.1

5 years, 6 months

[PATCH vkd3d 5/7] vkd3d-shader: Implement vkd3d_write_mask_component_count() on top of vkd3d_popcount().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1d79c91602b8..dd3650b2d828 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -866,16 +866,8 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - unsigned int i, count = 0; - assert(write_mask); - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - { - if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - ++count; - } - - return count; + return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) -- 2.18.1

5 years, 6 months

[PATCH vkd3d 4/7] vkd3d-shader: Add support for stores to scalar variables.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e43f48ae027b..4fc25ee40764 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2789,19 +2789,22 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, chain_id, index[1]; + uint32_t type_id, ptr_type_id, id, index[1]; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); - component_idx = vkd3d_write_mask_get_component_idx(write_mask); - index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); + id = reg_info->id; + if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + { + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + } - vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler, -- 2.18.1

5 years, 6 months

[PATCH vkd3d 3/7] vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_load_scalar().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 234b7c82003e..e43f48ae027b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2623,12 +2623,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile } static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) + const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; unsigned int component_idx, reg_component_count; - struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; assert(reg->type != VKD3DSPR_IMMCONST); @@ -2638,22 +2638,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); component_type = vkd3d_component_type_from_data_type(reg->data_type); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - { - type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); - return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); - } - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - reg_component_count = vkd3d_write_mask_component_count(reg_info.write_mask); + reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); if (component_idx > reg_component_count) ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, 1); - reg_id = reg_info.id; + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + reg_id = reg_info->id; if (reg_component_count != 1) { - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); reg_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, reg_id, indexes, ARRAY_SIZE(indexes)); @@ -2661,7 +2655,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); - if (component_type != reg_info.component_type) + if (component_type != reg_info->component_type) { type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); @@ -2683,9 +2677,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) { @@ -2694,6 +2685,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + if (component_count == 1) + return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); -- 2.18.1

5 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2018