September 2022 - Wine-Commits

Etaash Mathamsetty : ntoskrnl: Implement KeGetCurrentProcessorNumberEx.
by Alexandre Julliard Sept. 21, 2022

Sept. 21, 2022

Module: wine Branch: master Commit: e2a5bf7540a3b1f5b3889f6339795e5edf7f590f URL: https://gitlab.winehq.org/wine/wine/-/commit/e2a5bf7540a3b1f5b3889f6339795e… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Sep 11 14:35:22 2022 -0400 ntoskrnl: Implement KeGetCurrentProcessorNumberEx. --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8bdb769cb6d..fd18ea706c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3387,6 +3387,25 @@ VOID WINAPI KeSetTargetProcessorDpc(PRKDPC dpc, CCHAR number) FIXME("%p, %d stub\n", dpc, number); } +/*********************************************************************** + * KeGetCurrentProcessorNumberEx (NTOSKRNL.EXE.@) + */ +ULONG WINAPI KeGetCurrentProcessorNumberEx(PPROCESSOR_NUMBER process_number) +{ + ULONG cur_number = NtGetCurrentProcessorNumber(); + + FIXME("%p semi-stub\n", process_number); + + if (process_number) + { + process_number->Group = 0; + process_number->Reserved = 0; + process_number->Number = cur_number; + } + + return cur_number; +} + /*********************************************************************** * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9085bd55e4c..a1a42d52fd1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -555,6 +555,7 @@ @ stub KeFlushEntireTb @ stdcall KeFlushQueuedDpcs() @ stdcall KeGetCurrentProcessorNumber() NtGetCurrentProcessorNumber +@ stdcall KeGetCurrentProcessorNumberEx(ptr) @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment

1 0

Paul Gofman : crypt32: Support CRYPT_STRING_HEXRAW in CryptBinaryToStringA().
by Alexandre Julliard Sept. 21, 2022

Sept. 21, 2022

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

Hans Leidekker : winhttp/tests: Fix test failure caused by expired client certificate.
by Alexandre Julliard Sept. 21, 2022

Sept. 21, 2022

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 Sept. 21, 2022

Sept. 21, 2022

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

Zebediah Figura : d3d10core/tests: Ignore random WARP failures in test_pipeline_statistics_query.
by Alexandre Julliard Sept. 21, 2022

Sept. 21, 2022

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 Sept. 21, 2022

Sept. 21, 2022

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 Sept. 21, 2022

Sept. 21, 2022

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 Sept. 20, 2022

Sept. 20, 2022

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 Sept. 20, 2022

Sept. 20, 2022

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

Nikolay Sivov : include: Add windows.security.cryptography.idl.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 307eae20a6d2528ec847052d0546c123412d50a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/307eae20a6d2528ec847052d0546c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 21:48:03 2022 +0300 include: Add windows.security.cryptography.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.security.cryptography.idl | 110 ++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 14fe8e24863..1c04f9a298b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -806,6 +806,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.security.cryptography.idl \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ diff --git a/include/windows.security.cryptography.idl b/include/windows.security.cryptography.idl new file mode 100644 index 00000000000..7d7b7fba2dc --- /dev/null +++ b/include/windows.security.cryptography.idl @@ -0,0 +1,110 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Security.Cryptography +{ + typedef enum BinaryStringEncoding BinaryStringEncoding; + runtimeclass CryptographicBuffer; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum BinaryStringEncoding + { + Utf8 = 0, + Utf16LE = 1, + Utf16BE = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Cryptography.CryptographicBuffer), + uuid(320b7e22-3cb0-4cdf-8663-1d28910065eb) + ] + interface ICryptographicBufferStatics : IInspectable + { + HRESULT Compare( + [in] Windows.Storage.Streams.IBuffer *object1, + [in] Windows.Storage.Streams.IBuffer *object2, + [out, retval] boolean *is_equal + ); + HRESULT GenerateRandom( + [in] UINT32 length, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT GenerateRandomNumber( + [out, retval] UINT32 *value + ); + HRESULT CreateFromByteArray( + [in] UINT32 value_size, + [in, size_is(value_size)] BYTE *value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT CopyToByteArray( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out] UINT32 *value_size, + [out, size_is(, *value_size)] BYTE **value + ); + HRESULT DecodeFromHexString( + [in] HSTRING value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT EncodeToHexString( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + HRESULT DecodeFromBase64String( + [in] HSTRING value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT EncodeToBase64String( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + HRESULT ConvertStringToBinary( + [in] HSTRING value, + [in] Windows.Security.Cryptography.BinaryStringEncoding encoding, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT ConvertBinaryToString( + [in] Windows.Security.Cryptography.BinaryStringEncoding encoding, + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Security.Cryptography.ICryptographicBufferStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass CryptographicBuffer + { + } +}

1 0