May 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Move the occlusion query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: ce1c0ff1e9aa46b30cabb511f72c0cf5b2dfcae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce1c0ff1e9aa46b30cabb511… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:07 2019 +0430 wined3d: Move the occlusion query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 58 ++++++++++++++++++++++-------------------- dlls/wined3d/query.c | 20 +++++++-------- dlls/wined3d/wined3d_private.h | 20 ++++++++------- 3 files changed, 51 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce1c0ff1e9aa46b30cab…

1 0

Zebediah Figura : quartz: Make Parser_OutputPin_BreakConnect() a local helper.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: f789c70dddf1e608f92ffb81dc5848abba1520e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f789c70dddf1e608f92ffb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:18 2019 -0500 quartz: Make Parser_OutputPin_BreakConnect() a local helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9278a58..d92161f 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -46,7 +46,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IM static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { @@ -429,7 +428,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, Parser_OutputPin_DecideBufferSize, Parser_OutputPin_DecideAllocator, - Parser_OutputPin_BreakConnect + NULL, }; HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt) @@ -468,6 +467,22 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR return hr; } +static HRESULT WINAPI break_connection(IPin *iface) +{ + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + HRESULT hr; + + if (!pin->pin.pin.pConnectedTo || !pin->pin.pMemInputPin) + hr = VFW_E_NOT_CONNECTED; + else + { + hr = IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(iface); + } + + return hr; +} + static HRESULT Parser_RemoveOutputPins(ParserImpl * This) { /* NOTE: should be in critical section when calling this function */ @@ -483,7 +498,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) for (i = 0; i < This->cStreams; i++) { - hr = ((BaseOutputPin *)ppOldPins[i + 1])->pFuncsTable->pfnBreakConnect((BaseOutputPin *)ppOldPins[i + 1]); + hr = break_connection(ppOldPins[i + 1]); TRACE("Disconnect: %08x\n", hr); IPin_Release(ppOldPins[i + 1]); } @@ -609,26 +624,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe return hr; } -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - - static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface);

1 0

Zebediah Figura : winegstreamer: Make GSTOutPin_BreakConnect() a local helper.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 797672182be30fbd6d54732267cd2869f4af42c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797672182be30fbd6d547322… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:19 2019 -0500 winegstreamer: Make GSTOutPin_BreakConnect() a local helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3c32107..1a369a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1829,7 +1829,7 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputP return hr; } -static HRESULT WINAPI GSTOutPin_BreakConnect(BaseOutputPin *This) +static HRESULT break_source_connection(BaseOutputPin *This) { HRESULT hr; @@ -1840,7 +1840,9 @@ static HRESULT WINAPI GSTOutPin_BreakConnect(BaseOutputPin *This) hr = VFW_E_NOT_CONNECTED; else { - hr = IPin_Disconnect(This->pin.pConnectedTo); + hr = IMemAllocator_Decommit(This->pAllocator); + if (SUCCEEDED(hr)) + hr = IPin_Disconnect(This->pin.pConnectedTo); IPin_Disconnect((IPin *)This); } LeaveCriticalSection(This->pin.pCritSec); @@ -1877,7 +1879,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, GSTOutPin_DecideBufferSize, GSTOutPin_DecideAllocator, - GSTOutPin_BreakConnect + NULL, }; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt) @@ -1920,7 +1922,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_BreakConnect(&This->ppPins[i]->pin); + hr = break_source_connection(&This->ppPins[i]->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); }

1 0

