wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Józef Kucia : d3d11/tests: Check that private data is shared between d3d10 and d3d11 interfaces.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: d8a6972bd22c3481246d51d4cad250b6aa514d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a6972bd22c3481246d51d4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:27 2015 +0200 d3d11/tests: Check that private data is shared between d3d10 and d3d11 interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b48fe0..cecac07 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1637,6 +1637,7 @@ static void test_private_data(void) { ULONG refcount, expected_refcount; D3D11_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *d3d10_texture; ID3D11Device *test_object; ID3D11Texture2D *texture; IDXGIDevice *dxgi_device; @@ -1785,6 +1786,20 @@ static void test_private_data(void) ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); IUnknown_Release(ptr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D10Texture2D.\n"); + if (SUCCEEDED(hr)) + { + ptr = NULL; + size = sizeof(ptr); + hr = ID3D10Texture2D_GetPrivateData(d3d10_texture, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + ID3D10Texture2D_Release(d3d10_texture); + } + IDXGISurface_Release(surface); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Józef Kucia : d3d11/tests: Port test_private_data() from d3d10core.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: dae7e7487a23bf15b0f38b91f928e90ee73276d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae7e7487a23bf15b0f38b91f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:26 2015 +0200 d3d11/tests: Port test_private_data() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a079acf..5b48fe0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1633,6 +1633,166 @@ static void test_device_removed_reason(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_private_data(void) +{ + ULONG refcount, expected_refcount; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Device *test_object; + ID3D11Texture2D *texture; + IDXGIDevice *dxgi_device; + IDXGISurface *surface; + ID3D11Device *device; + IUnknown *ptr; + HRESULT hr; + UINT size; + + static const GUID test_guid = + {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + static const GUID test_guid2 = + {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; + static const DWORD data[] = {1, 2, 3, 4}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + test_object = create_device(NULL); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface, hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateData(device, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = IDXGIDevice_GetPrivateData(dxgi_device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + IDXGIDevice_Release(dxgi_device); + + refcount = get_refcount((IUnknown *)test_object); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + --expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D11Device_SetPrivateData(device, &test_guid, size, data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D11Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + size = 1; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + hr = ID3D11Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ptr = NULL; + size = sizeof(ptr); + hr = IDXGISurface_GetPrivateData(surface, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + + IDXGISurface_Release(surface); + ID3D11Texture2D_Release(texture); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = ID3D11Device_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1650,4 +1810,5 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_device_removed_reason(); + test_private_data(); }

1 0

Józef Kucia : d3d11/tests: Port test_device_removed_reason() from d3d10core.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 894ef070bc3b33781973c0baab3e6aeb5f7f4ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894ef070bc3b33781973c0baa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:25 2015 +0200 d3d11/tests: Port test_device_removed_reason() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bc44dbd..a079acf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1612,6 +1612,27 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_device_removed_reason(void) +{ + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1628,4 +1649,5 @@ START_TEST(d3d11) test_create_shader(); test_create_depthstencil_state(); test_create_rasterizer_state(); + test_device_removed_reason(); }

1 0

Józef Kucia : d3d11: Implement private data methods for ID3D11Device.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 30fe161469e331289348b9ee2261b6abeaa9945b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fe161469e331289348b9ee2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:24 2015 +0200 d3d11: Implement private data methods for ID3D11Device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 74 ++++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 79e3ea8..693c992 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -503,25 +503,49 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device *iface, REFGUID guid, - const IUnknown *data_iface) + const IUnknown *data) { - FIXME("iface %p, guid %s, data_iface %p stub!\n", iface, debugstr_guid(guid), data_iface); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) @@ -2020,51 +2044,31 @@ static UINT STDMETHODCALLTYPE d3d10_device_GetExceptionMode(ID3D10Device1 *iface static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT *data_size, void *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; + struct d3d_device *device = impl_from_ID3D10Device(iface); - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); - IDXGIDevice_Release(dxgi_device); - - return hr; + return d3d11_device_GetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT data_size, const void *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; - - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + struct d3d_device *device = impl_from_ID3D10Device(iface); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); - IDXGIDevice_Release(dxgi_device); + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return hr; + return d3d11_device_SetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, REFGUID guid, const IUnknown *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); - IDXGIDevice_Release(dxgi_device); - - return hr; + return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device_iface, guid, data); } static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface)

