March 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Silence compile time warnings for dynamically loaded libxslt.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 49d69e440fcaa8715a2ef56cd480de2e610c8215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d69e440fcaa8715a2ef56cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 14:10:24 2011 +0300 msxml3: Silence compile time warnings for dynamically loaded libxslt. --- dlls/msxml3/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 741858b..6cbdd99 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -193,7 +193,9 @@ static void init_libxslt(void) if (!libxslt_handle) return; -#define LOAD_FUNCPTR(f, needed) if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL && needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } +#define LOAD_FUNCPTR(f, needed) \ + if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL) \ + if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } LOAD_FUNCPTR(xsltInit, 0); LOAD_FUNCPTR(xsltApplyStylesheet, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1);

1 0

Nikolay Sivov : msxml3: Downgrade FIXME to TRACE for unsupported interfaces .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9176c9e886f1f28163e433495f61b61a4a74a9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9176c9e886f1f28163e433495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 16:40:26 2011 +0300 msxml3: Downgrade FIXME to TRACE for unsupported interfaces. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/doctype.c | 2 +- dlls/msxml3/domdoc.c | 7 +------ dlls/msxml3/domimpl.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/selection.c | 2 +- dlls/msxml3/text.c | 2 +- 14 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index f61428a..603477c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domattr_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e9de472..2622e1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcdata_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index a75d178..cb5cada 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcomment_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index bc2b77f..0342bae 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -75,7 +75,7 @@ static HRESULT WINAPI domfrag_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 6c757b3..6a1952f 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1277ce1..7d1b352 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -916,14 +916,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { *ppvObject = &This->lpVtblConnectionPointContainer; } - else if(IsEqualGUID(&IID_IRunnableObject, riid)) - { - TRACE("IID_IRunnableObject not supported returning NULL\n"); - return E_NOINTERFACE; - } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 9743cc6..2ecf073 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -69,7 +69,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 55f463a..18a2577 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -85,7 +85,7 @@ static HRESULT WINAPI domelem_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 7ce85ed..b317606 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -75,7 +75,7 @@ static HRESULT WINAPI entityref_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 67bcd2a..6a25463 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -79,7 +79,7 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index a504934..1970840 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -82,7 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1766781..89b2b5a 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -75,7 +75,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 97165fa..abd9347 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -97,7 +97,7 @@ static HRESULT WINAPI domselection_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3e3d3b2..0f40cf5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domtext_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Andrew Eikum : oleaut32: Use helper function to get CustData by GUID.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 28fc129258f8f4e680859d9fd2227ecd6fb8b18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fc129258f8f4e680859d9fd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 11 15:15:44 2011 -0600 oleaut32: Use helper function to get CustData by GUID. --- dlls/oleaut32/typelib.c | 109 +++++++++++++++++++++++------------------------ 1 files changed, 53 insertions(+), 56 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1a1d379..5cc0219 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1614,6 +1614,17 @@ static inline TLBVarDesc *TLB_get_vardesc_by_name(TLBVarDesc *vardescs, return NULL; } +static inline TLBCustData *TLB_get_custdata_by_guid(TLBCustData **custdata_list, REFGUID guid) +{ + TLBCustData *cust_data = *custdata_list; + while(cust_data){ + if(IsEqualIID(&cust_data->guid, guid)) + return cust_data; + cust_data = cust_data->next; + } + return NULL; +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -4599,20 +4610,16 @@ static HRESULT WINAPI ITypeLib2_fnGetCustData( ITypeLibImpl *This = (ITypeLibImpl *)iface; TLBCustData *pCData; - for(pCData=This->pCustData; pCData; pCData = pCData->next) - { - if( IsEqualIID(guid, &pCData->guid)) break; - } + TRACE("%p %s %p\n", This, debugstr_guid(guid), pVarVal); - TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); + pCData = TLB_get_custdata_by_guid(&This->pCustData, guid); + if(!pCData) + return TYPE_E_ELEMENTNOTFOUND; - if(pCData) - { - VariantInit( pVarVal); - VariantCopy( pVarVal, &pCData->data); - return S_OK; - } - return E_INVALIDARG; /* FIXME: correct? */ + VariantInit(pVarVal); + VariantCopy(pVarVal, &pCData->data); + + return S_OK; } /* ITypeLib2::GetLibStatistics @@ -7236,10 +7243,9 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; - for(pCData=This->pCustData; pCData; pCData = pCData->next) - if( IsEqualIID(guid, &pCData->guid)) break; + TRACE("%p %s %p\n", This, debugstr_guid(guid), pVarVal); - TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); + pCData = TLB_get_custdata_by_guid(&This->pCustData, guid); VariantInit( pVarVal); if (pCData) @@ -7260,23 +7266,22 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( VARIANT *pVarVal) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBCustData *pCData=NULL; + TLBCustData *pCData; TLBFuncDesc *pFDesc = &This->funcdescs[index]; + TRACE("%p %u %s %p\n", This, index, debugstr_guid(guid), pVarVal); + if(index >= This->TypeAttr.cFuncs) return TYPE_E_ELEMENTNOTFOUND; - for(pCData=pFDesc->pCustData; pCData; pCData = pCData->next) - if( IsEqualIID(guid, &pCData->guid)) break; + pCData = TLB_get_custdata_by_guid(&pFDesc->pCustData, guid); + if(!pCData) + return TYPE_E_ELEMENTNOTFOUND; - TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); + VariantInit(pVarVal); + VariantCopy(pVarVal, &pCData->data); - if(pCData){ - VariantInit( pVarVal); - VariantCopy( pVarVal, &pCData->data); - return S_OK; - } - return TYPE_E_ELEMENTNOTFOUND; + return S_OK; } /* ITypeInfo2::GetParamCustData @@ -7294,25 +7299,23 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( TLBCustData *pCData; TLBFuncDesc *pFDesc = &This->funcdescs[indexFunc]; + TRACE("%p %u %u %s %p\n", This, indexFunc, indexParam, + debugstr_guid(guid), pVarVal); + if(indexFunc >= This->TypeAttr.cFuncs) return TYPE_E_ELEMENTNOTFOUND; if(indexParam >= pFDesc->funcdesc.cParams) return TYPE_E_ELEMENTNOTFOUND; - for(pCData=pFDesc->pParamDesc[indexParam].pCustData; pCData; - pCData = pCData->next) - if( IsEqualIID(guid, &pCData->guid)) break; + pCData = TLB_get_custdata_by_guid(&pFDesc->pParamDesc[indexParam].pCustData, guid); + if(!pCData) + return TYPE_E_ELEMENTNOTFOUND; - TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); + VariantInit(pVarVal); + VariantCopy(pVarVal, &pCData->data); - if(pCData) - { - VariantInit( pVarVal); - VariantCopy( pVarVal, &pCData->data); - return S_OK; - } - return TYPE_E_ELEMENTNOTFOUND; + return S_OK; } /* ITypeInfo2::GetVarCustData @@ -7326,7 +7329,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarCustData( VARIANT *pVarVal) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBCustData *pCData=NULL; + TLBCustData *pCData; TLBVarDesc *pVDesc = &This->vardescs[index]; TRACE("%p %s %p\n", This, debugstr_guid(guid), pVarVal); @@ -7334,14 +7337,13 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarCustData( if(index >= This->TypeAttr.cVars) return TYPE_E_ELEMENTNOTFOUND; - for(pCData=pVDesc->pCustData; pCData; pCData = pCData->next) - if(IsEqualIID(guid, &pCData->guid)) - break; + pCData = TLB_get_custdata_by_guid(&pVDesc->pCustData, guid); if(!pCData) return TYPE_E_ELEMENTNOTFOUND; - VariantInit( pVarVal); - VariantCopy( pVarVal, &pCData->data); + VariantInit(pVarVal); + VariantCopy(pVarVal, &pCData->data); + return S_OK; } @@ -7356,27 +7358,22 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeCustData( VARIANT *pVarVal) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBCustData *pCData=NULL; + TLBCustData *pCData; TLBImplType *pRDesc = &This->impltypes[index]; + TRACE("%p %u %s %p\n", This, index, debugstr_guid(guid), pVarVal); + if(index >= This->TypeAttr.cImplTypes) return TYPE_E_ELEMENTNOTFOUND; - for(pCData = pRDesc->pCustData; pCData; pCData = pCData->next) - { - if( IsEqualIID(guid, &pCData->guid)) break; - } + pCData = TLB_get_custdata_by_guid(&pRDesc->pCustData, guid); + if(!pCData) + return TYPE_E_ELEMENTNOTFOUND; - TRACE("(%p) guid %s %s found!x)\n", This, debugstr_guid(guid), pCData? "" : "NOT"); + VariantInit(pVarVal); + VariantCopy(pVarVal, &pCData->data); - if(pCData) - { - VariantInit( pVarVal); - VariantCopy( pVarVal, &pCData->data); - return S_OK; - } - - return TYPE_E_ELEMENTNOTFOUND; + return S_OK; } /* ITypeInfo2::GetDocumentation2

1 0

Andrew Eikum : oleaut32: Convert CustData to use standard linked lists.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ec0a86002e67020e63460b01ee64220b815a9b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0a86002e67020e63460b01e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 11 15:15:47 2011 -0600 oleaut32: Convert CustData to use standard linked lists. --- dlls/oleaut32/typelib.c | 331 ++++++++++++++++++++++------------------------- 1 files changed, 156 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec0a86002e67020e63460…

1 0

Juan Lang : cryptnet/tests: Add more tests for revocation checking.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0f6a6dcd2be702a7195bf422db95209597972a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6a6dcd2be702a7195bf422d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 11 13:53:54 2011 -0800 cryptnet/tests: Add more tests for revocation checking. --- dlls/cryptnet/tests/cryptnet.c | 129 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 123 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f6a6dcd2be702a7195bf…

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

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

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

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

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