November 2009 - Wine-Commits

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

Nov. 23, 2009

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

Ken Thomases : crypt32: Read trusted root certificates from system keychain on Mac OS X.
by Alexandre Julliard Nov. 23, 2009

Nov. 23, 2009

Module: wine Branch: master Commit: 3921454398d8808fb0e3d4e03f023c4ec70cba17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3921454398d8808fb0e3d4e03… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 20 15:49:11 2009 -0600 crypt32: Read trusted root certificates from system keychain on Mac OS X. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/rootstore.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index c2284b7..2daa01a 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ MODULE = crypt32.dll IMPORTLIB = crypt32 IMPORTS = user32 advapi32 kernel32 ntdll +EXTRALIBS = @SECURITYLIB@ C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index a55b281..70b5ef8 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -40,6 +40,9 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" +#ifdef __APPLE__ +#include <Security/Security.h> +#endif WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -713,6 +716,35 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) DWORD i; BOOL ret = FALSE; +#ifdef __APPLE__ + OSStatus status; + CFArrayRef rootCerts; + + status = SecTrustCopyAnchorCertificates(&rootCerts); + if (status == noErr) + { + int i; + for (i = 0; i < CFArrayGetCount(rootCerts); i++) + { + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(rootCerts, i); + CFDataRef certData; + if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + { + if (CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + CFDataGetBytePtr(certData), CFDataGetLength(certData), + CERT_STORE_ADD_NEW, NULL)) + ret = TRUE; + else + WARN("adding root cert %d failed: %08x\n", i, GetLastError()); + CFRelease(certData); + } + else + WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + } + CFRelease(rootCerts); + } +#endif + for (i = 0; !ret && i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); i++)

1 0

Juan Lang : cryptnet: Check CRL with verify time in CertDllVerifyRevocation .
by Alexandre Julliard Nov. 23, 2009

Nov. 23, 2009