Zebediah Figura : wineqtdecoder: Make QTOutPin_BreakConnect() a local helper.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 7c46e56ce2a0bd3524f6cad61a09fbf982d467f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c46e56ce2a0bd3524f6cad6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:20 2019 -0500 wineqtdecoder: Make QTOutPin_BreakConnect() a local helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 33edf25..cd146db 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -810,6 +810,25 @@ static const IBaseFilterVtbl QT_Vtbl = { BaseFilterImpl_QueryVendorInfo }; +static HRESULT break_source_connection(BaseOutputPin *pin) +{ + HRESULT hr; + + EnterCriticalSection(pin->pin.pCritSec); + if (!pin->pin.pConnectedTo || !pin->pMemInputPin) + hr = VFW_E_NOT_CONNECTED; + else + { + hr = IMemAllocator_Decommit(pin->pAllocator); + if (SUCCEEDED(hr)) + hr = IPin_Disconnect(pin->pin.pConnectedTo); + IPin_Disconnect(&pin->pin.IPin_iface); + } + LeaveCriticalSection(pin->pin.pCritSec); + + return hr; +} + /* * Input Pin */ @@ -821,7 +840,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) if (This->pVideo_Pin) { OutputQueue_Destroy(This->pVideo_Pin->queue); - hr = BaseOutputPinImpl_BreakConnect(&This->pVideo_Pin->pin); + hr = break_source_connection(&This->pVideo_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pVideo_Pin->pin.pin.IPin_iface); This->pVideo_Pin = NULL; @@ -829,7 +848,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) if (This->pAudio_Pin) { OutputQueue_Destroy(This->pAudio_Pin->queue); - hr = BaseOutputPinImpl_BreakConnect(&This->pAudio_Pin->pin); + hr = break_source_connection(&This->pAudio_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pAudio_Pin->pin.pin.IPin_iface); This->pAudio_Pin = NULL; @@ -1426,25 +1445,6 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi return hr; } -static HRESULT WINAPI QTOutPin_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - static const IPinVtbl QT_OutputPin_Vtbl = { QTOutPin_QueryInterface, BasePinImpl_AddRef, @@ -1520,7 +1520,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, QTOutPin_DecideBufferSize, QTOutPin_DecideAllocator, - QTOutPin_BreakConnect + NULL, }; static const OutputQueueFuncTable output_OutputQueueFuncTable = {

1 0

Zebediah Figura : strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: df05902b96734005f1ab31e689b9ddb1455add32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df05902b96734005f1ab31e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:21 2019 -0500 strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 7 ------- dlls/qcap/avimux.c | 7 ------- dlls/qcap/smartteefilter.c | 16 ---------------- dlls/qcap/vfwcapture.c | 1 - dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 1 - dlls/strmbase/pin.c | 25 ------------------------- dlls/strmbase/transform.c | 1 - dlls/winegstreamer/gstdemux.c | 1 - dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 3 --- 11 files changed, 64 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 49ac2d8..f8eade9 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base, return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc); } -static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base) -{ - FIXME("(%p)\n", base); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { { NULL, @@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { BaseOutputPinImpl_AttemptConnection, AVICompressorOut_DecideBufferSize, AVICompressorOut_DecideAllocator, - AVICompressorOut_BreakConnect }; IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 2bb6e12..dd78d71 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, *pAlloc, TRUE); } -static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base) -{ - FIXME("(%p)\n", base); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { { AviMuxOut_CheckMediaType, @@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { AviMuxOut_AttemptConnection, NULL, AviMuxOut_DecideAllocator, - AviMuxOut_BreakConnect }; static inline AviMux* impl_from_out_IPin(IPin *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 72794d0..4e22b95 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } -static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base) -{ - SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { { SmartTeeFilterCapture_CheckMediaType, @@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { BaseOutputPinImpl_AttemptConnection, NULL, SmartTeeFilterCapture_DecideAllocator, - SmartTeeFilterCapture_BreakConnect }; static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface) @@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } -static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base) -{ - SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { { SmartTeeFilterPreview_CheckMediaType, @@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { BaseOutputPinImpl_AttemptConnection, NULL, SmartTeeFilterPreview_DecideAllocator, - SmartTeeFilterPreview_BreakConnect }; IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) { diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 3d737bb..178609a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, VfwPin_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 293914d..a54e948 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { FileAsyncReaderPin_AttemptConnection, FileAsyncReaderPin_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index d92161f..c3b69cd 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, Parser_OutputPin_DecideBufferSize, Parser_OutputPin_DecideAllocator, - NULL, }; HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 58fe0e5..2fa0b9a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) return hr; } -/* replaces OutputPin_DeliverDisconnect */ -HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - { - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IMemAllocator_Decommit(This->pAllocator); - - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); - } - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 1ce6283..544b77a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, TransformFilter_Output_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, TransformFilter* pTransformFilter) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1a369a1..32b871d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, GSTOutPin_DecideBufferSize, GSTOutPin_DecideAllocator, - NULL, }; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index cd146db..4855069 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, QTOutPin_DecideBufferSize, QTOutPin_DecideAllocator, - NULL, }; static const OutputQueueFuncTable output_OutputQueueFuncTable = { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cb7112b..120642c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -67,7 +67,6 @@ typedef struct BaseOutputPin typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -typedef HRESULT (WINAPI *BaseOutputPin_BreakConnect)(BaseOutputPin * This); typedef struct BaseOutputPinFuncTable { BasePinFuncTable base; @@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable { BaseOutputPin_DecideBufferSize pfnDecideBufferSize; /* Required for BaseOutputPinImpl_AttemptConnection */ BaseOutputPin_DecideAllocator pfnDecideAllocator; - BaseOutputPin_BreakConnect pfnBreakConnect; } BaseOutputPinFuncTable; typedef struct BaseInputPin @@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample); -HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc);

