wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Ziqing Hui : ws2_32/tests: Test getaddrinfo() for IPv6 DNS querying.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 6bdf3a6ba7c169e5d2e21f7d79bc798fb6e28c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdf3a6ba7c169e5d2e21f7d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 21 17:05:54 2022 +0800 ws2_32/tests: Test getaddrinfo() for IPv6 DNS querying. The tests show that if we don't have a global IPv6 address, getaddrinfo() will not return IPv6 results. Specifing AF_UNSPEC makes it return IPv4 results. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 5f728a9c4a4..9a6c8610718 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2122,6 +2122,17 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b) ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); } +static BOOL ipv6_found(ADDRINFOA *addr) +{ + ADDRINFOA *p; + for (p = addr; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + return TRUE; + } + return FALSE; +} + static void test_getaddrinfo(void) { int i, ret; @@ -2129,6 +2140,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); @@ -2396,6 +2408,59 @@ static void test_getaddrinfo(void) ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); freeaddrinfo(result); + + /* Check whether we have global IPv6 address */ + result = NULL; + ret = getaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + has_ipv6_addr = FALSE; + for (p = result; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + { + IN6_ADDR *a = &((SOCKADDR_IN6 *)p->ai_addr)->sin6_addr; + if (!IN6_IS_ADDR_LINKLOCAL(a) && !IN6_IS_ADDR_LOOPBACK(a) && !IN6_IS_ADDR_UNSPECIFIED(a)) + { + has_ipv6_addr = TRUE; + break; + } + } + } + freeaddrinfo(result); + + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + for (i = 0; i < ARRAY_SIZE(hinttests); i++) + { + if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue; + winetest_push_context("Test %u", i); + + hint.ai_flags = 0; + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, &hint, &result); + ok(!ret, "Got unexpected ret %d\n", ret); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + hint.ai_family = AF_INET6; + result = NULL; + ret = getaddrinfo("www.kernel.org", NULL, &hint, &result); + if (!has_ipv6_addr) + todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret); + freeaddrinfo(result); + + winetest_pop_context(); + } } static void test_dns(void)

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in path.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 010315571e6371821b793f92f5162e2cc6921497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=010315571e6371821b793f92… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:51 2022 +0100 ntdll/tests: Enable compilation with long types in path.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 5211945437c..dba42688e05 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" #include "winnls.h" @@ -375,7 +376,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -385,7 +386,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -398,7 +399,7 @@ static void test_RtlGetFullPathName_U(void) pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); ok( ret == len || (test->alt_rname && ret == strlen(test->alt_rname)*sizeof(WCHAR)), - "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); + "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), @@ -580,7 +581,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#lx.\n", status); } winetest_pop_context(); @@ -600,7 +601,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) { RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(tests[i].dos, &nameW, &file_part, NULL); - ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", debugstr_w(tests[i].dos), status); + ok(status == STATUS_SUCCESS, "%s: Got status %#lx.\n", debugstr_w(tests[i].dos), status); } ok(!wcscmp(nameW.Buffer, tests[i].nt) @@ -711,7 +712,7 @@ static void test_nt_names(void) if (handle) NtClose( handle ); todo_wine_if( tests[i].todo ) ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), - "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); } }

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in reg.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: f06f4db4474226568801ac8bb79db31068e8cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06f4db4474226568801ac8b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:23:01 2022 +0100 ntdll/tests: Enable compilation with long types in reg.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 739 +++++++++++++++++++++++++------------------------ 1 file changed, 370 insertions(+), 369 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06f4db4474226568801…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in info.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 6ab71c6ac2146e6555a0b433d33b1000c795dbaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab71c6ac2146e6555a0b433… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:47 2022 +0100 ntdll/tests: Enable compilation with long types in info.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 1289 ++++++++++++++++++++++++----------------------- 1 file changed, 645 insertions(+), 644 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ab71c6ac2146e6555a0…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in port.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: df94b7b435bf8f5b2c48fc8894216d4a90336e5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=df94b7b435bf8f5b2c48fc88… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:58 2022 +0100 ntdll/tests: Enable compilation with long types in port.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/port.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 2406a63d8f1..9c8c26a8174 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -16,6 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -183,10 +184,10 @@ static void ProcessConnectionRequest(union lpc_message *LpcMessage, PHANDLE pAcc } status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, NULL, NULL); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); status = pNtCompleteConnectPort(*pAcceptPortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); } static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) @@ -202,7 +203,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) strcpy((LPSTR)LpcMessage->msg64.Data, REPLY); status = pNtReplyPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg64.MessageType == LPC_REQUEST, "Expected LPC_REQUEST, got %d\n", LpcMessage->msg64.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REPLY), @@ -217,7 +218,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) strcpy((LPSTR)LpcMessage->msg.Data, REPLY); status = pNtReplyPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg.MessageType == LPC_REQUEST, "Expected LPC_REQUEST, got %d\n", LpcMessage->msg.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg.Data, REPLY), @@ -239,11 +240,11 @@ static DWORD WINAPI test_ports_client(LPVOID arg) sqos.EffectiveOnly = TRUE; status = pNtConnectPort(&PortHandle, &port, &sqos, 0, 0, &len, NULL, NULL); - todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); if (status != STATUS_SUCCESS) return 1; status = pNtRegisterThreadTerminatePort(PortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); if (is_wow64) { @@ -256,7 +257,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) strcpy((LPSTR)LpcMessage->msg64.Data, REQUEST1); status = pNtRequestPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg64.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg64.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REQUEST1), "Expected %s, got %s\n", REQUEST1, LpcMessage->msg64.Data); @@ -269,7 +270,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) /* Send the message and wait for the reply */ status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(!strcmp((LPSTR)out->msg64.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg64.Data); ok(out->msg64.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg64.MessageType); } @@ -284,7 +285,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) strcpy((LPSTR)LpcMessage->msg.Data, REQUEST1); status = pNtRequestPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg.Data, REQUEST1), "Expected %s, got %s\n", REQUEST1, LpcMessage->msg.Data); @@ -297,7 +298,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) /* Send the message and wait for the reply */ status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(!strcmp((LPSTR)out->msg.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg.Data); ok(out->msg.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg.MessageType); } @@ -324,7 +325,7 @@ static void test_ports_server( HANDLE PortHandle ) status = pNtReplyWaitReceivePort(PortHandle, NULL, NULL, &LpcMessage->msg); todo_wine { - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d(%x)\n", status, status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status); } /* STATUS_INVALID_HANDLE: win2k without admin rights will perform an * endless loop here @@ -384,7 +385,7 @@ START_TEST(port) status = pNtCreatePort(&port_handle, &obj, 100, 100, 0); if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n"); - else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld\n", status); if (status == STATUS_SUCCESS) {

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in pipe.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 3a0448f82bc92b925dd215cc14f8e46c204a8c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a0448f82bc92b925dd215cc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:54 2022 +0100 ntdll/tests: Enable compilation with long types in pipe.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 749 ++++++++++++++++++++++++------------------------ 1 file changed, 375 insertions(+), 374 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a0448f82bc92b925dd2…

