August 2023 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/d3dbc: Use the bind count instead of the allocation size in d3dbc.c.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: vkd3d Branch: master Commit: 96f66aa4f88ebd695a3ac8d7f79c6ffd89ee2dce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/96f66aa4f88ebd695a3ac8d7f79c6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Aug 7 18:53:57 2023 -0400 vkd3d-shader/d3dbc: Use the bind count instead of the allocation size in d3dbc.c. This should have no effect, since in SM1 the allocation size is the same as the bind count because there are no texture registers. It is just done for consistency. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 1156d593..99a5bd7a 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1686,7 +1686,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe else { put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[r].id)); - put_u32(buffer, var->regs[r].allocation_size); + put_u32(buffer, var->bind_count[r]); } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ @@ -2033,7 +2033,7 @@ static void write_sm1_sampler_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b if (!var->regs[HLSL_REGSET_SAMPLERS].allocated) continue; - count = var->regs[HLSL_REGSET_SAMPLERS].allocation_size; + count = var->bind_count[HLSL_REGSET_SAMPLERS]; for (i = 0; i < count; ++i) {

1 0

Francisco Casas : tests: Test texture allocation ordering in complex scenarios.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: vkd3d Branch: master Commit: 948c4145f56e2adf2d9793e842ac42ea4a083096 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/948c4145f56e2adf2d9793e842ac4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 25 04:46:54 2023 -0400 tests: Test texture allocation ordering in complex scenarios. --- Makefile.am | 1 + tests/hlsl/texture-ordering.shader_test | 303 ++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 4 +- 3 files changed, 306 insertions(+), 2 deletions(-)

1 0

Stefan Dösinger : ntdll: Try to raise the file limit above OPEN_MAX on MacOS.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: de7604b6c68e2e69c1f56d20e34d13639c7a4ea1 URL: https://gitlab.winehq.org/wine/wine/-/commit/de7604b6c68e2e69c1f56d20e34d13… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 3 13:54:50 2023 +0300 ntdll: Try to raise the file limit above OPEN_MAX on MacOS. OPEN_MAX is 10240, which is usually lower than the kern.maxfilesperproc sysctl value. Said value from sysctl works on Mojave to Monterey (and most likely earlier Mac OS versions, but I can't test). Since Big Sur we can successfully set the reported rlim_max value. --- dlls/ntdll/unix/loader.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 28f0c4bf245..8d5fc79895c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -446,18 +446,42 @@ static void set_max_limit( int limit ) if (!getrlimit( limit, &rlimit )) { rlimit.rlim_cur = rlimit.rlim_max; - if (setrlimit( limit, &rlimit ) != 0) - { + + if (!setrlimit( limit, &rlimit )) + return; + #if defined(__APPLE__) && defined(RLIMIT_NOFILE) && defined(OPEN_MAX) + if (limit == RLIMIT_NOFILE) + { + unsigned int nlimit = 0; + size_t size; + /* On Leopard, setrlimit(RLIMIT_NOFILE, ...) fails on attempts to set - * rlim_cur above OPEN_MAX (even if rlim_max > OPEN_MAX). */ - if (limit == RLIMIT_NOFILE && rlimit.rlim_cur > OPEN_MAX) - { + * rlim_cur above OPEN_MAX (even if rlim_max > OPEN_MAX). + * + * In later versions it can be set to kern.maxfilesperproc (from + * sysctl). In Big Sur and later it can be set to rlim_max. */ + size = sizeof(nlimit); + if (sysctlbyname("kern.maxfilesperproc", &nlimit, &size, NULL, 0) != 0 || nlimit < OPEN_MAX) rlimit.rlim_cur = OPEN_MAX; - setrlimit( limit, &rlimit ); + else + rlimit.rlim_cur = nlimit; + + if (!setrlimit( limit, &rlimit )) + { + TRACE("Fallback 1: RLIMIT_NOFILE to kern.maxfilesperproc\n"); + return; + } + + rlimit.rlim_cur = OPEN_MAX; + if (!setrlimit( limit, &rlimit )) + { + TRACE("Fallback 2: RLIMIT_NOFILE to OPEN_MAX(%d)\n", OPEN_MAX); + return; } -#endif } +#endif + WARN("Failed to raise limit %d\n", limit); } }

1 0

Torge Matthies : wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentEncode.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 46e0f765149401ed6cad3dabbf45c1d9bc056a9a URL: https://gitlab.winehq.org/wine/wine/-/commit/46e0f765149401ed6cad3dabbf45c1… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentEncode. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/tests/asn.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index f5eb77d4d95..ee70cbabf3b 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -527,6 +527,153 @@ static void test_decodeSPCPEImage(void) } } +static const BYTE emptyIndirectData[] = { + 0x30,0x0c,0x30,0x02,0x06,0x00,0x30,0x06,0x30,0x02,0x06,0x00,0x04,0x00 }; +static const BYTE spcidcWithOnlyDigest[] = { + 0x30,0x20,0x30,0x02,0x06,0x00,0x30,0x1a,0x30,0x02,0x06,0x00,0x04,0x14,0x01,0x02, + 0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12, + 0x13,0x14 }; +static const BYTE spcidcWithDigestAndAlgorithm[] = { + 0x30,0x27,0x30,0x02,0x06,0x00,0x30,0x21,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02, + 0x1a,0x05,0x00,0x04,0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b, + 0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14 }; +static const BYTE spcidcWithDigestAndAlgorithmParams[] = { + 0x30,0x29,0x30,0x02,0x06,0x00,0x30,0x23,0x30,0x0b,0x06,0x05,0x2b,0x0e,0x03,0x02, + 0x1a,0x74,0x65,0x73,0x74,0x04,0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, + 0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14 }; +static const BYTE spcidcWithEverythingExceptDataValue[] = { + 0x30,0x33,0x30,0x0c,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0f, + 0x30,0x23,0x30,0x0b,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1a,0x74,0x65,0x73,0x74,0x04, + 0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x10,0x11,0x12,0x13,0x14 }; +static const BYTE spcidcWithEverything[] = { + 0x30,0x35,0x30,0x0e,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0f, + 0x30,0x00,0x30,0x23,0x30,0x0b,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1a,0x74,0x65,0x73, + 0x74,0x04,0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d, + 0x0e,0x0f,0x10,0x11,0x12,0x13,0x14 }; + +static void test_encodeSPCIndirectDataContent(void) +{ + static char SPC_PE_IMAGE_DATA_OBJID_[] = SPC_PE_IMAGE_DATA_OBJID; + static char szOID_OIWSEC_sha1_[] = szOID_OIWSEC_sha1; + + static BYTE fakeDigest[] = { + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10, + 0x11,0x12,0x13,0x14 }; + static BYTE parameters[] = { 't','e','s','t' }; + + SPC_INDIRECT_DATA_CONTENT indirectData = { { 0 } }; + DWORD size = 0; + LPBYTE buf; + BOOL ret; + + if (!pCryptEncodeObjectEx) + { + win_skip("CryptEncodeObjectEx() is not available. Skipping the encodeSPCIndirectDataContent tests\n"); + return; + } + + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); + if (size == sizeof(emptyIndirectData)) + todo_wine + ok(!memcmp(buf, emptyIndirectData, sizeof(emptyIndirectData)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With only digest */ + indirectData.Digest.cbData = sizeof(fakeDigest); + indirectData.Digest.pbData = fakeDigest; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); + if (size == sizeof(spcidcWithOnlyDigest)) + todo_wine + ok(!memcmp(buf, spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With digest and digest algorithm */ + indirectData.DigestAlgorithm.pszObjId = szOID_OIWSEC_sha1_; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(spcidcWithDigestAndAlgorithm), "Unexpected size %ld\n", + size); + if (size == sizeof(spcidcWithDigestAndAlgorithm)) + ok(!memcmp(buf, spcidcWithDigestAndAlgorithm, + sizeof(spcidcWithDigestAndAlgorithm)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With digest algorithm parameters */ + indirectData.DigestAlgorithm.Parameters.cbData = sizeof(parameters); + indirectData.DigestAlgorithm.Parameters.pbData = parameters; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(spcidcWithDigestAndAlgorithmParams), + "Unexpected size %ld\n", size); + if (size == sizeof(spcidcWithDigestAndAlgorithmParams)) + ok(!memcmp(buf, spcidcWithDigestAndAlgorithmParams, + sizeof(spcidcWithDigestAndAlgorithmParams)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With everything except Data.Value */ + indirectData.Data.pszObjId = SPC_PE_IMAGE_DATA_OBJID_; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(spcidcWithEverythingExceptDataValue), + "Unexpected size %ld\n", size); + if (size == sizeof(spcidcWithEverythingExceptDataValue)) + ok(!memcmp(buf, spcidcWithEverythingExceptDataValue, + sizeof(spcidcWithEverythingExceptDataValue)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With everything */ + indirectData.Data.Value.cbData = sizeof(emptySequence); + indirectData.Data.Value.pbData = (void*)emptySequence; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + todo_wine + ok(size == sizeof(spcidcWithEverything), "Unexpected size %ld\n", size); + if (size == sizeof(spcidcWithEverything)) + ok(!memcmp(buf, spcidcWithEverything, sizeof(spcidcWithEverything)), + "Unexpected value\n"); + LocalFree(buf); + } +} + static WCHAR foo[] = { 'f','o','o',0 }; static WCHAR guidStr[] = { '{','8','b','c','9','6','b','0','0','-', '8','d','a','1','-','1','1','c','f','-','8','7','3','6','-','0','0', @@ -948,6 +1095,7 @@ START_TEST(asn) test_decodeSPCLink(); test_encodeSPCPEImage(); test_decodeSPCPEImage(); + test_encodeSPCIndirectDataContent(); test_encodeCatMemberInfo(); test_decodeCatMemberInfo(); test_encodeCatNameValue();

1 0

Torge Matthies : wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentDecode.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 2f2fbefb69475ac2c08f208ae9ab61ec557350c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f2fbefb69475ac2c08f208ae9ab61… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentDecode. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/tests/asn.c | 119 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index ee70cbabf3b..88778e990f1 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -552,16 +552,16 @@ static const BYTE spcidcWithEverything[] = { 0x74,0x04,0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d, 0x0e,0x0f,0x10,0x11,0x12,0x13,0x14 }; +static BYTE fakeDigest[] = { + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10, + 0x11,0x12,0x13,0x14 }; +static BYTE parameters[] = { 't','e','s','t' }; + static void test_encodeSPCIndirectDataContent(void) { static char SPC_PE_IMAGE_DATA_OBJID_[] = SPC_PE_IMAGE_DATA_OBJID; static char szOID_OIWSEC_sha1_[] = szOID_OIWSEC_sha1; - static BYTE fakeDigest[] = { - 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10, - 0x11,0x12,0x13,0x14 }; - static BYTE parameters[] = { 't','e','s','t' }; - SPC_INDIRECT_DATA_CONTENT indirectData = { { 0 } }; DWORD size = 0; LPBYTE buf; @@ -674,6 +674,114 @@ static void test_encodeSPCIndirectDataContent(void) } } +static void test_decodeSPCIndirectDataContent(void) +{ + static const BYTE asn1Null[] = { 0x05,0x00 }; + + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + SPC_INDIRECT_DATA_CONTENT *indirectData; + + if (!pCryptDecodeObjectEx) + { + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCIndirectDataContent tests\n"); + return; + } + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + emptyIndirectData, sizeof(emptyIndirectData), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + todo_wine + ok(indirectData->Data.pszObjId != NULL, "Expected non-NULL data objid\n"); + if (indirectData->Data.pszObjId) + ok(!strcmp(indirectData->Data.pszObjId, ""), + "Expected empty data objid\n"); + ok(indirectData->Data.Value.cbData == 0, "Expected no data value\n"); + todo_wine + ok(indirectData->DigestAlgorithm.pszObjId != NULL, + "Expected non-NULL digest algorithm objid\n"); + if (indirectData->DigestAlgorithm.pszObjId) + ok(!strcmp(indirectData->DigestAlgorithm.pszObjId, ""), + "Expected empty digest algorithm objid\n"); + ok(indirectData->DigestAlgorithm.Parameters.cbData == 0, + "Expected no digest algorithm parameters\n"); + ok(indirectData->Digest.cbData == 0, "Expected no digest\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + ok(indirectData->Digest.cbData == sizeof(fakeDigest), + "Unexpected digest size %ld\n", indirectData->Digest.cbData); + if (indirectData->Digest.cbData == sizeof(fakeDigest)) + ok(!memcmp(indirectData->Digest.pbData, fakeDigest, + sizeof(fakeDigest)), + "Unexpected flags\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithDigestAndAlgorithm, sizeof(spcidcWithDigestAndAlgorithm), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + ok(indirectData->DigestAlgorithm.pszObjId != NULL, + "Expected non-NULL digest algorithm objid\n"); + if (indirectData->DigestAlgorithm.pszObjId) + ok(!strcmp(indirectData->DigestAlgorithm.pszObjId, szOID_OIWSEC_sha1), + "Expected szOID_OIWSEC_sha1, got \"%s\"\n", + indirectData->DigestAlgorithm.pszObjId); + ok(indirectData->DigestAlgorithm.Parameters.cbData == sizeof(asn1Null), + "Unexpected digest algorithm parameters size %ld\n", + indirectData->DigestAlgorithm.Parameters.cbData); + if (indirectData->DigestAlgorithm.Parameters.cbData == sizeof(asn1Null)) + ok(!memcmp(indirectData->DigestAlgorithm.Parameters.pbData, + asn1Null, sizeof(asn1Null)), + "Unexpected digest algorithm parameters\n"); + ok(indirectData->Digest.cbData == sizeof(fakeDigest), + "Unexpected digest size %ld\n", indirectData->Digest.cbData); + if (indirectData->Digest.cbData == sizeof(fakeDigest)) + ok(!memcmp(indirectData->Digest.pbData, fakeDigest, + sizeof(fakeDigest)), + "Unexpected flags\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithDigestAndAlgorithmParams, sizeof(spcidcWithDigestAndAlgorithmParams), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* what? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithEverythingExceptDataValue, sizeof(spcidcWithEverythingExceptDataValue), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* huh??? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithEverything, sizeof(spcidcWithEverything), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* ?????? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); +} + static WCHAR foo[] = { 'f','o','o',0 }; static WCHAR guidStr[] = { '{','8','b','c','9','6','b','0','0','-', '8','d','a','1','-','1','1','c','f','-','8','7','3','6','-','0','0', @@ -1096,6 +1204,7 @@ START_TEST(asn) test_encodeSPCPEImage(); test_decodeSPCPEImage(); test_encodeSPCIndirectDataContent(); + test_decodeSPCIndirectDataContent(); test_encodeCatMemberInfo(); test_decodeCatMemberInfo(); test_encodeCatNameValue();

1 0

Torge Matthies : wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a35d2b17a58965974b16fc7960e5a1b10bee6c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/a35d2b17a58965974b16fc7960e5a1… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 2 +- dlls/wintrust/tests/asn.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 27a77629b11..7846ccb5e2e 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -681,7 +681,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAttributeTypeValue(DWORD dwCertEncodingType, { const CRYPT_ATTRIBUTE_TYPE_VALUE *typeValue = pvStructInfo; struct AsnEncodeSequenceItem items[] = { - { &typeValue->pszObjId, CRYPT_AsnEncodeOid, 0 }, + { typeValue->pszObjId, CRYPT_AsnEncodeOid, 0 }, { &typeValue->Value, CRYPT_CopyEncodedBlob, 0 }, }; diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 88778e990f1..09a00ea393a 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -575,11 +575,9 @@ static void test_encodeSPCIndirectDataContent(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) todo_wine @@ -592,11 +590,9 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Digest.pbData = fakeDigest; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) todo_wine @@ -608,7 +604,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.DigestAlgorithm.pszObjId = szOID_OIWSEC_sha1_; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -626,7 +621,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.DigestAlgorithm.Parameters.pbData = parameters; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -643,7 +637,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Data.pszObjId = SPC_PE_IMAGE_DATA_OBJID_; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -661,7 +654,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Data.Value.pbData = (void*)emptySequence; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) {

1 0

Torge Matthies : wintrust: Encode SPC_INDIRECT_DATA_CONTENT digest as an octet string.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 402091048c535e24895cacee8c0105f546849ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/402091048c535e24895cacee8c0105… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust: Encode SPC_INDIRECT_DATA_CONTENT digest as an octet string. Instead of raw data. See SpcIndirectDataContent specification. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 2 +- dlls/wintrust/tests/asn.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 7846ccb5e2e..71a2025c461 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -702,7 +702,7 @@ static BOOL WINAPI CRYPT_AsnEncodeSPCDigest(DWORD dwCertEncodingType, const struct SPCDigest *digest = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { &digest->DigestAlgorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, - { &digest->Digest, CRYPT_CopyEncodedBlob, 0 }, + { &digest->Digest, CRYPT_AsnEncodeOctets, 0 }, }; return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 09a00ea393a..fa0716a2d4d 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -578,6 +578,7 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { + todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) todo_wine @@ -593,6 +594,7 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { + todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) todo_wine @@ -607,7 +609,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithDigestAndAlgorithm), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithDigestAndAlgorithm)) @@ -624,7 +625,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithDigestAndAlgorithmParams), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithDigestAndAlgorithmParams)) @@ -640,7 +640,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithEverythingExceptDataValue), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithEverythingExceptDataValue)) @@ -657,7 +656,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithEverything), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithEverything)) ok(!memcmp(buf, spcidcWithEverything, sizeof(spcidcWithEverything)),

1 0

Torge Matthies : wintrust: Encode algorithm id without parameters if pszObjId is NULL.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: c58c42ad93d04034345266c4639734979b3bbcde URL: https://gitlab.winehq.org/wine/wine/-/commit/c58c42ad93d04034345266c4639734… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:34 2023 +0200 wintrust: Encode algorithm id without parameters if pszObjId is NULL. The only user of this function is CRYPT_AsnEncodeSPCDigest, whose only user is WVTAsn1SpcIndirectDataContentEncode, so this behavior might be specific to that function. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 8 ++++++-- dlls/wintrust/tests/asn.c | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 71a2025c461..87deff72245 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -652,6 +652,7 @@ static BOOL WINAPI CRYPT_CopyEncodedBlob(DWORD dwCertEncodingType, return ret; } +/* Different from the one in crypt32 */ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -665,12 +666,15 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( { algo->pszObjId, CRYPT_AsnEncodeOid, 0 }, { NULL, CRYPT_CopyEncodedBlob, 0 }, }; + DWORD cItem = 2; if (algo->Parameters.cbData) items[1].pvStructInfo = &algo->Parameters; - else + else if (algo->pszObjId) items[1].pvStructInfo = &nullBlob; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + else + cItem -= 1; + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, pbEncoded, pcbEncoded); return ret; } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index fa0716a2d4d..deaaf40e64b 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -578,10 +578,8 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) - todo_wine ok(!memcmp(buf, emptyIndirectData, sizeof(emptyIndirectData)), "Unexpected value\n"); LocalFree(buf); @@ -594,10 +592,8 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) - todo_wine ok(!memcmp(buf, spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest)), "Unexpected value\n"); LocalFree(buf);

1 0

Torge Matthies : wintrust: Decode a zero-length OID to an empty string.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 8f76cc687da9c0fc7fb10e84a8cf36bcad0ef473 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f76cc687da9c0fc7fb10e84a8cf36… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:34 2023 +0200 wintrust: Decode a zero-length OID to an empty string. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 9 +++++---- dlls/wintrust/tests/asn.c | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 87deff72245..f6c4086b508 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1878,6 +1878,8 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, } } } + else + bytesNeeded += 1; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1888,12 +1890,13 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, } else { + LPSTR pszObjId = *(LPSTR *)pvStructInfo; + + *pszObjId = 0; if (dataLen) { const BYTE *ptr; - LPSTR pszObjId = *(LPSTR *)pvStructInfo; - *pszObjId = 0; pszObjId += sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); @@ -1914,8 +1917,6 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, pszObjId += sprintf(pszObjId, ".%d", val); } } - else - *(LPSTR *)pvStructInfo = NULL; *pcbStructInfo = bytesNeeded; } } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index deaaf40e64b..5f75ec3298e 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -682,13 +682,11 @@ static void test_decodeSPCIndirectDataContent(void) if (ret) { indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; - todo_wine ok(indirectData->Data.pszObjId != NULL, "Expected non-NULL data objid\n"); if (indirectData->Data.pszObjId) ok(!strcmp(indirectData->Data.pszObjId, ""), "Expected empty data objid\n"); ok(indirectData->Data.Value.cbData == 0, "Expected no data value\n"); - todo_wine ok(indirectData->DigestAlgorithm.pszObjId != NULL, "Expected non-NULL digest algorithm objid\n"); if (indirectData->DigestAlgorithm.pszObjId)

1 0

Piotr Caban : magnification: Add stub dll.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 57943168c468723ce8752f8a1717243b1c3deceb URL: https://gitlab.winehq.org/wine/wine/-/commit/57943168c468723ce8752f8a171724… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 8 13:44:39 2023 +0200 magnification: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/magnification/Makefile.in | 3 +++ dlls/magnification/magnification.spec | 21 +++++++++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/configure b/configure index 829741a5c0e..181835823f2 100755 --- a/configure +++ b/configure @@ -1195,6 +1195,7 @@ enable_loadperf enable_localspl enable_localui enable_lz32 +enable_magnification enable_mapi32 enable_mapistub enable_mciavi32 @@ -21465,6 +21466,7 @@ wine_fn_config_makefile dlls/localui/tests enable_tests wine_fn_config_makefile dlls/lz32 enable_lz32 wine_fn_config_makefile dlls/lz32/tests enable_tests wine_fn_config_makefile dlls/lzexpand.dll16 enable_win16 +wine_fn_config_makefile dlls/magnification enable_magnification wine_fn_config_makefile dlls/mapi32 enable_mapi32 wine_fn_config_makefile dlls/mapi32/tests enable_tests wine_fn_config_makefile dlls/mapistub enable_mapistub diff --git a/configure.ac b/configure.ac index 90f4fd3809d..4f7ba4c61bc 100644 --- a/configure.ac +++ b/configure.ac @@ -2728,6 +2728,7 @@ WINE_CONFIG_MAKEFILE(dlls/localui/tests) WINE_CONFIG_MAKEFILE(dlls/lz32) WINE_CONFIG_MAKEFILE(dlls/lz32/tests) WINE_CONFIG_MAKEFILE(dlls/lzexpand.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/magnification) WINE_CONFIG_MAKEFILE(dlls/mapi32) WINE_CONFIG_MAKEFILE(dlls/mapi32/tests) WINE_CONFIG_MAKEFILE(dlls/mapistub) diff --git a/dlls/magnification/Makefile.in b/dlls/magnification/Makefile.in new file mode 100644 index 00000000000..d880ca49369 --- /dev/null +++ b/dlls/magnification/Makefile.in @@ -0,0 +1,3 @@ +MODULE = magnification.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/magnification/magnification.spec b/dlls/magnification/magnification.spec new file mode 100644 index 00000000000..ddbb171b605 --- /dev/null +++ b/dlls/magnification/magnification.spec @@ -0,0 +1,21 @@ +@ stub MagSetFullscreenUseBitmapSmoothing +@ stub MagSetLensUseBitmapSmoothing +@ stub MagGetColorEffect +@ stub MagGetFullscreenColorEffect +@ stub MagGetFullscreenTransform +@ stub MagGetImageScalingCallback +@ stub MagGetInputTransform +@ stub MagGetWindowFilterList +@ stub MagGetWindowSource +@ stub MagGetWindowTransform +@ stub MagInitialize +@ stub MagSetColorEffect +@ stub MagSetFullscreenColorEffect +@ stub MagSetFullscreenTransform +@ stub MagSetImageScalingCallback +@ stub MagSetInputTransform +@ stub MagSetWindowFilterList +@ stub MagSetWindowSource +@ stub MagSetWindowTransform +@ stub MagShowSystemCursor +@ stub MagUninitialize

1 0