November 2016 - Wine-Commits

Nikolay Sivov : strmbase: Use wine_dbgstr_longlong() to trace REFERENCE_TIME arguments.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 61105aee5bf616acbdd45a97d520dba72890c1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61105aee5bf616acbdd45a97d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 12:10:46 2016 +0300 strmbase: Use wine_dbgstr_longlong() to trace REFERENCE_TIME arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 4 ++-- dlls/strmbase/transform.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c19f528..0c1b7cc 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -339,7 +339,7 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { BasePin *This = impl_from_IPin(iface); - TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -1017,7 +1017,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 92eef16..65b6052 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -545,7 +545,7 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter* pTransform; HRESULT hr = S_OK; - TRACE("(%p)->()\n", iface); + TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); EnterCriticalSection(&pTransform->filter.csFilter);

1 0

Nikolay Sivov : strmbase: Allocate sample list as a part of queue structure.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 89763f0e954c751975f70acd3fe40676d28bda89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89763f0e954c751975f70acd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 12:10:45 2016 +0300 strmbase: Allocate sample list as a part of queue structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 33 ++++++++++++--------------------- include/wine/strmbase.h | 4 +++- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 842a9f0..5513193 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -49,7 +49,7 @@ static DWORD WINAPI OutputQueue_InitialThreadProc(LPVOID data) static void OutputQueue_FreeSamples(OutputQueue *pOutputQueue) { struct list *cursor, *cursor2; - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); list_remove(cursor); @@ -86,14 +86,7 @@ HRESULT WINAPI OutputQueue_Construct( This->bBatchExact = bBatchExact; InitializeCriticalSection(&This->csQueue); This->csQueue.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OutputQueue.csQueue"); - This->SampleList = HeapAlloc(GetProcessHeap(),0,sizeof(struct list)); - if (!This->SampleList) - { - OutputQueue_Destroy(This); - *ppOutputQueue = NULL; - return E_OUTOFMEMORY; - } - list_init(This->SampleList); + list_init(&This->SampleList); This->pInputPin = pInputPin; IPin_AddRef(&pInputPin->pin.IPin_iface); @@ -130,8 +123,6 @@ HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) DeleteCriticalSection(&pOutputQueue->csQueue); CloseHandle(pOutputQueue->hProcessQueue); - HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); - IPin_Release(&pOutputQueue->pInputPin->pin.IPin_iface); HeapFree(GetProcessHeap(),0,pOutputQueue); return S_OK; @@ -168,11 +159,11 @@ HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSamp qev->type = SAMPLE_PACKET; qev->pSample = ppSamples[i]; IMediaSample_AddRef(ppSamples[i]); - list_add_tail(pOutputQueue->SampleList, &qev->entry); + list_add_tail(&pOutputQueue->SampleList, &qev->entry); (*nSamplesProcessed)++; } - if (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) + if (!pOutputQueue->bBatchExact || list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) SetEvent(pOutputQueue->hProcessQueue); LeaveCriticalSection(&pOutputQueue->csQueue); } @@ -190,7 +181,7 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) if (pOutputQueue->hThread) { EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(pOutputQueue->SampleList)) + if (!list_empty(&pOutputQueue->SampleList)) { pOutputQueue->bSendAnyway = TRUE; SetEvent(pOutputQueue->hProcessQueue); @@ -213,7 +204,7 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) } qev->type = EOS_PACKET; qev->pSample = NULL; - list_add_tail(pOutputQueue->SampleList, &qev->entry); + list_add_tail(&pOutputQueue->SampleList, &qev->entry); } else { @@ -235,14 +226,14 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) do { EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(pOutputQueue->SampleList) && + if (!list_empty(&pOutputQueue->SampleList) && (!pOutputQueue->bBatchExact || - list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || + list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || pOutputQueue->bSendAnyway ) ) { - while (!list_empty(pOutputQueue->SampleList)) + while (!list_empty(&pOutputQueue->SampleList)) { IMediaSample **ppSamples; LONG nSamples; @@ -251,10 +242,10 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) int i = 0; /* First Pass Process Samples */ - i = list_count(pOutputQueue->SampleList); + i = list_count(&pOutputQueue->SampleList); ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * i); nSamples = 0; - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == SAMPLE_PACKET) @@ -278,7 +269,7 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) HeapFree(GetProcessHeap(),0,ppSamples); /* Process Non-Samples */ - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == EOS_PACKET) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 841359d..abe92ae 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/list.h" + HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); AM_MEDIA_TYPE * WINAPI CreateMediaType(AM_MEDIA_TYPE const * pSrc); @@ -351,7 +353,7 @@ typedef struct tagOutputQueue { BOOL bTerminate; BOOL bSendAnyway; - struct list *SampleList; + struct list SampleList; const struct OutputQueueFuncTable* pFuncsTable; } OutputQueue;

