November 2009 - Wine-commits

Marcin Baczyński : gdiplus: Add missing declaration for font.c.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 56057fdb2448c3beda824c80ab421e2fbd746de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56057fdb2448c3beda824c80a… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Sat Nov 21 01:45:46 2009 +0100 gdiplus: Add missing declaration for font.c. --- include/gdiplusflat.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d4f51a3..8d24929 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -107,6 +107,8 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*); +GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection*, + GDIPCONST void*,INT); GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*); GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT, GpFontFamily*[], INT*);

1 0

Marcin Baczyński : gdiplus: Add missing declarations for graphicspath.c.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 1aedfa8c6c23f526e01b708169471c0f1a63b6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aedfa8c6c23f526e01b70816… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Sat Nov 21 01:45:47 2009 +0100 gdiplus: Add missing declarations for graphicspath.c. --- include/gdiplusflat.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8d24929..563ee96 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -350,6 +350,9 @@ GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); +GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL, + REAL,REAL,REAL,WarpMode,REAL); +GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL); /* HatchBrush */ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**);

1 0

Gerald Pfeifer : comdlg32: Simplify CC_WMPaint, CC_WMLButtonUp and CC_WMLButtonDown by shedding unused parameters.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 5e3f66c21174e687ee98331196d910183719add4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3f66c21174e687ee9833119… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 20 21:58:42 2009 +0100 comdlg32: Simplify CC_WMPaint, CC_WMLButtonUp and CC_WMLButtonDown by shedding unused parameters. --- dlls/comdlg32/colordlg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index e134d45..2a61706 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1081,7 +1081,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif /*********************************************************************** * CC_WMPaint [internal] */ -static LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) +static LRESULT CC_WMPaint( HWND hDlg ) { PAINTSTRUCT ps; LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); @@ -1103,7 +1103,7 @@ static LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) /*********************************************************************** * CC_WMLButtonUp [internal] */ -static LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ) +static LRESULT CC_WMLButtonUp( HWND hDlg ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); @@ -1158,7 +1158,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) /*********************************************************************** * CC_WMLButtonDown [internal] */ -static LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ) +static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); int r, g, b, i; @@ -1252,7 +1252,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, return TRUE; break; case WM_PAINT: - if ( CC_WMPaint(hDlg, wParam, lParam)) + if (CC_WMPaint(hDlg)) return TRUE; break; case WM_LBUTTONDBLCLK: @@ -1264,11 +1264,11 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, return TRUE; break; case WM_LBUTTONUP: /* FIXME: ClipCursor off (if in color graph)*/ - if (CC_WMLButtonUp(hDlg, wParam, lParam)) + if (CC_WMLButtonUp(hDlg)) return TRUE; break; case WM_LBUTTONDOWN:/* FIXME: ClipCursor on (if in color graph)*/ - if (CC_WMLButtonDown(hDlg, wParam, lParam)) + if (CC_WMLButtonDown(hDlg, lParam)) return TRUE; break; }

1 0

Gerald Pfeifer : include: Guard preprocessor use of _WIN32_IE.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: aa7cedc895bbb5c340bfdd98b65f5f15bf29d30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7cedc895bbb5c340bfdd98b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 20 22:28:52 2009 +0100 include: Guard preprocessor use of _WIN32_IE. --- include/prsht.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index 27e43c8..0830757 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -266,7 +266,7 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) #define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ #define PSH_NOCONTEXTHELP 0x02000000 #ifndef __WINESRC__ -# if _WIN32_IE < 0x0500 +# if defined(_WIN32_IE) && (_WIN32_IE < 0x0500) # define PSH_WIZARD97 PSH_WIZARD97_OLD # else # define PSH_WIZARD97 PSH_WIZARD97_NEW

1 0

