February 2015 - Wine-Commits

Alexandre Julliard : user32/tests: Ignore WM_PAINT messages in GetMessagePos test.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 4e87b952b3a9c1291829dc076e0b3639a1c048a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e87b952b3a9c1291829dc076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:19:26 2015 +0900 user32/tests: Ignore WM_PAINT messages in GetMessagePos test. --- dlls/user32/tests/win.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c6dee75..0b67eea 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8032,6 +8032,11 @@ static void test_GetMessagePos(void) SetTimer(button, 1, 250, NULL); SetCursorPos(330, 350); GetMessageA(&msg, button, 0, 0); + while (msg.message == WM_PAINT) + { + UpdateWindow( button ); + GetMessageA(&msg, button, 0, 0); + } ok(msg.message == WM_TIMER, "msg.message = %x\n", msg.message); pos = GetMessagePos(); todo_wine ok(pos == MAKELONG(330, 350), "pos = %08x\n", pos);

1 0

Amine Khaldi : dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: bd58a7ca454754b3cd9f406f858974974b125152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd58a7ca454754b3cd9f406f8… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Feb 23 21:40:25 2015 +0100 dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way. --- dlls/dinput/tests/dinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 0490642..5ac55cf 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -50,7 +50,7 @@ static const DWORD directinput_version_list[] = DIRECTINPUT_VERSION_700, }; -static HRESULT WINAPI (*pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); +static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) {

1 0

Alexandre Julliard : user32/tests: Avoid a race with the get/ set window text threads.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: a5ec8bf8b07dd21fc6c4123302771fd60da53c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ec8bf8b07dd21fc6c412330… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:19:46 2015 +0900 user32/tests: Avoid a race with the get/set window text threads. --- dlls/user32/tests/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0b67eea..d71e92a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5794,7 +5794,7 @@ static void test_gettext(void) num_msgs++; } CloseHandle( thread ); - ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); /* test interthread SetWindowText */ num_msgs = 0; @@ -5807,7 +5807,7 @@ static void test_gettext(void) num_msgs++; } CloseHandle( thread ); - ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); num_gettext_msgs = 0; memset( buf, 0, sizeof(buf) );

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SetPrivateData().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: c9fd72d80cc9225488cab70edb72ec1bea8e2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fd72d80cc9225488cab70ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:39 2015 +0100 d3d10core: Implement d3d10_device_SetPrivateData(). --- dlls/d3d10core/device.c | 12 +++- dlls/d3d10core/tests/device.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7f41360..21f3c30 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1284,10 +1284,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + IDXGIDevice *dxgi_device; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + 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); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8b51cda..24bddda 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2519,6 +2519,145 @@ static void test_texture(void) DestroyWindow(window); } +static void test_private_data(void) +{ + ULONG refcount, expected_refcount; + ID3D10Device *test_object; + IDXGIDevice *dxgi_device; + ID3D10Device *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())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + test_object = create_device(); + + /* SetPrivateData() with a pointer of NULL has the purpose of + * FreePrivateData() in previous D3D versions. A successful clear returns + * S_OK. A redundant clear S_FALSE. Setting a NULL interface is not + * considered a clear but as setting an interface pointer that happens to + * be NULL. */ + hr = ID3D10Device_SetPrivateData(device, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); + todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + + hr = ID3D10Device_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); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); + todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + IDXGIDevice_Release(dxgi_device); + + refcount = get_refcount((IUnknown *)test_object); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine 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 = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D10Device_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 = ID3D10Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + if (ptr) + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + size = 1; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + todo_wine ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = ID3D10Device_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", refcount); +} + START_TEST(device) { test_create_texture2d(); @@ -2537,4 +2676,5 @@ START_TEST(device) test_clear_state(); test_blend(); test_texture(); + test_private_data(); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_GetPrivateData().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: e5dd9b2a183c2df1a004f2b274900bf27760f95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dd9b2a183c2df1a004f2b27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:44 2015 +0100 d3d10core: Implement d3d10_texture2d_GetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 2 ++ dlls/d3d10core/texture.c | 16 ++++++++++++++-- dlls/d3d10core/utils.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 6a975c1..de84567 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -66,6 +66,8 @@ DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECL struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; +HRESULT d3d10_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT d3d10_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 1c82bad..4b32f3d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -119,10 +119,22 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index a5f539b..2515136 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -411,6 +411,35 @@ DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) } } +HRESULT d3d10_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + + if (!data_size) + return E_INVALIDARG; + + if (!(stored_data = wined3d_private_store_get_private_data(store, guid))) + { + *data_size = 0; + return DXGI_ERROR_NOT_FOUND; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + return S_OK; + if (size_in < stored_data->size) + return DXGI_ERROR_MORE_DATA; + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + + return S_OK; +} + HRESULT d3d10_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_SetPrivateDataInterface() .
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 9c97e156e84d1b94fc309a79686086ace5ab2eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c97e156e84d1b94fc309a796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:46 2015 +0100 d3d10core: Implement d3d10_query_SetPrivateDataInterface(). --- dlls/d3d10core/async.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 075a767..b64dba7 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -116,9 +116,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_query *query = impl_from_ID3D10Query(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&query->private_store, guid, data); } /* ID3D10Asynchronous methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_SetPrivateData().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 0d59cba5c915a5ad90b9052526a440bcd448ab5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d59cba5c915a5ad90b905252… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:48 2015 +0100 d3d10core: Implement d3d10_buffer_SetPrivateData(). --- dlls/d3d10core/buffer.c | 11 +++++++++-- dlls/d3d10core/d3d10core_private.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index c5d851e..ff94fbc 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -111,10 +111,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, @@ -206,6 +208,9 @@ struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) { + struct d3d10_buffer *buffer = parent; + + wined3d_private_store_cleanup(&buffer->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -222,6 +227,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; buffer->refcount = 1; + wined3d_private_store_init(&buffer->private_store); FIXME("Implement DXGI<->wined3d usage conversion\n"); @@ -237,6 +243,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi if (FAILED(hr)) { WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + wined3d_private_store_cleanup(&buffer->private_store); return hr; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 18c5ca1..5544dc7 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -121,6 +121,7 @@ struct d3d10_buffer ID3D10Buffer ID3D10Buffer_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; ID3D10Device1 *device; };

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_GetPrivateData().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 5dfb4c126655e0a25f6ec8d3ae1c12090ff10413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfb4c126655e0a25f6ec8d3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:47 2015 +0100 d3d10core: Implement d3d10_query_GetPrivateData(). --- dlls/d3d10core/async.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index b64dba7..d6c3d81 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -96,10 +96,12 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&query->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_SetPrivateDataInterface().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 21da7be665da1e8261649d596fd1f40ce382b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21da7be665da1e8261649d596… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:43 2015 +0100 d3d10core: Implement d3d10_texture2d_SetPrivateDataInterface(). --- dlls/d3d10core/d3d10core_private.h | 2 ++ dlls/d3d10core/tests/device.c | 9 ++++----- dlls/d3d10core/texture.c | 16 ++++++++++++++-- dlls/d3d10core/utils.c | 9 +++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a3ab637..6a975c1 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -68,6 +68,8 @@ DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; HRESULT d3d10_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; +HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, + REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5e3668d..68012ac 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2672,14 +2672,13 @@ static void test_private_data(void) ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ptr = NULL; size = sizeof(ptr); hr = IDXGISurface_GetPrivateData(surface, &test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); - if (ptr) - IUnknown_Release(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); ID3D10Texture2D_Release(texture); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 8897c1d..1c82bad 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -149,9 +149,21 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10Texture2D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_set_private_data_interface(&texture->private_store, guid, data); } /* ID3D10Resource methods */ diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 6dee2d1..a5f539b 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -428,6 +428,15 @@ HRESULT d3d10_set_private_data(struct wined3d_private_store *store, return wined3d_private_store_set_private_data(store, guid, data, data_size, 0); } +HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, + REFGUID guid, const IUnknown *object) +{ + if (!object) + return d3d10_set_private_data(store, guid, sizeof(object), &object); + + return wined3d_private_store_set_private_data(store, + guid, object, sizeof(object), WINED3DSPD_IUNKNOWN); +} void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i;

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_SetPrivateData().
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: c2e6a7d0b12631db9ad251fa6467e720aa5428d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2e6a7d0b12631db9ad251fa6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:42 2015 +0100 d3d10core: Implement d3d10_texture2d_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/tests/device.c | 32 ++++++++++++++++++++++++++++++++ dlls/d3d10core/texture.c | 21 +++++++++++++++++++-- dlls/d3d10core/utils.c | 17 +++++++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b777900..a3ab637 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -66,6 +66,9 @@ DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECL struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; +HRESULT d3d10_set_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -83,6 +86,7 @@ struct d3d10_texture2d ID3D10Texture2D ID3D10Texture2D_iface; LONG refcount; + struct wined3d_private_store private_store; IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE2D_DESC desc; diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1f3ffe7..5e3668d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2521,9 +2521,12 @@ static void test_texture(void) static void test_private_data(void) { + D3D10_TEXTURE2D_DESC texture_desc; ULONG refcount, expected_refcount; ID3D10Device *test_object; + ID3D10Texture2D *texture; IDXGIDevice *dxgi_device; + IDXGISurface *surface; ID3D10Device *device; IUnknown *ptr; HRESULT hr; @@ -2543,6 +2546,23 @@ static void test_private_data(void) test_object = create_device(); + 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 = 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 = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface, hr %#x.\n", hr); + /* SetPrivateData() with a pointer of NULL has the purpose of * FreePrivateData() in previous D3D versions. A successful clear returns * S_OK. A redundant clear S_FALSE. Setting a NULL interface is not @@ -2651,6 +2671,18 @@ static void test_private_data(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ptr = NULL; + size = sizeof(ptr); + hr = IDXGISurface_GetPrivateData(surface, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + if (ptr) + IUnknown_Release(ptr); + + IDXGISurface_Release(surface); + ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); refcount = ID3D10Device_Release(test_object); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 330dea9..8897c1d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -80,6 +80,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_wined3d_object_released(void *pare struct d3d10_texture2d *This = parent; if (This->dxgi_surface) IUnknown_Release(This->dxgi_surface); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -127,10 +128,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10Texture2D *iface, @@ -256,6 +269,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; texture->refcount = 1; + wined3d_private_store_init(&texture->private_store); texture->desc = *desc; if (desc->MipLevels == 1 && desc->ArraySize == 1) @@ -267,6 +281,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); + wined3d_private_store_cleanup(&texture->private_store); return E_FAIL; } @@ -281,6 +296,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic if (FAILED(hr)) { ERR("Failed to create DXGI surface, returning %#x\n", hr); + wined3d_private_store_cleanup(&texture->private_store); return hr; } } @@ -310,6 +326,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic WARN("Failed to create wined3d texture, hr %#x.\n", hr); if (texture->dxgi_surface) IUnknown_Release(texture->dxgi_surface); + wined3d_private_store_cleanup(&texture->private_store); return hr; } texture->desc.MipLevels = levels; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 91eda6d..6dee2d1 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -411,6 +411,23 @@ DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) } } +HRESULT d3d10_set_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT data_size, const void *data) +{ + struct wined3d_private_data *entry; + + if (!data) + { + if (!(entry = wined3d_private_store_get_private_data(store, guid))) + return S_FALSE; + wined3d_private_store_free_private_data(store, entry); + + return S_OK; + } + + return wined3d_private_store_set_private_data(store, guid, data, data_size, 0); +} + void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i;

1 0