wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 81f2a237f35bed6bc6009ca9cd6bdec1acc1f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f2a237f35bed6bc6009ca9c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 19:09:55 2011 +0100 cabinet: Check correctly for the magic value (Coverity). --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 27a969b..5fc22cd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -196,7 +196,7 @@ static FDI_Int *get_fdi_ptr( HFDI hfdi ) { FDI_Int *fdi= (FDI_Int *)hfdi; - if (!fdi || !fdi->magic == FDI_INT_MAGIC) + if (!fdi || fdi->magic != FDI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL;

1 0

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 80a0eb3b963fbb43a59fb4a8e3d4f5c598b9e7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a0eb3b963fbb43a59fb4a8e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 19:09:50 2011 +0100 cabinet: Check correctly for the magic value (Coverity). --- dlls/cabinet/fci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 9ec1bdd..82d94ab 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -205,7 +205,7 @@ static FCI_Int *get_fci_ptr( HFCI hfci ) { FCI_Int *fci= (FCI_Int *)hfci; - if (!fci || !fci->magic == FCI_INT_MAGIC) + if (!fci || fci->magic != FCI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL;

1 0

Jacek Caban : mshtml: Fixed type in get_nsdoc_window.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: b411ba3fb060abee87c5f17b697239fc2bc78c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b411ba3fb060abee87c5f17b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 18:35:40 2011 +0100 mshtml: Fixed type in get_nsdoc_window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0e42021..656999e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -94,7 +94,7 @@ nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) } nsres = nsIDOMDocumentView_GetDefaultView(nsdocview, &nsview); - nsIDOMDocumentView_Release(nsview); + nsIDOMDocumentView_Release(nsdocview); if(NS_FAILED(nsres)) { ERR("GetDefaultView failed: %08x\n", nsres); return NULL;

1 0

Jacek Caban : wincodec.h: Fixed a typo.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: cbf9bdcdd2144ad7e3d6580b2962700a420b2f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf9bdcdd2144ad7e3d6580b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 16:20:55 2011 +0100 wincodec.h: Fixed a typo. --- include/wincodec.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4139f51..6a24f5e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -78,7 +78,7 @@ typedef enum WICBitmapInterpolationMode { WICBitmapInterpolationModeNearestNeighbor = 0x00000000, WICBitmapInterpolationModeLinear = 0x00000001, WICBitmapInterpolationModeCubic = 0x00000002, - WICBitmapInterpolationModeFaint = 0x00000003, + WICBitmapInterpolationModeFant = 0x00000003, WICBITMAPINTERPOLATIONMODE_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapInterpolationMode;

1 0

Paul Vriens : dxgi: Only cast to a void pointer (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: a01b1a397451a6a95ea318ebae62bfbe7b79c7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01b1a397451a6a95ea318eba… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 13:04:41 2011 +0100 dxgi: Only cast to a void pointer (Coverity). --- dlls/dxgi/dxgi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index ec1b2f0..2ef5072 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -146,7 +146,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) return E_FAIL; } - d3d10core_register_layers = (HRESULT (WINAPI *)(void))GetProcAddress(mod, "D3D10CoreRegisterLayers"); + d3d10core_register_layers = (void *)GetProcAddress(mod, "D3D10CoreRegisterLayers"); hr = d3d10core_register_layers(); if (FAILED(hr)) {

1 0

Hwang YunSong : inetcpl.cpl: Update Korean resource.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 50d04d157faf8cea061e672d88927b5f1e8f3307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d04d157faf8cea061e672d8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Mar 12 17:17:03 2011 +0900 inetcpl.cpl: Update Korean resource. --- dlls/inetcpl.cpl/cpl_Ko.rc | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index 96e3ecd..615fab5 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -40,11 +40,33 @@ BEGIN PUSHBUTTON "현재 페이지(&C)", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "기본 페이지(&D)", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "빈 페이지(&B)", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " 방문 기록 ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "당신은 캐시된 페이지,쿠키나 다른 데이터를 지울 수 있습니다.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "파일들 지우기(&F)...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "설정(&S)...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "방문 기록 지우기" +BEGIN + + AUTOCHECKBOX "임시 인터넷 파일\n웹페이지의 캐시된 복사본,그림 그리고 인증서.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "쿠키\n이 파일은 웹사이트에 위해 사용자 환경설정이나 로그인 정보같은 것을 당신의 컴퓨터에 저장하는데 사용됩니다. .", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "방문기록\n당신이 방문한 웹사이트의 목록.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "폼 정보\n당신이 정보 폼에 입력한 사용자 이름과 다른 정보.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "암호\n당신이 폼에 입력한 저장된 암호.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "취소", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "지우기", IDOK, 120, 230, 60, 15, WS_GROUP END

1 0

Aurimas Fišeras : inetcpl.cpl: Update Lithuanian translation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 4a22a6a1aff07aa5d8f8f85a0daa990a156834ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22a6a1aff07aa5d8f8f85a0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Mar 12 12:23:48 2011 +0200 inetcpl.cpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index c81ab60..217f62c 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -1,7 +1,7 @@ /* * Internet control panel applet * - * Copyright 2010 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2010-2011 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,11 +40,33 @@ BEGIN PUSHBUTTON "&Dabartinis puslapis", IDC_HOME_CURRENT, 58, 40, 80, 14 PUSHBUTTON "&Numatytasis puslapis", IDC_HOME_DEFAULT, 144, 40, 80, 14 PUSHBUTTON "&Tuščias puslapis", IDC_HOME_BLANK, 230, 40, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Naršymo istorija ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Jūs galite pašalinti puslapius podėlyje, slapukus ir kitus duomenis.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Šalinti &failus...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "Nuo&statos...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Šalinti naršymo istoriją" +BEGIN + + AUTOCHECKBOX "Laikini interneto failai\nTinklalapių kopijos podėlyje, paveikslai, liudijimai.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Slapukai\nTinklalapių kompiuteryje išsaugoti failai, kuriuose saugomi naudotojų nustatymai ir prisijungimo informacija.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Istorija\nTinklalapių, kuriuos naršėte, sąrašas.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Formų duomenys\nNaudotojų vardai ir kita informacija, kurią įvedėte į formas.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Slaptažodžiai\nIšsaugoti slaptažodžiai, kuriuos įvedėte į formas.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Atsisakyti", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Šalinti", IDOK, 120, 230, 60, 15, WS_GROUP END

1 0

Frédéric Delanoy : inetcpl.cpl: Update French translation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: dff189d509ab8bbdbf846720a7a42c8cf48c5da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff189d509ab8bbdbf846720a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Mar 12 09:09:53 2011 +0100 inetcpl.cpl: Update French translation. --- dlls/inetcpl.cpl/cpl_Fr.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc index 54d19e9..1244ff6 100644 --- a/dlls/inetcpl.cpl/cpl_Fr.rc +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -35,17 +35,17 @@ CAPTION "Général" BEGIN GROUPBOX " Page d'accueil ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Vous pouvez spécifier une adresse à utiliser comme page d'accueil :", + LTEXT "Vous pouvez spécifier l'adresse à utiliser comme page d'accueil :", IDC_STATIC, 68, 10, 242, 10 EDITTEXT IDC_HOME_EDIT, 68, 22, 242, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "Page &courante", IDC_HOME_CURRENT, 68, 36, 77, 14 PUSHBUTTON "Page par &défaut", IDC_HOME_DEFAULT, 151, 36, 77, 14 PUSHBUTTON "Page &blanche", IDC_HOME_BLANK, 233, 36, 77, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + GROUPBOX " Historique de navigation ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Vous pouvez effacer les pages en cache, les cookies et d'autres données.", + IDC_STATIC, 68, 72, 242, 10 + PUSHBUTTON "&Effacer les fichiers...", IDC_HISTORY_DELETE, 151, 86, 77, 14 + PUSHBUTTON "&Paramètres...", IDC_HISTORY_SETTINGS, 233, 86, 77, 14 END

1 0

Juan Lang : wininet: Differentiate checking online and offline CRLs.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 1ce0799dae685f796ae7fb866fa427845e0df73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce0799dae685f796ae7fb866… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 11 16:26:02 2011 -0800 wininet: Differentiate checking online and offline CRLs. --- dlls/cryptnet/cryptnet_main.c | 71 +++++++++++++++++++++++++++++---------- dlls/cryptnet/tests/cryptnet.c | 5 --- 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3b9a044..97d0ad8 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1557,29 +1557,25 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } -static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, +static DWORD verify_cert_revocation_with_crl_online(PCCERT_CONTEXT cert, PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, PCERT_REVOCATION_STATUS pRevStatus) { DWORD error; + PCRL_ENTRY entry = NULL; - if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) { - /* The CRL isn't time valid */ - error = CRYPT_E_NO_REVOCATION_CHECK; + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; } else { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); - if (entry) - { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = index; - } - else - error = ERROR_SUCCESS; + /* Since the CRL was retrieved for the cert being checked, then it's + * guaranteed to be fresh, and the cert is not revoked. + */ + error = ERROR_SUCCESS; } return error; } @@ -1625,8 +1621,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext( NULL, NULL, NULL, NULL); if (ret) { - error = verify_cert_revocation_with_crl(cert, crl, index, - pTime, pRevStatus); + error = verify_cert_revocation_with_crl_online(cert, crl, + index, pTime, pRevStatus); if (!error && timeout) { DWORD time = GetTickCount(); @@ -1696,6 +1692,45 @@ static DWORD verify_cert_revocation_from_aia_ext( return error; } +static DWORD verify_cert_revocation_with_crl_offline(PCCERT_CONTEXT cert, + PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, + PCERT_REVOCATION_STATUS pRevStatus) +{ + DWORD error; + LONG valid; + + valid = CompareFileTime(pTime, &crl->pCrlInfo->ThisUpdate); + if (valid <= 0) + { + /* If this CRL is not older than the time being verified, there's no + * way to know whether the certificate was revoked. + */ + TRACE("CRL not old enough\n"); + error = CRYPT_E_REVOCATION_OFFLINE; + } + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; + } + else + { + /* Since the CRL was not retrieved for the cert being checked, + * there's no guarantee it's fresh, so the cert *might* be okay, + * but it's safer not to guess. + */ + TRACE("certificate not found\n"); + error = CRYPT_E_REVOCATION_OFFLINE; + } + } + return error; +} + static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) @@ -1761,8 +1796,8 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, } if (crl) { - error = verify_cert_revocation_with_crl(cert, crl, index, - pTime, pRevStatus); + error = verify_cert_revocation_with_crl_offline(cert, crl, + index, pTime, pRevStatus); CertFreeCRLContext(crl); } else diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 9ed9204..1be327e 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -733,7 +733,6 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_REVOKED || broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), "expected CRYPT_E_REVOKED, got %08x\n", GetLastError()); @@ -748,7 +747,6 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); @@ -764,7 +762,6 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); @@ -772,7 +769,6 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); @@ -780,7 +776,6 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError());

1 0

Juan Lang : cryptnet: Trace more reasons for revocation failure.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ec223a21295621cf7fd8251aff2d0ad77e5a0c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec223a21295621cf7fd8251af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 11 13:44:26 2011 -0800 cryptnet: Trace more reasons for revocation failure. --- dlls/cryptnet/cryptnet_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 204590f..3b9a044 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1767,12 +1767,19 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, } else { + TRACE("no CRL found\n"); error = CRYPT_E_NO_REVOCATION_CHECK; pRevStatus->dwIndex = index; } } else { + if (!pRevPara) + WARN("no CERT_REVOCATION_PARA\n"); + else if (!pRevPara->hCrlStore) + WARN("no dist points/aia extension and no CRL store\n"); + else if (!pRevPara->pIssuerCert) + WARN("no dist points/aia extension and no issuer\n"); error = CRYPT_E_NO_REVOCATION_CHECK; pRevStatus->dwIndex = index; }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011