Module: wine Branch: master Commit: ff57ba9d7c633c2e263f8a88392448087c1eca13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff57ba9d7c633c2e263f8a883… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:09:21 2009 -0800 cryptnet: Check CRL with verify time in CertDllVerifyRevocation. --- dlls/cryptnet/cryptnet_main.c | 46 +++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3744e68..a37c0d6 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1441,6 +1441,15 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { + DWORD cbSize; + PCCERT_CONTEXT pIssuerCert; + DWORD cCertStore; + HCERTSTORE *rgCertStore; + HCERTSTORE hCrlStore; + LPFILETIME pftTimeToUse; +} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS; + typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD cbSize; DWORD dwIndex; @@ -1457,6 +1466,8 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, { DWORD error = 0, i; BOOL ret; + FILETIME now; + LPFILETIME pTime = NULL; TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); @@ -1472,6 +1483,14 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, SetLastError(E_INVALIDARG); return FALSE; } + if (pRevPara && pRevPara->cbSize >= + sizeof(CERT_REVOCATION_PARA_NO_EXTRA_FIELDS)) + pTime = pRevPara->pftTimeToUse; + if (!pTime) + { + GetSystemTimeAsFileTime(&now); + pTime = &now; + } memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) { @@ -1524,18 +1543,27 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, (void **)&crl, NULL, NULL, NULL, NULL); if (ret) { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL( - rgpvContext[i], crl, 0, NULL, - &entry); - if (entry) + if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = i; + /* The CRL isn't time valid */ + error = CRYPT_E_NO_REVOCATION_CHECK; ret = FALSE; } - else if (timeout) + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL( + rgpvContext[i], crl, 0, NULL, + &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = i; + ret = FALSE; + } + } + if (ret && timeout) { DWORD time = GetTickCount();

1 0

Andrew Eikum : mshtml: Also get dispid by element name & id in HTMLElementCollection.
by Alexandre Julliard Nov. 23, 2009

Nov. 23, 2009

Module: wine Branch: master Commit: 9a9c5f9cdfbe890bd60acc6f2faa79eb3b38a64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9c5f9cdfbe890bd60acc6f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 20 16:21:54 2009 -0600 mshtml: Also get dispid by element name & id in HTMLElementCollection. --- dlls/mshtml/htmlelemcol.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 70827bc..c973707 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -205,6 +205,26 @@ static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection return E_NOTIMPL; } +static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) +{ + BSTR elem_id; + HRESULT hres; + + hres = IHTMLElement_get_id(HTMLELEM(elem), &elem_id); + if(FAILED(hres)){ + WARN("IHTMLElement_get_id failed: 0x%08x\n", hres); + return FALSE; + } + + if(elem_id && !strcmpW(elem_id, name)) { + SysFreeString(elem_id); + return TRUE; + } + + SysFreeString(elem_id); + return FALSE; +} + static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) { const PRUnichar *str; @@ -376,7 +396,16 @@ static HRESULT HTMLElementCollection_get_dispid(IUnknown *iface, BSTR name, DWOR for(ptr = name; *ptr && isdigitW(*ptr); ptr++) idx = idx*10 + (*ptr-'0'); - if(*ptr || idx >= This->len) + if(*ptr) { + /* the name contains alpha characters, so search by name & id */ + for(idx = 0; idx < This->len; ++idx) { + if(is_elem_id(This->elems[idx], name) || + is_elem_name(This->elems[idx], name)) + break; + } + } + + if(idx >= This->len) return DISP_E_UNKNOWNNAME; *dispid = DISPID_ELEMCOL_0 + idx;

1 0

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

Nov. 23, 2009

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

Andrew Eikum : mshtml: Also search by node name attribute in IHTMLDocument3 ::getElementById.
by Alexandre Julliard Nov. 23, 2009

Nov. 23, 2009

Module: wine Branch: master Commit: d51c0966158f6161e7749afdce1a81e7c54c95a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51c0966158f6161e7749afdc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 20 17:04:58 2009 -0600 mshtml: Also search by node name attribute in IHTMLDocument3::getElementById. --- dlls/mshtml/htmldoc3.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/nsiface.idl | 33 ++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 9 ++++++- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index a00fa95..b930d88 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -431,6 +431,8 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v HTMLDocument *This = HTMLDOC3_THIS(iface); nsIDOMElement *nselem; HTMLDOMNode *node; + nsIDOMNode *nsnode, *nsnode_by_id, *nsnode_by_name; + nsIDOMNodeList *nsnode_list; nsAString id_str; nsresult nsres; @@ -442,16 +444,64 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v } nsAString_Init(&id_str, v); + /* get element by id attribute */ nsres = nsIDOMHTMLDocument_GetElementById(This->doc_node->nsdoc, &id_str, &nselem); - nsAString_Finish(&id_str); if(FAILED(nsres)) { ERR("GetElementById failed: %08x\n", nsres); + nsAString_Finish(&id_str); return E_FAIL; } + nsnode_by_id = (nsIDOMNode*)nselem; - if(nselem) { - node = get_node(This->doc_node, (nsIDOMNode*)nselem, TRUE); - nsIDOMElement_Release(nselem); + /* get first element by name attribute */ + nsres = nsIDOMHTMLDocument_GetElementsByName(This->doc_node->nsdoc, &id_str, &nsnode_list); + if(FAILED(nsres)) { + ERR("getElementsByName failed: %08x\n", nsres); + nsAString_Finish(&id_str); + if(nsnode_by_id) + nsIDOMNode_Release(nsnode_by_id); + return E_FAIL; + } + nsIDOMNodeList_Item(nsnode_list, 0, &nsnode_by_name); + nsIDOMNodeList_Release(nsnode_list); + + nsAString_Finish(&id_str); + + if(nsnode_by_name && nsnode_by_id) { + nsIDOM3Node *node3; + PRUint16 pos; + + nsres = nsIDOMNode_QueryInterface(nsnode_by_name, &IID_nsIDOM3Node, (void**)&node3); + if(NS_FAILED(nsres)) { + FIXME("failed to get nsIDOM3Node interface: 0x%08x\n", nsres); + nsIDOMNode_Release(nsnode_by_name); + nsIDOMNode_Release(nsnode_by_id); + return E_FAIL; + } + + nsres = nsIDOM3Node_CompareDocumentPosition(node3, nsnode_by_id, &pos); + nsIDOM3Node_Release(node3); + if(NS_FAILED(nsres)) { + FIXME("nsIDOM3Node_CompareDocumentPosition failed: 0x%08x\n", nsres); + nsIDOMNode_Release(nsnode_by_name); + nsIDOMNode_Release(nsnode_by_id); + return E_FAIL; + } + + TRACE("CompareDocumentPosition gave: 0x%x\n", pos); + if(pos & PRECEDING || pos & CONTAINS) { + nsnode = nsnode_by_id; + nsIDOMNode_Release(nsnode_by_name); + }else { + nsnode = nsnode_by_name; + nsIDOMNode_Release(nsnode_by_id); + } + }else + nsnode = nsnode_by_name ? nsnode_by_name : nsnode_by_id; + + if(nsnode) { + node = get_node(This->doc_node, nsnode, TRUE); + nsIDOMNode_Release(nsnode); IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel); }else { diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 19f29b0..9d0bb30 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -140,6 +140,8 @@ typedef nsISupports nsIContent; typedef nsISupports nsINode; typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; +typedef nsISupports nsIVariant; +typedef nsISupports nsIDOMUserDataHandler; [ object, @@ -603,6 +605,37 @@ interface nsIDOMNodeList : nsISupports [ object, + uuid(29fb2a18-1dd2-11b2-8dd9-a6fd5d5ad12f), + local + /* NOT_FROZEN */ +] +interface nsIDOM3Node : nsISupports +{ + enum NSDOCPOSITION { + DISCONNECTED = 1, + PRECEDING = 2, + FOLLOWING = 4, + CONTAINS = 8, + CONTAINED_BY = 16, + IMPLEMENTATION_SPECIFIC = 32 + }; + + nsresult GetBaseURI(nsAString *aBaseURI); + nsresult CompareDocumentPosition(nsIDOMNode *other, PRUint16 *_retval); + nsresult GetTextContent(nsAString *aTextContent); + nsresult SetTextContent(const nsAString *aTextContent); + nsresult IsSameNode(nsIDOMNode *other, PRBool *_retval); + nsresult LookupPrefix(const nsAString *namespaceURI, PRBool *_retval); + nsresult IsDefaultNamespace(const nsAString *namespaceURI, PRBool *_retval); + nsresult LookupNamespaceURI(const nsAString *prefix, nsAString _retval); + nsresult IsEqualNode(nsIDOMNode *arg, PRBool *_retval); + nsresult GetFeature(const nsAString *feature, const nsAString *version, nsISupports **_retval); + nsresult SetUserData(const nsAString *key, nsIVariant *data, nsIDOMUserDataHandler *handler, nsIVariant **_retval); + nsresult GetUserData(const nsAString *key, nsIVariant **_retval); +} + +[ + object, uuid(a6cf907c-15b3-11d2-932e-00805f8add32), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8681164..bd55c9f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -65,7 +65,7 @@ static const char cond_comment_str[] = "</body></html>"; static const char frameset_str[] = "<html><head><title>frameset test</title></head><frameset rows=\"28, *\">" - "<frame src=\"about:blank\" id=\"fr1\"><frame src=\"about:blank\" id=\"fr2\">" + "<frame src=\"about:blank\" name=\"nm1\" id=\"fr1\"><frame src=\"about:blank\" name=\"nm2\" id=\"fr2\">" "</frameset></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; @@ -5396,6 +5396,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(!node, "node = %p\n", node); elem2 = get_doc_elem_by_id(doc, "x"); + test_elem_tag((IUnknown*)elem2, "A"); node = node_get_next((IUnknown*)elem2); IHTMLDOMNode_Release(node); IHTMLElement_Release(elem2); @@ -5682,6 +5683,7 @@ static void test_frameset(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IHTMLFramesCollection2 *frames; + IHTMLElement *elem; LONG length; VARIANT index_var, result_var; HRESULT hres; @@ -5805,6 +5807,11 @@ static void test_frameset(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" "failed with E_INVALIDARG, instead: 0x%08x\n", hres); VariantClear(&result_var); + + /* getElementById with node name attributes */ + elem = get_doc_elem_by_id(doc, "nm1"); + test_elem_id((IUnknown*)elem, "fr1"); + IHTMLElement_Release(elem); } static IHTMLDocument2 *notif_doc;

1 0

Alexander Nicolaysen Sørnes : Add and use maintainer::getMaintainerCountForUserId
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: b4f0ac8507229e75934d7c6f6af946dcf3e90e85 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b4f0ac8507229e75934d7c6f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:29:46 2009 +0100 Add and use maintainer::getMaintainerCountForUserId --- include/maintainer.php | 10 ++++++++-- include/maintainerView.php | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 5ca2751..881b315 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -529,17 +529,23 @@ class maintainer } // returns the number of applications/versions a particular user maintains - function getMaintainerCountForUser($oUser, $bSuperMaintainer) + function getMaintainerCountForUserId($iUserId, $bSuperMaintainer) { $sQuery = "SELECT count(*) as cnt from appMaintainers WHERE userid = '?' AND superMaintainer = '?'". " AND state ='?'"; - $hResult = query_parameters($sQuery, $oUser->iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); + $hResult = query_parameters($sQuery, $iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); if(!$hResult) return 0; $oRow = query_fetch_object($hResult); return $oRow->cnt; } + // returns the number of applications/versions a particular user maintains + function getMaintainerCountForUser($oUser, $bSuperMaintainer) + { + return getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); + } + /** * get the applications and versions that this user maintains */ diff --git a/include/maintainerView.php b/include/maintainerView.php index 36cee0a..3fade1e 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -96,6 +96,7 @@ class maintainerView { $oTableRow = new TableRow(); $oMaintainerView = new maintainerView(null, $oRow); + $iUserId = $oMaintainerView->iUserId; $oUser = new user($oMaintainerView->iUserId); $sStyle = 'border-top: thin solid; border-bottom: thin solid;'; @@ -107,13 +108,13 @@ class maintainerView $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedApps = maintainer::GetMaintainerCountForUser($oUser, true); + $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); $sPlural = ($iMaintainedApps == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedApps ? "$iMaintainedApps application$sPlural" : ' '); $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedVersions = maintainer::GetMaintainerCountForUser($oUser, false); + $iMaintainedVersions = maintainer::GetMaintainerCountForUserId($iUserId, false); $sPlural = ($iMaintainedVersions == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedVersions ? "$iMaintainedVersions version$sPlural" : ' '); $oCell->SetStyle($sStyle);

1 0

Alexander Nicolaysen Sørnes : query_parameters: replace deprecated split with preg_split
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 805ce2c3d35a42b19508e5e13d832b50ca4af6a5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=805ce2c3d35a42b19508e5e1… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sat Nov 21 18:16:49 2009 +0100 query_parameters: replace deprecated split with preg_split --- include/query.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/query.php b/include/query.php index 0c45496..9527fb8 100644 --- a/include/query.php +++ b/include/query.php @@ -85,7 +85,7 @@ function query_parameters() $aData = func_get_args(); $sQuery = $aData[0]; - $aTokens = split("[&?~]", $sQuery); /* NOTE: no need to escape characters inside of [] in regex */ + $aTokens = preg_split("/[&?~]/", $sQuery); /* NOTE: no need to escape characters inside of [] in regex */ $sPreparedquery = $aTokens[0]; $iCount = strlen($aTokens[0]);

1 0

Alexander Nicolaysen Sørnes : contact. php: Fix some warnings
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: 4134a08fde157a936f34cb87da09ec40df738113 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4134a08fde157a936f34cb87… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:12:03 2009 +0100 contact.php: Fix some warnings --- contact.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contact.php b/contact.php index 06757c6..9bbb4fd 100644 --- a/contact.php +++ b/contact.php @@ -9,6 +9,7 @@ require_once(BASE."/include/incl.php"); */ $oUser = new User($_SESSION['current']->iUserId); +$shError = ''; /* Restrict error to logged-in users */ if(!$oUser->isLoggedIn()) @@ -55,7 +56,7 @@ if($sRecipientGroup) /* Check for errors */ if((!$aClean['sMessage'] || !$aClean['sSubject']) && $aClean['sSubmit']) { - $error = "<font color=\"red\">Please enter both a subject and a ". + $shError = "<font color=\"red\">Please enter both a subject and a ". "message.</font>"; $aClean['sSubmit'] = ""; } @@ -67,7 +68,7 @@ if(!$aClean['sSubmit']) echo '&nbsp'; echo html_frame_start("Composer",400,"",0); - echo $error; + echo $shError; echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">"; /* User manager */ @@ -96,7 +97,7 @@ if(!$aClean['sSubmit']) $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Subject"); $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\"". - " value=\"".$aClean['sSubject']."\">"); + " value=\"".getInput('sSubject', $aClean)."\">"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow); @@ -106,7 +107,7 @@ if(!$aClean['sSubmit']) $oTableCell->SetValign("top"); $oTableRow->AddCell($oTableCell); $oTableCell = new TableCell("<textarea name=\"sMessage\" rows=\"15\" cols=\"60\">" - .$aClean['sMessage']."</textarea>"); + .getInput('sMessage', $aClean)."</textarea>"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow);

1 0

Alexander Nicolaysen Sørnes : Admin Maintainers: Re-add link to email all maintainers
by Alexander Nicolaysen Sørnes Nov. 22, 2009

Nov. 22, 2009

Module: appdb Branch: master Commit: ed3d1d04757400c542dc53d8232c44c5a98adb00 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ed3d1d04757400c542dc53d8… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:07:33 2009 +0100 Admin Maintainers: Re-add link to email all maintainers --- include/maintainerView.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 3fade1e..bf90582 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -80,6 +80,8 @@ class maintainerView public function objectDrawCustomTable($hResult, $sQueued, $oM) { + echo '<div align="center"><a href="'.BASE.'contact.php?sRecipientGroup=maintainers">E-mail all maintainers</a></div>'; + $oTable = new Table(); $oNewOM = new objectManager('maintainer');

1 0