wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Bruno Jesus : ws2_32: Try harder to get the host name address in getaddrinfo.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 18a02d8f41013aa8bf3cdd03750eb706ce52e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a02d8f41013aa8bf3cdd037… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 8 11:14:32 2015 +0800 ws2_32: Try harder to get the host name address in getaddrinfo. --- dlls/ws2_32/socket.c | 18 +++++++++++----- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca82ec9..5cf3e0f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5996,7 +5996,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname = NULL; + char *hostname; const char *node; *res = NULL; @@ -6006,13 +6006,13 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr return WSAHOST_NOT_FOUND; } + hostname = get_hostname(); + if (!hostname) return WSA_NOT_ENOUGH_MEMORY; + if (!nodename) node = NULL; else if (!nodename[0]) - { - node = hostname = get_hostname(); - if (!node) return WSA_NOT_ENOUGH_MEMORY; - } + node = hostname; else node = nodename; @@ -6056,6 +6056,14 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); + if (result && !strcmp(hostname, node)) + { + /* If it didn't work it means the host name IP is not in /etc/hosts, try again + * by sending a NULL host and avoid sending a NULL servname too because that + * is invalid */ + ERR_(winediag)("Failed to resolve your host name IP\n"); + result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); + } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, hostname); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d14496..03e1627 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6313,6 +6313,8 @@ static void test_GetAddrInfoW(void) static const WCHAR zero[] = {'0',0}; int i, ret; ADDRINFOW *result, *result2, *p, hint; + WCHAR name[256]; + DWORD size = sizeof(name); if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -6320,6 +6322,8 @@ static void test_GetAddrInfoW(void) return; } memset(&hint, 0, sizeof(ADDRINFOW)); + name[0] = 0; + GetComputerNameExW( ComputerNamePhysicalDnsHostname, name, &size ); result = (ADDRINFOW *)0xdeadbeef; WSASetLastError(0xdeadbeef); @@ -6395,6 +6399,30 @@ static void test_GetAddrInfoW(void) ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + /* try to get information from the computer name, result is the same + * as if requesting with an empty host name. */ + ret = pGetAddrInfoW(name, NULL, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pGetAddrInfoW(empty, NULL, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + + ret = pGetAddrInfoW(name, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pGetAddrInfoW(empty, empty, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + result = (ADDRINFOW *)0xdeadbeef; WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); @@ -6475,6 +6503,8 @@ static void test_getaddrinfo(void) { int i, ret; ADDRINFOA *result, *result2, *p, hint; + CHAR name[256]; + DWORD size = sizeof(name); if (!pgetaddrinfo || !pfreeaddrinfo) { @@ -6482,6 +6512,7 @@ static void test_getaddrinfo(void) return; } memset(&hint, 0, sizeof(ADDRINFOA)); + GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); result = (ADDRINFOA *)0xdeadbeef; WSASetLastError(0xdeadbeef); @@ -6558,6 +6589,30 @@ static void test_getaddrinfo(void) ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); + /* try to get information from the computer name, result is the same + * as if requesting with an empty host name. */ + ret = pgetaddrinfo(name, NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pgetaddrinfo("", NULL, NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfo(result, result2); + pfreeaddrinfo(result); + pfreeaddrinfo(result2); + + ret = pgetaddrinfo(name, "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pgetaddrinfo("", "", NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfo(result, result2); + pfreeaddrinfo(result); + pfreeaddrinfo(result2); + result = (ADDRINFOA *)0xdeadbeef; WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result);

1 0

Piotr Caban : rpcrt4: Free server side arguments with MustFree flag first so other arguments may be used to determine its size.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 614afcefa33c727f31d566c3d7ee05d74afc363f URL: http://source.winehq.org/git/wine.git/?a=commit;h=614afcefa33c727f31d566c3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 7 18:45:10 2015 +0200 rpcrt4: Free server side arguments with MustFree flag first so other arguments may be used to determine its size. This also fixes a leak when both MustFree and ServerAllocSize flags are specified. --- dlls/rpcrt4/ndr_stubless.c | 7 +++++-- dlls/rpcrt4/ndr_stubless.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 033c650..f5a6bab 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1161,12 +1161,14 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, if (params[i].attr.IsOut || params[i].attr.IsReturn) call_marshaller(pStubMsg, pArg, &params[i]); break; - case STUBLESS_FREE: + case STUBLESS_MUSTFREE: if (params[i].attr.MustFree) { call_freer(pStubMsg, pArg, &params[i]); } - else if (params[i].attr.ServerAllocSize) + break; + case STUBLESS_FREE: + if (params[i].attr.ServerAllocSize) { HeapFree(GetProcessHeap(), 0, *(void **)pArg); } @@ -1455,6 +1457,7 @@ LONG WINAPI NdrStubCall2( case STUBLESS_INITOUT: case STUBLESS_CALCSIZE: case STUBLESS_MARSHAL: + case STUBLESS_MUSTFREE: case STUBLESS_FREE: retval_ptr = stub_do_args(&stubMsg, pFormat, phase, number_of_params); break; diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 5b0add0..2e7beba 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -234,6 +234,7 @@ enum stubless_phase STUBLESS_CALCSIZE, STUBLESS_GETBUFFER, STUBLESS_MARSHAL, + STUBLESS_MUSTFREE, STUBLESS_FREE };

1 0

Thomas Faller : kernel32/tests: Fix uninitialized memory of a test case.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 98aa8528d53365f497b9b6ef9b471aec420b1177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98aa8528d53365f497b9b6ef9… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Mon Sep 7 15:09:35 2015 +0200 kernel32/tests: Fix uninitialized memory of a test case. --- dlls/kernel32/tests/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 838d79c..c4de194 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -851,7 +851,8 @@ static void test_GetSystemTimes(void) sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); ok( !NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, - sizeof(*sppi), &ReturnLength), + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors, + &ReturnLength), "NtQuerySystemInformation failed\n" ); for (i = 0; i < sbi.NumberOfProcessors; i++)

1 0

Huw Davies : comctl32: Set the item size after LISTVIEW_ScrollColumns().
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 4f06425a0314103ff5653e6f93a6551a08c39f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f06425a0314103ff5653e6f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 7 13:51:11 2015 +0100 comctl32: Set the item size after LISTVIEW_ScrollColumns(). LISTVIEW_ScrollColumns() increments the item width by the scroll delta, so we need the original width to still be present. --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e1c7cea..e3fad51 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5674,11 +5674,11 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) } /* update the other column info */ - LISTVIEW_UpdateItemSize(infoPtr); if(DPA_GetPtrCount(infoPtr->hdpaColumns) == 0) LISTVIEW_InvalidateList(infoPtr); else LISTVIEW_ScrollColumns(infoPtr, nColumn, -(rcCol.right - rcCol.left)); + LISTVIEW_UpdateItemSize(infoPtr); return TRUE; }

