ole: Fix mis-handling of return value in StgStreamImpl_Read.

BlockChainStream_ReadAt returns a BOOL, not an HRESULT so change StgStreamImpl_Read to handle this, by returning STG_E_READFAULT on failure.

ole: Fix mis-handling of return value in StgStreamImpl_Read.
8f604e92 · Robert Shearman · Alexandre Julliard · 03060551 · 8f604e92
Commit 8f604e92 authored Jan 03, 2006 by Robert Shearman Committed by Alexandre Julliard Jan 03, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

stg_stream.c dlls/ole32/stg_stream.c +10 -6

No files found.
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -249,7 +249,7 @@ static HRESULT WINAPI StgStreamImpl_Read(

  ULONG bytesReadBuffer;
  ULONG bytesToReadFromBuffer;
-  HRESULT res = S_FALSE;
+  HRESULT res;

  TRACE("(%p, %p, %ld, %p)\n",
 	iface, pv, cb, pcbRead);
@@ -282,11 +282,15 @@ static HRESULT WINAPI StgStreamImpl_Read(
  }
  else if (This->bigBlockChain!=0)
  {
-    res = BlockChainStream_ReadAt(This->bigBlockChain,
-			    This->currentPosition,
-			    bytesToReadFromBuffer,
-			    pv,
-			    pcbRead);
+    BOOL success = BlockChainStream_ReadAt(This->bigBlockChain,
+                                           This->currentPosition,
+                                           bytesToReadFromBuffer,
+                                           pv,
+                                           pcbRead);
+    if (success)
+      res = S_OK;
+    else
+      res = STG_E_READFAULT;
  }
  else
  {