November 2009 - Wine-Commits

Vincent Povirk : ole32: Rename property variables in insertIntoTree.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: a9ad3fed29cfadfd13787ad6ad4f02e7ccf461f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ad3fed29cfadfd13787ad6a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:51:17 2009 -0600 ole32: Rename property variables in insertIntoTree. --- 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 c5bdd62..0cc5413 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -190,7 +190,7 @@ static HRESULT destroyDirEntry( static HRESULT insertIntoTree( StorageImpl *This, ULONG parentStorageIndex, - ULONG newPropertyIndex); + ULONG newEntryIndex); static LONG propertyNameCmp( const OLECHAR *newProperty, @@ -1253,53 +1253,53 @@ static LONG propertyNameCmp( static HRESULT insertIntoTree( StorageImpl *This, ULONG parentStorageIndex, - ULONG newPropertyIndex) + ULONG newEntryIndex) { - DirEntry currentProperty; - DirEntry newProperty; + DirEntry currentEntry; + DirEntry newEntry; /* * Read the inserted property */ StorageImpl_ReadDirEntry(This, - newPropertyIndex, - &newProperty); + newEntryIndex, + &newEntry); /* * Read the root property */ StorageImpl_ReadDirEntry(This, parentStorageIndex, - &currentProperty); + &currentEntry); - if (currentProperty.dirRootEntry != DIRENTRY_NULL) + if (currentEntry.dirRootEntry != DIRENTRY_NULL) { /* * The root storage contains some element, therefore, start the research * for the appropriate location. */ BOOL found = 0; - ULONG current, next, previous, currentPropertyId; + ULONG current, next, previous, currentEntryId; /* * Keep the DirEntry sequence number of the storage first property */ - currentPropertyId = currentProperty.dirRootEntry; + currentEntryId = currentEntry.dirRootEntry; /* * Read */ StorageImpl_ReadDirEntry(This, - currentProperty.dirRootEntry, - &currentProperty); + currentEntry.dirRootEntry, + &currentEntry); - previous = currentProperty.leftChild; - next = currentProperty.rightChild; - current = currentPropertyId; + previous = currentEntry.leftChild; + next = currentEntry.rightChild; + current = currentEntryId; while (found == 0) { - LONG diff = propertyNameCmp( newProperty.name, currentProperty.name); + LONG diff = propertyNameCmp( newEntry.name, currentEntry.name); if (diff < 0) { @@ -1307,15 +1307,15 @@ static HRESULT insertIntoTree( { StorageImpl_ReadDirEntry(This, previous, - &currentProperty); + &currentEntry); current = previous; } else { - currentProperty.leftChild = newPropertyIndex; + currentEntry.leftChild = newEntryIndex; StorageImpl_WriteDirEntry(This, current, - &currentProperty); + &currentEntry); found = 1; } } @@ -1325,15 +1325,15 @@ static HRESULT insertIntoTree( { StorageImpl_ReadDirEntry(This, next, - &currentProperty); + &currentEntry); current = next; } else { - currentProperty.rightChild = newPropertyIndex; + currentEntry.rightChild = newEntryIndex; StorageImpl_WriteDirEntry(This, current, - &currentProperty); + &currentEntry); found = 1; } } @@ -1346,8 +1346,8 @@ static HRESULT insertIntoTree( return STG_E_FILEALREADYEXISTS; } - previous = currentProperty.leftChild; - next = currentProperty.rightChild; + previous = currentEntry.leftChild; + next = currentEntry.rightChild; } } else @@ -1355,10 +1355,10 @@ static HRESULT insertIntoTree( /* * The root storage is empty, link the new property to its dir property */ - currentProperty.dirRootEntry = newPropertyIndex; + currentEntry.dirRootEntry = newEntryIndex; StorageImpl_WriteDirEntry(This, parentStorageIndex, - &currentProperty); + &currentEntry); } return S_OK;

1 0