1 0

Hugh McMaster : regsvr32: Process the next file in the array if an error occurs.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 07cc9a34a87cd08c87ae198e4aeb8c9bb7f55175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cc9a34a87cd08c87ae198e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 7 20:38:04 2015 +1000 regsvr32: Process the next file in the array if an error occurs. The Windows version stops processing the current file and moves to the next file on the first error. --- programs/regsvr32/regsvr32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ff6a3ae..a1b55a3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -292,8 +292,9 @@ int wmain(int argc, WCHAR* argv[]) if (CallInstall && Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); + /* The Windows version stops processing the current file on the first error. */ if (res) - return res; + continue; if (!CallInstall || (CallInstall && CallRegister)) { @@ -304,14 +305,13 @@ int wmain(int argc, WCHAR* argv[]) } if (res) - return res; - /* Confirmed. The Windows version stops on the first error. */ + continue; if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); if (res) - return res; + continue; } }

1 0

Hugh McMaster : regsvr32: Call InstallDll before UnregisterDll when using /u /i.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 48c7a3f4d7ffcbe62b70f6b0eab1bc8c79e2e5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c7a3f4d7ffcbe62b70f6b0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 7 20:08:10 2015 +1000 regsvr32: Call InstallDll before UnregisterDll when using /u /i. --- programs/regsvr32/regsvr32.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index a2d83a1..ff6a3ae 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -289,6 +289,12 @@ int wmain(int argc, WCHAR* argv[]) int res = 0; DllFound = TRUE; + if (CallInstall && Unregister) + res = InstallDll(!Unregister, DllName, wsCommandLine); + + if (res) + return res; + if (!CallInstall || (CallInstall && CallRegister)) { if(Unregister) @@ -301,10 +307,8 @@ int wmain(int argc, WCHAR* argv[]) return res; /* Confirmed. The Windows version stops on the first error. */ - if (CallInstall) - { + if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); - } if (res) return res;

1 0

