November 2009 - Wine-Commits

Juan Lang : crypt32: Correct tests for CertIsValidCRLForCertificate.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: e5c56b1798135b9914d1f448ea0deb7465d0b8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c56b1798135b9914d1f448e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 14:01:53 2009 -0800 crypt32: Correct tests for CertIsValidCRLForCertificate. --- dlls/crypt32/tests/crl.c | 55 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index d8d8bfc..bc6c862 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -229,13 +229,15 @@ static const BYTE v1CRLWithIssuerAndEntry[] = { 0x30, 0x44, 0x30, 0x02, 0x06, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x16, 0x30, 0x14, 0x02, 0x01, 0x01, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a }; -static const BYTE v2CRLWithIssuingDistPoint[] = { 0x30,0x5c,0x02,0x01,0x01, - 0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03, - 0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x18,0x0f,0x31, - 0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30, - 0x16,0x30,0x14,0x02,0x01,0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, - 0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0xa0,0x13,0x30,0x11,0x30,0x0f,0x06, - 0x03,0x55,0x1d,0x13,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; +static const BYTE v2CRLWithIssuingDistPoint[] = { +0x30,0x70,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x16,0x30,0x14,0x02,0x01,0x01,0x18,0x0f,0x31,0x36, +0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0xa0,0x27, +0x30,0x25,0x30,0x23,0x06,0x03,0x55,0x1d,0x1c,0x01,0x01,0xff,0x04,0x19,0x30, +0x17,0xa0,0x15,0xa0,0x13,0x86,0x11,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77, +0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72,0x67 }; static const BYTE verisignCRL[] = { 0x30, 0x82, 0x01, 0xb1, 0x30, 0x82, 0x01, 0x1a, 0x02, 0x01, 0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x02, 0x05, 0x00, 0x30, 0x61, 0x31, 0x11, 0x30, 0x0f, 0x06, @@ -684,10 +686,24 @@ static void testCRLProperties(void) } } +static const BYTE bigCertWithCRLDistPoints[] = { +0x30,0x81,0xa5,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x26,0x30,0x24,0x30,0x22,0x06, +0x03,0x55,0x1d,0x1f,0x04,0x1b,0x30,0x19,0x30,0x17,0xa0,0x15,0xa0,0x13,0x86, +0x11,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e, +0x6f,0x72,0x67 }; + static void testIsValidCRLForCert(void) { BOOL ret; - PCCERT_CONTEXT cert1, cert2; + PCCERT_CONTEXT cert1, cert2, cert3; PCCRL_CONTEXT crl; HCERTSTORE store; @@ -728,16 +744,30 @@ static void testIsValidCRLForCert(void) CertFreeCRLContext(crl); - /* Yet with a CRL_ISSUING_DIST_POINT in the CRL, I still can't get this - * to say the CRL is not valid for either cert. + /* With a CRL_ISSUING_DIST_POINT in the CRL, it returns FALSE, since the + * cert doesn't have the same extension in it. */ crl = CertCreateCRLContext(X509_ASN_ENCODING, v2CRLWithIssuingDistPoint, sizeof(v2CRLWithIssuingDistPoint)); ok(crl != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); + todo_wine { ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); - ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + } + + /* With a CRL_ISSUING_DIST_POINT in the CRL, it matches the cert containing + * a CRL_DIST_POINTS_INFO extension. + */ + cert3 = CertCreateCertificateContext(X509_ASN_ENCODING, + bigCertWithCRLDistPoints, sizeof(bigCertWithCRLDistPoints)); + ok(cert3 != NULL, "CertCreateCertificateContext failed: %08x\n", + GetLastError()); + ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08x\n", GetLastError()); CertFreeCRLContext(crl); @@ -755,7 +785,7 @@ static void testIsValidCRLForCert(void) CertFreeCRLContext(crl); /* One last test: a CRL in a different store than the cert is also valid - * for the cert, so CertIsValidCRLForCertificate must always return TRUE? + * for the cert. */ store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -774,6 +804,7 @@ static void testIsValidCRLForCert(void) CertCloseStore(store, 0); + CertFreeCertificateContext(cert3); CertFreeCertificateContext(cert2); CertFreeCertificateContext(cert1); }

1 0