1 0

Józef Kucia : setupapi: Avoid debugstr buffer overflow.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 88e28d971bd119f214e29d4ebfa819af9f18f5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e28d971bd119f214e29d4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun May 12 15:50:09 2019 +0200 setupapi: Avoid debugstr buffer overflow. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c108689..69376c4 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1853,13 +1853,8 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, } buffer[i - index] = value; } - if (TRACE_ON(setupapi)) - { - TRACE( "%p/%p/%d/%d index %d returning", - context->Inf, context->CurrentInf, context->Section, context->Line, index ); - for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] ); - TRACE( "\n" ); - } + TRACE( "%p/%p/%d/%d index %d\n", + context->Inf, context->CurrentInf, context->Section, context->Line, index ); return TRUE; }

1 0

Tim Schumacher : services: Allow reading binary registry values as DWORDs.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 7b139bbb5cb1da4c443e8163c2a14adc8ba93a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b139bbb5cb1da4c443e8163… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun May 12 23:12:41 2019 +0200 services: Allow reading binary registry values as DWORDs. Some programs/services actually save those values as a registry value of the type REG_BINARY. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/utils.c b/programs/services/utils.c index c59b003..f787990 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -149,7 +149,7 @@ DWORD load_reg_dword(HKEY hKey, LPCWSTR szValue, DWORD *output) return ERROR_SUCCESS; goto failed; } - if (type != REG_DWORD || size != sizeof(DWORD)) + if ((type != REG_DWORD && type != REG_BINARY) || size != sizeof(DWORD)) { err = ERROR_INVALID_DATATYPE; goto failed;

1 0

Akihiro Sagawa : advapi32/tests: Add basic RegLoadMUIString tests.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: c29a5560a682ac59d87c5d9c3420840d03eede60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29a5560a682ac59d87c5d9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:24 2019 +0900 advapi32/tests: Add basic RegLoadMUIString tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d1fe3f0..f5bcbf3 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -51,6 +51,8 @@ static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); static LONG (WINAPI *pRegSetKeyValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); +static LONG (WINAPI *pRegLoadMUIStringA)(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); +static LONG (WINAPI *pRegLoadMUIStringW)(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); static BOOL limited_user; @@ -142,6 +144,8 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegDeleteKeyExA); ADVAPI32_GET_PROC(RegDeleteKeyValueA); ADVAPI32_GET_PROC(RegSetKeyValueW); + ADVAPI32_GET_PROC(RegLoadMUIStringA); + ADVAPI32_GET_PROC(RegLoadMUIStringW); pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); @@ -3830,6 +3834,116 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_RegLoadMUIString(void) +{ + HMODULE hUser32, hResDll; + int (WINAPI *pLoadStringW)(HMODULE, UINT, WCHAR *, int); + LONG ret; + HKEY hkey; + DWORD type, size, text_size; + UINT i; + char buf[64], *p, sysdir[MAX_PATH]; + WCHAR textW[64], bufW[64]; + WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; + const static char tz_value[] = "MUI_Std"; + const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + + if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) + { + win_skip("RegLoadMUIString is not available\n"); + return; + } + + hUser32 = LoadLibraryA("user32.dll"); + ok(hUser32 != NULL, "cannot load user32.dll\n"); + pLoadStringW = (void *)GetProcAddress(hUser32, "LoadStringW"); + ok(pLoadStringW != NULL, "failed to get LoadStringW address\n"); + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\UTC", 0, + KEY_READ, &hkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + size = ARRAY_SIZE(buf); + ret = RegQueryValueExA(hkey, tz_value, NULL, &type, (BYTE *)buf, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(buf[0] == '@', "got %s\n", buf); + + p = strrchr(buf, ','); + *p = '\0'; + i = atoi(p + 2); /* skip ',-' */ + hResDll = LoadLibraryExA(&buf[1], NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + memset(textW, 0xaa, sizeof(textW)); + ret = pLoadStringW(hResDll, i, textW, ARRAY_SIZE(textW)); + ok(ret > 0, "failed to load string resource\n"); + text_size = (ret + 1) * sizeof(WCHAR); + FreeLibrary(hResDll); + FreeLibrary(hUser32); + + ret = GetSystemDirectoryW(sysdirW, ARRAY_SIZE(sysdirW)); + ok(ret > 0, "GetSystemDirectoryW failed\n"); + ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); + ok(ret > 0, "GetSystemDirectoryA failed\n"); + + /* change the current direcoty to system32 */ + GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); + SetCurrentDirectoryW(sysdirW); + + size = 0xdeadbeef; + ret = pRegLoadMUIStringW(hkey, tz_valueW, NULL, 0, &size, 0, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)+1, &size, 0, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, 0, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + todo_wine ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), + "got %u, expected %u\n", size, text_size); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); + ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + size = min(size, sizeof(bufW)); + todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + /* change the current direcoty to other than system32 directory */ + SetCurrentDirectoryA("\\"); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, sysdirW); + todo_wine ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + size = min(size, sizeof(bufW)); + todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, sysdir); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + RegCloseKey(hkey); + SetCurrentDirectoryW(curdirW); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3866,6 +3980,7 @@ START_TEST(registry) test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); test_RegQueryValueExPerformanceData(); + test_RegLoadMUIString(); /* cleanup */ delete_key( hkey_main );

