wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Dmitry Timoshkov : msi: Limit the progress to its maximal value, use MulDiv for better results.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: df8780356bdde662dc743ea51753fe8bb13abeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8780356bdde662dc743ea51… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 29 20:46:34 2009 +0800 msi: Limit the progress to its maximal value, use MulDiv for better results. --- dlls/msi/dialog.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 3f1b571..88cdfa9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -606,6 +606,8 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, func = MSI_RecordGetInteger( rec , 1 ); val = MSI_RecordGetInteger( rec , 2 ); + TRACE("progress: func %u, val %u\n", func, val); + switch (func) { case 0: /* init */ @@ -618,10 +620,12 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, break; case 2: /* move */ ctrl->progress_current += val; - SendMessageW(ctrl->hwnd, PBM_SETPOS, 100*(ctrl->progress_current/ctrl->progress_max), 0); + if (ctrl->progress_current > ctrl->progress_max) + ctrl->progress_current = ctrl->progress_max; + SendMessageW(ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0); break; default: - ERR("Unknown progress message %d\n", func); + FIXME("Unknown progress message %u\n", func); break; } }

1 0

Vincent Povirk : ole32: Write the new data in getFreeProperty and rename the function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 37f3f3d92a8854104de0ef6774bc54f4a1400354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f3f3d92a8854104de0ef677… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 13:42:42 2009 -0500 ole32: Write the new data in getFreeProperty and rename the function. This is to avoid calling WriteProperty with an index to a directory entry that has not yet been reserved in the file. We reserve the entry by writing the new data to it. --- dlls/ole32/storage32.c | 73 +++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3e00cf6..89ae657 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -180,8 +180,10 @@ static HRESULT adjustPropertyChain( * Declaration of the functions used to manipulate StgProperty */ -static ULONG getFreeProperty( - StorageImpl *storage); +static HRESULT createDirEntry( + StorageImpl *storage, + const StgProperty *newData, + ULONG *index); static void updatePropertyChain( StorageImpl *storage, @@ -757,17 +759,9 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( */ /* - * Obtain a free property in the property chain - */ - renamedPropertyIndex = getFreeProperty(This->ancestorStorage); - - /* - * Save the new property into the new property spot + * Save the new property into a new property spot */ - StorageImpl_WriteProperty( - This->ancestorStorage, - renamedPropertyIndex, - &renamedProperty); + createDirEntry(This->ancestorStorage, &renamedProperty, &renamedPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -945,17 +939,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* newStreamProperty.propertyUniqueID */ /* - * Get a free property or create a new one + * Save the new property into a new property spot */ - newPropertyIndex = getFreeProperty(This->ancestorStorage); - - /* - * Save the new property into the new property spot - */ - StorageImpl_WriteProperty( - This->ancestorStorage, - newPropertyIndex, - &newStreamProperty); + createDirEntry(This->ancestorStorage, &newStreamProperty, &newPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -1136,17 +1122,9 @@ static HRESULT WINAPI StorageImpl_CreateStorage( /* newStorageProperty.propertyUniqueID */ /* - * Obtain a free property in the property chain + * Save the new property into a new property spot */ - newPropertyIndex = getFreeProperty(This->base.ancestorStorage); - - /* - * Save the new property into the new property spot - */ - StorageImpl_WriteProperty( - This->base.ancestorStorage, - newPropertyIndex, - &newProperty); + createDirEntry(This->base.ancestorStorage, &newProperty, &newPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -1175,24 +1153,26 @@ static HRESULT WINAPI StorageImpl_CreateStorage( * * Internal Method * - * Get a free property or create a new one. + * Reserve a directory entry in the file and initialize it. */ -static ULONG getFreeProperty( - StorageImpl *storage) +static HRESULT createDirEntry( + StorageImpl *storage, + const StgProperty *newData, + ULONG *index) { ULONG currentPropertyIndex = 0; ULONG newPropertyIndex = PROPERTY_NULL; - HRESULT readRes = S_OK; + HRESULT hr = S_OK; BYTE currentData[PROPSET_BLOCK_SIZE]; WORD sizeOfNameString; do { - readRes = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, - currentPropertyIndex, - currentData); + hr = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, + currentPropertyIndex, + currentData); - if (SUCCEEDED(readRes)) + if (SUCCEEDED(hr)) { StorageUtl_ReadWord( currentData, @@ -1221,7 +1201,7 @@ static ULONG getFreeProperty( /* * grow the property chain */ - if (!SUCCEEDED(readRes)) + if (FAILED(hr)) { BYTE emptyData[PROPSET_BLOCK_SIZE]; ULARGE_INTEGER newSize; @@ -1258,7 +1238,7 @@ static ULONG getFreeProperty( lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; for( - propertyIndex = newPropertyIndex; + propertyIndex = newPropertyIndex + 1; propertyIndex < lastProperty; propertyIndex++) { @@ -1269,7 +1249,14 @@ static ULONG getFreeProperty( } } - return newPropertyIndex; + UpdateRawDirEntry(currentData, newData); + + hr = StorageImpl_WriteRawDirEntry(storage, newPropertyIndex, currentData); + + if (SUCCEEDED(hr)) + *index = newPropertyIndex; + + return hr; } /****************************************************************************

1 0

Vincent Povirk : ole32: Split the data conversion functions out of WriteProperty.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 20dd1886d5682801307752f5c85ec6c292e5d6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dd1886d5682801307752f5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 13:27:52 2009 -0500 ole32: Split the data conversion functions out of WriteProperty. --- dlls/ole32/storage32.c | 138 ++++++++++++++++++++++++++---------------------- dlls/ole32/storage32.h | 4 ++ 2 files changed, 79 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b1f19f3..3e00cf6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3102,6 +3102,80 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE } /****************************************************************************** + * UpdateRawDirEntry + * + * Update raw directory entry data from the fields in newData. + * + * buffer must be PROPSET_BLOCK_SIZE bytes long. + */ +void UpdateRawDirEntry(BYTE *buffer, const StgProperty *newData) +{ + memset(buffer, 0, PROPSET_BLOCK_SIZE); + + memcpy( + buffer + OFFSET_PS_NAME, + newData->name, + PROPERTY_NAME_BUFFER_LEN ); + + memcpy(buffer + OFFSET_PS_PROPERTYTYPE, &newData->propertyType, 1); + + StorageUtl_WriteWord( + buffer, + OFFSET_PS_NAMELENGTH, + newData->sizeOfNameString); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_LEFTCHILD, + newData->leftChild); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_RIGHTCHILD, + newData->rightChild); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_DIRPROP, + newData->dirProperty); + + StorageUtl_WriteGUID( + buffer, + OFFSET_PS_GUID, + &newData->propertyUniqueID); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_CTIMELOW, + newData->ctime.dwLowDateTime); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_CTIMEHIGH, + newData->ctime.dwHighDateTime); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_MTIMELOW, + newData->mtime.dwLowDateTime); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_MTIMEHIGH, + newData->ctime.dwHighDateTime); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_STARTBLOCK, + newData->startingBlock); + + StorageUtl_WriteDWord( + buffer, + OFFSET_PS_SIZE, + newData->size.u.LowPart); +} + +/****************************************************************************** * Storage32Impl_ReadProperty * * This method will read the specified property from the property chain. @@ -3203,69 +3277,7 @@ BOOL StorageImpl_WriteProperty( BYTE currentProperty[PROPSET_BLOCK_SIZE]; HRESULT writeRes; - memset(currentProperty, 0, PROPSET_BLOCK_SIZE); - - memcpy( - currentProperty + OFFSET_PS_NAME, - buffer->name, - PROPERTY_NAME_BUFFER_LEN ); - - memcpy(currentProperty + OFFSET_PS_PROPERTYTYPE, &buffer->propertyType, 1); - - StorageUtl_WriteWord( - currentProperty, - OFFSET_PS_NAMELENGTH, - buffer->sizeOfNameString); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_LEFTCHILD, - buffer->leftChild); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_RIGHTCHILD, - buffer->rightChild); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_DIRPROP, - buffer->dirProperty); - - StorageUtl_WriteGUID( - currentProperty, - OFFSET_PS_GUID, - &buffer->propertyUniqueID); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_CTIMELOW, - buffer->ctime.dwLowDateTime); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_CTIMEHIGH, - buffer->ctime.dwHighDateTime); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_MTIMELOW, - buffer->mtime.dwLowDateTime); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_MTIMEHIGH, - buffer->ctime.dwHighDateTime); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_STARTBLOCK, - buffer->startingBlock); - - StorageUtl_WriteDWord( - currentProperty, - OFFSET_PS_SIZE, - buffer->size.u.LowPart); + UpdateRawDirEntry(currentProperty, buffer); writeRes = StorageImpl_WriteRawDirEntry(This, index, currentProperty); return SUCCEEDED(writeRes) ? TRUE : FALSE; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index bbc6a5d..1f3d264 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -295,6 +295,10 @@ HRESULT StorageImpl_ReadRawDirEntry( ULONG index, BYTE *buffer); +void UpdateRawDirEntry( + BYTE *buffer, + const StgProperty *newData); + HRESULT StorageImpl_WriteRawDirEntry( StorageImpl *This, ULONG index,

1 0

Vincent Povirk : ole32: Use the raw directory entry functions in getFreeProperty.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: ac9d77cd10ed83217de63d44aa5b108bcc2f4c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9d77cd10ed83217de63d44a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 12:49:09 2009 -0500 ole32: Use the raw directory entry functions in getFreeProperty. The meaning of the "index" argument in Read/WriteProperty will likely change in the future, but getFreeProperty must work with real indexes into the file's real directory stream. --- dlls/ole32/storage32.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 86c174b..b1f19f3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1182,20 +1182,24 @@ static ULONG getFreeProperty( { ULONG currentPropertyIndex = 0; ULONG newPropertyIndex = PROPERTY_NULL; - BOOL readSuccessful = TRUE; - StgProperty currentProperty; + HRESULT readRes = S_OK; + BYTE currentData[PROPSET_BLOCK_SIZE]; + WORD sizeOfNameString; do { - /* - * Start by reading the root property - */ - readSuccessful = StorageImpl_ReadProperty(storage->base.ancestorStorage, - currentPropertyIndex, - &currentProperty); - if (readSuccessful) + readRes = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, + currentPropertyIndex, + currentData); + + if (SUCCEEDED(readRes)) { - if (currentProperty.sizeOfNameString == 0) + StorageUtl_ReadWord( + currentData, + OFFSET_PS_NAMELENGTH, + &sizeOfNameString); + + if (sizeOfNameString == 0) { /* * The property existis and is available, we found it. @@ -1217,9 +1221,9 @@ static ULONG getFreeProperty( /* * grow the property chain */ - if (! readSuccessful) + if (!SUCCEEDED(readRes)) { - StgProperty emptyProperty; + BYTE emptyData[PROPSET_BLOCK_SIZE]; ULARGE_INTEGER newSize; ULONG propertyIndex; ULONG lastProperty = 0; @@ -1246,7 +1250,7 @@ static ULONG getFreeProperty( * memset the empty property in order to initialize the unused newly * created property */ - memset(&emptyProperty, 0, sizeof(StgProperty)); + memset(&emptyData, 0, PROPSET_BLOCK_SIZE); /* * initialize them @@ -1258,10 +1262,10 @@ static ULONG getFreeProperty( propertyIndex < lastProperty; propertyIndex++) { - StorageImpl_WriteProperty( + StorageImpl_WriteRawDirEntry( storage->base.ancestorStorage, propertyIndex, - &emptyProperty); + emptyData); } }

1 0

Vincent Povirk : ole32: Move the low-level functionality of WriteProperty to a new function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: e71c696b510fc60f1a18491a8e9c03f0a139cb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71c696b510fc60f1a18491a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 11:41:50 2009 -0500 ole32: Move the low-level functionality of WriteProperty to a new function. --- dlls/ole32/storage32.c | 37 +++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4ff9f89..86c174b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3072,6 +3072,32 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer } /****************************************************************************** + * StorageImpl_WriteRawDirEntry + * + * This method will write the raw data from a directory entry in the file. + * + * buffer must be PROPSET_BLOCK_SIZE bytes long. + */ +HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE *buffer) +{ + ULARGE_INTEGER offset; + HRESULT hr; + ULONG bytesRead; + + offset.u.HighPart = 0; + offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + + hr = BlockChainStream_WriteAt( + This->rootBlockChain, + offset, + PROPSET_BLOCK_SIZE, + buffer, + &bytesRead); + + return hr; +} + +/****************************************************************************** * Storage32Impl_ReadProperty * * This method will read the specified property from the property chain. @@ -3171,12 +3197,7 @@ BOOL StorageImpl_WriteProperty( const StgProperty* buffer) { BYTE currentProperty[PROPSET_BLOCK_SIZE]; - ULARGE_INTEGER offsetInPropSet; HRESULT writeRes; - ULONG bytesWritten; - - offsetInPropSet.u.HighPart = 0; - offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE; memset(currentProperty, 0, PROPSET_BLOCK_SIZE); @@ -3242,11 +3263,7 @@ BOOL StorageImpl_WriteProperty( OFFSET_PS_SIZE, buffer->size.u.LowPart); - writeRes = BlockChainStream_WriteAt(This->rootBlockChain, - offsetInPropSet, - PROPSET_BLOCK_SIZE, - currentProperty, - &bytesWritten); + writeRes = StorageImpl_WriteRawDirEntry(This, index, currentProperty); return SUCCEEDED(writeRes) ? TRUE : FALSE; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 281948e..bbc6a5d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -295,6 +295,11 @@ HRESULT StorageImpl_ReadRawDirEntry( ULONG index, BYTE *buffer); +HRESULT StorageImpl_WriteRawDirEntry( + StorageImpl *This, + ULONG index, + const BYTE *buffer); + BOOL StorageImpl_ReadProperty( StorageImpl* This, ULONG index,

1 0

Vincent Povirk : ole32: Move the low-level functionality of ReadProperty to a new function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 56622de95182863cf374eb850afaef6ce08ca39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56622de95182863cf374eb850… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 11:37:30 2009 -0500 ole32: Move the low-level functionality of ReadProperty to a new function. --- dlls/ole32/storage32.c | 38 +++++++++++++++++++++++++++----------- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 64039cc..4ff9f89 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3046,6 +3046,32 @@ static void StorageImpl_SaveFileHeader( } /****************************************************************************** + * StorageImpl_ReadRawDirEntry + * + * This method will read the raw data from a directory entry in the file. + * + * buffer must be PROPSET_BLOCK_SIZE bytes long. + */ +HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer) +{ + ULARGE_INTEGER offset; + HRESULT hr; + ULONG bytesRead; + + offset.u.HighPart = 0; + offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + + hr = BlockChainStream_ReadAt( + This->rootBlockChain, + offset, + PROPSET_BLOCK_SIZE, + buffer, + &bytesRead); + + return hr; +} + +/****************************************************************************** * Storage32Impl_ReadProperty * * This method will read the specified property from the property chain. @@ -3056,19 +3082,9 @@ BOOL StorageImpl_ReadProperty( StgProperty* buffer) { BYTE currentProperty[PROPSET_BLOCK_SIZE]; - ULARGE_INTEGER offsetInPropSet; HRESULT readRes; - ULONG bytesRead; - offsetInPropSet.u.HighPart = 0; - offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE; - - readRes = BlockChainStream_ReadAt( - This->rootBlockChain, - offsetInPropSet, - PROPSET_BLOCK_SIZE, - currentProperty, - &bytesRead); + readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); if (SUCCEEDED(readRes)) { diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 8dd44fa..281948e 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -290,6 +290,11 @@ struct StorageImpl BigBlockFile* bigBlockFile; }; +HRESULT StorageImpl_ReadRawDirEntry( + StorageImpl *This, + ULONG index, + BYTE *buffer); + BOOL StorageImpl_ReadProperty( StorageImpl* This, ULONG index,

1 0

Vincent Povirk : ole32: Further simplify adjustPropertyChain and fold in findPlaceholder.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 5d550cdc45e1c0989785a1a3ced0ae039a16b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d550cdc45e1c0989785a1a3c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 17:34:49 2009 -0500 ole32: Further simplify adjustPropertyChain and fold in findPlaceholder. The logic is unchanged from the original version. --- dlls/ole32/storage32.c | 204 +++++++++++++++--------------------------------- 1 files changed, 64 insertions(+), 140 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 470dc83..64039cc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -169,12 +169,6 @@ static HRESULT deleteStreamProperty( ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); -static HRESULT findPlaceholder( - StorageImpl *storage, - ULONG propertyIndexToStore, - ULONG storagePropertyIndex, - INT typeOfRelation); - static HRESULT adjustPropertyChain( StorageImpl *This, StgProperty propertyToDelete, @@ -2025,92 +2019,22 @@ static HRESULT deleteStreamProperty( return S_OK; } -/********************************************************************* - * - * Internal Method - * - * Finds a placeholder for the StgProperty within the Storage - * - */ -static HRESULT findPlaceholder( - StorageImpl *storage, - ULONG propertyIndexToStore, - ULONG storePropertyIndex, - INT typeOfRelation) +static void setPropertyLink(StgProperty *property, ULONG relation, ULONG new_target) { - StgProperty storeProperty; - BOOL res = TRUE; - - /* - * Read the storage property - */ - res = StorageImpl_ReadProperty( - storage->base.ancestorStorage, - storePropertyIndex, - &storeProperty); - - if(! res) - { - return E_FAIL; - } - - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) - { - if (storeProperty.leftChild != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.leftChild, - typeOfRelation); - } - else - { - storeProperty.leftChild = propertyIndexToStore; - } - } - else if (typeOfRelation == PROPERTY_RELATION_NEXT) - { - if (storeProperty.rightChild != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.rightChild, - typeOfRelation); - } - else - { - storeProperty.rightChild = propertyIndexToStore; - } - } - else if (typeOfRelation == PROPERTY_RELATION_DIR) - { - if (storeProperty.dirProperty != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.dirProperty, - typeOfRelation); - } - else - { - storeProperty.dirProperty = propertyIndexToStore; - } - } - - res = StorageImpl_WriteProperty( - storage->base.ancestorStorage, - storePropertyIndex, - &storeProperty); - - if(!res) + switch (relation) { - return E_FAIL; + case PROPERTY_RELATION_PREVIOUS: + property->leftChild = new_target; + break; + case PROPERTY_RELATION_NEXT: + property->rightChild = new_target; + break; + case PROPERTY_RELATION_DIR: + property->dirProperty = new_target; + break; + default: + assert(0); } - - return S_OK; } /************************************************************************* @@ -2127,11 +2051,6 @@ static HRESULT adjustPropertyChain( ULONG parentPropertyId, INT typeOfRelation) { - ULONG newLinkProperty = PROPERTY_NULL; - BOOL needToFindAPlaceholder = FALSE; - ULONG storeNode = PROPERTY_NULL; - ULONG toStoreNode = PROPERTY_NULL; - INT relationType = 0; HRESULT hr = S_OK; BOOL res = TRUE; @@ -2140,64 +2059,69 @@ static HRESULT adjustPropertyChain( /* * Replace the deleted entry with its left child */ - newLinkProperty = propertyToDelete.leftChild; + setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); + + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + parentPropertyId, + &parentProperty); + if(!res) + { + return E_FAIL; + } if (propertyToDelete.rightChild != PROPERTY_NULL) { /* - * We also need to find a place for the other link, setup variables - * to do this at the end... + * 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. */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; + ULONG newRightChildParent = propertyToDelete.leftChild; + StgProperty newRightChildParentProperty; + + do + { + res = StorageImpl_ReadProperty( + This->base.ancestorStorage, + newRightChildParent, + &newRightChildParentProperty); + if (!res) + { + return E_FAIL; + } + + if (newRightChildParentProperty.rightChild != PROPERTY_NULL) + newRightChildParent = newRightChildParentProperty.rightChild; + } while (newRightChildParentProperty.rightChild != PROPERTY_NULL); + + newRightChildParentProperty.rightChild = propertyToDelete.rightChild; + + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + newRightChildParent, + &newRightChildParentProperty); + if (!res) + { + return E_FAIL; + } } } - else if (propertyToDelete.rightChild != PROPERTY_NULL) + else { /* * Replace the deleted entry with its right child */ - newLinkProperty = propertyToDelete.rightChild; - } + setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) - { - parentProperty.leftChild = newLinkProperty; - } - else if (typeOfRelation == PROPERTY_RELATION_NEXT) - { - parentProperty.rightChild = newLinkProperty; - } - else /* (typeOfRelation == PROPERTY_RELATION_DIR) */ - { - parentProperty.dirProperty = newLinkProperty; - } - - /* - * Write back the parent property - */ - res = StorageImpl_WriteProperty( - This->base.ancestorStorage, - parentPropertyId, - &parentProperty); - if(! res) - { - return E_FAIL; - } - - /* - * If a placeholder is required for the other link, then, find one and - * get out of here... - */ - if (needToFindAPlaceholder) - { - hr = findPlaceholder( - This, - toStoreNode, - storeNode, - relationType); + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + parentPropertyId, + &parentProperty); + if(!res) + { + return E_FAIL; + } } return hr;

