From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Nov 2015 15:31:10 +0000 (+0000)
Subject: [AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536
X-Git-Tag: ReactOS-0.4.0~60^2~80
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4dc5d956b9fd631e463344b29dfe19c831a46052

[AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=70027
---

diff --git a/reactos/dll/directx/wine/amstream/mediastream.c b/reactos/dll/directx/wine/amstream/mediastream.c
index 66053eed98b..e5d0cca6bc1 100644
--- a/reactos/dll/directx/wine/amstream/mediastream.c
+++ b/reactos/dll/directx/wine/amstream/mediastream.c
@@ -102,9 +102,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
 {
     DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);
 
-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
 
-    return S_FALSE;
+    if (!multi_media_stream)
+        return E_POINTER;
+
+    IMultiMediaStream_AddRef(This->parent);
+    *multi_media_stream = This->parent;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
@@ -263,9 +269,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiM
 {
     DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
 
-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
 
-    return S_FALSE;
+    if (!ppMultiMediaStream)
+        return E_POINTER;
+
+    IMultiMediaStream_AddRef(This->parent);
+    *ppMultiMediaStream = This->parent;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
@@ -503,9 +515,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
 {
     AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
 
-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
+    TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
 
-    return S_FALSE;
+    if (!multi_media_stream)
+        return E_POINTER;
+
+    IMultiMediaStream_AddRef(This->parent);
+    *multi_media_stream = This->parent;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
@@ -664,9 +682,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
 {
     AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
 
-    FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream);
+    TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream);
 
-    return S_FALSE;
+    if (!multimedia_stream)
+        return E_POINTER;
+
+    IMultiMediaStream_AddRef(This->parent);
+    *multimedia_stream = This->parent;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
@@ -995,6 +1019,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD
         desc.ddpfPixelFormat.dwBBitMask = 0x0000ff;
         desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0;
         desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN;
+        desc.lpSurface = NULL;
 
         hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL);
         IDirectDraw_Release(ddraw);
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 754e5946255..51e4a7f41ed 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -21,7 +21,7 @@ reactos/tools/wpp                 # Synced to WineStaging-1.7.47
 
 The following libraries are shared with Wine.
 
-reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.7.47
+reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47