wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Hans Leidekker : secur32/tests: Fix test failure caused by expired client certificate.
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: 7de69f49c63962f871b429268eeff43b35018096 URL: https://gitlab.winehq.org/wine/wine/-/commit/7de69f49c63962f871b429268eeff4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 16:22:39 2022 +0200 secur32/tests: Fix test failure caused by expired client certificate. --- dlls/secur32/tests/schannel.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a531505648f..25ae197bca6 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1506,26 +1506,7 @@ static void test_communication(void) ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } - ok (status == SEC_E_OK, "got %08lx\n", status); - - buf = &buffers[0].pBuffers[0]; - buf->cbBuffer = buf_size; - data_size = receive_data(sock, buf); - - buffers[0].pBuffers[0].cbBuffer = data_size; - buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA; - buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; - status = DecryptMessage(&context, &buffers[0], 0, NULL); - ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status); - if (status == SEC_E_OK) - { - ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); - ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); - - data = buffers[0].pBuffers[1].pvBuffer; - data[buffers[0].pBuffers[1].cbBuffer] = 0; - } + ok (status == SEC_E_CERT_EXPIRED, "got %08lx\n", status); done: DeleteSecurityContext(&context);

1 0

Hans Leidekker : winhttp/tests: Fix test failure caused by expired client certificate.
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: 89225483fe08810286fa188ea6c0d9e86eb417b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/89225483fe08810286fa188ea6c0d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 16:19:25 2022 +0200 winhttp/tests: Fix test failure caused by expired client certificate. --- dlls/winhttp/tests/winhttp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 17720611547..d1dd58fdad4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5603,8 +5603,12 @@ static void test_client_cert_authentication(void) ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); ok( ret, "failed to send request %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %lu\n", GetLastError() ); + todo_wine { + ok( !ret, "unexpected success\n" ); + ok( GetLastError() == SEC_E_CERT_EXPIRED, "got %lu\n", GetLastError() ); + } CertFreeCertificateContext( cert ); CertCloseStore( store, 0 );

1 0

Paul Gofman : crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary().
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: 1120a1cb2951964f3b9f8467a0e34d3f2faf6bc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1120a1cb2951964f3b9f8467a0e34d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 20 15:47:54 2022 -0500 crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary(). --- dlls/crypt32/base64.c | 123 ++++++++++++++ dlls/crypt32/tests/base64.c | 386 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 505 insertions(+), 4 deletions(-)

1 0