1 0

Vincent Povirk : ole32: Reduce duplicated code in adjustPropertyChain.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: a7e69339dcda3d3360f3b03bac5272f9c1c0176d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e69339dcda3d3360f3b03ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 16:48:39 2009 -0500 ole32: Reduce duplicated code in adjustPropertyChain. Most of the work is the same regardless of relation type, so bring those parts out of the relation type test. --- dlls/ole32/storage32.c | 106 +++++++++-------------------------------------- 1 files changed, 21 insertions(+), 85 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fe74fb9..470dc83 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2135,107 +2135,43 @@ static HRESULT adjustPropertyChain( HRESULT hr = S_OK; BOOL res = TRUE; - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) + if (propertyToDelete.leftChild != PROPERTY_NULL) { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent previous to the property to delete previous - */ - newLinkProperty = propertyToDelete.leftChild; + /* + * Replace the deleted entry with its left child + */ + newLinkProperty = propertyToDelete.leftChild; - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) + if (propertyToDelete.rightChild != PROPERTY_NULL) { /* - * Set the parent previous to the property to delete next + * We also need to find a place for the other link, setup variables + * to do this at the end... */ - newLinkProperty = propertyToDelete.rightChild; + needToFindAPlaceholder = TRUE; + storeNode = propertyToDelete.leftChild; + toStoreNode = propertyToDelete.rightChild; + relationType = PROPERTY_RELATION_NEXT; } - + } + else if (propertyToDelete.rightChild != PROPERTY_NULL) + { /* - * Link it for real... + * Replace the deleted entry with its right child */ - parentProperty.leftChild = newLinkProperty; + newLinkProperty = propertyToDelete.rightChild; + } + if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) + { + parentProperty.leftChild = newLinkProperty; } else if (typeOfRelation == PROPERTY_RELATION_NEXT) { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent next to the property to delete next previous - */ - newLinkProperty = propertyToDelete.leftChild; - - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * Set the parent next to the property to delete next - */ - newLinkProperty = propertyToDelete.rightChild; - } - - /* - * Link it for real... - */ parentProperty.rightChild = newLinkProperty; } else /* (typeOfRelation == PROPERTY_RELATION_DIR) */ { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent dir to the property to delete previous - */ - newLinkProperty = propertyToDelete.leftChild; - - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * Set the parent dir to the property to delete next - */ - newLinkProperty = propertyToDelete.rightChild; - } - - /* - * Link it for real... - */ parentProperty.dirProperty = newLinkProperty; }

