November 2009 - Wine-commits

Vincent Povirk : ole32: Rename property variables in IEnumSTATSTGImpl methods.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: f8ca09c0b82d8f6613cddb8a88972139c1a6fb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ca09c0b82d8f6613cddb8a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:01:51 2009 -0600 ole32: Rename property variables in IEnumSTATSTGImpl methods. --- dlls/ole32/storage32.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c2460e1..fc5872c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3574,7 +3574,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( { IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; - DirEntry currentProperty; + DirEntry currentEntry; STATSTG* currentReturnStruct = rgelt; ULONG objectFetched = 0; ULONG currentSearchNode; @@ -3609,17 +3609,17 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( IEnumSTATSTGImpl_PopSearchNode(This, TRUE); /* - * Read the property from the storage. + * Read the entry from the storage. */ StorageImpl_ReadDirEntry(This->parentStorage, currentSearchNode, - &currentProperty); + &currentEntry); /* * Copy the information to the return buffer. */ StorageUtl_CopyDirEntryToSTATSTG(currentReturnStruct, - &currentProperty, + &currentEntry, STATFLAG_DEFAULT); /* @@ -3631,7 +3631,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Push the next search node in the search stack. */ - IEnumSTATSTGImpl_PushSearchNode(This, currentProperty.rightChild); + IEnumSTATSTGImpl_PushSearchNode(This, currentEntry.rightChild); /* * continue the iteration. @@ -3652,7 +3652,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( { IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; - DirEntry currentProperty; + DirEntry currentEntry; ULONG objectFetched = 0; ULONG currentSearchNode; @@ -3670,11 +3670,11 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( IEnumSTATSTGImpl_PopSearchNode(This, TRUE); /* - * Read the property from the storage. + * Read the entry from the storage. */ StorageImpl_ReadDirEntry(This->parentStorage, currentSearchNode, - &currentProperty); + &currentEntry); /* * Step to the next item in the iteration @@ -3684,7 +3684,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( /* * Push the next search node in the search stack. */ - IEnumSTATSTGImpl_PushSearchNode(This, currentProperty.rightChild); + IEnumSTATSTGImpl_PushSearchNode(This, currentEntry.rightChild); /* * continue the iteration. @@ -3703,7 +3703,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( { IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; - DirEntry rootProperty; + DirEntry storageEntry; BOOL readSuccessful; /* @@ -3712,21 +3712,21 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( This->stackSize = 0; /* - * Read the root property from the storage. + * Read the storage entry from the top-level storage. */ readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, This->storageDirEntry, - &rootProperty); + &storageEntry); if (readSuccessful) { - assert(rootProperty.sizeOfNameString!=0); + assert(storageEntry.sizeOfNameString!=0); /* * Push the search node in the search stack. */ - IEnumSTATSTGImpl_PushSearchNode(This, rootProperty.dirRootEntry); + IEnumSTATSTGImpl_PushSearchNode(This, storageEntry.dirRootEntry); } return S_OK; @@ -3779,7 +3779,7 @@ static void IEnumSTATSTGImpl_PushSearchNode( IEnumSTATSTGImpl* This, ULONG nodeToPush) { - DirEntry rootProperty; + DirEntry storageEntry; BOOL readSuccessful; /* @@ -3806,21 +3806,21 @@ static void IEnumSTATSTGImpl_PushSearchNode( This->stackSize++; /* - * Read the root property from the storage. + * Read the storage entry from the top-level storage. */ readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, nodeToPush, - &rootProperty); + &storageEntry); if (readSuccessful) { - assert(rootProperty.sizeOfNameString!=0); + assert(storageEntry.sizeOfNameString!=0); /* * Push the previous search node in the search stack. */ - IEnumSTATSTGImpl_PushSearchNode(This, rootProperty.leftChild); + IEnumSTATSTGImpl_PushSearchNode(This, storageEntry.leftChild); } }

1 0

