[ros-diffs] [akhaldi] 70027: [AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Sun Nov 22 15:31:10 2015
New Revision: 70027

URL: http://svn.reactos.org/svn/reactos?rev=70027&view=rev
Log:
[AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/directx/wine/amstream/mediastream.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m...
==============================================================================
--- trunk/reactos/dll/directx/wine/amstream/mediastream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/amstream/mediastream.c	[iso-8859-1] Sun Nov 22 15:31:10 2015
@@ -102,9 +102,15 @@
 {
     DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);

-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
-
-    return S_FALSE;
+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
+
+    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 @@
 {
     DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);

-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
-
-    return S_FALSE;
+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
+
+    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 @@
 {
     AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);

-    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
-
-    return S_FALSE;
+    TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
+
+    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 @@
 {
     AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);

-    FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream);
-
-    return S_FALSE;
+    TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream);
+
+    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 @@
         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);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Nov 22 15:31:10 2015
@@ -21,7 +21,7 @@

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