February 2015 - Wine-commits

Nikolay Sivov : scrrun: Store compare method for dictionary.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 075fe10ba5bc9e882acc7944697286e6cafcdda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075fe10ba5bc9e882acc79446… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 24 11:28:41 2015 +0300 scrrun: Store compare method for dictionary. --- dlls/scrrun/dictionary.c | 18 ++++++++------ dlls/scrrun/tests/dictionary.c | 55 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 4fcaedd..c1122fa 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -34,8 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); typedef struct { IDictionary IDictionary_iface; - LONG ref; + + CompareMethod method; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -260,22 +261,24 @@ static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) return E_NOTIMPL; } -static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMethod pcomp) +static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMethod method) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->(%d)\n", This, method); - return E_NOTIMPL; + This->method = method; + return S_OK; } -static HRESULT WINAPI dictionary_get_CompareMode(IDictionary *iface, CompareMethod *pcomp) +static HRESULT WINAPI dictionary_get_CompareMode(IDictionary *iface, CompareMethod *method) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p)\n", This, pcomp); + TRACE("(%p)->(%p)\n", This, method); - return E_NOTIMPL; + *method = This->method; + return S_OK; } static HRESULT WINAPI dictionary__NewEnum(IDictionary *iface, IUnknown **ppunk) @@ -336,6 +339,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->IDictionary_iface.lpVtbl = &dictionary_vtbl; This->ref = 1; + This->method = BinaryCompare; *obj = &This->IDictionary_iface; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index e28bbb1..cad387d 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -44,10 +44,7 @@ static void test_interfaces(void) hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); - return; - } + ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&key); VariantInit(&value); @@ -91,12 +88,60 @@ static void test_interfaces(void) IDispatch_Release(disp); } +static void test_comparemode(void) +{ + CompareMethod method; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDictionary_get_CompareMode(dict, NULL); + + method = 10; + hr = IDictionary_get_CompareMode(dict, &method); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(method == BinaryCompare, "got %d\n", method); + + /* invalid mode value is not checked */ + hr = IDictionary_put_CompareMode(dict, 10); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_get_CompareMode(dict, &method); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(method == 10, "got %d\n", method); + + hr = IDictionary_put_CompareMode(dict, DatabaseCompare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_get_CompareMode(dict, &method); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(method == DatabaseCompare, "got %d\n", method); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { + IDispatch *disp; + HRESULT hr; + CoInitialize(NULL); - test_interfaces(); + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) { + win_skip("Dictionary object is not supported: %08x\n", hr); + CoUninitialize(); + return; + } + IDispatch_Release(disp); + test_interfaces(); + test_comparemode(); CoUninitialize(); }

1 0

Michael Stefaniuc : mshtml: RT_HTML is already an INTRESOURCE (PVS-Studio) .
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 5d578b48fcb1adcf75acc32ef0233e78acbd6faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d578b48fcb1adcf75acc32ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 24 09:35:33 2015 +0100 mshtml: RT_HTML is already an INTRESOURCE (PVS-Studio). --- dlls/mshtml/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 9988c90..0d822b4 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -643,7 +643,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *url_file++ = 0; }else { url_file = res_type; - res_type = MAKEINTRESOURCEW(RT_HTML); + res_type = (LPWSTR)RT_HTML; } /* Ignore query and hash parts. */

1 0

Jacek Caban : wininet: Call WSACleanup only if WSAStartup was previously called successfully.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 6d4abc78d0a224813200a226bbccc1e16fd77738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4abc78d0a224813200a226b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 24 13:18:57 2015 +0100 wininet: Call WSACleanup only if WSAStartup was previously called successfully. Spotted by Piotr. --- dlls/wininet/netconnection.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 962c2a9..ca668f2 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -406,7 +406,8 @@ void NETCON_unload(void) if(have_compat_cred_handle) FreeCredentialsHandle(&compat_cred_handle); DeleteCriticalSection(&init_sechandle_cs); - WSACleanup(); + if(winsock_loaded) + WSACleanup(); } /* translate a unix error code into a winsock one */

1 0

Andrey Gusev : po: Fix a mistake in Dutch translation.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 3bd8800021b34d38aa5851b8227d7d5aab40d4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd8800021b34d38aa5851b82… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 23 16:57:03 2015 +0200 po: Fix a mistake in Dutch translation. --- po/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index b652d6b..1a18f8c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13946,7 +13946,7 @@ msgid "" "and attach that file to the report." msgstr "" "Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteed, dan kunt U gedetailleerde informatie in een bestand " +"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " "opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=\"http://" "wiki.winehq.org/Bugs\">file a bug report</a> versturen."

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 7b620af230ee82632bd97951a0532821900620df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b620af230ee82632bd97951a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 23 22:55:04 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index a0e0d03..24ff72b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-20 19:22+0300\n" +"PO-Revision-Date: 2015-02-23 22:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11507,10 +11507,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Klaida: Netinkami komandos eilutės parametrai\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n" +msgstr "Klaida: Nepavyko prieiti prie nuotolinio kompiuterio\n" #: reg.rc:38 msgid "" @@ -11518,10 +11516,8 @@ msgid "" msgstr "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Nepalaikomas tipas.\n" +msgstr "Klaida: Nepalaikomas tipas\n" #: regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

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_device_SetPrivateDataInterface( ).
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 7f7844a79dd68d48dd6a50ba12e3164cba68ee43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7844a79dd68d48dd6a50ba1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:40 2015 +0100 d3d10core: Implement d3d10_device_SetPrivateDataInterface(). --- dlls/d3d10core/device.c | 12 ++++++++++-- dlls/d3d10core/tests/device.c | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 21f3c30..fe7e054 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1301,9 +1301,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + 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; } static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 24bddda..6524e32 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2551,14 +2551,14 @@ static void test_private_data(void) 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); + 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); + 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); + 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); @@ -2571,33 +2571,33 @@ static void test_private_data(void) 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); + 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 = ID3D10Device_SetPrivateDataInterface(device, &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); 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); + 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); + 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); + 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); + 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); + 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); @@ -2610,7 +2610,7 @@ static void test_private_data(void) hr = ID3D10Device_SetPrivateDataInterface(device, &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); ++expected_refcount; size = 2 * sizeof(ptr); ptr = NULL; @@ -2634,7 +2634,7 @@ static void test_private_data(void) 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); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 34f4c407b26416404e7a5bf07ecdef40f885d2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f4c407b26416404e7a5bf07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:41 2015 +0100 d3d10core: Implement d3d10_device_GetPrivateData(). --- dlls/d3d10core/device.c | 12 ++++++++++-- dlls/d3d10core/tests/device.c | 35 +++++++++++++++++------------------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fe7e054..ed59ee6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1275,10 +1275,18 @@ static UINT STDMETHODCALLTYPE d3d10_device_GetExceptionMode(ID3D10Device1 *iface static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + IDXGIDevice *dxgi_device; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, 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_GetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6524e32..1f3ffe7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2562,9 +2562,9 @@ static void test_private_data(void) 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); + 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 = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); @@ -2615,41 +2615,40 @@ static void test_private_data(void) 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); + 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); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - if (ptr) - IUnknown_Release(ptr); + 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 = 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); + 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 = 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); + 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 = 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(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 = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + 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(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 = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); refcount = ID3D10Device_Release(device);

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_SetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

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

Henri Verbeet : d3d10core: Implement d3d10_texture2d_SetPrivateDataInterface().
by Alexandre Julliard 24 Feb '15

24 Feb '15

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