Paul Gofman : crypt32: Support CRYPT_STRING_HEXRAW in CryptBinaryToStringA().
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: a79ec1c584fed956d78296f541642c2ba9400da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79ec1c584fed956d78296f541642c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 20 10:43:31 2022 -0500 crypt32: Support CRYPT_STRING_HEXRAW in CryptBinaryToStringA(). --- dlls/crypt32/base64.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/base64.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 11fb137ed91..9523eb1914c 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -241,6 +241,63 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, return ret; } +static BOOL BinaryToHexRawA(const BYTE *bin, DWORD nbin, DWORD flags, char *str, DWORD *nstr) +{ + static const char hex[] = "0123456789abcdef"; + DWORD needed; + + if (flags & CRYPT_STRING_NOCRLF) + needed = 0; + else if (flags & CRYPT_STRING_NOCR) + needed = 1; + else + needed = 2; + + needed += nbin * 2 + 1; + + if (!str) + { + *nstr = needed; + return TRUE; + } + + if (needed > *nstr && *nstr < 3) + { + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + + nbin = min(nbin, (*nstr - 1) / 2); + + while (nbin--) + { + *str++ = hex[(*bin >> 4) & 0xf]; + *str++ = hex[*bin & 0xf]; + bin++; + } + + if (needed > *nstr) + { + *str = 0; + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + + if (flags & CRYPT_STRING_NOCR) + { + *str++ = '\n'; + } + else if (!(flags & CRYPT_STRING_NOCRLF)) + { + *str++ = '\r'; + *str++ = '\n'; + } + + *str = 0; + *nstr = needed - 1; + return TRUE; +} + BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString) { @@ -271,6 +328,9 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, case CRYPT_STRING_BASE64X509CRLHEADER: encoder = BinaryToBase64A; break; + case CRYPT_STRING_HEXRAW: + encoder = BinaryToHexRawA; + break; case CRYPT_STRING_HEX: case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 0839543f0f0..42252557455 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -266,6 +266,7 @@ static void test_CryptBinaryToString(void) BYTE input[256 * sizeof(WCHAR)]; DWORD strLen, strLen2, i, j, k; WCHAR *hex, *cmp, *ptr; + char *hex_a, *cmp_a; BOOL ret; ret = CryptBinaryToStringA(NULL, 0, 0, NULL, NULL); @@ -401,11 +402,17 @@ static void test_CryptBinaryToString(void) for (i = 0; i < ARRAY_SIZE(flags); i++) { + winetest_push_context("i %lu", i); strLen = 0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); ok(ret, "CryptBinaryToStringW failed: %ld\n", GetLastError()); ok(strLen > 0, "Unexpected string length.\n"); + strLen = 0; + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); + ok(ret, "failed, error %ld.\n", GetLastError()); + ok(strLen > 0, "Unexpected string length.\n"); + strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); @@ -420,8 +427,11 @@ static void test_CryptBinaryToString(void) ok(strLen == strLen2, "Expected length %ld, got %ld\n", strLen2, strLen); hex = malloc(strLen * sizeof(WCHAR)); + hex_a = malloc(strLen); + memset(hex, 0xcc, strLen * sizeof(WCHAR)); ptr = cmp = malloc(strLen * sizeof(WCHAR)); + cmp_a = malloc(strLen); for (j = 0; j < ARRAY_SIZE(input); j++) { *ptr++ = hexdig[(input[j] >> 4) & 0xf]; @@ -437,6 +447,11 @@ static void test_CryptBinaryToString(void) *ptr++ = '\n'; } *ptr++ = 0; + + for (j = 0; cmp[j]; ++j) + cmp_a[j] = cmp[j]; + cmp_a[j] = 0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], hex, &strLen); ok(ret, "CryptBinaryToStringW failed: %ld\n", GetLastError()); @@ -444,6 +459,13 @@ static void test_CryptBinaryToString(void) ok(strLen == strLen2, "Expected length %ld, got %ld\n", strLen, strLen2); ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "Unexpected value\n"); + ++strLen; + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW | flags[i], + hex_a, &strLen); + ok(ret, "failed, error %ld.\n", GetLastError()); + ok(strLen == strLen2, "Expected length %ld, got %ld.\n", strLen, strLen2); + ok(!memcmp(hex_a, cmp_a, strLen), "Unexpected value.\n"); + /* adjusts size if buffer too big */ strLen *= 2; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], @@ -451,6 +473,12 @@ static void test_CryptBinaryToString(void) ok(ret, "CryptBinaryToStringW failed: %ld\n", GetLastError()); ok(strLen == strLen2, "Expected length %ld, got %ld\n", strLen, strLen2); + strLen *= 2; + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], + hex_a, &strLen); + ok(ret, "failed, error %ld.\n", GetLastError()); + ok(strLen == strLen2, "Expected length %ld, got %ld.\n", strLen, strLen2); + /* no writes if buffer too small */ strLen /= 2; strLen2 /= 2; @@ -464,8 +492,49 @@ static void test_CryptBinaryToString(void) ok(strLen == strLen2, "Expected length %ld, got %ld\n", strLen, strLen2); ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "Unexpected value\n"); + SetLastError(0xdeadbeef); + memset(hex_a, 0xcc, strLen + 3); + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW | flags[i], + hex_a, &strLen); + ok(!ret && GetLastError() == ERROR_MORE_DATA,"got ret %d, error %lu.\n", ret, GetLastError()); + ok(strLen == strLen2, "Expected length %ld, got %ld.\n", strLen2, strLen); + /* Output consists of the number of full bytes which fit in plus terminating 0. */ + strLen = (strLen - 1) & ~1; + ok(!memcmp(hex_a, cmp_a, strLen), "Unexpected value\n"); + ok(!hex_a[strLen], "got %#x.\n", (unsigned char)hex_a[strLen]); + ok((unsigned char)hex_a[strLen + 1] == 0xcc, "got %#x.\n", (unsigned char)hex_a[strLen + 1]); + + /* Output is not filled if string length is less than 3. */ + strLen = 1; + memset(hex_a, 0xcc, strLen2); + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW | flags[i], + hex_a, &strLen); + ok(strLen == 1, "got %ld.\n", strLen); + ok((unsigned char)hex_a[0] == 0xcc, "got %#x.\n", (unsigned char)hex_a[strLen - 1]); + + strLen = 2; + memset(hex_a, 0xcc, strLen2); + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW | flags[i], + hex_a, &strLen); + ok(strLen == 2, "got %ld.\n", strLen); + ok((unsigned char)hex_a[0] == 0xcc, "got %#x.\n", (unsigned char)hex_a[0]); + ok((unsigned char)hex_a[1] == 0xcc, "got %#x.\n", (unsigned char)hex_a[1]); + + strLen = 3; + memset(hex_a, 0xcc, strLen2); + ret = CryptBinaryToStringA(input, sizeof(input), CRYPT_STRING_HEXRAW | flags[i], + hex_a, &strLen); + ok(strLen == 3, "got %ld.\n", strLen); + ok(hex_a[0] == 0x30, "got %#x.\n", (unsigned char)hex_a[0]); + ok(hex_a[1] == 0x30, "got %#x.\n", (unsigned char)hex_a[1]); + ok(!hex_a[2], "got %#x.\n", (unsigned char)hex_a[2]); + free(hex); + free(hex_a); free(cmp); + free(cmp_a); + + winetest_pop_context(); } for (k = 0; k < ARRAY_SIZE(sizes); k++)

