November 2009 - Wine-commits

Juan Lang : crypt32: More fully implement CertIsValidCRLForCertificate.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: c84c53b1a6fba37a1619bc099d379f8f0c86723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84c53b1a6fba37a1619bc099… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:21:09 2009 -0800 crypt32: More fully implement CertIsValidCRLForCertificate. --- dlls/crypt32/crl.c | 148 +++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/crl.c | 2 +- 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index f483256..f71e6a8 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -19,10 +19,12 @@ #include <assert.h> #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -484,11 +486,155 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext, return ret; } +static BOOL compare_dist_point_name(const CRL_DIST_POINT_NAME *name1, + const CRL_DIST_POINT_NAME *name2) +{ + BOOL match; + + if (name1->dwDistPointNameChoice == name2->dwDistPointNameChoice) + { + match = TRUE; + if (name1->dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) + { + if (name1->u.FullName.cAltEntry == name2->u.FullName.cAltEntry) + { + DWORD i; + + for (i = 0; match && i < name1->u.FullName.cAltEntry; i++) + { + const CERT_ALT_NAME_ENTRY *entry1 = + &name1->u.FullName.rgAltEntry[i]; + const CERT_ALT_NAME_ENTRY *entry2 = + &name2->u.FullName.rgAltEntry[i]; + + if (entry1->dwAltNameChoice == entry2->dwAltNameChoice) + { + switch (entry1->dwAltNameChoice) + { + case CERT_ALT_NAME_URL: + match = !strcmpiW(entry1->u.pwszURL, + entry2->u.pwszURL); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + match = (entry1->u.DirectoryName.cbData == + entry2->u.DirectoryName.cbData) && + !memcmp(entry1->u.DirectoryName.pbData, + entry2->u.DirectoryName.pbData, + entry1->u.DirectoryName.cbData); + break; + default: + FIXME("unimplemented for type %d\n", + entry1->dwAltNameChoice); + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + return match; +} + +static BOOL match_dist_point_with_issuing_dist_point( + const CRL_DIST_POINT *distPoint, const CRL_ISSUING_DIST_POINT *idp) +{ + BOOL match; + + /* While RFC 5280, section 4.2.1.13 recommends against segmenting + * CRL distribution points by reasons, it doesn't preclude doing so. + * "This profile RECOMMENDS against segmenting CRLs by reason code." + * If the issuing distribution point for this CRL is only valid for + * some reasons, only match if the reasons covered also match the + * reasons in the CRL distribution point. + */ + if (idp->OnlySomeReasonFlags.cbData) + { + if (idp->OnlySomeReasonFlags.cbData == distPoint->ReasonFlags.cbData) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < distPoint->ReasonFlags.cbData; i++) + if (idp->OnlySomeReasonFlags.pbData[i] != + distPoint->ReasonFlags.pbData[i]) + match = FALSE; + } + else + match = FALSE; + } + else + match = TRUE; + if (match) + match = compare_dist_point_name(&idp->DistPointName, + &distPoint->DistPointName); + return match; +} + BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved) { + PCERT_EXTENSION ext; + BOOL ret; + TRACE("(%p, %p, %08x, %p)\n", pCert, pCrl, dwFlags, pvReserved); - return TRUE; + + if (!pCert) + return TRUE; + + if ((ext = CertFindExtension(szOID_ISSUING_DIST_POINT, + pCrl->pCrlInfo->cExtension, pCrl->pCrlInfo->rgExtension))) + { + CRL_ISSUING_DIST_POINT *idp; + DWORD size; + + if ((ret = CryptDecodeObjectEx(pCrl->dwCertEncodingType, + X509_ISSUING_DIST_POINT, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &idp, &size))) + { + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + pCert->pCertInfo->cExtension, pCert->pCertInfo->rgExtension))) + { + CRL_DIST_POINTS_INFO *distPoints; + + if ((ret = CryptDecodeObjectEx(pCert->dwCertEncodingType, + X509_CRL_DIST_POINTS, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &distPoints, &size))) + { + DWORD i; + + ret = FALSE; + for (i = 0; !ret && i < distPoints->cDistPoint; i++) + ret = match_dist_point_with_issuing_dist_point( + &distPoints->rgDistPoint[i], idp); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(distPoints); + } + } + else + { + /* no CRL dist points extension in cert, compare CRL's issuer + * to cert's issuer. + */ + if (!CertCompareCertificateName(pCrl->dwCertEncodingType, + &pCrl->pCrlInfo->Issuer, &pCert->pCertInfo->Issuer)) + { + ret = FALSE; + SetLastError(CRYPT_E_NO_MATCH); + } + } + LocalFree(idp); + } + } + else + ret = TRUE; + return ret; } static PCRL_ENTRY CRYPT_FindCertificateInCRL(PCERT_INFO cert, const CRL_INFO *crl) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index bc6c862..cec233f 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -755,10 +755,10 @@ static void testIsValidCRLForCert(void) ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); 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.

1 0

Juan Lang : crypt32: Add basic flags tests flags for CertFindCRLInStore with find type CRL_FIND_ISSUED_BY .
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 8beed85a2cda2824cdfa5d7f38fc5f92d4180433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8beed85a2cda2824cdfa5d7f3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:26:48 2009 -0800 crypt32: Add basic flags tests flags for CertFindCRLInStore with find type CRL_FIND_ISSUED_BY. --- dlls/crypt32/tests/crl.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index cec233f..2d361a5 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -379,6 +379,18 @@ static void testFindCRL(void) if (context) CertFreeCRLContext(context); + /* 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, + CRL_FIND_ISSUED_BY, cert, NULL); + ok(context != NULL, "Expected a context\n"); + if (context) + CertFreeCRLContext(context); + if (0) { /* Crash or return NULL/STATUS_ACCESS_VIOLATION */

1 0

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

19 Nov '09

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 more tests for CertFindCRLInStore.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: b278155616d3147f6695b55b77345e70894a9624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278155616d3147f6695b55b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:36:15 2009 -0800 crypt32: Add more tests for CertFindCRLInStore. --- dlls/crypt32/tests/crl.c | 237 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 236 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b278155616d3147f6695b…

1 0

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

19 Nov '09

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

Jeremy White : mshtml: Declare prototype of wine_dos_get_file_name correctly; fixes Gecko install on win64.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9145a1cdb27404a4694fcd58a70a414995963fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9145a1cdb27404a4694fcd58a… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Nov 18 14:46:00 2009 -0600 mshtml: Declare prototype of wine_dos_get_file_name correctly; fixes Gecko install on win64. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 5eca3a6..cfe3cd0 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -182,7 +182,7 @@ static BOOL install_from_unix_file(const char *file_name) int fd; BOOL ret; - static WCHAR *(*wine_get_dos_file_name)(const char*); + static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; fd = open(file_name, O_RDONLY);

1 0

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

19 Nov '09

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 : shell32: Implement support for SHIL_SYSSMALL in SHGetImageList .
by Alexandre Julliard 19 Nov '09

19 Nov '09

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

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

19 Nov '09

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 : comctl32/tests: Fix imagelist v6 test failures on XP.
by Alexandre Julliard 19 Nov '09

19 Nov '09

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