November 2009 - Wine-Commits

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

Nov. 17, 2009

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 Nov. 17, 2009

Nov. 17, 2009

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: If a hostname in a URI or rfc822 name constraint doesn 't begin with '.', a match must be exact.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

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 Nov. 17, 2009

Nov. 17, 2009

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

Vincent Povirk : ole32: Rename property variables in StorageImpl_Construct.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 26acdb3efd28074c91e33d8c53d70e3a3a24cfe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26acdb3efd28074c91e33d8c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:51:34 2009 -0600 ole32: Rename property variables in StorageImpl_Construct. --- dlls/ole32/storage32.c | 56 ++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 587a555..0050814 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2128,9 +2128,9 @@ static HRESULT StorageImpl_Construct( BOOL create) { HRESULT hr = S_OK; - DirEntry currentProperty; + DirEntry currentEntry; BOOL readSuccessful; - ULONG currentPropertyIndex; + ULONG currentEntryRef; if ( FAILED( validateSTGM(openFlags) )) return STG_E_INVALIDFLAG; @@ -2183,7 +2183,7 @@ static HRESULT StorageImpl_Construct( /* * Initialize all header variables: * - The big block depot consists of one block and it is at block 0 - * - The properties start at block 1 + * - The directory table starts at block 1 * - There is no small block depot */ memset( This->bigBlockDepotStart, @@ -2202,7 +2202,7 @@ static HRESULT StorageImpl_Construct( StorageImpl_SaveFileHeader(This); /* - * Add one block for the big block depot and one block for the properties + * Add one block for the big block depot and one block for the directory table */ size.u.HighPart = 0; size.u.LowPart = This->bigBlockSize * 3; @@ -2254,51 +2254,51 @@ static HRESULT StorageImpl_Construct( return STG_E_READFAULT; /* - * Write the root property (memory only) + * Write the root storage entry (memory only) */ if (create) { - DirEntry rootProp; + DirEntry rootEntry; /* - * Initialize the property chain + * Initialize the directory table */ - memset(&rootProp, 0, sizeof(rootProp)); - MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootProp.name, - sizeof(rootProp.name)/sizeof(WCHAR) ); - rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); - rootProp.stgType = STGTY_ROOT; - rootProp.leftChild = DIRENTRY_NULL; - rootProp.rightChild = DIRENTRY_NULL; - rootProp.dirRootEntry = DIRENTRY_NULL; - rootProp.startingBlock = BLOCK_END_OF_CHAIN; - rootProp.size.u.HighPart = 0; - rootProp.size.u.LowPart = 0; + memset(&rootEntry, 0, sizeof(rootEntry)); + MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootEntry.name, + sizeof(rootEntry.name)/sizeof(WCHAR) ); + rootEntry.sizeOfNameString = (strlenW(rootEntry.name)+1) * sizeof(WCHAR); + rootEntry.stgType = STGTY_ROOT; + rootEntry.leftChild = DIRENTRY_NULL; + rootEntry.rightChild = DIRENTRY_NULL; + rootEntry.dirRootEntry = DIRENTRY_NULL; + rootEntry.startingBlock = BLOCK_END_OF_CHAIN; + rootEntry.size.u.HighPart = 0; + rootEntry.size.u.LowPart = 0; - StorageImpl_WriteDirEntry(This, 0, &rootProp); + StorageImpl_WriteDirEntry(This, 0, &rootEntry); } /* - * Find the ID of the root in the property sets. + * Find the ID of the root storage. */ - currentPropertyIndex = 0; + currentEntryRef = 0; do { readSuccessful = StorageImpl_ReadDirEntry( This, - currentPropertyIndex, - &currentProperty); + currentEntryRef, + &currentEntry); if (readSuccessful) { - if ( (currentProperty.sizeOfNameString != 0 ) && - (currentProperty.stgType == STGTY_ROOT) ) + if ( (currentEntry.sizeOfNameString != 0 ) && + (currentEntry.stgType == STGTY_ROOT) ) { - This->base.storageDirEntry = currentPropertyIndex; + This->base.storageDirEntry = currentEntryRef; } } - currentPropertyIndex++; + currentEntryRef++; } while (readSuccessful && (This->base.storageDirEntry == DIRENTRY_NULL) );

1 0

Vincent Povirk : ole32: Rename property variables in internal storage functions.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: f1861166bbe4f784a82426314d8fdb2fee03d782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1861166bbe4f784a82426314… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:47:07 2009 -0600 ole32: Rename property variables in internal storage functions. --- dlls/ole32/storage32.c | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0c27f0d..587a555 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1093,8 +1093,8 @@ static HRESULT createDirEntry( const DirEntry *newData, ULONG *index) { - ULONG currentPropertyIndex = 0; - ULONG newPropertyIndex = DIRENTRY_NULL; + ULONG currentEntryIndex = 0; + ULONG newEntryIndex = DIRENTRY_NULL; HRESULT hr = S_OK; BYTE currentData[RAW_DIRENTRY_SIZE]; WORD sizeOfNameString; @@ -1102,7 +1102,7 @@ static HRESULT createDirEntry( do { hr = StorageImpl_ReadRawDirEntry(storage, - currentPropertyIndex, + currentEntryIndex, currentData); if (SUCCEEDED(hr)) @@ -1115,79 +1115,79 @@ static HRESULT createDirEntry( if (sizeOfNameString == 0) { /* - * The property existis and is available, we found it. + * The entry exists and is available, we found it. */ - newPropertyIndex = currentPropertyIndex; + newEntryIndex = currentEntryIndex; } } else { /* - * We exhausted the property list, we will create more space below + * We exhausted the directory entries, we will create more space below */ - newPropertyIndex = currentPropertyIndex; + newEntryIndex = currentEntryIndex; } - currentPropertyIndex++; + currentEntryIndex++; - } while (newPropertyIndex == DIRENTRY_NULL); + } while (newEntryIndex == DIRENTRY_NULL); /* - * grow the property chain + * grow the directory stream */ if (FAILED(hr)) { BYTE emptyData[RAW_DIRENTRY_SIZE]; ULARGE_INTEGER newSize; - ULONG propertyIndex; - ULONG lastProperty = 0; + ULONG entryIndex; + ULONG lastEntry = 0; ULONG blockCount = 0; /* - * obtain the new count of property blocks + * obtain the new count of blocks in the directory stream */ blockCount = BlockChainStream_GetCount( storage->rootBlockChain)+1; /* - * initialize the size used by the property stream + * initialize the size used by the directory stream */ newSize.u.HighPart = 0; newSize.u.LowPart = storage->bigBlockSize * blockCount; /* - * add a property block to the property chain + * add a block to the directory stream */ BlockChainStream_SetSize(storage->rootBlockChain, newSize); /* - * memset the empty property in order to initialize the unused newly - * created property + * memset the empty entry in order to initialize the unused newly + * created entries */ memset(&emptyData, 0, RAW_DIRENTRY_SIZE); /* * initialize them */ - lastProperty = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; + lastEntry = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; for( - propertyIndex = newPropertyIndex + 1; - propertyIndex < lastProperty; - propertyIndex++) + entryIndex = newEntryIndex + 1; + entryIndex < lastEntry; + entryIndex++) { StorageImpl_WriteRawDirEntry( storage, - propertyIndex, + entryIndex, emptyData); } } UpdateRawDirEntry(currentData, newData); - hr = StorageImpl_WriteRawDirEntry(storage, newPropertyIndex, currentData); + hr = StorageImpl_WriteRawDirEntry(storage, newEntryIndex, currentData); if (SUCCEEDED(hr)) - *index = newPropertyIndex; + *index = newEntryIndex; return hr; } @@ -1245,7 +1245,7 @@ static LONG entryNameCmp( * * Internal Method * - * Properly link this new element in the property chain. + * Add a directory entry to a storage */ static HRESULT insertIntoTree( StorageImpl *This, @@ -1256,14 +1256,14 @@ static HRESULT insertIntoTree( DirEntry newEntry; /* - * Read the inserted property + * Read the inserted entry */ StorageImpl_ReadDirEntry(This, newEntryIndex, &newEntry); /* - * Read the root property + * Read the storage entry */ StorageImpl_ReadDirEntry(This, parentStorageIndex, @@ -1279,7 +1279,7 @@ static HRESULT insertIntoTree( ULONG current, next, previous, currentEntryId; /* - * Keep the DirEntry sequence number of the storage first property + * Keep a reference to the root of the storage's element tree */ currentEntryId = currentEntry.dirRootEntry; @@ -1350,7 +1350,7 @@ static HRESULT insertIntoTree( else { /* - * The root storage is empty, link the new property to its dir property + * The storage is empty, make the new entry the root of its element tree */ currentEntry.dirRootEntry = newEntryIndex; StorageImpl_WriteDirEntry(This, @@ -1944,18 +1944,18 @@ static HRESULT deleteStreamContents( return S_OK; } -static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target) +static void setEntryLink(DirEntry *entry, ULONG relation, ULONG new_target) { switch (relation) { case DIRENTRY_RELATION_PREVIOUS: - property->leftChild = new_target; + entry->leftChild = new_target; break; case DIRENTRY_RELATION_NEXT: - property->rightChild = new_target; + entry->rightChild = new_target; break; case DIRENTRY_RELATION_DIR: - property->dirRootEntry = new_target; + entry->dirRootEntry = new_target; break; default: assert(0); @@ -1976,69 +1976,69 @@ static HRESULT removeFromTree( { HRESULT hr = S_OK; BOOL res = TRUE; - DirEntry propertyToDelete; - DirEntry parentProperty; - ULONG parentPropertyId; + DirEntry entryToDelete; + DirEntry parentEntry; + ULONG parentEntryRef; ULONG typeOfRelation; - res = StorageImpl_ReadDirEntry(This, deletedIndex, &propertyToDelete); + res = StorageImpl_ReadDirEntry(This, deletedIndex, &entryToDelete); /* - * Find the property that links to the one we want to delete. + * Find the element that links to the one we want to delete. */ - hr = findTreeParent(This, parentStorageIndex, propertyToDelete.name, - &parentProperty, &parentPropertyId, &typeOfRelation); + hr = findTreeParent(This, parentStorageIndex, entryToDelete.name, + &parentEntry, &parentEntryRef, &typeOfRelation); if (hr != S_OK) return hr; - if (propertyToDelete.leftChild != DIRENTRY_NULL) + if (entryToDelete.leftChild != DIRENTRY_NULL) { /* * Replace the deleted entry with its left child */ - setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); + setEntryLink(&parentEntry, typeOfRelation, entryToDelete.leftChild); res = StorageImpl_WriteDirEntry( This, - parentPropertyId, - &parentProperty); + parentEntryRef, + &parentEntry); if(!res) { return E_FAIL; } - if (propertyToDelete.rightChild != DIRENTRY_NULL) + if (entryToDelete.rightChild != DIRENTRY_NULL) { /* * We need to reinsert the right child somewhere. We already know it and * its children are greater than everything in the left tree, so we * insert it at the rightmost point in the left tree. */ - ULONG newRightChildParent = propertyToDelete.leftChild; - DirEntry newRightChildParentProperty; + ULONG newRightChildParent = entryToDelete.leftChild; + DirEntry newRightChildParentEntry; do { res = StorageImpl_ReadDirEntry( This, newRightChildParent, - &newRightChildParentProperty); + &newRightChildParentEntry); if (!res) { return E_FAIL; } - if (newRightChildParentProperty.rightChild != DIRENTRY_NULL) - newRightChildParent = newRightChildParentProperty.rightChild; - } while (newRightChildParentProperty.rightChild != DIRENTRY_NULL); + if (newRightChildParentEntry.rightChild != DIRENTRY_NULL) + newRightChildParent = newRightChildParentEntry.rightChild; + } while (newRightChildParentEntry.rightChild != DIRENTRY_NULL); - newRightChildParentProperty.rightChild = propertyToDelete.rightChild; + newRightChildParentEntry.rightChild = entryToDelete.rightChild; res = StorageImpl_WriteDirEntry( This, newRightChildParent, - &newRightChildParentProperty); + &newRightChildParentEntry); if (!res) { return E_FAIL; @@ -2050,12 +2050,12 @@ static HRESULT removeFromTree( /* * Replace the deleted entry with its right child */ - setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); + setEntryLink(&parentEntry, typeOfRelation, entryToDelete.rightChild); res = StorageImpl_WriteDirEntry( This, - parentPropertyId, - &parentProperty); + parentEntryRef, + &parentEntry); if(!res) { return E_FAIL;

1 0

Vincent Povirk : ole32: Rename property variables in internal StorageImpl methods.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: d21d690ac5be777f4cefd0571b1e96f1c4402276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21d690ac5be777f4cefd0571… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:54:23 2009 -0600 ole32: Rename property variables in internal StorageImpl 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 0050814..f975ca3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2988,7 +2988,7 @@ static void StorageImpl_SaveFileHeader( * * This method will read the raw data from a directory entry in the file. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer) { @@ -3014,7 +3014,7 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer * * This method will write the raw data from a directory entry in the file. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE *buffer) { @@ -3040,7 +3040,7 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE * * Update raw directory entry data from the fields in newData. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) { @@ -3110,87 +3110,87 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) } /****************************************************************************** - * Storage32Impl_ReadProperty + * Storage32Impl_ReadDirEntry * - * This method will read the specified property from the property chain. + * This method will read the specified directory entry. */ BOOL StorageImpl_ReadDirEntry( StorageImpl* This, ULONG index, DirEntry* buffer) { - BYTE currentProperty[RAW_DIRENTRY_SIZE]; + BYTE currentEntry[RAW_DIRENTRY_SIZE]; HRESULT readRes; - readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); + readRes = StorageImpl_ReadRawDirEntry(This, index, currentEntry); if (SUCCEEDED(readRes)) { /* replace the name of root entry (often "Root Entry") by the file name */ - WCHAR *propName = (index == This->base.storageDirEntry) ? - This->filename : (WCHAR *)currentProperty+OFFSET_PS_NAME; + WCHAR *entryName = (index == This->base.storageDirEntry) ? + This->filename : (WCHAR *)currentEntry+OFFSET_PS_NAME; memset(buffer->name, 0, sizeof(buffer->name)); memcpy( buffer->name, - propName, + entryName, DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); - memcpy(&buffer->stgType, currentProperty + OFFSET_PS_STGTYPE, 1); + memcpy(&buffer->stgType, currentEntry + OFFSET_PS_STGTYPE, 1); StorageUtl_ReadWord( - currentProperty, + currentEntry, OFFSET_PS_NAMELENGTH, &buffer->sizeOfNameString); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_LEFTCHILD, &buffer->leftChild); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_RIGHTCHILD, &buffer->rightChild); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_DIRROOT, &buffer->dirRootEntry); StorageUtl_ReadGUID( - currentProperty, + currentEntry, OFFSET_PS_GUID, &buffer->clsid); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_CTIMELOW, &buffer->ctime.dwLowDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_CTIMEHIGH, &buffer->ctime.dwHighDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_MTIMELOW, &buffer->mtime.dwLowDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_MTIMEHIGH, &buffer->mtime.dwHighDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_STARTBLOCK, &buffer->startingBlock); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_SIZE, &buffer->size.u.LowPart); @@ -3201,19 +3201,19 @@ BOOL StorageImpl_ReadDirEntry( } /********************************************************************* - * Write the specified property into the property chain + * Write the specified directory entry to the file */ BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer) { - BYTE currentProperty[RAW_DIRENTRY_SIZE]; + BYTE currentEntry[RAW_DIRENTRY_SIZE]; HRESULT writeRes; - UpdateRawDirEntry(currentProperty, buffer); + UpdateRawDirEntry(currentEntry, buffer); - writeRes = StorageImpl_WriteRawDirEntry(This, index, currentProperty); + writeRes = StorageImpl_WriteRawDirEntry(This, index, currentEntry); return SUCCEEDED(writeRes) ? TRUE : FALSE; }

1 0

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

Nov. 17, 2009

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

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

Nov. 17, 2009

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

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

Nov. 17, 2009

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