1 0

Alexandre Julliard : po: Regenerate po files.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 9e939d148d44aba78e1ef4a70103eaf839ea53e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e939d148d44aba78e1ef4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 23:23:16 2022 +0100 po: Regenerate po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 22 +++++++++++++++------- po/ast.po | 22 +++++++++++++++------- po/bg.po | 22 +++++++++++++++------- po/ca.po | 24 +++++++++++++++++------- po/cs.po | 22 +++++++++++++++------- po/da.po | 22 +++++++++++++++------- po/de.po | 24 +++++++++++++++++------- po/el.po | 22 +++++++++++++++------- po/en.po | 22 +++++++++++++++------- po/en_US.po | 22 +++++++++++++++------- po/eo.po | 22 +++++++++++++++------- po/es.po | 24 +++++++++++++++++------- po/fa.po | 22 +++++++++++++++------- po/fi.po | 24 +++++++++++++++++------- po/fr.po | 22 +++++++++++++++------- po/he.po | 22 +++++++++++++++------- po/hi.po | 22 +++++++++++++++------- po/hr.po | 22 +++++++++++++++------- po/hu.po | 22 +++++++++++++++------- po/it.po | 22 +++++++++++++++------- po/ja.po | 24 +++++++++++++++++------- po/ko.po | 24 +++++++++++++++++------- po/lt.po | 24 +++++++++++++++++------- po/ml.po | 22 +++++++++++++++------- po/nb_NO.po | 22 +++++++++++++++------- po/nl.po | 24 +++++++++++++++++------- po/or.po | 22 +++++++++++++++------- po/pa.po | 22 +++++++++++++++------- po/pl.po | 24 +++++++++++++++++------- po/pt_BR.po | 24 +++++++++++++++++------- po/pt_PT.po | 22 +++++++++++++++------- po/rm.po | 22 +++++++++++++++------- po/ro.po | 22 +++++++++++++++------- po/ru.po | 22 +++++++++++++++------- po/si.po | 22 +++++++++++++++------- po/sk.po | 22 +++++++++++++++------- po/sl.po | 22 +++++++++++++++------- po/sr_RS(a)cyrillic.po | 22 +++++++++++++++------- po/sr_RS(a)latin.po | 22 +++++++++++++++------- po/sv.po | 22 +++++++++++++++------- po/ta.po | 22 +++++++++++++++------- po/te.po | 22 +++++++++++++++------- po/th.po | 22 +++++++++++++++------- po/tr.po | 22 +++++++++++++++------- po/uk.po | 24 +++++++++++++++++------- po/wa.po | 22 +++++++++++++++------- po/wine.pot | 22 +++++++++++++++------- po/zh_CN.po | 24 +++++++++++++++++------- po/zh_TW.po | 24 +++++++++++++++++------- 49 files changed, 761 insertions(+), 343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e939d148d44aba78e1e…

1 0