1 0

Józef Kucia : d3d10core/tests: Use 'd3d10core_test' as window name in test_scissor().
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 5b0fb73c1b013a2bd76f1121e26ec847b662a3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fb73c1b013a2bd76f1121e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:23 2015 +0200 d3d10core/tests: Use 'd3d10core_test' as window name in test_scissor(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ec835ab..5dc3049 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1520,7 +1520,7 @@ static void test_scissor(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + window = CreateWindowA("static", "d3d10core_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_ID3D10Texture2D, (void **)&backbuffer);

1 0

Stefan Dösinger : d3d8/tests: Port test_flip to d3d8.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: c9c622f083b0d09908e775967b5b06eaaa1e3411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c622f083b0d09908e775967… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 5 23:13:14 2015 +0200 d3d8/tests: Port test_flip to d3d8. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 41ef2f9..318d3ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -114,6 +114,38 @@ out: return ret; } +static D3DCOLOR get_surface_color(IDirect3DSurface8 *surface, UINT x, UINT y) +{ + DWORD color; + HRESULT hr; + D3DSURFACE_DESC desc; + RECT rectToLock = {x, y, x+1, y+1}; + D3DLOCKED_RECT lockedRect; + + hr = IDirect3DSurface8_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr=%#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &lockedRect, &rectToLock, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr=%#x.\n", hr); + + switch(desc.Format) + { + case D3DFMT_A8R8G8B8: + color = ((D3DCOLOR *)lockedRect.pBits)[0]; + break; + + default: + trace("Error: unknown surface format: %u.\n", desc.Format); + color = 0xdeadbeef; + break; + } + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr=%#x.\n", hr); + + return color; +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7885,6 +7917,118 @@ done: DestroyWindow(window); } +static void test_flip(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + IDirect3DSurface8 *back_buffers[3], *test_surface; + unsigned int i; + D3DCOLOR color; + D3DPRESENT_PARAMETERS present_parameters = {0}; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferCount = 3; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + hr = IDirect3DDevice8_GetRenderTarget(device, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[0], "Expected render target %p, got %p.\n", back_buffers[0], test_surface); + IDirect3DSurface8_Release(test_surface); + + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[0], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[1], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[2], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Render target is unmodified. */ + hr = IDirect3DDevice8_GetRenderTarget(device, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[2], "Expected render target %p, got %p.\n", back_buffers[2], test_surface); + IDirect3DSurface8_Release(test_surface); + + /* Backbuffer surface pointers are unmodified */ + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(test_surface == back_buffers[i], "Expected back buffer %u = %p, got %p.\n", + i, back_buffers[i], test_surface); + IDirect3DSurface8_Release(test_surface); + } + + /* Contents were changed. */ + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + IDirect3DSurface8_Release(back_buffers[i]); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -7946,4 +8090,5 @@ START_TEST(visual) test_texcoordindex(); test_vshader_input(); test_fixed_function_fvf(); + test_flip(); }

1 0

Stefan Dösinger : d3d9/tests: Port test_flip to d3d9.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 178d0030a2fa7a7b4ff393670b25719dec638429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178d0030a2fa7a7b4ff393670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 5 23:13:13 2015 +0200 d3d9/tests: Port test_flip to d3d9. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d49d3b2..a9b1ade 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19796,6 +19796,112 @@ done: DestroyWindow(window); } +static void test_flip(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + IDirect3DSurface9 *back_buffers[3], *test_surface; + unsigned int i; + D3DCOLOR color; + D3DPRESENT_PARAMETERS present_parameters = {0}; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferCount = 3; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[0], "Expected render target %p, got %p.\n", back_buffers[0], test_surface); + IDirect3DSurface9_Release(test_surface); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, back_buffers[2]); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_ColorFill(device, back_buffers[0], NULL, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x.\n", hr); + hr = IDirect3DDevice9_ColorFill(device, back_buffers[1], NULL, 0xff00ff00); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Render target is unmodified. */ + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[2], "Expected render target %p, got %p.\n", back_buffers[2], test_surface); + IDirect3DSurface9_Release(test_surface); + + /* Backbuffer surface pointers are unmodified */ + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(test_surface == back_buffers[i], "Expected back buffer %u = %p, got %p.\n", + i, back_buffers[i], test_surface); + IDirect3DSurface9_Release(test_surface); + } + + /* Contents were changed. */ + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColorFromSurface(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + color = getPixelColorFromSurface(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + IDirect3DSurface9_Release(back_buffers[i]); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -19914,4 +20020,5 @@ START_TEST(visual) test_vertex_blending(); test_updatetexture(); test_depthbias(); + test_flip(); }

1 0

Matteo Bruni : wined3d: Initialize unwritten texcoord varyings in the VS.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: b90b61aa68c593b4ab5fa2e611018a551dddc0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90b61aa68c593b4ab5fa2e61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 2 14:54:47 2015 +0200 wined3d: Initialize unwritten texcoord varyings in the VS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9fd48c4..c85b334 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4939,6 +4939,8 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, if (ps_major < 3) { + DWORD texcoords_written_mask[MAX_TEXTURES] = {0}; + if (!legacy_context) { declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); @@ -4975,15 +4977,11 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { - if (semantic_idx < 8) + if (semantic_idx < MAX_TEXTURES) { - if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) - write_mask |= WINED3DSP_WRITEMASK_3; - shader_addline(buffer, "gl_TexCoord[%u]%s = vs_out[%u]%s;\n", semantic_idx, reg_mask, output->register_idx, reg_mask); - if (!(write_mask & WINED3DSP_WRITEMASK_3)) - shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); + texcoords_written_mask[semantic_idx] = write_mask; } } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) @@ -4998,7 +4996,22 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, output->register_idx, reg_mask[1]); } } - shader_addline(buffer, "}\n"); + + for (i = 0; i < MAX_TEXTURES; ++i) + { + if (ps && !(ps->reg_maps.texcoord & (1u << i))) + continue; + + if (texcoords_written_mask[i] != WINED3DSP_WRITEMASK_ALL) + { + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + && !texcoords_written_mask[i]) + continue; + + shader_glsl_write_mask_to_str(~texcoords_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); + shader_addline(buffer, "gl_TexCoord[%u]%s = vec4(0.0)%s;\n", i, reg_mask, reg_mask); + } + } } else { @@ -5034,10 +5047,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, /* Then, fix the pixel shader input */ handle_ps3_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, &vs->output_signature, &vs->reg_maps); - - shader_addline(buffer, "}\n"); } + shader_addline(buffer, "}\n"); + ret = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); checkGLcall("glCreateShader(GL_VERTEX_SHADER)"); shader_glsl_compile(gl_info, ret, buffer->buffer);

