[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH v2] ole32: Return error from IStream Clone.
From:       Daniel Lehman <dlehman () esri ! com>
Date:       2018-01-31 15:05:33
Message-ID: 6c5a9916afa34a7dbb864ba8ed1239b7 () RED-INF-MXMB-P4 ! esri ! com
[Download RAW message or body]

v2: minus assert.h header

["v2-0001-ole32-Return-error-from-IStream-Clone.txt" (text/plain)]

From 79a1bfd57d412dc056525b207959608eecd0f048 Mon Sep 17 00:00:00 2001
From: Daniel Lehman <dlehman@esri.com>
Date: Fri, 19 Jan 2018 10:39:17 -0800
Subject: [PATCH v2] ole32: Return error from IStream Clone.

Signed-off-by: Daniel Lehman <dlehman@esri.com>
---
 dlls/ole32/stg_stream.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index a3abf46..1a5f061 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -23,7 +23,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -604,7 +603,6 @@ static HRESULT WINAPI StgStreamImpl_Clone(
 				   IStream**    ppstm) /* [out] */
 {
   StgStreamImpl* This = impl_from_IStream(iface);
-  HRESULT hres;
   StgStreamImpl* new_stream;
   LARGE_INTEGER seek_pos;
 
@@ -630,11 +628,7 @@ static HRESULT WINAPI StgStreamImpl_Clone(
 
   seek_pos.QuadPart = This->currentPosition.QuadPart;
 
-  hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL);
-
-  assert (SUCCEEDED(hres));
-
-  return S_OK;
+  return IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL);
 }
 
 /*
-- 
1.9.5


[Attachment #4 (text/plain)]




[prev in list] [next in list] [prev in thread] [next in thread]