Vincent Povirk : ole32: Rename propertyNameCmp to entryNameCmp.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 42e8dfa2cb9417efbc0bee611ea09a0de9dccf77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e8dfa2cb9417efbc0bee611… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:55:49 2009 -0600 ole32: Rename propertyNameCmp to entryNameCmp. --- dlls/ole32/storage32.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0cc5413..9040a97 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -192,9 +192,9 @@ static HRESULT insertIntoTree( ULONG parentStorageIndex, ULONG newEntryIndex); -static LONG propertyNameCmp( - const OLECHAR *newProperty, - const OLECHAR *currentProperty); +static LONG entryNameCmp( + const OLECHAR *name1, + const OLECHAR *name2); static ULONG findElement( StorageImpl *storage, @@ -1223,22 +1223,22 @@ static HRESULT destroyDirEntry( * Case insensitive comparison of DirEntry.name by first considering * their size. * - * Returns <0 when newProperty < currentProperty - * >0 when newProperty > currentProperty - * 0 when newProperty == currentProperty + * Returns <0 when name1 < name2 + * >0 when name1 > name2 + * 0 when name1 == name2 */ -static LONG propertyNameCmp( - const OLECHAR *newProperty, - const OLECHAR *currentProperty) +static LONG entryNameCmp( + const OLECHAR *name1, + const OLECHAR *name2) { - LONG diff = lstrlenW(newProperty) - lstrlenW(currentProperty); + LONG diff = lstrlenW(name1) - lstrlenW(name2); if (diff == 0) { /* * We compare the string themselves only when they are of the same length */ - diff = lstrcmpiW( newProperty, currentProperty); + diff = lstrcmpiW( name1, name2); } return diff; @@ -1299,7 +1299,7 @@ static HRESULT insertIntoTree( while (found == 0) { - LONG diff = propertyNameCmp( newEntry.name, currentEntry.name); + LONG diff = entryNameCmp( newEntry.name, currentEntry.name); if (diff < 0) { @@ -1386,7 +1386,7 @@ static ULONG findElement(StorageImpl *storage, ULONG storageEntry, StorageImpl_ReadDirEntry(storage, currentEntry, data); - cmp = propertyNameCmp(name, data->name); + cmp = entryNameCmp(name, data->name); if (cmp == 0) /* found it */ @@ -1432,7 +1432,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, StorageImpl_ReadDirEntry(storage, childEntry, &childData); - cmp = propertyNameCmp(childName, childData.name); + cmp = entryNameCmp(childName, childData.name); if (cmp == 0) /* found it */

1 0

Juan Lang : crypt32: Fix more test failures.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 8adc75b3ec630219f609913f1ae943f09626c421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adc75b3ec630219f609913f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 10:58:50 2009 -0800 crypt32: Fix more test failures. --- dlls/crypt32/tests/chain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e48dba3..bfdf203 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3034,8 +3034,7 @@ static const SimpleChainStatusCheck simpleStatus27[] = { static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | - CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), @@ -3408,7 +3407,8 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + 0 }, 1, simpleStatus27Broken }, 0 };

1 0

Aurimas Fišeras : mshtml: Update Lithuanain translation.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: fdd99387544e1341649aec7cb09ddae707ab80b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd99387544e1341649aec7cb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Nov 13 22:03:56 2009 +0200 mshtml: Update Lithuanain translation. --- dlls/mshtml/Lt.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index 9883bb4..8f7e772 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -31,18 +31,18 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Įdiegiama..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 105 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko diegimo programa" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine nepavyko rasti Gecko paketo reikalingo programoms įterpiančioms HTML " \ + "teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n\n" \ + "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 + DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 80, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

Juan Lang : crypt32: Set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS when a certificate' s name constraints are met.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: c4b997bab3d530339c89370cda337f8b3e415129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b997bab3d530339c89370cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 17:05:07 2009 -0800 crypt32: Set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS when a certificate's name constraints are met. --- dlls/crypt32/chain.c | 8 ++++++-- dlls/crypt32/tests/chain.c | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index eb6d757..17471d5 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -815,8 +815,12 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) CRYPT_CheckNameConstraints(nameConstraints, chain->rgpElement[j]->pCertContext->pCertInfo, &errorStatus); - chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - errorStatus; + if (errorStatus) + chain->rgpElement[i]->TrustStatus.dwErrorStatus |= + errorStatus; + else + chain->rgpElement[i]->TrustStatus.dwInfoStatus |= + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS; } } } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index be3a0bd..e48dba3 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2927,7 +2927,8 @@ static CONST_DATA_BLOB chain19[] = { static const CERT_TRUST_STATUS elementStatus19[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus19[] = { { sizeof(elementStatus19) / sizeof(elementStatus19[0]), elementStatus19 }, @@ -2951,7 +2952,8 @@ static CONST_DATA_BLOB chain21[] = { static const CERT_TRUST_STATUS elementStatus21[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus21[] = { { sizeof(elementStatus21) / sizeof(elementStatus21[0]), elementStatus21 }, @@ -3257,7 +3259,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus19 }, 0 }, /* Older versions of crypt32 do not set @@ -3278,7 +3280,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus21 }, 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 },

1 0

Vincent Povirk : ole32: Rename deleteSt*Property to deleteSt*Contents.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 14647d7ca9cea8493284db0fc7395f87104cc85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14647d7ca9cea8493284db0fc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:46:04 2009 -0600 ole32: Rename deleteSt*Property to deleteSt*Contents. We now only delete the node contents in these functions. --- dlls/ole32/storage32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9682a1e..c5bdd62 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -159,15 +159,15 @@ typedef struct /*********************************************************************** * Forward declaration of internal functions used by the method DestroyElement */ -static HRESULT deleteStorageProperty( +static HRESULT deleteStorageContents( StorageBaseImpl *parentStorage, - ULONG foundPropertyIndexToDelete, - DirEntry propertyToDelete); + ULONG indexToDelete, + DirEntry entryDataToDelete); -static HRESULT deleteStreamProperty( +static HRESULT deleteStreamContents( StorageBaseImpl *parentStorage, - ULONG foundPropertyIndexToDelete, - DirEntry propertyToDelete); + ULONG indexToDelete, + DirEntry entryDataToDelete); static HRESULT removeFromTree( StorageImpl *This, @@ -1746,14 +1746,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if ( propertyToDelete.stgType == STGTY_STORAGE ) { - hr = deleteStorageProperty( + hr = deleteStorageContents( This, foundPropertyIndexToDelete, propertyToDelete); } else if ( propertyToDelete.stgType == STGTY_STREAM ) { - hr = deleteStreamProperty( + hr = deleteStreamContents( This, foundPropertyIndexToDelete, propertyToDelete); @@ -1839,13 +1839,13 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) * * Internal Method * - * Perform the deletion of a complete storage node + * Delete the contents of a storage entry. * */ -static HRESULT deleteStorageProperty( +static HRESULT deleteStorageContents( StorageBaseImpl *parentStorage, - ULONG indexOfPropertyToDelete, - DirEntry propertyToDelete) + ULONG indexToDelete, + DirEntry entryDataToDelete) { IEnumSTATSTG *elements = 0; IStorage *childStorage = 0; @@ -1858,7 +1858,7 @@ static HRESULT deleteStorageProperty( */ hr = StorageBaseImpl_OpenStorage( (IStorage*)parentStorage, - propertyToDelete.name, + entryDataToDelete.name, 0, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, @@ -1906,13 +1906,13 @@ static HRESULT deleteStorageProperty( * * Internal Method * - * Perform the deletion of a stream node + * Perform the deletion of a stream's data * */ -static HRESULT deleteStreamProperty( +static HRESULT deleteStreamContents( StorageBaseImpl *parentStorage, - ULONG indexOfPropertyToDelete, - DirEntry propertyToDelete) + ULONG indexToDelete, + DirEntry entryDataToDelete) { IStream *pis; HRESULT hr; @@ -1922,7 +1922,7 @@ static HRESULT deleteStreamProperty( size.u.LowPart = 0; hr = StorageBaseImpl_OpenStream((IStorage*)parentStorage, - propertyToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); + entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); if (hr!=S_OK) {

1 0

Vincent Povirk : ole32: Rename BlockChainStream. ownerPropertyIndex to ownerDirEntry.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 848caa51685f771a1897898e7880349d5a19ce0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=848caa51685f771a1897898e7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:31:25 2009 -0600 ole32: Rename BlockChainStream.ownerPropertyIndex to ownerDirEntry. --- dlls/ole32/storage32.c | 18 +++++++++--------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0bff0f4..0701c5a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3470,7 +3470,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( } /* destroy the original big block chain */ - propertyIndex = (*ppbbChain)->ownerPropertyIndex; + propertyIndex = (*ppbbChain)->ownerDirEntry; BlockChainStream_SetSize(*ppbbChain, size); BlockChainStream_Destroy(*ppbbChain); *ppbbChain = NULL; @@ -4106,7 +4106,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( BlockChainStream* BlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex) + ULONG dirEntry) { BlockChainStream* newStream; ULONG blockIndex; @@ -4115,7 +4115,7 @@ BlockChainStream* BlockChainStream_Construct( newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; - newStream->ownerPropertyIndex = propertyIndex; + newStream->ownerDirEntry = dirEntry; newStream->lastBlockNoInSequence = 0xFFFFFFFF; newStream->tailIndex = BLOCK_END_OF_CHAIN; newStream->numBlocks = 0; @@ -4161,11 +4161,11 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) if (This->headOfStreamPlaceHolder != 0) return *(This->headOfStreamPlaceHolder); - if (This->ownerPropertyIndex != DIRENTRY_NULL) + if (This->ownerDirEntry != DIRENTRY_NULL) { readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); if (readSuccessful) @@ -4498,18 +4498,18 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, else { DirEntry chainProp; - assert(This->ownerPropertyIndex != DIRENTRY_NULL); + assert(This->ownerDirEntry != DIRENTRY_NULL); StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); chainProp.startingBlock = blockIndex; StorageImpl_WriteDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); } @@ -4627,7 +4627,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) */ StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); return chainProperty.size; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 566e541..41dd9bd 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -431,7 +431,7 @@ struct BlockChainStream { StorageImpl* parentStorage; ULONG* headOfStreamPlaceHolder; - ULONG ownerPropertyIndex; + ULONG ownerDirEntry; ULONG lastBlockNoInSequence; ULONG lastBlockNoInSequenceIndex; ULONG tailIndex; @@ -444,7 +444,7 @@ struct BlockChainStream BlockChainStream* BlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex); + ULONG dirEntry); void BlockChainStream_Destroy( BlockChainStream* This);

1 0

Vincent Povirk : ole32: Rename rootPropertySetIndex to storageDirEntry.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 4ba13cb9a725422a7cfd1ce93810b22551f91375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba13cb9a725422a7cfd1ce93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:19:37 2009 -0600 ole32: Rename rootPropertySetIndex to storageDirEntry. Not only is it not related to property set storages, it's also not the root of the tree that's used to search for elements. --- dlls/ole32/storage32.c | 50 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 5 +-- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a834a46..f2d856b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -443,7 +443,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( */ foundPropertyIndex = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -551,7 +551,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( foundPropertyIndex = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -610,7 +610,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( newEnum = IEnumSTATSTGImpl_Construct( This->ancestorStorage, - This->rootPropertySetIndex); + This->storageDirEntry); if (newEnum!=0) { @@ -652,7 +652,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( readSuccessful = StorageImpl_ReadDirEntry( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (readSuccessful) @@ -700,7 +700,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName)); foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsNewName, &currentProperty); @@ -716,14 +716,14 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( * Search for the old element name */ foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsOldName, &currentProperty); if (foundPropertyIndex != DIRENTRY_NULL) { /* Remove the element from its current position in the tree */ - removeFromTree(This->ancestorStorage, This->rootPropertySetIndex, + removeFromTree(This->ancestorStorage, This->storageDirEntry, foundPropertyIndex); /* Change the name of the element */ @@ -733,7 +733,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( &currentProperty); /* Insert the element in a new position in the tree */ - insertIntoTree(This->ancestorStorage, This->rootPropertySetIndex, + insertIntoTree(This->ancestorStorage, This->storageDirEntry, foundPropertyIndex); } else @@ -812,7 +812,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( *ppstm = 0; foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -884,7 +884,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ insertIntoTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, newPropertyIndex); /* @@ -926,14 +926,14 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( TRACE("(%p, %p)\n", iface, clsid); success = StorageImpl_ReadDirEntry(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (success) { curProperty.clsid = *clsid; success = StorageImpl_WriteDirEntry(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (success) hRes = S_OK; @@ -998,7 +998,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( } foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -1067,7 +1067,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( */ insertIntoTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, newPropertyIndex); /* @@ -1735,7 +1735,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( foundPropertyIndexToDelete = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &propertyToDelete); @@ -1767,7 +1767,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( */ hr = removeFromTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, foundPropertyIndexToDelete); /* @@ -2297,13 +2297,13 @@ static HRESULT StorageImpl_Construct( if ( (currentProperty.sizeOfNameString != 0 ) && (currentProperty.stgType == STGTY_ROOT) ) { - This->base.rootPropertySetIndex = currentPropertyIndex; + This->base.storageDirEntry = currentPropertyIndex; } } currentPropertyIndex++; - } while (readSuccessful && (This->base.rootPropertySetIndex == DIRENTRY_NULL) ); + } while (readSuccessful && (This->base.storageDirEntry == DIRENTRY_NULL) ); if (!readSuccessful) { @@ -2315,7 +2315,7 @@ static HRESULT StorageImpl_Construct( * Create the block chain abstraction for the small block root chain. */ if(!(This->smallBlockRootChain = - BlockChainStream_Construct(This, NULL, This->base.rootPropertySetIndex))) + BlockChainStream_Construct(This, NULL, This->base.storageDirEntry))) return STG_E_READFAULT; return hr; @@ -3130,7 +3130,7 @@ BOOL StorageImpl_ReadDirEntry( if (SUCCEEDED(readRes)) { /* replace the name of root entry (often "Root Entry") by the file name */ - WCHAR *propName = (index == This->base.rootPropertySetIndex) ? + WCHAR *propName = (index == This->base.storageDirEntry) ? This->filename : (WCHAR *)currentProperty+OFFSET_PS_NAME; memset(buffer->name, 0, sizeof(buffer->name)); @@ -3964,7 +3964,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( /* * Keep the index of the root property set for this storage, */ - newStorage->base.rootPropertySetIndex = rootPropertyIndex; + newStorage->base.storageDirEntry = rootPropertyIndex; return newStorage; } @@ -4900,7 +4900,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_ReadDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); rootProp.startingBlock = sbStartIndex; @@ -4909,7 +4909,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_WriteDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); } else @@ -4930,7 +4930,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_ReadDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); if (rootProp.size.u.LowPart < @@ -4944,7 +4944,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_WriteDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); } } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 2a9dd1f..cc5d267 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -207,10 +207,9 @@ struct StorageBaseImpl StorageImpl* ancestorStorage; /* - * Index of the property for the root of - * this storage + * Index of the directory entry of this storage */ - ULONG rootPropertySetIndex; + ULONG storageDirEntry; /* * virtual Destructor method.

1 0

Vincent Povirk : ole32: Rename stream.ownerProperty to dirEntry.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: df960e27c40875911c42532270d09393f7836afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df960e27c40875911c4253227… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:25:10 2009 -0600 ole32: Rename stream.ownerProperty to dirEntry. --- dlls/ole32/stg_stream.c | 24 ++++++++++++------------ dlls/ole32/storage32.c | 2 +- dlls/ole32/storage32.h | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 4cc114a..e3ca9a1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -209,7 +209,7 @@ static void StgStreamImpl_OpenBlockChain( * Read the information from the property. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); if (readSuccessful) @@ -233,14 +233,14 @@ static void StgStreamImpl_OpenBlockChain( This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } else { This->bigBlockChain = BlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } } } @@ -591,14 +591,14 @@ static HRESULT WINAPI StgStreamImpl_SetSize( This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } else { This->bigBlockChain = BlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } } @@ -606,7 +606,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( * Read this stream's property to see if it's small blocks or big blocks */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); /* * Determine if we have to switch from small to big blocks or vice versa @@ -651,7 +651,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( * Write the new information about this stream to the property */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); curProperty.size.u.HighPart = libNewSize.u.HighPart; @@ -660,7 +660,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( if (Success) { StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); } @@ -853,7 +853,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( * Read the information from the property. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); if (readSuccessful) @@ -910,7 +910,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( if ( ppstm == 0 ) return STG_E_INVALIDPOINTER; - new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->ownerProperty); + new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->dirEntry); if (!new_stream) return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */ @@ -962,7 +962,7 @@ static const IStreamVtbl StgStreamImpl_Vtbl = StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, DWORD grfMode, - ULONG ownerProperty) + ULONG dirEntry) { StgStreamImpl* newStream; @@ -991,7 +991,7 @@ StgStreamImpl* StgStreamImpl_Construct( */ newStream->grfMode = grfMode; - newStream->ownerProperty = ownerProperty; + newStream->dirEntry = dirEntry; /* * Start the stream at the beginning. diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f2d856b..0bff0f4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -827,7 +827,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) { - if (strm->ownerProperty == foundPropertyIndex) + if (strm->dirEntry == foundPropertyIndex) { TRACE("Stream deleted %p\n", strm); strm->parentStorage = NULL; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index cc5d267..566e541 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -352,9 +352,9 @@ struct StgStreamImpl DWORD grfMode; /* - * Index of the property that owns (points to) this stream. + * Index of the directory entry that owns (points to) this stream. */ - ULONG ownerProperty; + ULONG dirEntry; /* * Helper variable that contains the size of the stream @@ -381,7 +381,7 @@ struct StgStreamImpl StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, DWORD grfMode, - ULONG ownerProperty); + ULONG dirEntry); /******************************************************************************

1 0

Vincent Povirk : ole32: Rename propertyUniqueID to clsid.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: cf1242e03b24c152cc122279649edf369845011c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1242e03b24c152cc1222796… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:10:17 2009 -0600 ole32: Rename propertyUniqueID to clsid. --- dlls/ole32/storage32.c | 8 ++++---- dlls/ole32/storage32.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f6f2163..a834a46 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -930,7 +930,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( &curProperty); if (success) { - curProperty.propertyUniqueID = *clsid; + curProperty.clsid = *clsid; success = StorageImpl_WriteDirEntry(This->ancestorStorage, This->rootPropertySetIndex, @@ -3079,7 +3079,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) StorageUtl_WriteGUID( buffer, OFFSET_PS_GUID, - &newData->propertyUniqueID); + &newData->clsid); StorageUtl_WriteDWord( buffer, @@ -3165,7 +3165,7 @@ BOOL StorageImpl_ReadDirEntry( StorageUtl_ReadGUID( currentProperty, OFFSET_PS_GUID, - &buffer->propertyUniqueID); + &buffer->clsid); StorageUtl_ReadDWord( currentProperty, @@ -4094,7 +4094,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( */ destination->grfMode = 0; destination->grfLocksSupported = 0; - destination->clsid = source->propertyUniqueID; + destination->clsid = source->clsid; destination->grfStateBits = 0; destination->reserved = 0; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index d23714e..2a9dd1f 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -133,7 +133,7 @@ struct DirEntry ULONG leftChild; ULONG rightChild; ULONG dirRootEntry; - GUID propertyUniqueID; + GUID clsid; FILETIME ctime; FILETIME mtime; ULONG startingBlock;

1 0