Zebediah Figura : tests: Add a test for the "nointerpolation" modifier.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 24a27daf98d3a2a31a4dcc02cde89d61eca7da04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=24a27daf98d3a2a31a4dcc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:21 2022 -0500 tests: Add a test for the "nointerpolation" modifier. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/nointerpolation.shader_test | 27 +++++++++++++++++++++++++++ tests/shader_runner.c | 17 +++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/Makefile.am b/Makefile.am index f2c8440c..64cfe534 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ @@ -351,6 +352,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/max.shader_test \ + tests/nointerpolation.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test endif diff --git a/tests/nointerpolation.shader_test b/tests/nointerpolation.shader_test new file mode 100644 index 00000000..8f15be6e --- /dev/null +++ b/tests/nointerpolation.shader_test @@ -0,0 +1,27 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32b32a32 float texcoord + +[vertex buffer 0] +0.0 1.0 0.0 1.0 +1.0 0.0 0.0 1.0 +0.0 0.0 1.0 1.0 + +[vertex shader] +void main(uint id : sv_vertexid, nointerpolation inout float4 t : texcoord, out float4 pos : sv_position) +{ + float2 coords = float2((id << 1) & 2, id & 2); + pos = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); +} + +[pixel shader] +float4 main(nointerpolation float4 t : texcoord) : sv_target +{ + return t; +} + +[test] +draw triangle list 3 +probe all rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index c3f967a2..99f2a22f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -336,6 +336,23 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } + else if (match_string(line, "draw", &line)) + { + D3D_PRIMITIVE_TOPOLOGY topology; + unsigned int vertex_count; + char *rest; + + if (match_string(line, "triangle list", &line)) + topology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; + else + fatal_error("Unknown primitive topology '%s'.\n", line); + + vertex_count = strtoul(line, &rest, 10); + if (line == rest) + fatal_error("Malformed vertex count '%s'.\n", line); + + runner->ops->draw(runner, topology, vertex_count); + } else if (match_string(line, "probe all rgba", &line)) { static const RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT};

1 0

Zebediah Figura : tests: Specify the primitive type from the shader runner frontend.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: c7623262cc5c5fb4d8df0f22e546c1e7da13f0a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7623262cc5c5fb4d8df0f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:20 2022 -0500 tests: Specify the primitive type from the shader runner frontend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 2 +- tests/shader_runner_d3d11.c | 5 +++-- tests/shader_runner_d3d12.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 04819c7d..c3f967a2 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -334,7 +334,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw(runner, 3); + runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } else if (match_string(line, "probe all rgba", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 7e29873c..a98917c5 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -112,7 +112,7 @@ struct shader_runner_ops { struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); - void (*draw)(struct shader_runner *runner, unsigned int vertex_count); + void (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index f2181ffc..93904a64 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,8 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count) +static void d3d11_runner_draw(struct shader_runner *r, + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; @@ -525,7 +526,7 @@ static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count ID3D11InputLayout_Release(input_layout); } - ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext_IASetPrimitiveTopology(context, primitive_topology); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2dda6a75..06221691 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,8 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count) +static void d3d12_runner_draw(struct shader_runner *r, + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -291,7 +292,7 @@ static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &test_context->scissor_rect); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &test_context->viewport); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, primitive_topology); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0);

1 0

Zebediah Figura : tests: Specify the vertex count from the shader runner frontend.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 492cd135e3f25ad627389c12f99d7a07ced29d1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=492cd135e3f25ad627389c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:19 2022 -0500 tests: Specify the vertex count from the shader runner frontend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 2 +- tests/shader_runner_d3d11.c | 6 +++--- tests/shader_runner_d3d12.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index b564a8a5..04819c7d 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -334,7 +334,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw_quad(runner); + runner->ops->draw(runner, 3); } else if (match_string(line, "probe all rgba", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index dd692b5c..7e29873c 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -112,7 +112,7 @@ struct shader_runner_ops { struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); - void (*draw_quad)(struct shader_runner *runner); + void (*draw)(struct shader_runner *runner, unsigned int vertex_count); void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 5b20d22d..f2181ffc 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,7 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw_quad(struct shader_runner *r) +static void d3d11_runner_draw(struct shader_runner *r, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; @@ -529,7 +529,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_Draw(context, 3, 0); + ID3D11DeviceContext_Draw(context, vertex_count, 0); ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs); @@ -611,7 +611,7 @@ static const struct shader_runner_ops d3d11_runner_ops = { .create_resource = d3d11_runner_create_resource, .destroy_resource = d3d11_runner_destroy_resource, - .draw_quad = d3d11_runner_draw_quad, + .draw = d3d11_runner_draw, .probe_vec4 = d3d11_runner_probe_vec4, }; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 588964b5..2dda6a75 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,7 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw_quad(struct shader_runner *r) +static void d3d12_runner_draw(struct shader_runner *r, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -294,7 +294,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); transition_resource_state(command_list, test_context->render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -324,7 +324,7 @@ static const struct shader_runner_ops d3d12_runner_ops = { .create_resource = d3d12_runner_create_resource, .destroy_resource = d3d12_runner_destroy_resource, - .draw_quad = d3d12_runner_draw_quad, + .draw = d3d12_runner_draw, .probe_vec4 = d3d12_runner_probe_vec4, };

1 0

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 March 2022