ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Change WriteDirEntry return type to HRESULT.

This commit is contained in:
Vincent Povirk 2009-11-25 15:51:48 -06:00 committed by Alexandre Julliard
parent 382ffed003
commit df13a1d1fe
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/ole32/storage32.c
View File

@ -978,11 +978,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(
{
currentEntry.clsid = *clsid;
success = StorageImpl_WriteDirEntry(This->ancestorStorage,
This->storageDirEntry,
&currentEntry);
if (success)
hRes = S_OK;
hRes = StorageImpl_WriteDirEntry(This->ancestorStorage,
This->storageDirEntry,
&currentEntry);
}
return hRes;
@ -2091,13 +2089,13 @@ static HRESULT removeFromTree(
*/
setEntryLink(&parentEntry, typeOfRelation, entryToDelete.leftChild);
res = StorageImpl_WriteDirEntry(
hr = StorageImpl_WriteDirEntry(
This,
parentEntryRef,
&parentEntry);
if(!res)
if(FAILED(hr))
{
return E_FAIL;
return hr;
}
if (entryToDelete.rightChild != DIRENTRY_NULL)
@ -2127,13 +2125,13 @@ static HRESULT removeFromTree(
newRightChildParentEntry.rightChild = entryToDelete.rightChild;
res = StorageImpl_WriteDirEntry(
hr = StorageImpl_WriteDirEntry(
This,
newRightChildParent,
&newRightChildParentEntry);
if (!res)
if (FAILED(hr))
{
return E_FAIL;
return hr;
}
}
}
@ -2144,13 +2142,13 @@ static HRESULT removeFromTree(
*/
setEntryLink(&parentEntry, typeOfRelation, entryToDelete.rightChild);
res = StorageImpl_WriteDirEntry(
hr = StorageImpl_WriteDirEntry(
This,
parentEntryRef,
&parentEntry);
if(!res)
if(FAILED(hr))
{
return E_FAIL;
return hr;
}
}
@ -3334,7 +3332,7 @@ BOOL StorageImpl_ReadDirEntry(
/*********************************************************************
* Write the specified directory entry to the file
*/
BOOL StorageImpl_WriteDirEntry(
HRESULT StorageImpl_WriteDirEntry(
StorageImpl* This,
DirRef index,
const DirEntry* buffer)
@ -3345,7 +3343,7 @@ BOOL StorageImpl_WriteDirEntry(
UpdateRawDirEntry(currentEntry, buffer);
writeRes = StorageImpl_WriteRawDirEntry(This, index, currentEntry);
return SUCCEEDED(writeRes) ? TRUE : FALSE;
return writeRes;
}
static BOOL StorageImpl_ReadBigBlock(

2
dlls/ole32/storage32.h
View File

@ -336,7 +336,7 @@ BOOL StorageImpl_ReadDirEntry(
DirRef index,
DirEntry* buffer);
BOOL StorageImpl_WriteDirEntry(
HRESULT StorageImpl_WriteDirEntry(
StorageImpl* This,
DirRef index,
const DirEntry* buffer);