Vincent Povirk : ole32: Rename property variables in StorageInternalImpl_Construct.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 3aa8cdec7b7ea4c6d9717cc8a772f5dd0a502a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa8cdec7b7ea4c6d9717cc8a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:03:09 2009 -0600 ole32: Rename property variables in StorageInternalImpl_Construct. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fc5872c..3210f55 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3933,7 +3933,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static StorageInternalImpl* StorageInternalImpl_Construct( StorageImpl* ancestorStorage, DWORD openFlags, - ULONG rootPropertyIndex) + ULONG storageDirEntry) { StorageInternalImpl* newStorage; @@ -3959,9 +3959,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.ancestorStorage = ancestorStorage; /* - * Keep the index of the root property set for this storage, + * Keep a reference to the directory entry of this storage */ - newStorage->base.storageDirEntry = rootPropertyIndex; + newStorage->base.storageDirEntry = storageDirEntry; return newStorage; }

1 0

Vincent Povirk : ole32: Rename property variables in BlockChainStream methods.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 8f2d0f888768c66b42c410f067f0f60a883edd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2d0f888768c66b42c410f06… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:05:51 2009 -0600 ole32: Rename property variables in BlockChainStream methods. --- dlls/ole32/storage32.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3210f55..5e828a6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4146,13 +4146,13 @@ void BlockChainStream_Destroy(BlockChainStream* This) * BlockChainStream_GetHeadOfChain * * Returns the head of this stream chain. - * Some special chains don't have properties, their heads are kept in + * Some special chains don't have directory entries, their heads are kept in * This->headOfStreamPlaceHolder. * */ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; BOOL readSuccessful; if (This->headOfStreamPlaceHolder != 0) @@ -4163,11 +4163,11 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); if (readSuccessful) { - return chainProperty.startingBlock; + return chainEntry.startingBlock; } } @@ -4494,20 +4494,20 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, } else { - DirEntry chainProp; + DirEntry chainEntry; assert(This->ownerDirEntry != DIRENTRY_NULL); StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); - chainProp.startingBlock = blockIndex; + chainEntry.startingBlock = blockIndex; StorageImpl_WriteDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); } This->tailIndex = blockIndex; @@ -4610,29 +4610,28 @@ BOOL BlockChainStream_SetSize( * BlockChainStream_GetSize * * Returns the size of this chain. - * Will return the block count if this chain doesn't have a property. + * Will return the block count if this chain doesn't have a directory entry. */ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; if(This->headOfStreamPlaceHolder == NULL) { /* - * This chain is a data stream read the property and return - * the appropriate size + * This chain has a directory entry so use the size value from there. */ StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); - return chainProperty.size; + return chainEntry.size; } else { /* - * this chain is a chain that does not have a property, figure out the + * this chain is a chain that does not have a directory entry, figure out the * size by making the product number of used blocks times the * size of them */

1 0

Vincent Povirk : ole32: Rename property variables in SmallBlockChainStream methods.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: aca5cc52e1b283c3cafff5cda12bf00904976e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca5cc52e1b283c3cafff5cda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:07:39 2009 -0600 ole32: Rename property variables in SmallBlockChainStream methods. --- dlls/ole32/storage32.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5e828a6..c75dff0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4680,7 +4680,7 @@ void SmallBlockChainStream_Destroy( static ULONG SmallBlockChainStream_GetHeadOfChain( SmallBlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; BOOL readSuccessful; if (This->headOfStreamPlaceHolder != NULL) @@ -4691,11 +4691,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); if (readSuccessful) { - return chainProperty.startingBlock; + return chainEntry.startingBlock; } } @@ -4874,7 +4874,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( /* * We have just created the small block depot. */ - DirEntry rootProp; + DirEntry rootEntry; ULONG sbStartIndex; /* @@ -4897,16 +4897,16 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_ReadDirEntry( This->parentStorage, This->parentStorage->base.storageDirEntry, - &rootProp); + &rootEntry); - rootProp.startingBlock = sbStartIndex; - rootProp.size.u.HighPart = 0; - rootProp.size.u.LowPart = This->parentStorage->bigBlockSize; + rootEntry.startingBlock = sbStartIndex; + rootEntry.size.u.HighPart = 0; + rootEntry.size.u.LowPart = This->parentStorage->bigBlockSize; StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.storageDirEntry, - &rootProp); + &rootEntry); } else StorageImpl_SaveFileHeader(This->parentStorage); @@ -4921,27 +4921,27 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( */ if (blockIndex % smallBlocksPerBigBlock == 0) { - DirEntry rootProp; + DirEntry rootEntry; ULONG blocksRequired = (blockIndex / smallBlocksPerBigBlock) + 1; StorageImpl_ReadDirEntry( This->parentStorage, This->parentStorage->base.storageDirEntry, - &rootProp); + &rootEntry); - if (rootProp.size.u.LowPart < + if (rootEntry.size.u.LowPart < (blocksRequired * This->parentStorage->bigBlockSize)) { - rootProp.size.u.LowPart += This->parentStorage->bigBlockSize; + rootEntry.size.u.LowPart += This->parentStorage->bigBlockSize; BlockChainStream_SetSize( This->parentStorage->smallBlockRootChain, - rootProp.size); + rootEntry.size); StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.storageDirEntry, - &rootProp); + &rootEntry); } } @@ -5171,17 +5171,17 @@ static BOOL SmallBlockChainStream_Shrink( */ if (count == 0) { - DirEntry chainProp; + DirEntry chainEntry; StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); - chainProp.startingBlock = BLOCK_END_OF_CHAIN; + chainEntry.startingBlock = BLOCK_END_OF_CHAIN; StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); /* * We start freeing the chain at the head block. @@ -5249,15 +5249,15 @@ static BOOL SmallBlockChainStream_Enlarge( } else { - DirEntry chainProp; + DirEntry chainEntry; StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); - chainProp.startingBlock = blockIndex; + chainEntry.startingBlock = blockIndex; StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); } } @@ -5366,7 +5366,7 @@ static ULONG SmallBlockChainStream_GetCount(SmallBlockChainStream* This) */ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; if(This->headOfStreamPlaceHolder != NULL) { @@ -5382,9 +5382,9 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); - return chainProperty.size; + return chainEntry.size; } /******************************************************************************

1 0

Juan Lang : crypt32: Trace method used to find an issuer.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: f9ad32f0addb6309d35a867379fd7c9781af0e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ad32f0addb6309d35a86737… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 13:49:39 2009 -0800 crypt32: Trace method used to find an issuer. --- dlls/crypt32/chain.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c508c25..6344e67 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1505,7 +1505,10 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by issuer/serial number\n"); *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; + } } else if (info->KeyId.cbData) { @@ -1515,7 +1518,10 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by key id\n"); *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; + } } LocalFree(info); } @@ -1558,7 +1564,10 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by directory name\n"); *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; + } } else FIXME("no supported name type in authority key id2\n"); @@ -1571,7 +1580,10 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by key id\n"); *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; + } } LocalFree(info); } @@ -1581,6 +1593,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); + TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } return issuer;

1 0

Juan Lang : crypt32: Include name constraints errors in the chain' s error status.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 3c8a04f12f5b54e20af4c2767653086771b55c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8a04f12f5b54e20af4c2767… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 16:37:52 2009 -0800 crypt32: Include name constraints errors in the chain's error status. --- dlls/crypt32/chain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 6344e67..3badef1 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -816,8 +816,12 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) chain->rgpElement[j]->pCertContext->pCertInfo, &errorStatus); if (errorStatus) + { chain->rgpElement[i]->TrustStatus.dwErrorStatus |= errorStatus; + CRYPT_CombineTrustStatus(&chain->TrustStatus, + &chain->rgpElement[i]->TrustStatus); + } else chain->rgpElement[i]->TrustStatus.dwInfoStatus |= CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS;

1 0

Juan Lang : crypt32: Only compare the hostname portion of a URL when checking against a name constraint .
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e82005fe2dcd983769b09550e0f69f8bb36def05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82005fe2dcd983769b09550e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 17:44:42 2009 -0800 crypt32: Only compare the hostname portion of a URL when checking against a name constraint. --- dlls/crypt32/chain.c | 56 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3badef1..0fd9df7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -517,14 +517,58 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if (constraint[0] == '.') + else { - if (lstrlenW(name) > lstrlenW(constraint)) - match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), - constraint); + LPCWSTR colon, authority_end, at, hostname = NULL; + /* The maximum length for a hostname is 254 in the DNS, see RFC 1034 */ + WCHAR hostname_buf[255]; + + /* RFC 5280: only the hostname portion of the URL is compared. From + * section 4.2.1.10: + * "For URIs, the constraint applies to the host part of the name. + * The constraint MUST be specified as a fully qualified domain name + * and MAY specify a host or a domain." + * The format for URIs is in RFC 2396. + * + * First, remove any scheme that's present. */ + colon = strchrW(name, ':'); + if (colon && *(colon + 1) == '/' && *(colon + 2) == '/') + name = colon + 3; + /* Next, find the end of the authority component. (The authority is + * generally just the hostname, but it may contain a username or a port. + * Those are removed next.) + */ + authority_end = strchrW(name, '/'); + if (!authority_end) + authority_end = strchrW(name, '?'); + if (!authority_end) + authority_end = name + strlenW(name); + /* Remove any port number from the authority */ + for (colon = authority_end; colon >= name && *colon != ':'; colon--) + ; + if (*colon == ':') + authority_end = colon; + /* Remove any username from the authority */ + if ((at = strchrW(name, '@'))) + name = at; + /* Ignore any path or query portion of the URL. */ + if (*authority_end) + { + if (authority_end - name < sizeof(hostname_buf) / + sizeof(hostname_buf[0])) + { + memcpy(hostname_buf, name, + (authority_end - name) * sizeof(WCHAR)); + hostname_buf[authority_end - name] = 0; + hostname = hostname_buf; + } + /* else: Hostname is too long, not a match */ + } + else + hostname = name; + if (hostname) + match = !lstrcmpiW(constraint, hostname); } - else - match = !lstrcmpiW(constraint, name); return match; }