1 0

Zebediah Figura : d3d10core/tests: Ignore random WARP failures in test_pipeline_statistics_query.
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: cd7a9386ec9ae282ee4a81b5273bee5816498042 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd7a9386ec9ae282ee4a81b5273bee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 31 16:51:53 2022 -0500 d3d10core/tests: Ignore random WARP failures in test_pipeline_statistics_query. This is the d3d10core counterpart to d741742e327cb0a68a63ab49b1a632ede02bd689. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 853e8492526..74f689630eb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4750,6 +4750,7 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { + static const D3D10_QUERY_DATA_PIPELINE_STATISTICS zero_data; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d10core_test_context test_context; @@ -4810,15 +4811,26 @@ static void test_pipeline_statistics_query(void) ID3D10Asynchronous_End(query); get_query_data(query, &data, sizeof(data)); - ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); - ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); - ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); - ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); - ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); - ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); - todo_wine - ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + + /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and + * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * does not eliminate it entirely. To make things work reliably ignore such broken results. */ + if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) + { + win_skip("WARP device randomly returns zeroed query results.\n"); + } + else + { + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + } hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Zebediah Figura : d3d11/tests: Use a pixel shader that consumes SV_Position in test_pipeline_statistics_query().
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: d89a017056b7bc399e8f65dab81ce97f43f1e69d URL: https://gitlab.winehq.org/wine/wine/-/commit/d89a017056b7bc399e8f65dab81ce9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 31 16:50:47 2022 -0500 d3d11/tests: Use a pixel shader that consumes SV_Position in test_pipeline_statistics_query(). Some drivers (AMD Radeon RX 6700 XT, with radeonsi from Mesa 22.2.0-rc3) emit less than one invocation per pixel, presumably because they detect that the shader control flow is uniform for all pixels. Having the control flow depend on SV_Position avoids this test failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b45c3f93d7f..2c96bc0018e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6027,7 +6027,6 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { static const D3D11_QUERY_DATA_PIPELINE_STATISTICS zero_data = {0}; - static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; D3D11_QUERY_DATA_PIPELINE_STATISTICS data; @@ -6036,9 +6035,27 @@ static void test_pipeline_statistics_query(void) D3D11_QUERY_DESC query_desc; ID3D11Asynchronous *query; unsigned int data_size; + ID3D11PixelShader *ps; ID3D11Device *device; HRESULT hr; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 pos : sv_position) : sv_target + { + return pos; + } +#endif + 0x43425844, 0xac408178, 0x2ca4213f, 0x4f2551e1, 0x1626b422, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x0000003c, 0x00000040, + 0x0000000f, 0x04002064, 0x001010f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + if (!init_test_context(&test_context, NULL)) return; @@ -6098,8 +6115,12 @@ static void test_pipeline_statistics_query(void) ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); } + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_Begin(context, query); - draw_color_quad(&test_context, &red); + draw_quad(&test_context); ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); @@ -6114,6 +6135,7 @@ static void test_pipeline_statistics_query(void) ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + ID3D11PixelShader_Release(ps); ID3D11Asynchronous_Release(query); release_test_context(&test_context); }

