ole32: Convert the *_{Read,Write}At structured storage functions to

return HRESULTs instead of BOOLs so that errors can be properly propagated from lower levels.

ole32: Convert the *_{Read,Write}At structured storage functions to
79f7318a · Robert Shearman · Alexandre Julliard · bfc1bdc3 · 79f7318a · 79f7318a
Commit 79f7318a authored Sep 11, 2006 by Robert Shearman Committed by Alexandre Julliard Sep 11, 2006
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 67 additions and 62 deletions

stg_stream.c dlls/ole32/stg_stream.c +11 -12

storage32.c dlls/ole32/storage32.c +53 -47

storage32.h dlls/ole32/storage32.h +3 -3

No files found.
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -302,15 +302,11 @@ static HRESULT WINAPI StgStreamImpl_Read(
  }
  else if (This->bigBlockChain!=0)
  {
-    BOOL success = BlockChainStream_ReadAt(This->bigBlockChain,
-                                           This->currentPosition,
-                                           bytesToReadFromBuffer,
-                                           pv,
-                                           pcbRead);
-    if (success)
-      res = S_OK;
-    else
-      res = STG_E_READFAULT;
+    res = BlockChainStream_ReadAt(This->bigBlockChain,
+                 This->currentPosition,
+                 bytesToReadFromBuffer,
+                 pv,
+                 pcbRead);
  }
  else
  {
@@ -363,6 +359,7 @@ static HRESULT WINAPI StgStreamImpl_Write(

  ULARGE_INTEGER newSize;
  ULONG bytesWritten = 0;
+  HRESULT res;

  TRACE("(%p, %p, %ld, %p)\n",
 	iface, pv, cb, pcbWritten);
@@ -427,7 +424,7 @@ static HRESULT WINAPI StgStreamImpl_Write(
   */
  if (This->smallBlockChain!=0)
  {
-    SmallBlockChainStream_WriteAt(This->smallBlockChain,
+    res = SmallBlockChainStream_WriteAt(This->smallBlockChain,
 				  This->currentPosition,
 				  cb,
 				  pv,
@@ -436,13 +433,15 @@ static HRESULT WINAPI StgStreamImpl_Write(
  }
  else if (This->bigBlockChain!=0)
  {
-    BlockChainStream_WriteAt(This->bigBlockChain,
+    res = BlockChainStream_WriteAt(This->bigBlockChain,
 			     This->currentPosition,
 			     cb,
 			     pv,
 			     pcbWritten);
  }
  else
+    /* this should never happen because the IStream_SetSize call above will
+     * make sure a big or small block chain is created */
    assert(FALSE);

  /*
@@ -451,7 +450,7 @@ static HRESULT WINAPI StgStreamImpl_Write(
  This->currentPosition.u.LowPart += *pcbWritten;

  TRACE("<-- S_OK, written %lu\n", *pcbWritten);
-  return S_OK;
+  return res;
 }

 /***

--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -455,14 +455,14 @@ BlockChainStream* BlockChainStream_Construct(
 void BlockChainStream_Destroy(
 		BlockChainStream* This);

-BOOL BlockChainStream_ReadAt(
+HRESULT BlockChainStream_ReadAt(
 		BlockChainStream* This,
 		ULARGE_INTEGER offset,
 		ULONG          size,
 		void*          buffer,
 		ULONG*         bytesRead);

-BOOL BlockChainStream_WriteAt(
+HRESULT BlockChainStream_WriteAt(
 		BlockChainStream* This,
 		ULARGE_INTEGER offset,
 		ULONG          size,
@@ -502,7 +502,7 @@ HRESULT SmallBlockChainStream_ReadAt(
 	       void*          buffer,
 	       ULONG*         bytesRead);

-BOOL SmallBlockChainStream_WriteAt(
+HRESULT SmallBlockChainStream_WriteAt(
 	       SmallBlockChainStream* This,
 	       ULARGE_INTEGER offset,
 	       ULONG          size,