1 0

Matteo Bruni : wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 47bf62962a316ec99ec3e6f6cdb7a37c7eb7da19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bf62962a316ec99ec3e6f6c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 2 14:54:46 2015 +0200 wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader. Only when the GPU supports enough varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/utils.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af44989..9fd48c4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5802,6 +5802,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe if (settings->texcoords & (1u << i)) shader_addline(buffer, "gl_TexCoord[%u] = ffp_texture_matrix[%u] * ffp_attrib_texcoord%u;\n", i, i, i); + else if (gl_info->limits.glsl_varyings >= wined3d_max_compat_varyings(gl_info)) + shader_addline(buffer, "gl_TexCoord[%u] = vec4(0.0);\n", i); break; case WINED3DTSS_TCI_CAMERASPACENORMAL: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa6eb62..8265b9c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4343,6 +4343,13 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { return size; } +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) +{ + /* On core profile we have to also count diffuse and specular colors and the + * fog coordinate. */ + return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? MAX_TEXTURES * 4 : (MAX_TEXTURES + 2) * 4 + 1; +} + void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 758af54..d3c362b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,6 +1877,7 @@ extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECL extern const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,

1 0

Hans Leidekker : msiexec: Add support for /passive.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: c0b3f3f2e8ebc17b68ce31af7d02fb1a2ef9de6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b3f3f2e8ebc17b68ce31af7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 00:29:13 2015 +0200 msiexec: Add support for /passive. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msiexec/msiexec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index bb5c931..b7999d1 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -924,6 +924,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine wine_dbgstr_w(argvW[i]+2)); } } + else if(msi_option_equal(argvW[i], "passive")) + { + static const WCHAR rebootpromptW[] = + {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; + + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; + StringListAppend(&property_list, rebootpromptW); + } else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE;

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015