Juan Lang : crypt32: Remove a redundant test.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: b16a78baa77b1facda02d34016c9753b5c34af7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16a78baa77b1facda02d3401… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 13:56:55 2009 -0800 crypt32: Remove a redundant test. --- dlls/crypt32/tests/encode.c | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f2fc727..316a9f8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3851,23 +3851,14 @@ static const BYTE v2CRLWithExt[] = { 0x30,0x5c,0x02,0x01,0x01,0x30,0x02,0x06, 0x02,0x01,0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30, 0x30,0x30,0x30,0x30,0x5a,0xa0,0x13,0x30,0x11,0x30,0x0f,0x06,0x03,0x55,0x1d, 0x13,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; -static const BYTE v2CRLWithIssuingDistPoint[] = { 0x30,0x5c,0x02,0x01,0x01, - 0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03, - 0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x18,0x0f,0x31, - 0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30, - 0x16,0x30,0x14,0x02,0x01,0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, - 0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0xa0,0x13,0x30,0x11,0x30,0x0f,0x06, - 0x03,0x55,0x1d,0x13,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; static void test_encodeCRLToBeSigned(DWORD dwEncoding) { BOOL ret; BYTE *buf = NULL; - static CHAR oid_issuing_dist_point[] = szOID_ISSUING_DIST_POINT; DWORD size = 0; CRL_INFO info = { 0 }; CRL_ENTRY entry = { { 0 }, { 0 }, 0, 0 }; - CERT_EXTENSION ext; /* Test with a V1 CRL */ ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, @@ -3978,21 +3969,6 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) ok(!memcmp(buf, v2CRLWithExt, size), "Got unexpected value\n"); LocalFree(buf); } - /* a v2 CRL with an issuing dist point extension */ - ext.pszObjId = oid_issuing_dist_point; - ext.fCritical = TRUE; - ext.Value.cbData = sizeof(urlIDP); - ext.Value.pbData = (LPBYTE)urlIDP; - entry.rgExtension = &ext; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); - if (buf) - { - ok(size == sizeof(v2CRLWithIssuingDistPoint), "Wrong size %d\n", size); - ok(!memcmp(buf, v2CRLWithIssuingDistPoint, size), "Unexpected value\n"); - LocalFree(buf); - } } static const BYTE verisignCRL[] = { 0x30, 0x82, 0x01, 0xb1, 0x30, 0x82, 0x01, @@ -4686,19 +4662,6 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) info->cExtension); LocalFree(buf); } - /* And again, with an issuing dist point */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, - v2CRLWithIssuingDistPoint, sizeof(v2CRLWithIssuingDistPoint), - CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); - if (buf) - { - CRL_INFO *info = (CRL_INFO *)buf; - - ok(info->cExtension == 1, "Expected 1 extensions, got %d\n", - info->cExtension); - LocalFree(buf); - } } static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING,

1 0