Jacek Caban : oleaut32: Clean up IPSFactoryBuffer instance.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 91bd7ffaa80bafa712aaba2d4fe51a9c91f41495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bd7ffaa80bafa712aaba2d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 7 13:38:32 2015 +0200 oleaut32: Clean up IPSFactoryBuffer instance. --- dlls/oleaut32/tmarshal.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6608aed..f4ce311 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2338,17 +2338,12 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = { PSFacBuf_CreateStub }; -/* This is the whole PSFactoryBuffer object, just the vtableptr */ -static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; +static IPSFactoryBuffer psfac = { &psfacbufvtbl }; /*********************************************************************** * TMARSHAL_DllGetClassObject */ -HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) +HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) { - if (IsEqualIID(iid,&IID_IPSFactoryBuffer)) { - *ppv = &lppsfac; - return S_OK; - } - return E_NOINTERFACE; + return IPSFactoryBuffer_QueryInterface(&psfac, iid, ppv); }

1 0

Józef Kucia : d3d10core/tests: Port test_buffer_interfaces() from d3d11.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: d7af6664ac931f63507a4d22b2d1231cfa73965d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7af6664ac931f63507a4d22b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:51 2015 +0200 d3d10core/tests: Port test_buffer_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 847abd1..ebe50cc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -518,6 +518,135 @@ static void test_create_texture3d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_buffer_interfaces(void) +{ + ID3D11Buffer *d3d11_buffer; + D3D10_BUFFER_DESC desc; + ID3D10Buffer *buffer; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + D3D10_BIND_VERTEX_BUFFER, 0, + D3D11_BIND_VERTEX_BUFFER, 0 + }, + { + D3D10_BIND_INDEX_BUFFER, 0, + D3D11_BIND_INDEX_BUFFER, 0 + }, + { + D3D10_BIND_CONSTANT_BUFFER, 0, + D3D11_BIND_CONSTANT_BUFFER, 0 + }, + { + D3D10_BIND_SHADER_RESOURCE, 0, + D3D11_BIND_SHADER_RESOURCE, 0 + }, + { + D3D10_BIND_STREAM_OUTPUT, 0, + D3D11_BIND_STREAM_OUTPUT, 0 + }, + { + D3D10_BIND_RENDER_TARGET, 0, + D3D11_BIND_RENDER_TARGET, 0 + }, + { + 0, D3D10_RESOURCE_MISC_SHARED, + 0, D3D11_RESOURCE_MISC_SHARED + }, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.ByteWidth = 1024; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D10Buffer_QueryInterface(buffer, &IID_ID3D11Buffer, (void **)&d3d11_buffer); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Buffer should implement ID3D11Buffer.\n"); + if (SUCCEEDED(hr)) ID3D11Buffer_Release(d3d11_buffer); + ID3D10Buffer_Release(buffer); + + if (FAILED(hr)) + { + win_skip("D3D11 is not available.\n"); + ID3D10Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D11_BUFFER_DESC d3d11_desc; + ID3D11Device *d3d11_device; + + desc.ByteWidth = 1024; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), "Test %u: Failed to create a buffer, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create a buffer, skipping test %u.\n", i); + continue; + } + + hr = ID3D10Buffer_QueryInterface(buffer, &IID_ID3D11Buffer, (void **)&d3d11_buffer); + ok(SUCCEEDED(hr), "Test %u: Buffer should implement ID3D11Buffer.\n", i); + ID3D10Buffer_Release(buffer); + + ID3D11Buffer_GetDesc(d3d11_buffer, &d3d11_desc); + + ok(d3d11_desc.ByteWidth == desc.ByteWidth, + "Test %u: Got unexpected ByteWidth %u.\n", i, d3d11_desc.ByteWidth); + ok(d3d11_desc.Usage == (D3D11_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d11_desc.Usage); + ok(d3d11_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d11_desc.BindFlags); + ok(d3d11_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d11_desc.CPUAccessFlags); + ok(d3d11_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d11_desc.MiscFlags); + ok(d3d11_desc.StructureByteStride == 0, + "Test %u: Got unexpected StructureByteStride %u.\n", i, d3d11_desc.StructureByteStride); + + d3d11_device = NULL; + ID3D11Buffer_GetDevice(d3d11_buffer, &d3d11_device); + ok(!!d3d11_device, "Test %u: Got NULL, expected device pointer.\n", i); + ID3D11Device_Release(d3d11_device); + + ID3D11Buffer_Release(d3d11_buffer); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; @@ -3607,6 +3736,7 @@ START_TEST(device) test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); + test_buffer_interfaces(); test_create_depthstencil_view(); test_create_rendertarget_view(); test_create_shader_resource_view();

1 0