1 0

Zebediah Figura : d3d10core/tests: Use a pixel shader that consumes SV_Position in test_pipeline_statistics_query().
by Alexandre Julliard 21 Sep '22

21 Sep '22

Module: wine Branch: master Commit: 34bd0dd0704c613abef8a9aa3ba2a2507ed02843 URL: https://gitlab.winehq.org/wine/wine/-/commit/34bd0dd0704c613abef8a9aa3ba2a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 31 16:17:46 2022 -0500 d3d10core/tests: Use a pixel shader that consumes SV_Position in test_pipeline_statistics_query(). Some drivers (AMD Radeon RX 6700 XT, with radeonsi from Mesa 22.2.0-rc3) emit less than one invocation per pixel, presumably because they detect that the shader control flow is uniform for all pixels. Having the control flow depend on SV_Position avoids this test failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 908b11b7435..853e8492526 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4750,7 +4750,6 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { - static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d10core_test_context test_context; @@ -4758,9 +4757,27 @@ static void test_pipeline_statistics_query(void) D3D10_QUERY_DESC query_desc; ID3D10Asynchronous *query; unsigned int data_size; + ID3D10PixelShader *ps; ID3D10Device *device; HRESULT hr; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 pos : sv_position) : sv_target + { + return pos; + } +#endif + 0x43425844, 0xac408178, 0x2ca4213f, 0x4f2551e1, 0x1626b422, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x0000003c, 0x00000040, + 0x0000000f, 0x04002064, 0x001010f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + if (!init_test_context(&test_context)) return; @@ -4803,8 +4820,12 @@ static void test_pipeline_statistics_query(void) todo_wine ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D10Device_PSSetShader(device, ps); + ID3D10Asynchronous_Begin(query); - draw_color_quad(&test_context, &red); + draw_quad(&test_context); ID3D10Asynchronous_End(query); get_query_data(query, &data, sizeof(data)); ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); @@ -4816,6 +4837,7 @@ static void test_pipeline_statistics_query(void) ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); ok(data.PSInvocations >= 640 * 480, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ID3D10PixelShader_Release(ps); ID3D10Asynchronous_Release(query); release_test_context(&test_context); }

1 0

André Zwing : ntdll: Fix ARM vs AMD64 typo.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: b07e06e297dd8bca67fc1ee523fc235cecebbf1e URL: https://gitlab.winehq.org/wine/wine/-/commit/b07e06e297dd8bca67fc1ee523fc23… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Sep 20 18:59:16 2022 +0200 ntdll: Fix ARM vs AMD64 typo. --- dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ca1d1293d10..bb8c1c2936b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1107,8 +1107,8 @@ void *get_cpu_area( USHORT machine ) switch (cpu->Machine) { case IMAGE_FILE_MACHINE_I386: align = TYPE_ALIGNMENT(I386_CONTEXT); break; - case IMAGE_FILE_MACHINE_AMD64: align = TYPE_ALIGNMENT(ARM_CONTEXT); break; - case IMAGE_FILE_MACHINE_ARMNT: align = TYPE_ALIGNMENT(AMD64_CONTEXT); break; + case IMAGE_FILE_MACHINE_AMD64: align = TYPE_ALIGNMENT(AMD64_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARMNT: align = TYPE_ALIGNMENT(ARM_CONTEXT); break; case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; default: return NULL; }