Gerald Pfeifer : msvidc32: Guard old code by #ifdef instead of plain #if.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: a15f283c7d41b8b2e8c5e4009e27b3e2dbbc19d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15f283c7d41b8b2e8c5e4009… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 20 23:13:16 2009 +0100 msvidc32: Guard old code by #ifdef instead of plain #if. --- dlls/msvidc32/msvideo1.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index ab51e4c..3052964 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -132,7 +132,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) { -#if ORIGINAL +#ifdef ORIGINAL pixels[pixel_ptr++] = colors[(flags & 0x1) ^ 1]; #else pixels[width*(height-(pixel_ptr/width)-1) + @@ -154,7 +154,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) { -#if ORIGINAL +#ifdef ORIGINAL pixels[pixel_ptr++] = colors[((pixel_y & 0x2) << 1) + (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; @@ -175,7 +175,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++) { -#if ORIGINAL +#ifdef ORIGINAL pixels[pixel_ptr++] = colors[0]; #else pixels[width*(height-(pixel_ptr/width)-1) +

1 0

Gerald Pfeifer : include: Fix preprocessor use of _MSC_VER.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 2ad4439d517e8da509b09b3cc15eab95712f9833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad4439d517e8da509b09b3cc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 20 22:08:43 2009 +0100 include: Fix preprocessor use of _MSC_VER. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index a77a607..222af22 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -296,7 +296,7 @@ extern "C" { #endif /* Eliminate Microsoft C/C++ compiler warning 4715 */ -#if (_MSC_VER > 1200) +#if defined(_MSC_VER) && (_MSC_VER > 1200) # define DEFAULT_UNREACHABLE default: __assume(0) #else # define DEFAULT_UNREACHABLE

1 0

Gerald Pfeifer : include: Remove use of _WIN32_WINNT.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 36fad653382626980270e8bd92ff987b14ac6d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fad653382626980270e8bd9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 20 23:49:20 2009 +0100 include: Remove use of _WIN32_WINNT. --- include/winternl.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index d38f49c..6f21ad0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1670,9 +1670,7 @@ typedef struct _RTL_HANDLE_TABLE #define FILE_PIPE_SERVER_END 0x00000001 #define FILE_PIPE_CLIENT_END 0x00000000 -#if (_WIN32_WINNT >= 0x0501) #define INTERNAL_TS_ACTIVE_CONSOLE_ID ( *((volatile ULONG*)(0x7ffe02d8)) ) -#endif /* (_WIN32_WINNT >= 0x0501) */ #define LOGONID_CURRENT ((ULONG)-1)

1 0

Juan Lang : crypt32: Test verifying the enhanced key usage of a chain.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: e611a839624e97708aa3c768aeacf39aca9ad6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e611a839624e97708aa3c768a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:06:47 2009 -0800 crypt32: Test verifying the enhanced key usage of a chain. --- dlls/crypt32/tests/chain.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2b8d967..b21fba6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3606,6 +3606,9 @@ static void testGetCertChain(void) CERT_TRUST_IS_REVOKED | CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION; HCERTSTORE store; + static char one_two_three[] = "1.2.3"; + static char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; + LPSTR oids[2]; /* Basic parameter checks */ if (0) @@ -3829,6 +3832,70 @@ static void testGetCertChain(void) CertCloseStore(store, 0); CertFreeCertificateContext(cert); + /* Test usage match with Google's cert */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + verisignCA, sizeof(verisignCA), CERT_STORE_ADD_ALWAYS, NULL); + CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + thawte_sgc_ca, sizeof(thawte_sgc_ca), CERT_STORE_ADD_ALWAYS, NULL); + cert = CertCreateCertificateContext(X509_ASN_ENCODING, + google, sizeof(google)); + SystemTimeToFileTime(&oct2009, &fileTime); + memset(&para, 0, sizeof(para)); + para.cbSize = sizeof(para); + oids[0] = one_two_three; + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; + para.RequestedUsage.Usage.rgpszUsageIdentifier = oids; + para.RequestedUsage.Usage.cUsageIdentifier = 1; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + todo_wine + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + oids[0] = oid_server_auth; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + ok(!(chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + oids[1] = one_two_three; + para.RequestedUsage.Usage.cUsageIdentifier = 2; + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + todo_wine + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_OR; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + ok(!(chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + CertCloseStore(store, 0); + CertFreeCertificateContext(cert); + for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) { chain = getChain(&chainCheck[i].certs, 0, TRUE, &oct2007,

1 0

Juan Lang : crypt32: Only trace a usage match if it's not empty.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 30de1034858825a9467438407d0d905053a2ab70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30de1034858825a9467438407… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:07:10 2009 -0800 crypt32: Only trace a usage match if it's not empty. --- dlls/crypt32/chain.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0f2b5dd..a53b030 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2456,12 +2456,15 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) { - DWORD i; + if (usageMatch->Usage.cUsageIdentifier) + { + DWORD i; - TRACE_(chain)("%s: %s\n", name, - usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); - for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) - TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + TRACE_(chain)("%s: %s\n", name, + usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); + for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + } } static void dump_chain_para(const CERT_CHAIN_PARA *pChainPara)

1 0

Juan Lang : crypt32: Support checking the requested usage for a chain.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 1a392e1a3045ba827e24b4940bf64334daefc690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a392e1a3045ba827e24b4940… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:08:38 2009 -0800 crypt32: Support checking the requested usage for a chain. --- dlls/crypt32/chain.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/chain.c | 2 - 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a53b030..de482ae 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2454,6 +2454,111 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, } } +static void CRYPT_CheckUsages(PCERT_CHAIN_CONTEXT chain, + const CERT_CHAIN_PARA *pChainPara) +{ + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && + pChainPara->RequestedUsage.Usage.cUsageIdentifier) + { + PCCERT_CONTEXT endCert; + PCERT_EXTENSION ext; + BOOL validForUsage; + + /* A chain, if created, always includes the end certificate */ + endCert = chain->rgpChain[0]->rgpElement[0]->pCertContext; + /* The extended key usage extension specifies how a certificate's + * public key may be used. From RFC 5280, section 4.2.1.12: + * "This extension indicates one or more purposes for which the + * certified public key may be used, in addition to or in place of the + * basic purposes indicated in the key usage extension." + * If the extension is present, it only satisfies the requested usage + * if that usage is included in the extension: + * "If the extension is present, then the certificate MUST only be used + * for one of the purposes indicated." + * There is also the special anyExtendedKeyUsage OID, but it doesn't + * have to be respected: + * "Applications that require the presence of a particular purpose + * MAY reject certificates that include the anyExtendedKeyUsage OID + * but not the particular OID expected for the application." + * For now, I'm being more conservative and ignoring the presence of + * the anyExtendedKeyUsage OID. + */ + if ((ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE, + endCert->pCertInfo->cExtension, endCert->pCertInfo->rgExtension))) + { + const CERT_ENHKEY_USAGE *requestedUsage = + &pChainPara->RequestedUsage.Usage; + CERT_ENHKEY_USAGE *usage; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size)) + { + if (pChainPara->RequestedUsage.dwType == USAGE_MATCH_TYPE_AND) + { + DWORD i, j; + + /* For AND matches, all usages must be present */ + validForUsage = TRUE; + for (i = 0; validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + BOOL match = FALSE; + + for (j = 0; !match && j < usage->cUsageIdentifier; j++) + match = !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + if (!match) + validForUsage = FALSE; + } + } + else + { + DWORD i, j; + + /* For OR matches, any matching usage suffices */ + validForUsage = FALSE; + for (i = 0; !validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + for (j = 0; !validForUsage && + j < usage->cUsageIdentifier; j++) + validForUsage = + !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + } + } + LocalFree(usage); + } + else + validForUsage = FALSE; + } + else + { + /* If the extension isn't present, any interpretation is valid: + * "Certificate using applications MAY require that the extended + * key usage extension be present and that a particular purpose + * be indicated in order for the certificate to be acceptable to + * that application." + * For now I'm being more conservative and disallowing it. + */ + WARN_(chain)("requested usage from a certificate with no usages\n"); + validForUsage = FALSE; + } + if (!validForUsage) + { + chain->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + chain->rgpChain[0]->rgpElement[0]->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + } + } + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA) && + pChainPara->RequestedIssuancePolicy.Usage.cUsageIdentifier) + FIXME("unimplemented for RequestedIssuancePolicy\n"); +} + static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) { if (usageMatch->Usage.cUsageIdentifier) @@ -2534,6 +2639,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + CRYPT_CheckUsages(pChain, pChainPara); if (ppChainContext) *ppChainContext = pChain; else diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b21fba6..d41a8ca 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3853,7 +3853,6 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); CertFreeCertificateChain(chain); @@ -3877,7 +3876,6 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); CertFreeCertificateChain(chain);

1 0