Michael Stefaniuc : dmime: Stop pretending to Load() the 'WAVE' form.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Mar 14 00:43:21 2018 +0100

dmime: Stop pretending to Load() the 'WAVE' form.

It doesn't make sense to forward to DirectSoundWave anyway as that would
require the totally undocumented interface
{69e934e4-97f1-4f1d-88e8-f2ac88671327}

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dmime/segment.c | 49 +------------------------------------------------
 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index dbb9467..fcb97be 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -1001,35 +1001,6 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_C
   return S_OK;
 }
 
-static HRESULT load_wave(IStream *pClonedStream, IDirectMusicObject **ppWaveObject)
-{
-  HRESULT hr = E_FAIL;
-  IPersistStream* pPersistStream = NULL;
-  
-  hr = CoCreateInstance (&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*) ppWaveObject);
-  if (FAILED(hr)) {
-    ERR(": could not create object\n");
-    return hr;
-  }
-  /* acquire PersistStream interface */
-  hr = IDirectMusicObject_QueryInterface (*ppWaveObject, &IID_IPersistStream, (LPVOID*) &pPersistStream);
-  if (FAILED(hr)) {
-    ERR(": could not acquire IPersistStream\n");
-    return hr;
-  }
-  /* load */
-  hr = IPersistStream_Load (pPersistStream, pClonedStream);
-  if (FAILED(hr)) {
-    ERR(": failed to load object\n");
-    return hr;
-  }
-  
-  /* release all loading-related stuff */
-  IPersistStream_Release (pPersistStream);
-
-  return S_OK;
-}
-
 static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface);
@@ -1064,25 +1035,7 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pS
       break;
     }
     case mmioFOURCC('W','A','V','E'): {
-      LPSTREAM pClonedStream = NULL;	
-      IDirectMusicObject* pWave = NULL;
-
-      FIXME_(dmfile)(": WAVE form (loading to be checked)\n");
-
-      IStream_Clone (pStm, &pClonedStream);
-	
-      liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD));
-      IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL);
-
-      hr = load_wave(pClonedStream, &pWave);
-      if (FAILED(hr)) {
-	ERR(": could not load track\n");
-	return hr;
-      }
-      IStream_Release (pClonedStream);
-      
-      IDirectMusicTrack_Release(pWave); pWave = NULL; /* now we can release at as it inserted */
-
+      FIXME(": WAVE form loading not implemented\n");
       liMove.QuadPart = StreamSize;
       IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
       break;