Juan Lang : crypt32: Implement CertFindCRLInStore for find type CRL_FIND_ISSUED_FOR.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 4fa4f67c79d3aa38e85c8f2ea3658afb7e163864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa4f67c79d3aa38e85c8f2ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 10:40:08 2009 -0800 crypt32: Implement CertFindCRLInStore for find type CRL_FIND_ISSUED_FOR. --- dlls/crypt32/crl.c | 17 +++++++++++++++++ dlls/crypt32/tests/crl.c | 4 ---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 522aadf..f483256 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -137,6 +137,20 @@ static BOOL compare_crl_existing(PCCRL_CONTEXT pCrlContext, DWORD dwType, return ret; } +static BOOL compare_crl_issued_for(PCCRL_CONTEXT pCrlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + const CRL_FIND_ISSUED_FOR_PARA *para = pvPara; + BOOL ret; + + ret = CertCompareCertificateName(para->pIssuerCert->dwCertEncodingType, + &para->pIssuerCert->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); + if (ret) + ret = CertIsValidCRLForCertificate(para->pSubjectCert, pCrlContext, + 0, NULL); + return ret; +} + PCCRL_CONTEXT WINAPI CertFindCRLInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, const void *pvFindPara, PCCRL_CONTEXT pPrevCrlContext) @@ -158,6 +172,9 @@ PCCRL_CONTEXT WINAPI CertFindCRLInStore(HCERTSTORE hCertStore, case CRL_FIND_EXISTING: compare = compare_crl_existing; break; + case CRL_FIND_ISSUED_FOR: + compare = compare_crl_issued_for; + break; default: FIXME("find type %08x unimplemented\n", dwFindType); compare = NULL; diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index ea344aa..d8d8bfc 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -390,7 +390,6 @@ static void testFindCRL(void) issuedForPara.pIssuerCert = cert; context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); - todo_wine ok(context != NULL, "Expected a context\n"); if (context) { @@ -433,12 +432,10 @@ static void testFindCRL(void) * match cert's issuer, but verisignCRL does not, so the expected count * is 0. */ - todo_wine ok(count == 3, "expected 3 matching CRLs, got %d\n", count); /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain * entries, so the count of CRL entries that match cert is 2. */ - todo_wine ok(revoked_count == 2, "expected 2 matching CRL entries, got %d\n", revoked_count); @@ -495,7 +492,6 @@ static void testFindCRL(void) revoked_count++; } } while (context); - todo_wine ok(count == 1, "expected 1 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count);

1 0

Juan Lang : crypt32: Add support for CRL_FIND_ISSUED_BY_SIGNATURE_FLAG to CertFindCRLInStore.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 4727212e012de9a60dd320d84f1a8edf5aaa23f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4727212e012de9a60dd320d84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:27:49 2009 -0800 crypt32: Add support for CRL_FIND_ISSUED_BY_SIGNATURE_FLAG to CertFindCRLInStore. --- dlls/crypt32/crl.c | 5 +++++ dlls/crypt32/tests/crl.c | 1 - 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index f71e6a8..4f69a9d 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -116,6 +116,11 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, ret = CertCompareCertificateName(issuer->dwCertEncodingType, &issuer->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); + if (ret && (dwFlags & CRL_FIND_ISSUED_BY_SIGNATURE_FLAG)) + ret = CryptVerifyCertificateSignatureEx(0, + issuer->dwCertEncodingType, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL, (void *)pCrlContext, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)issuer, 0, NULL); } else ret = TRUE; diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 2d361a5..0eaf43a 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -382,7 +382,6 @@ static void testFindCRL(void) /* Try various find flags */ context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, CRL_FIND_ISSUED_BY, cert, NULL); - todo_wine ok(!context, "unexpected context\n"); /* The CRL doesn't have an AKI extension, so it matches any cert */ context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG,

1 0

Juan Lang : crypt32: Add tests for CertFindCRLInStore with find type CRL_FIND_ISSUED_FOR.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: a3b462e3ea37a9b9d10711679ca47b52b7e5b377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b462e3ea37a9b9d10711679… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 10:26:06 2009 -0800 crypt32: Add tests for CertFindCRLInStore with find type CRL_FIND_ISSUED_FOR. --- dlls/crypt32/tests/crl.c | 262 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 213 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b462e3ea37a9b9d1071…

1 0

