[PATCH 4/8] dmstyle: Move the IStream resetting to the load_band() helper.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmstyle/style.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index c221c5c8dc2..e28948cd2c6 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -393,7 +393,7 @@ static inline struct style *impl_from_IPersistStream(IPersistStream *iface)
     return CONTAINING_RECORD(iface, struct style, dmobj.IPersistStream_iface);
 }

-static HRESULT load_band(IStream *stream, IDirectMusicBand **band)
+static HRESULT load_band(IStream *stream, IDirectMusicBand **band, struct chunk_entry *chunk)
 {
     IPersistStream *persist;
     HRESULT hr;
@@ -403,7 +403,9 @@ static HRESULT load_band(IStream *stream, IDirectMusicBand **band)
         return hr;
     if (SUCCEEDED(hr = IDirectMusicBand_QueryInterface(*band, &IID_IPersistStream, (void **)&persist)))
     {
-        hr = IPersistStream_Load(persist, stream);
+        /* Can be application provided IStream without Clone method */
+        if (SUCCEEDED(hr = stream_reset_chunk_start(stream, chunk)))
+            hr = IPersistStream_Load(persist, stream);
         IPersistStream_Release(persist);
     }

@@ -608,9 +610,7 @@ static HRESULT parse_style_band(struct style *This, IStream *stream, struct chun
     if (!(band = calloc(1, sizeof(*band))))
         return E_OUTOFMEMORY;

-    /* Can be application provided IStream without Clone method */
-    if (FAILED(hr = stream_reset_chunk_start(stream, chunk)) ||
-            FAILED(hr = load_band(stream, &band->band)))
+    if (FAILED(hr = load_band(stream, &band->band, chunk)))
     {
         free(band);
         return hr;