1 0

Juan Lang : crypt32: If a hostname in a URI or rfc822 name constraint doesn 't begin with '.', a match must be exact.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: b74ef17efc1a35a6593113d57069d880e001705e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74ef17efc1a35a6593113d57… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 17:51:55 2009 -0800 crypt32: If a hostname in a URI or rfc822 name constraint doesn't begin with '.', a match must be exact. --- dlls/crypt32/chain.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0fd9df7..9b09e61 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -506,6 +506,41 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, return validBasicConstraints; } +static BOOL domain_name_matches(LPCWSTR constraint, LPCWSTR name) +{ + BOOL match; + + /* RFC 5280, section 4.2.1.10: + * "For URIs, the constraint applies to the host part of the name... + * When the constraint begins with a period, it MAY be expanded with one + * or more labels. That is, the constraint ".example.com" is satisfied by + * both host.example.com and my.host.example.com. However, the constraint + * ".example.com" is not satisfied by "example.com". When the constraint + * does not begin with a period, it specifies a host." + * and for email addresses, + * "To indicate all Internet mail addresses on a particular host, the + * constraint is specified as the host name. For example, the constraint + * "example.com" is satisfied by any mail address at the host + * "example.com". To specify any address within a domain, the constraint + * is specified with a leading period (as with URIs)." + */ + if (constraint[0] == '.') + { + /* Must be strictly greater than, a name can't begin with '.' */ + if (lstrlenW(name) > lstrlenW(constraint)) + match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), + constraint); + else + { + /* name is too short, no match */ + match = FALSE; + } + } + else + match = !lstrcmpiW(name, constraint); + return match; +} + static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, DWORD *trustErrorStatus) { @@ -567,7 +602,7 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, else hostname = name; if (hostname) - match = !lstrcmpiW(constraint, hostname); + match = domain_name_matches(constraint, hostname); } return match; } @@ -589,7 +624,7 @@ static BOOL rfc822_name_matches(LPCWSTR constraint, LPCWSTR name, else { if ((at = strchrW(name, '@'))) - match = url_matches(constraint, at + 1, trustErrorStatus); + match = domain_name_matches(constraint, at + 1); else match = !lstrcmpiW(constraint, name); }

1 0

Juan Lang : crypt32: Correctly match subdomains with dns name constraints.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 1974e61b598007419637b74ea06ffdd777cf35ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1974e61b598007419637b74ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 18:05:11 2009 -0800 crypt32: Correctly match subdomains with dns name constraints. --- dlls/crypt32/chain.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 9b09e61..52ac5d9 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -642,9 +642,35 @@ static BOOL dns_name_matches(LPCWSTR constraint, LPCWSTR name, *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if (lstrlenW(name) >= lstrlenW(constraint)) + /* RFC 5280, section 4.2.1.10: + * "DNS name restrictions are expressed as host.example.com. Any DNS name + * that can be constructed by simply adding zero or more labels to the + * left-hand side of the name satisfies the name constraint. For example, + * www.host.example.com would satisfy the constraint but host1.example.com + * would not." + */ + else if (lstrlenW(name) == lstrlenW(constraint)) + match = !lstrcmpiW(name, constraint); + else if (lstrlenW(name) > lstrlenW(constraint)) + { match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), constraint); + if (match) + { + BOOL dot = FALSE; + LPCWSTR ptr; + + /* This only matches if name is a subdomain of constraint, i.e. + * there's a '.' between the beginning of the name and the + * matching portion of the name. + */ + for (ptr = name + lstrlenW(name) - lstrlenW(constraint); + !dot && ptr >= name; ptr--) + if (*ptr == '.') + dot = TRUE; + match = dot; + } + } /* else: name is too short, no match */ return match;

