Michael Stefaniuc : quartz: Free two assert calls from having side effects.

Alexandre Julliard julliard at winehq.org
Sat Oct 8 15:16:35 CDT 2011


Module: wine
Branch: master
Commit: a948e5e4749b1ab12df5ff99a59d0d9d8d6a7c57
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a948e5e4749b1ab12df5ff99a59d0d9d8d6a7c57

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Oct  7 13:26:51 2011 +0200

quartz: Free two assert calls from having side effects.

---

 dlls/quartz/mpegsplit.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index 059a854..68348a3 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -182,7 +182,8 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample)
     IMediaSample_GetPointer(pCurrentSample, &fbuf);
 
     /* Find the next valid header.. it <SHOULD> be right here */
-    assert(parse_header(fbuf, &length, &This->position) == S_OK);
+    hr = parse_header(fbuf, &length, &This->position);
+    assert(hr == S_OK);
     IMediaSample_SetActualDataLength(pCurrentSample, length);
 
     /* Queue the next sample */
@@ -739,7 +740,9 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface)
     IMediaSample *sample;
 
     TRACE("Seeking? %d\n", This->seek);
-    assert(parse_header(This->header, &length, NULL) == S_OK);
+
+    hr = parse_header(This->header, &length, NULL);
+    assert(hr == S_OK);
 
     if (pin->rtCurrent >= pin->rtStop)
     {




More information about the wine-cvs mailing list