1 0

Józef Kucia : d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 6b80fe5095ae0405b875ec431d17f84b31f6dcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b80fe5095ae0405b875ec431… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:53 2016 +0100 d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX. 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> --- dlls/d3d9/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4ea5e6c..87dd9e7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5489,7 +5489,7 @@ static void test_query_support(void) DestroyWindow(window); } -static void test_occlusion_query_states(void) +static void test_occlusion_query(void) { static const float quad[] = { @@ -5498,21 +5498,25 @@ static void test_occlusion_query_states(void) 1.0f, 1.0f, 0.0f, 1.0f, -1.0f, 0.0f, }; + unsigned int data_size, i, count; struct device_desc device_desc; IDirect3DQuery9 *query = NULL; - unsigned int data_size, i; IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; IDirect3D9 *d3d9; + D3DVIEWPORT9 vp; ULONG refcount; + D3DCAPS9 caps; HWND window; HRESULT hr; union { WORD word[4]; DWORD dword[2]; - } data; + UINT64 uint; + } data, expected; BOOL broken_occlusion = FALSE; - DWORD expected = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; + expected.uint = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5591,7 +5595,7 @@ static void test_occlusion_query_states(void) memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == expected || broken(!data.dword[0]), + ok(data.dword[0] == expected.dword[0] || broken(!data.dword[0]), "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); if (!data.dword[0]) { @@ -5603,7 +5607,7 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_GetData(query, &data, sizeof(WORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (!broken_occlusion) - ok(data.word[0] == (WORD)expected, + ok(data.word[0] == expected.word[0], "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); ok(data.word[1] == 0xffff, "data was modified outside of the expected size (0x%.8x).\n", data.dword[0]); @@ -5612,7 +5616,7 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (!broken_occlusion) - ok(data.dword[0] == expected, + ok(data.dword[0] == expected.dword[0], "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); /* Different drivers seem to return different data in those high bytes on Windows, but they all write something there and the extra data is consistent (I've seen 0x00000000 and 0xdddddddd @@ -5642,8 +5646,73 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + if (broken_occlusion) + goto done; + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + vp.X = 0; + vp.Y = 0; + vp.Width = min(caps.MaxTextureWidth, 8192); + vp.Height = min(caps.MaxTextureHeight, 8192); + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, vp.Width, vp.Height, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + if (FAILED(hr)) + { + skip("Failed to create render target (width %u, height %u), hr %#x.\n", vp.Width, vp.Height, hr); + goto done; + } + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + + expected.uint = vp.Width * vp.Height; + count = ((((UINT64)~0u) + 1) / expected.uint) + 1; + expected.uint *= count; + + trace("Expects 0x%08x%08x samples.\n", expected.dword[1], expected.dword[0]); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < count; i++) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLEFAN, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok((data.dword[0] == expected.dword[0] && data.dword[1] == expected.dword[1]) + || (data.dword[0] == 0xffffffff && !data.dword[1]) + || broken(data.dword[0] < 0xffffffff && !data.dword[1]), + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + IDirect3DSurface9_Release(rt); + +done: IDirect3DQuery9_Release(query); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -11310,7 +11379,7 @@ START_TEST(device) test_vb_lock_flags(); test_vertex_buffer_alignment(); test_query_support(); - test_occlusion_query_states(); + test_occlusion_query(); test_timestamp_query(); test_get_set_vertex_shader(); test_vertex_shader_constant();

1 0

Józef Kucia : d3d10core/tests: Port test_occlusion_query() from d3d11.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: e22b70f270b278ef5f7aa5b682a832c6b3480bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22b70f270b278ef5f7aa5b68… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:52 2016 +0100 d3d10core/tests: Port test_occlusion_query() from d3d11. 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> --- dlls/d3d10core/tests/device.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1952a87..260128f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3656,6 +3656,168 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_occlusion_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + D3D10_QUERY_DESC query_desc; + ID3D10Asynchronous *query; + unsigned int data_size, i; + ID3D10Texture2D *texture; + ID3D10Device *device; + D3D10_VIEWPORT vp; + union + { + UINT64 uint; + DWORD dword[2]; + } data; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D10_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_Begin(query); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Asynchronous_End(query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(DWORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(WORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + hr = ID3D10Asynchronous_GetData(query, NULL, sizeof(DWORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, NULL, sizeof(data), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_End(query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data.dword[0] = 0x12345678; + data.dword[1] = 0x12345678; + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + texture_desc.Width = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.Height = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + ID3D10Asynchronous_Begin(query); + for (i = 0; i < 100; i++) + draw_color_quad(&test_context, &red); + ID3D10Asynchronous_End(query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok((data.dword[0] == 0x90000000 && data.dword[1] == 0x1) + || (data.dword[0] == 0xffffffff && !data.dword[1]) + || broken(!data.uint), + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D10Asynchronous_Release(query); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -9621,6 +9783,7 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_occlusion_query(); test_timestamp_query(); test_device_removed_reason(); test_scissor();

1 0

Nikolay Sivov : d2d1: Fix GetGradientStops() when asked for more stops than collection has.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 463d1877aeb46884358d014c68de1294c817a136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463d1877aeb46884358d014c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 10:15:24 2016 +0300 d2d1: Fix GetGradientStops() when asked for more stops than collection has. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 -- dlls/d2d1/tests/d2d1.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index d51f53f..601f40f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -108,8 +108,6 @@ static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCol TRACE("iface %p, stops %p, stop_count %u.\n", iface, stops, stop_count); memcpy(stops, gradient->stops, min(gradient->stop_count, stop_count) * sizeof(*stops)); - if (stop_count > gradient->stop_count) - memset(stops, 0, (stop_count - gradient->stop_count) * sizeof(*stops)); } static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7fcda64..a8f24f9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3475,6 +3475,65 @@ static void test_stroke_style(void) ID2D1Factory_Release(factory); } +static void test_gradient(void) +{ + ID2D1GradientStopCollection *gradient; + D2D1_GRADIENT_STOP stops[3], stops2[3]; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_COLOR_F color; + unsigned int i; + UINT32 count; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + stops2[0].position = 0.5f; + set_color(&stops2[0].color, 1.0f, 1.0f, 0.0f, 1.0f); + stops2[1] = stops2[0]; + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops2, 2, D2D1_GAMMA_2_2, + D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + count = ID2D1GradientStopCollection_GetGradientStopCount(gradient); + ok(count == 2, "Unexpected stop count %u.\n", count); + + /* Request more stops than collection has. */ + stops[0].position = 123.4f; + set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); + color = stops[0].color; + stops[2] = stops[1] = stops[0]; + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); + for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + { + ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); + ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i); + } + + ID2D1GradientStopCollection_Release(gradient); + ID2D1RenderTarget_Release(rt); + + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -3496,4 +3555,5 @@ START_TEST(d2d1) test_bitmap_target(); test_desktop_dpi(); test_stroke_style(); + test_gradient(); }

1 0

Józef Kucia : wined3d: Increase shader resource limit to MAX_SHADER_RESOURCE_VIEWS.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 604ec98d17800b14129b08da6ef568a2e71a4614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604ec98d17800b14129b08da6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:54 2016 +0100 wined3d: Increase shader resource limit to MAX_SHADER_RESOURCE_VIEWS. 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> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ace0a55..cad5bb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -833,7 +833,7 @@ struct wined3d_shader_reg_maps WORD local_bool_consts; /* WINED3D_MAX_CONSTS_B, 16 */ UINT cb_sizes[WINED3D_MAX_CBS]; - struct wined3d_shader_resource_info resource_info[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + struct wined3d_shader_resource_info resource_info[MAX_SHADER_RESOURCE_VIEWS]; struct wined3d_shader_sampler_map sampler_map; DWORD sampler_comparison_mode; BYTE bumpmat; /* MAX_TEXTURES, 8 */

1 0

Tag wine-1.9.24 : Alexandre Julliard : Release 1.9.24
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: refs/tags/wine-1.9.24 Tag: a3dd19ce8dbd53c3ba8a566da1915d5b906c507e URL: http://source.winehq.org/git/wine.git/?a=tag;h=a3dd19ce8dbd53c3ba8a566da191… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:17:31 2016 +0100 Release 1.9.24

1 0

Alexandre Julliard : Release 1.9.24.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 705c52691a4e8c6224cda5080fb88f257de5fd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705c52691a4e8c6224cda5080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:17:31 2016 +0100 Release 1.9.24. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 490 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 267 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=705c52691a4e8c6224cda…

1 0

Nikolay Sivov : strmbase: Remove a couple of redundant statements in Release() methods.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 16dead4dd21360aae066b417b022ce22fb150c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dead4dd21360aae066b417b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 12:10:44 2016 +0300 strmbase: Remove a couple of redundant statements in Release() methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 4 +--- dlls/strmbase/transform.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d61469c..c19f528 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -397,10 +397,8 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { BaseOutputPin_Destroy(This); - return 0; - } + return refCount; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4ad9730..92eef16 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -344,11 +344,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) IUnknown_Release(This->seekthru_unk); BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); - - return 0; } - else - return refCount; + return refCount; } /** IMediaFilter methods **/

1 0

Józef Kucia : wined3d: Synchronize shader memory accesses after each draw call.
by Alexandre Julliard Nov. 24, 2016

Nov. 24, 2016

Module: wine Branch: master Commit: d368779b9ac90494888f4f4d9af0b6f90f150aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d368779b9ac90494888f4f4d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:10 2016 +0100 wined3d: Synchronize shader memory accesses after each draw call. 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> --- dlls/wined3d/context.c | 4 ++++ dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e626e20..989daf2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3396,6 +3396,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, struct gl_texture *gl_texture; unsigned int i; + context->uses_uavs = 0; + if (!(shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) return; @@ -3416,6 +3418,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } + context->uses_uavs = 1; + texture = texture_from_resource(view->resource); wined3d_texture_load(texture, context, FALSE); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 36c8d98..ebccb1d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -578,6 +578,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s draw_primitive_arrays(context, state, idx_data, idx_size, base_vertex_idx, start_idx, index_count, start_instance, instance_count); + if (context->uses_uavs) + { + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + } + if (ib_query) wined3d_event_query_issue(ib_query, device); for (i = 0; i < context->num_buffer_queries; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4fe6dff..ace0a55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1505,8 +1505,9 @@ struct wined3d_context DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; + DWORD uses_uavs : 1; DWORD destroy_delayed : 1; - DWORD padding : 12; + DWORD padding : 11; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask;

1 0