1 0

Roderick Colenbrander : wgl: The GLX context creation code isn' t needed anymore in wglCopyContext because we always have a GLX context now .
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 50a8b2a633bcdd313353d40df7d96da76843e8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a8b2a633bcdd313353d40df… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Nov 16 20:46:01 2009 +0100 wgl: The GLX context creation code isn't needed anymore in wglCopyContext because we always have a GLX context now. --- dlls/winex11.drv/opengl.c | 36 +----------------------------------- 1 files changed, 1 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 395e2a4..6277e8a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1630,41 +1630,7 @@ BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { TRACE("hglrcSrc: (%p), hglrcDst: (%p), mask: %#x\n", hglrcSrc, hglrcDst, mask); - /* There is a slight difference in the way GL contexts share display lists in WGL and GLX. - * In case of GLX you need to specify this at context creation time but in case of WGL you - * do this using wglShareLists which you can call after creating the context. - * To emulate WGL we try to delay the creation of the context until wglShareLists or wglMakeCurrent. - * Up to now that works fine. - * - * The delayed GLX context creation could cause issues for wglCopyContext as it might get called - * when there is no GLX context yet. The chance this will cause problems is small as at the time of - * writing Wine has had OpenGL support for more than 7 years and this function has remained a stub - * ever since then. - */ - if(!src->ctx || !dst->ctx) { - /* NOTE: As a special case, if both GLX contexts are NULL, that means - * neither WGL context was made current. In that case, both contexts - * are in a default state, so any copy would no-op. - */ - if(!src->ctx && !dst->ctx) { - TRACE("No source or destination contexts set. No-op.\n"); - return TRUE; - } - - if (!src->ctx) { - wine_tsx11_lock(); - src->ctx = create_glxcontext(gdi_display, src, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", src->ctx); - } - else if (!dst->ctx) { - wine_tsx11_lock(); - dst->ctx = create_glxcontext(gdi_display, dst, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", dst->ctx); - } - } - else - wine_tsx11_lock(); - + wine_tsx11_lock(); pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); wine_tsx11_unlock();

1 0