November 2016 - Wine-Commits

Akihiro Sagawa : winegstreamer: Always pass non-NULL preferred allocator to IAsyncReader:: RequestAllocator.
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 8d3392a8ce4e75eaca858c2c96f666f1ab57834e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3392a8ce4e75eaca858c2c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 9 22:28:20 2016 +0900 winegstreamer: Always pass non-NULL preferred allocator to IAsyncReader::RequestAllocator. This fixes video playback issue in a certain application. The approach is very similar to 068593b23826c995f03559128041b922b68a916b. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5db99c8..a6a41ab 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1963,6 +1963,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(This->pin.pCritSec); if (!This->pin.pConnectedTo) { ALLOCATOR_PROPERTIES props; + IMemAllocator *pAlloc = NULL; props.cBuffers = 8; props.cbBuffer = 16384; @@ -1986,8 +1987,19 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); if (SUCCEEDED(hr)) hr = GST_Connect(This, pReceivePin, &props); + + /* A certain IAsyncReader::RequestAllocator expects to be passed + non-NULL preferred allocator */ if (SUCCEEDED(hr)) - hr = IAsyncReader_RequestAllocator(This->pReader, NULL, &props, &This->pAlloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, + &IID_IMemAllocator, (LPVOID *)&pAlloc); + if (SUCCEEDED(hr)) { + hr = IAsyncReader_RequestAllocator(This->pReader, pAlloc, &props, &This->pAlloc); + if (FAILED(hr)) + WARN("Can't get an allocator, got %08x\n", hr); + } + if (pAlloc) + IMemAllocator_Release(pAlloc); if (SUCCEEDED(hr)) { CopyMediaType(&This->pin.mtCurrent, pmt); This->pin.pConnectedTo = pReceivePin;

1 0

Józef Kucia : d3d10core/tests: Remove test_buffer_data_init().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 81e7e6cc1fb78c1de5855b699b335a47b8efff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e7e6cc1fb78c1de5855b699… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:28 2016 +0100 d3d10core/tests: Remove test_buffer_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial buffer data is not always initialized on other vendors GPUs. 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 | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fbce77d..0633470 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6931,33 +6931,6 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -static void test_buffer_data_init(void) -{ - struct resource_readback rb; - ID3D10Buffer *buffer; - ID3D10Device *device; - unsigned int i; - - if (!(device = create_device())) - { - skip("Failed to create device.\n"); - return; - } - - buffer = create_buffer(device, D3D10_BIND_SHADER_RESOURCE, 1024, NULL); - - get_buffer_readback(buffer, &rb); - for (i = 0; i < rb.width; ++i) - { - DWORD r = get_readback_color(&rb, i / sizeof(DWORD), 0); - ok(!r, "Got unexpected result %#x at offset %u.\n", r, i); - } - release_resource_readback(&rb); - - ID3D10Buffer_Release(buffer); - ID3D10Device_Release(device); -} - static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -9753,7 +9726,6 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing();

1 0

Józef Kucia : d3d11/tests: Initialize texture data in test_update_subresource().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 0175a267a80750960c6124b1710e6561630b8793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0175a267a80750960c6124b17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:23 2016 +0100 d3d11/tests: Initialize texture data in test_update_subresource(). Fixes test failures on Intel GPUs. 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/d3d11/tests/d3d11.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 38a3d65..d66f929 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6781,6 +6781,7 @@ static void test_fragment_coords(void) static void test_update_subresource(void) { struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; @@ -6822,6 +6823,7 @@ static void test_update_subresource(void) 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6855,7 +6857,11 @@ static void test_update_subresource(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_srv);

1 0

Józef Kucia : d3d10core/tests: Initialize buffer data in test_copy_subresource_region().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: d78aa12da650dd2ed8f246c3fcf1d8aa0de471cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78aa12da650dd2ed8f246c3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:22 2016 +0100 d3d10core/tests: Initialize buffer data in test_copy_subresource_region(). This test fails randomly on Windows 10 with AMD GPU. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e617319..fc0745a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6859,7 +6859,8 @@ static void test_copy_subresource_region(void) ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); ID3D10Device_PSSetShader(device, ps); - dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), NULL); + memset(float_colors, 0, sizeof(float_colors)); + dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), float_colors); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &dst_buffer);

1 0

Alistair Leslie-Hughes : advapi32/test: Stop crash when ReadEventLog returns an unexpected error.
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: d0350eef1eda55f6326f09dfabf88196fc724a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0350eef1eda55f6326f09dfa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 9 02:00:40 2016 +0000 advapi32/test: Stop crash when ReadEventLog returns an unexpected error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3ca59c3..7daaeaf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -909,6 +909,7 @@ static void test_readwrite(void) /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError()); i = 0; for (;;) { @@ -924,14 +925,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); - if (!ret && GetLastError() == ERROR_HANDLE_EOF) + ok(!ret, "Expected failure\n"); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { HeapFree(GetProcessHeap(), 0, buf); + ok(GetLastError() == ERROR_HANDLE_EOF, "record %d, got %d\n", i, GetLastError()); break; } - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INVALID_PARAMETER, got %d\n",GetLastError()); buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, @@ -1010,6 +1010,7 @@ static void test_readwrite(void) /* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL);