1 0

David Kahurani : win32u: Use allocator mechanism to allocate DC attributes.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: 903c91fc60aa7f3da127ab81e2c27844eec9bcdd URL: https://gitlab.winehq.org/wine/wine/-/commit/903c91fc60aa7f3da127ab81e2c278… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Sep 19 10:58:45 2022 +0300 win32u: Use allocator mechanism to allocate DC attributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53645 --- dlls/win32u/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 60229bb2f89..300ae2a1153 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -543,7 +543,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) release_dc_ptr( dc ); return 0; } - if (!(newdc->attr = calloc( 1, sizeof(*newdc->attr) ))) + if (!(newdc->attr = alloc_dc_attr() )) { free( newdc ); release_dc_ptr( dc );

1 0

Hans Leidekker : adsldp/tests: Get rid of workarounds for Windows XP.
by Alexandre Julliard 20 Sep '22

20 Sep '22

Module: wine Branch: master Commit: fa058bc3f0eab2039b98696e3816205a9cb7a0ac URL: https://gitlab.winehq.org/wine/wine/-/commit/fa058bc3f0eab2039b98696e381620… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:36:49 2022 +0200 adsldp/tests: Get rid of workarounds for Windows XP. --- dlls/adsldp/tests/ldap.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 8010837243e..23cca695c3a 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -395,11 +395,8 @@ static void test_DirectorySearch(void) hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, NULL); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - if (0) /* crashes under XP */ - { hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, 1, &sh); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - } hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -435,8 +432,8 @@ static void test_DirectorySearch(void) name = (void *)0xdeadbeef; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); - ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); - ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#lx\n", hr); + ok(name == NULL, "got %p/%s\n", name, wine_dbgstr_w(name)); } hr = IDirectorySearch_GetNextRow(ds, sh); @@ -445,21 +442,18 @@ static void test_DirectorySearch(void) name = NULL; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); todo_wine - ok(hr == S_OK || broken(hr == S_ADS_NOMORE_COLUMNS) /* XP */, "got %#lx\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); todo_wine - ok((name && !wcscmp(name, L"ADsPath")) || broken(!name) /* XP */, "got %s\n", wine_dbgstr_w(name)); + ok(name && !wcscmp(name, L"ADsPath"), "got %s\n", wine_dbgstr_w(name)); FreeADsMem(name); name = (void *)0xdeadbeef; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); - ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); - ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#lx\n", hr); + ok(name == NULL, "got %p/%s\n", name, wine_dbgstr_w(name)); - if (0) /* crashes under XP */ - { hr = IDirectorySearch_GetColumn(ds, sh, NULL, &col); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - } hr = IDirectorySearch_GetFirstRow(ds, sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -467,8 +461,8 @@ static void test_DirectorySearch(void) memset(&col, 0x55, sizeof(col)); hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col); ok(hr == E_ADS_COLUMN_NOT_SET, "got %#lx\n", hr); - ok(!col.pszAttrName || broken(col.pszAttrName != NULL) /* XP */, "got %p\n", col.pszAttrName); - ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType); + ok(!col.pszAttrName, "got %p\n", col.pszAttrName); + ok(col.dwADsType == ADSTYPE_INVALID, "got %d\n", col.dwADsType); ok(!col.pADsValues, "got %p\n", col.pADsValues); ok(!col.dwNumValues, "got %lu\n", col.dwNumValues); ok(!col.hReserved, "got %p\n", col.hReserved); @@ -564,7 +558,7 @@ static void test_DirectoryObject(void) ok(pref[1].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); - ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION) || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); if (hr == S_OK) { hr = IDirectorySearch_GetNextRow(ds, sh);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
56
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 2022