1 0

Józef Kucia : vkd3d: Accept DXGI_FORMAT_UNKNOWN for pipeline RTV formats.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 8e16831549fe65fb640cf5706f28e4a07d8b4575 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e16831549fe65fb640cf57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:18 2019 +0200 vkd3d: Accept DXGI_FORMAT_UNKNOWN for pipeline RTV formats. A NULL RTV is expected to be used when RTVFormat is DXGI_FORMAT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 26 +++++++++++++++++----- libs/vkd3d/state.c | 55 ++++++++++++++++++++++++++++++---------------- libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 57 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index abe4f27..07de716 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2331,8 +2331,11 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l { struct d3d12_device *device = list->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + struct d3d12_graphics_pipeline_state *graphics; struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; + unsigned int view_count; size_t start_idx = 0; unsigned int i; VkResult vr; @@ -2340,24 +2343,35 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l if (list->current_framebuffer != VK_NULL_HANDLE) return true; - if (!list->state->u.graphics.rt_idx) + graphics = &list->state->u.graphics; + + if (!graphics->rt_idx) ++start_idx; - for (i = 0; i < list->state->u.graphics.attachment_count; ++i) + for (i = 0, view_count = 0; i < graphics->attachment_count; ++i) { + if (graphics->null_attachment_mask & (1u << i)) + { + if (list->views[start_idx + i]) + WARN("Expected NULL view for attachment %u.\n", i); + continue; + } + if (!list->views[start_idx + i]) { - FIXME("Invalid attachment %u.\n", i); + FIXME("Invalid view for attachment %u.\n", i); return false; } + + views[view_count++] = list->views[start_idx + i]; } fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; - fb_desc.renderPass = list->state->u.graphics.render_pass; - fb_desc.attachmentCount = list->state->u.graphics.attachment_count; - fb_desc.pAttachments = &list->views[start_idx]; + fb_desc.renderPass = graphics->render_pass; + fb_desc.attachmentCount = view_count; + fb_desc.pAttachments = views; d3d12_command_list_get_fb_extent(list, &fb_desc.width, &fb_desc.height, &fb_desc.layers); if ((vr = VK_CALL(vkCreateFramebuffer(device->vk_device, &fb_desc, NULL, &vk_framebuffer))) < 0) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2b7059c..bc59b01 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1049,11 +1049,11 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_render_pass_entry *entry; + unsigned int index, attachment_index; unsigned int color_attachment_index; VkSubpassDescription sub_pass_desc; VkRenderPassCreateInfo pass_info; bool have_depth_stencil; - unsigned int index; VkResult vr; if (!vkd3d_array_reserve((void **)&cache->render_passes, &cache->render_passes_size, @@ -1104,28 +1104,37 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa attachments[index].initialLayout = depth_layout; attachments[index].finalLayout = depth_layout; - attachment_references[index].attachment = 0; + attachment_references[index].attachment = index; attachment_references[index].layout = depth_layout; ++index; } + attachment_index = index; assert(index == color_attachment_index); for (; index < key->attachment_count; ++index) { + if (!key->vk_formats[index]) + { + attachment_references[index].attachment = VK_ATTACHMENT_UNUSED; + attachment_references[index].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + continue; + } - attachments[index].flags = 0; - attachments[index].format = key->vk_formats[index]; - attachments[index].samples = key->sample_count; - attachments[index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - attachments[index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - attachments[index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - attachments[index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - attachments[index].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - attachments[index].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - attachment_references[index].attachment = index; + attachments[attachment_index].flags = 0; + attachments[attachment_index].format = key->vk_formats[index]; + attachments[attachment_index].samples = key->sample_count; + attachments[attachment_index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachments[attachment_index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + attachments[attachment_index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachments[attachment_index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + attachments[attachment_index].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + attachments[attachment_index].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + attachment_references[index].attachment = attachment_index; attachment_references[index].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + ++attachment_index; } sub_pass_desc.flags = 0; @@ -1145,7 +1154,7 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; pass_info.pNext = NULL; pass_info.flags = 0; - pass_info.attachmentCount = key->attachment_count; + pass_info.attachmentCount = attachment_index; pass_info.pAttachments = attachments; pass_info.subpassCount = 1; pass_info.pSubpasses = &sub_pass_desc; @@ -2140,6 +2149,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); graphics->rt_idx = 0; + graphics->null_attachment_mask = 0; if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { @@ -2183,7 +2193,18 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; - if (!(format = vkd3d_get_format(device, desc->RTVFormats[i], false))) + if (desc->RTVFormats[i] == DXGI_FORMAT_UNKNOWN) + { + graphics->null_attachment_mask |= 1u << idx; + ps_output_swizzle[i] = VKD3D_NO_SWIZZLE; + render_pass_key.vk_formats[idx] = VK_FORMAT_UNDEFINED; + } + else if ((format = vkd3d_get_format(device, desc->RTVFormats[i], false))) + { + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); + render_pass_key.vk_formats[idx] = format->vk_format; + } + else { WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; @@ -2204,10 +2225,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); - - render_pass_key.vk_formats[idx] = format->vk_format; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 057a0a7..b5beffa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -675,6 +675,7 @@ struct d3d12_graphics_pipeline_state VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; unsigned int attachment_count, rt_idx; + unsigned int null_attachment_mask; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value;

1 0

Józef Kucia : tests: Add test for UNKNOWN RTV formats in pipeline state desc.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 56cd52dad1ef5ad09c1af85fadfc5f9600a6c892 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56cd52dad1ef5ad09c1af85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:19 2019 +0200 tests: Add test for UNKNOWN RTV formats in pipeline state desc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c1992a8..4e08636 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4740,6 +4740,105 @@ static void test_multiple_render_targets(void) destroy_test_context(&context); } +static void test_unknown_rtv_format(void) +{ + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3]; + ID3D12Resource *render_targets[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(out float4 target1 : SV_Target1, out float4 target2 : SV_Target2) + { + target1 = float4(2.0f, 0.0f, 0.0f, 1.0f); + target2 = float4(3.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x980554be, 0xb8743fb0, 0xf5bb8deb, 0x639feaf8, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x00000038, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, + 0x40000000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, + 0x40400000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_descriptor_count = 16; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs); + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + pso_desc.RTVFormats[i] = desc.rt_format; + pso_desc.RTVFormats[0] = DXGI_FORMAT_UNKNOWN; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + rtvs[0] = get_cpu_rtv_handle(&context, context.rtv_heap, 0); + rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + rtvs[2] = get_cpu_rtv_handle(&context, context.rtv_heap, 2); + create_render_target(&context, &desc, &render_targets[0], &rtvs[1]); + create_render_target(&context, &desc, &render_targets[1], &rtvs[2]); + + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], &white.x, 0, NULL); + + /* NULL RTV */ + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D; + rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + rtv_desc.Texture2D.MipSlice = 0; + rtv_desc.Texture2D.PlaneSlice = 0; + ID3D12Device_CreateRenderTargetView(context.device, NULL, &rtv_desc, + get_cpu_rtv_handle(&context, context.rtv_heap, 0)); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, render_targets[0], + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, render_targets[1], + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &white, 0); + reset_command_list(command_list, context.allocator); + expected_vec4.x = 2.0f; + check_sub_resource_vec4(render_targets[0], 0, queue, command_list, &expected_vec4, 0); + reset_command_list(command_list, context.allocator); + expected_vec4.x = 3.0f; + check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0); + + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + ID3D12Resource_Release(render_targets[i]); + destroy_test_context(&context); +} + static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; @@ -29003,6 +29102,7 @@ START_TEST(d3d12) run_test(test_draw_indexed_instanced); run_test(test_draw_no_descriptor_bindings); run_test(test_multiple_render_targets); + run_test(test_unknown_rtv_format); run_test(test_append_aligned_element); run_test(test_gpu_virtual_address); run_test(test_fragment_coords);

1 0