1 0

Thomas Faber : propsys/tests: Fix build with MSVC.
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 60fa2d7aa5a8558f28bcf03e631d3783c46822b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fa2d7aa5a8558f28bcf03e6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Nov 9 12:08:06 2016 +0100 propsys/tests: Fix build with MSVC. VC2010 does not allow initializing a struct inside a struct with a variable. E.g. error C2440: 'initializing' : cannot convert from 'PROPERTYKEY' to 'unsigned long' Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 96 ++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index b658678..71b6a93 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -38,6 +38,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12); +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + static const char topic[] = "wine topic"; static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; static const WCHAR emptyW[] = {0}; @@ -90,9 +92,9 @@ static void test_PSStringFromPropertyKey(void) static const WCHAR expected3W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0', '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0', '0','}',' ','0','\0','X','X','X','X','X','X','X','X','X'}; - PROPERTYKEY prop = {GUID_NULL, ~0U}; - PROPERTYKEY prop2 = {GUID_NULL, 13579}; - PROPERTYKEY prop3 = {GUID_NULL, 0}; + PROPERTYKEY prop = {GUID_MEMBERS(GUID_NULL), ~0U}; + PROPERTYKEY prop2 = {GUID_MEMBERS(GUID_NULL), 13579}; + PROPERTYKEY prop3 = {GUID_MEMBERS(GUID_NULL), 0}; WCHAR out[PKEYSTR_MAX]; HRESULT ret; @@ -331,7 +333,7 @@ static void test_PSPropertyKeyFromString(void) static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0}; - PROPERTYKEY out_init = {dummy_guid, 0xdeadbeef}; + PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef}; PROPERTYKEY out; HRESULT ret; @@ -344,15 +346,15 @@ static void test_PSPropertyKeyFromString(void) } testcases[] = { {NULL, NULL, E_POINTER}, - {NULL, &out, E_POINTER, out_init}, + {NULL, &out, E_POINTER, {GUID_MEMBERS(out_init.fmtid), out_init.pid}}, {emptyW, NULL, E_POINTER}, - {emptyW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_clsidW, &out, E_INVALIDARG, {GUID_NULL, 0}}, + {emptyW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_clsidW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, {fmtid_truncatedW, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0,0,0,0,0,0,0,0}}, 0}}, - {fmtid_nobracketsW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badcharW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badchar2W, &out, E_INVALIDARG, {GUID_NULL, 0}}, + {fmtid_nobracketsW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badcharW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badchar2W, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, {fmtid_baddashW, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, {fmtid_badchar3W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, {fmtid_badchar4W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, @@ -371,42 +373,42 @@ static void test_PSPropertyKeyFromString(void) {fmtid_badchar13W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0,0}}, 0}}, {fmtid_badchar14W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0}}, 0}}, {fmtid_badbracket2W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0x00}}, 0 }}, - {fmtid_spaceW, &out, E_INVALIDARG, {GUID_NULL, 0 }}, - {fmtid_spaceendW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_spacesendW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_nopidW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_badpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_adjpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacespidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_negnegnegpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_negspacepidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negspacenegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_negspacespidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_pospidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_posnegpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_symbolpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_letterpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_spacepadpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacemixpidW, &out, S_OK, {expect_guid, 1}}, - {fmtid_tabpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_hexpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_mixedpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_overflowpidW, &out, S_OK, {expect_guid, 3755744309U}}, - {fmtid_commapidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_commaspidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_commaspacepidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacecommapidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spccommaspcpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacescommaspidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_commanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_spccommanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_commaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_spccommaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_commanegspcpidW, &out, S_OK, {expect_guid, 0U}}, - {fmtid_negcommapidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_normalpidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_spaceW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0 }}, + {fmtid_spaceendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_spacesendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_nopidW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_badpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_adjpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_negnegnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_negspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negspacenegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_negspacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_pospidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_posnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_symbolpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_letterpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_spacepadpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacemixpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 1}}, + {fmtid_tabpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_hexpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_mixedpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_overflowpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 3755744309U}}, + {fmtid_commapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_commaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_commaspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacecommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spccommaspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacescommaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_commanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_spccommanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_commaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_spccommaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_commanegspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0U}}, + {fmtid_negcommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_normalpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, }; int i;

1 0