1 0

Huw Davies : include: Add rowchg.idl.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d1f95617474d77867ccc84c5846d0b295f101a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f95617474d77867ccc84c58… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:49:02 2009 +0000 include: Add rowchg.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowchg.idl | 30 ++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c32137f..eb2cabe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -396,6 +396,7 @@ SRCDIR_INCLUDES = \ richedit.h \ rmxfguid.h \ row.idl \ + rowchg.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 1aeacd7..b525b56 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -57,6 +57,7 @@ typedef DWORD DBHASHVALUE; #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" +#include "rowchg.idl" #include "binres.idl" #include "crtrow.idl" diff --git a/include/rowchg.idl b/include/rowchg.idl new file mode 100644 index 0000000..7bfa506 --- /dev/null +++ b/include/rowchg.idl @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + local, + object, + uuid(0c733ab5-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowChange : IUnknown +{ + [local] + HRESULT SetColumns([in] DBORDINAL cColumns, + [in, out, size_is(cColumns), annotation("__in_ecount(cColumns)")] DBCOLUMNACCESS rgColumns[]); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index f707564..828e6b0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -126,6 +126,7 @@ my %private_idl_headers = ( "dyngraph.idl" => 1, "opnrst.idl" => 1, "row.idl" => 1, + "rowchg.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Huw Davies : include: Add row.idl.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 4f6c58dcd8b7981312ed6e6df3db785b366df153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6c58dcd8b7981312ed6e6df… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:44:06 2009 +0000 include: Add row.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/row.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f8fbfc9..c32137f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -395,6 +395,7 @@ SRCDIR_INCLUDES = \ regstr.h \ richedit.h \ rmxfguid.h \ + row.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 3f524eb..1aeacd7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -56,6 +56,7 @@ typedef DWORD DBHASHVALUE; #include "dbdsad.idl" #include "sesprp.idl" #include "opnrst.idl" +#include "row.idl" #include "binres.idl" #include "crtrow.idl" diff --git a/include/row.idl b/include/row.idl new file mode 100644 index 0000000..f56eade --- /dev/null +++ b/include/row.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + local, + object, + uuid(0c733ab4-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRow : IUnknown +{ + [local] + HRESULT GetColumns([in] DBORDINAL cColumns, + [in, out, size_is(cColumns), annotation("__inout_ecount(cColumns)")] DBCOLUMNACCESS rgColumns[]); + + + HRESULT GetSourceRowset([in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("__deref_opt_out_opt")] IUnknown **ppRowset, + [out, annotation("__out_opt")] HROW *phRow); + + HRESULT Open([in, unique, annotation("__in_opt")] IUnknown *pUnkOuter, + [in, annotation("__in")] DBID *pColumnID, + [in, annotation("__in")] REFGUID rguidColumnType, + [in] DWORD dwBindFlags, + [in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("__deref_opt_out")] IUnknown **ppUnk); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 28c1e1c..f707564 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -125,6 +125,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "row.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
121
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009