Józef Kucia : d3d11/tests: Add test for buffer interfaces.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: b9747d77f1710f26cf85a6183d0a5b17f7010584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9747d77f1710f26cf85a6183… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:50 2015 +0200 d3d11/tests: Add test for buffer interfaces. --- dlls/d3d11/tests/d3d11.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a5e6945..817ca9c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -642,6 +642,179 @@ static void test_texture3d_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_buffer_interfaces(void) +{ + ID3D10Buffer *d3d10_buffer; + D3D11_BUFFER_DESC desc; + ID3D11Buffer *buffer; + ID3D11Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + BOOL implements_d3d10_interfaces; + UINT bind_flags; + UINT misc_flags; + UINT structure_stride; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + TRUE, + D3D11_BIND_VERTEX_BUFFER, 0, 0, + D3D10_BIND_VERTEX_BUFFER, 0 + }, + { + TRUE, + D3D11_BIND_INDEX_BUFFER, 0, 0, + D3D10_BIND_INDEX_BUFFER, 0 + }, + { + TRUE, + D3D11_BIND_CONSTANT_BUFFER, 0, 0, + D3D10_BIND_CONSTANT_BUFFER, 0 + }, + { + TRUE, + D3D11_BIND_SHADER_RESOURCE, 0, 0, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + TRUE, + D3D11_BIND_STREAM_OUTPUT, 0, 0, + D3D10_BIND_STREAM_OUTPUT, 0 + }, + { + TRUE, + D3D11_BIND_RENDER_TARGET, 0, 0, + D3D10_BIND_RENDER_TARGET, 0 + }, + { + TRUE, + D3D11_BIND_UNORDERED_ACCESS, 0, 0, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED, 0, + 0, D3D10_RESOURCE_MISC_SHARED + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, 0, + 0, 0 + }, + { + TRUE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + FALSE /* Structured buffers do not implement ID3D10Buffer. */, + 0, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 16, + 0, 0 + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, 0, + 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX + }, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create ID3D11Device.\n"); + return; + } + + desc.ByteWidth = 1024; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Buffer_QueryInterface(buffer, &IID_ID3D10Buffer, (void **)&d3d10_buffer); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Buffer should implement ID3D10Buffer.\n"); + if (SUCCEEDED(hr)) ID3D10Buffer_Release(d3d10_buffer); + ID3D11Buffer_Release(buffer); + + if (FAILED(hr)) + { + win_skip("Buffers do not implement ID3D10Buffer.\n"); + ID3D11Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D10_BUFFER_DESC d3d10_desc; + ID3D10Device *d3d10_device; + + desc.ByteWidth = 1024; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + desc.StructureByteStride = current->structure_stride; + + hr = ID3D11Device_CreateBuffer(device, &desc, NULL, &buffer); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), "Test %u: Failed to create a buffer, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create a buffer, skipping test %u.\n", i); + continue; + } + + hr = ID3D11Buffer_QueryInterface(buffer, &IID_ID3D10Buffer, (void **)&d3d10_buffer); + ID3D11Buffer_Release(buffer); + + if (current->implements_d3d10_interfaces) + { + ok(SUCCEEDED(hr), "Test %u: Buffer should implement ID3D10Buffer.\n", i); + } + else + { + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Buffer should not implement ID3D10Buffer.\n", i); + if (SUCCEEDED(hr)) ID3D10Buffer_Release(d3d10_buffer); + continue; + } + + ID3D10Buffer_GetDesc(d3d10_buffer, &d3d10_desc); + + ok(d3d10_desc.ByteWidth == desc.ByteWidth, + "Test %u: Got unexpected ByteWidth %u.\n", i, d3d10_desc.ByteWidth); + ok(d3d10_desc.Usage == (D3D10_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d10_desc.Usage); + ok(d3d10_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d10_desc.BindFlags); + ok(d3d10_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d10_desc.CPUAccessFlags); + ok(d3d10_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d10_desc.MiscFlags); + + d3d10_device = (ID3D10Device *)0xdeadbeef; + ID3D10Buffer_GetDevice(d3d10_buffer, &d3d10_device); + todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + if (d3d10_device) ID3D10Device_Release(d3d10_device); + + ID3D10Buffer_Release(d3d10_buffer); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -650,4 +823,5 @@ START_TEST(d3d11) test_texture2d_interfaces(); test_create_texture3d(); test_texture3d_interfaces(); + test_buffer_interfaces(); }

1 0

Józef Kucia : d3d11: AddRef device returned from d3d11_buffer_GetDevice().
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: ae2b1539a9676a85baf97216c73a19d2b8b69954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2b1539a9676a85baf97216c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:49 2015 +0200 d3d11: AddRef device returned from d3d11_buffer_GetDevice(). --- dlls/d3d11/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 0245b52..26123e8 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -109,6 +109,7 @@ static void STDMETHODCALLTYPE d3d11_buffer_GetDevice(ID3D11Buffer *iface, ID3D11 TRACE("iface %p, device %p.\n", iface, device); *device = buffer->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface,

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
32
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 September 2015