Józef Kucia : d3d10core/tests: Remove test_texture_data_init().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 474288a03ae3cda10483b0cb6e74156833e3d0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474288a03ae3cda10483b0cb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:30 2016 +0100 d3d10core/tests: Remove test_texture_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial texture data is not always initialized on other vendors GPUs. 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 | 94 ------------------------------------------- 1 file changed, 94 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0633470..1952a87 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6931,99 +6931,6 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -static void test_texture_data_init(void) -{ - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - struct d3d10core_test_context test_context; - D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *texture; - ID3D10Device *device; - UINT count = 0; - HRESULT hr; - - if (!init_test_context(&test_context)) - return; - - device = test_context.device; - - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; - desc.ArraySize = 1; - desc.SampleDesc.Count = 1; - desc.SampleDesc.Quality = 0; - desc.Usage = D3D10_USAGE_DEFAULT; - desc.BindFlags = 0; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D10Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D10Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D32_FLOAT; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D10Texture2D_Release(texture); - - desc.ArraySize = 4; - - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D10Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D10Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D32_FLOAT; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D10Texture2D_Release(texture); - - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); - if (!count) - { - skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - release_test_context(&test_context); - return; - } - - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); - - desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.SampleDesc.Count = 2; - desc.SampleDesc.Quality = 0; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, - (ID3D10Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - - todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - - ID3D10Texture2D_Release(texture); - - release_test_context(&test_context); -} - static void test_check_multisample_quality_levels(void) { ID3D10Device *device; @@ -9726,7 +9633,6 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_formats();

1 0

Józef Kucia : d3d11/tests: Remove test_texture_data_init().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: 87ae0a4308283d05e0e5d7196cc26c6de69de4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ae0a4308283d05e0e5d7196… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:29 2016 +0100 d3d11/tests: Remove test_texture_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial texture data is not always initialized on other vendors GPUs. 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/d3d11/tests/d3d11.c | 96 ------------------------------------------------ 1 file changed, 96 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f073d04..123676d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7370,101 +7370,6 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_texture_data_init(void) -{ - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - struct d3d11_test_context test_context; - ID3D11DeviceContext *context; - D3D11_TEXTURE2D_DESC desc; - ID3D11Texture2D *texture; - ID3D11Device *device; - UINT count = 0; - HRESULT hr; - - if (!init_test_context(&test_context, NULL)) - return; - - device = test_context.device; - context = test_context.immediate_context; - - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; - desc.ArraySize = 1; - desc.SampleDesc.Count = 1; - desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = 0; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D11Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D11Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D32_FLOAT; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D11Texture2D_Release(texture); - - desc.ArraySize = 4; - - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D11Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_color(texture, 0x00000000, 0); - ID3D11Texture2D_Release(texture); - - desc.Format = DXGI_FORMAT_D32_FLOAT; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - check_texture_float(texture, 0.0f, 0); - ID3D11Texture2D_Release(texture); - - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); - if (!count) - { - skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - release_test_context(&test_context); - return; - } - - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); - - desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.SampleDesc.Count = 2; - desc.SampleDesc.Quality = 0; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, - (ID3D11Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - - todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - - ID3D11Texture2D_Release(texture); - - release_test_context(&test_context); -} - static void test_check_multisample_quality_levels(void) { ID3D11Device *device; @@ -11034,7 +10939,6 @@ START_TEST(d3d11) test_update_subresource(); test_copy_subresource_region(); test_resource_map(); - test_texture_data_init(); test_check_multisample_quality_levels(); run_for_each_feature_level(test_swapchain_formats); test_swapchain_views();

1 0

Józef Kucia : d3d10core/tests: Initialize texture data in test_copy_subresource_region().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: a55c56ee29fccc8e61a0c0cd62eb0414607b1567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55c56ee29fccc8e61a0c0cd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:26 2016 +0100 d3d10core/tests: Initialize texture data in test_copy_subresource_region(). Fixes test failures on Intel GPUs. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3bd6ea6..fbce77d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6727,6 +6727,7 @@ static void test_copy_subresource_region(void) 0x0010000a, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6759,13 +6760,17 @@ static void test_copy_subresource_region(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); texture_desc.Usage = D3D10_USAGE_IMMUTABLE; resource_data.pSysMem = bitmap_data; - resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); resource_data.SysMemSlicePitch = 0; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture);

1 0

Józef Kucia : d3d11/tests: Initialize texture data in test_copy_subresource_region().
by Alexandre Julliard Nov. 9, 2016

Nov. 9, 2016

Module: wine Branch: master Commit: a893abfd49ce09e9dac10dc1dc4e0ead7c384777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a893abfd49ce09e9dac10dc1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:25 2016 +0100 d3d11/tests: Initialize texture data in test_copy_subresource_region(). Fixes test failures on Intel GPUs. 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/d3d11/tests/d3d11.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d66f929..23ef146 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7024,6 +7024,7 @@ static void test_copy_subresource_region(void) 0x0010000a, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -7057,13 +7058,17 @@ static void test_copy_subresource_region(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); texture_desc.Usage = D3D11_USAGE_IMMUTABLE; resource_data.pSysMem = bitmap_data; - resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); resource_data.SysMemSlicePitch = 0; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture);

1 0