Owen Rudge : shell32: Implement support for SHIL_SYSSMALL in SHGetImageList .
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 8d93b9cee893b99d5bff2ea73602e33edc86023e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d93b9cee893b99d5bff2ea73… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 18 15:33:36 2009 -0600 shell32: Implement support for SHIL_SYSSMALL in SHGetImageList. --- dlls/shell32/shellord.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index be601a1..940633e 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2181,7 +2181,8 @@ void WINAPI SHFlushSFCache(void) * * NOTES * Windows XP features 4 sizes of image list, and Vista 5. Wine currently - * only supports 2, so requests for the others will currently fail. + * only supports the traditional small and large image lists, so requests + * for the others will currently fail. */ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { @@ -2190,7 +2191,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) HRESULT ret = E_FAIL; /* Wine currently only maintains large and small image lists */ - if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL)) + if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL) && (iImageList != SHIL_SYSSMALL)) { FIXME("Unsupported image list %i requested\n", iImageList); return E_FAIL;

1 0

Marcus Meissner : shell32: Remove useless NULL check (Coverity).
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: bc854874964ad86bc6ce0ed0b416c8c63bd0b3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc854874964ad86bc6ce0ed0b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Nov 19 09:10:03 2009 +0100 shell32: Remove useless NULL check (Coverity). --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9d4e956..921b9c0 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1468,7 +1468,7 @@ static HRESULT WINAPI UnixFolder_IPersistFolder3_Initialize(IPersistFolder3* ifa current = ILGetNext(current); } - if (current && current->mkid.cb) { + if (current->mkid.cb) { if (_ILIsDrive(current)) { WCHAR wszDrive[4] = { '?', ':', '\\', 0 }; wszDrive[0] = (WCHAR)*_ILGetTextPointer(current);

1 0

Owen Rudge : comctl32/tests: Use SHIL_SYSSMALL instead of LARGE, and compare with system metrics.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 5ce3af5b37b3e4cc3461f4e4daff41599feb8167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce3af5b37b3e4cc3461f4e4d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 18 15:35:07 2009 -0600 comctl32/tests: Use SHIL_SYSSMALL instead of LARGE, and compare with system metrics. This patch fixes a test failure if a user has a non-standard icon size set. Windows 7, for instance, offers more variation than previous versions of Windows in icon scaling. We should get the system icon metric and compare our icon size against that. --- dlls/comctl32/tests/imagelist.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ef5034c..22286d3 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -998,6 +998,7 @@ static void test_shell_imagelist(void) HRESULT hr; int out = 0; RECT rect; + int cx, cy; /* Try to load function from shell32 */ hShell32 = LoadLibrary("shell32.dll"); @@ -1010,7 +1011,7 @@ static void test_shell_imagelist(void) } /* Get system image list */ - hr = (pSHGetImageList)(SHIL_LARGE, &IID_IImageList, (void**)&iml); + hr = (pSHGetImageList)(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); @@ -1020,11 +1021,13 @@ static void test_shell_imagelist(void) IImageList_GetImageCount(iml, &out); ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); - /* right and bottom should be 32x32 for large icons, or 48x48 if larger - icons enabled in control panel */ + /* Fetch the small icon size */ + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + + /* Check icon size matches */ IImageList_GetImageRect(iml, 0, &rect); - ok((((rect.right == 32) && (rect.bottom == 32)) || - ((rect.right == 48) && (rect.bottom == 48))), + ok(((rect.right == cx) && (rect.bottom == cy)), "IImageList_GetImageRect returned r:%d,b:%d\n", rect.right, rect.bottom);

1 0

Owen Rudge : shell32: Don't increase refcount twice in SHGetImageList.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: ed5a2992f372dcbebf00abe52351bbc375a7b474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5a2992f372dcbebf00abe52… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 18 14:44:10 2009 -0600 shell32: Don't increase refcount twice in SHGetImageList. --- dlls/shell32/shellord.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7aa3a0c..be601a1 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2203,9 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) if (hNew) { ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); - - if (!SUCCEEDED(ret)) - ImageList_Destroy(hNew); + ImageList_Destroy(hNew); } return ret;

1 0

Owen Rudge : comctl32/tests: Fix imagelist v6 test failures on XP.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 482c454e50a00070d34be3cd08b61bae5624a9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=482c454e50a00070d34be3cd0… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 18 15:40:44 2009 -0600 comctl32/tests: Fix imagelist v6 test failures on XP. --- dlls/comctl32/tests/imagelist.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 22286d3..e06b974 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1490,11 +1490,18 @@ static void DoTest3_v6(void) ok(SUCCEEDED(IImageList_Replace(imgl, 2, hbm3, 0)), "failed to replace bitmap 3\n"); memset(&imldp, 0, sizeof (imldp)); - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero data succeeded!\n"); + ok(FAILED(IImageList_Draw(imgl, &imldp)), "zero data succeeded!\n"); + imldp.cbSize = sizeof (imldp); - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero hdc succeeded!\n"); imldp.hdcDst = hdc; - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero himl succeeded!\n"); + imldp.himl = himl; + + if (FAILED(IImageList_Draw(imgl, &imldp))) + { + /* Earlier versions of native comctl32 use a smaller structure */ + imldp.cbSize -= 3 * sizeof(DWORD); + ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); + } REDRAW(hwndfortest); WAIT; @@ -1510,7 +1517,7 @@ static void DoTest3_v6(void) imldp.i ++; ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); imldp.i ++; - ok(!SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should fail\n"); + ok(FAILED(IImageList_Draw(imgl, &imldp)), "should fail\n"); /* remove three */ ok(SUCCEEDED(IImageList_Remove(imgl, 0)), "removing 1st bitmap\n");

1 0