November 2009 - Wine-commits

Juan Lang : crypt32/tests: Fix tests on Win9x/ME.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: eee179206e3aecd07f63cf76a8e54c3c0cd1bc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee179206e3aecd07f63cf76a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:20:17 2009 -0800 crypt32/tests: Fix tests on Win9x/ME. --- dlls/crypt32/tests/cert.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index c42bb18..89268c0 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3200,21 +3200,28 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, NULL, &status); - todo_wine - ok(!ret && GetLastError() == CRYPT_E_REVOCATION_OFFLINE, - "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); - todo_wine - ok(status.dwError == CRYPT_E_REVOCATION_OFFLINE, - "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || + status.dwError == CRYPT_E_REVOCATION_OFFLINE, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Both certs together can't, either (they're not CRLs) */ SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, NULL, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); + ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Now add a CRL to the hCrlStore */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -3224,10 +3231,14 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Specifying CERT_VERIFY_REV_CHAIN_FLAG doesn't change things either */ SetLastError(0xdeadbeef);

1 0

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

23 Nov '09

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

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

23 Nov '09

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

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

23 Nov '09

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

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

23 Nov '09

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

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

23 Nov '09

Module: wine Branch: master Commit: f9456924d59635f6bc347c78b8092ec9fa91cb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9456924d59635f6bc347c78b… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Sat Nov 21 01:45:45 2009 +0100 gdiplus: Add missing declarations for customlinecap.c. --- include/gdiplusflat.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9824646..d4f51a3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -74,12 +74,15 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*); +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); /* Font */ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);

1 0

Alexander Nicolaysen Sørnes : query_parameters: replace deprecated split with preg_split
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

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 : vendor: If an admin adds a duplicate vendor, unqueue matching entry if it exists
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: 61439a79ce6af01e66fd578793c80a864f370f75 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61439a79ce6af01e66fd5787… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:07:50 2009 +0100 vendor: If an admin adds a duplicate vendor, unqueue matching entry if it exists --- include/vendor.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index e808215..820741b 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -76,6 +76,9 @@ class Vendor { { $this->vendor($oRow->vendorId); + if(!$this->mustBeQueued()) + $this->unQueue(); + /* Even though we did not create a new vendor, the caller is provided with an id and can proceed as normal, so we return TRUE */ return TRUE;

1 0

Alexander Nicolaysen Sørnes : version: Only show some filter optiosn for admins, as they have no effect for others
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: dd8399a861d665a0b85b39c93c78e18a4e8eea6e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dd8399a861d665a0b85b39c9… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:14:08 2009 +0100 version: Only show some filter optiosn for admins, as they have no effect for others --- include/version_queue.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/version_queue.php b/include/version_queue.php index 0be7ba4..2d1ee55 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -265,6 +265,11 @@ class version_queue public function objectGetFilterInfo() { $oFilter = new FilterInterface(); + + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return null; + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; }

1 0

Alexander Nicolaysen Sørnes : version: Allow admins to only show versions for apps they maintian
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: 15ddca9ff5515ba64aa7b11f7c33794163457bce URL: http://source.winehq.org/git/appdb.git/?a=commit;h=15ddca9ff5515ba64aa7b11f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:22:34 2009 +0100 version: Allow admins to only show versions for apps they maintian --- include/version.php | 53 ++++++++++++++++++++++++++++++++++----------- include/version_queue.php | 3 ++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/include/version.php b/include/version.php index 4fccfd0..a14a2c4 100644 --- a/include/version.php +++ b/include/version.php @@ -1472,22 +1472,35 @@ class version { public static function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; - if($aOptions['onlyWithoutMaintainers'] == 'true') + $oVersion = new version(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oVersion->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appFamily'; $sWhereFilter .= " AND appFamily.hasMaintainer = 'false' AND appFamily.appId = appVersion.appId"; } - $oVersion = new version(); - if($sState != 'accepted' && !$oVersion->canEdit()) + if($bOnlyMyMaintainedEntries) { - /* Users should see their own rejected entries, but maintainers should - not be able to see rejected entries for versions they maintain */ - if($sState == 'rejected') + if(!$oVersion->canEdit() && $sState == 'rejected') $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM appVersion$sExtraTables WHERE appVersion.submitterId = '?' @@ -1618,10 +1631,26 @@ class version { public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oVersion = new version(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oVersion->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appFamily'; @@ -1641,11 +1670,9 @@ class version { $iRows = version::objectGetEntriesCount($sState); } - if($sState != 'accepted' && !version::canEdit()) + if($bOnlyMyMaintainedEntries) { - /* Users should see their own rejected entries, but maintainers should - not be able to see rejected entries for versions they maintain */ - if($sState == 'rejected') + if(!$oVersion->canEdit() && $sState == 'rejected') $sQuery = "SELECT * FROM appVersion$sExtraTables WHERE appVersion.submitterId = '?' AND diff --git a/include/version_queue.php b/include/version_queue.php index 2d1ee55..d922adc 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -271,6 +271,9 @@ class version_queue return null; $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show versions for apps you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; }

1 0