[PATCH 1/4] amstream: Allocate the media type in set_mt_from_desc().

[Elizabeth Figura]

From: Elizabeth Figura

---
 dlls/amstream/ddrawstream.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index aaed6bc2510..4bbb950682f 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -555,12 +555,18 @@ static unsigned int align(unsigned int n, unsigned int alignment)

static void set_mt_from_desc(AM_MEDIA_TYPE *mt, const DDSURFACEDESC *format)
 {
-    VIDEOINFO *videoinfo = (VIDEOINFO *)mt->pbFormat;
+    VIDEOINFO *videoinfo = CoTaskMemAlloc(sizeof(VIDEOINFO));

+    mt->cbFormat = sizeof(VIDEOINFO);
+    mt->pbFormat = (BYTE *)videoinfo;
+
+    memset(videoinfo, 0, sizeof(*videoinfo));
+    videoinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
     videoinfo->bmiHeader.biWidth = format->dwWidth;
     videoinfo->bmiHeader.biHeight = format->dwHeight;
     videoinfo->bmiHeader.biBitCount = format->ddpfPixelFormat.dwRGBBitCount;
     videoinfo->bmiHeader.biCompression = BI_RGB;
+    videoinfo->bmiHeader.biPlanes = 1;
     videoinfo->bmiHeader.biSizeImage =
             align(format->dwWidth * format->dwHeight * format->ddpfPixelFormat.dwRGBBitCount / 8, 4);

@@ -571,9 +577,6 @@ static void set_mt_from_desc(AM_MEDIA_TYPE *mt, const DDSURFACEDESC *format)
     else if (format->ddpfPixelFormat.dwRGBBitCount == 16 && format->ddpfPixelFormat.dwRBitMask == 0xf800)
     {
         mt->subtype = MEDIASUBTYPE_RGB565;
-        mt->cbFormat = offsetof(VIDEOINFO, dwBitMasks[3]);
-        /* Note that we have to allocate the entire VIDEOINFO to satisfy C rules. */
-        mt->pbFormat = CoTaskMemRealloc(mt->pbFormat, sizeof(VIDEOINFO));
         videoinfo = (VIDEOINFO *)mt->pbFormat;
         videoinfo->bmiHeader.biCompression = BI_BITFIELDS;
         videoinfo->dwBitMasks[iRED]   = 0xf800;
@@ -691,12 +694,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr
             return MS_E_SAMPLEALLOC;
         }

-        if (FAILED(hr = CopyMediaType(&old_media_type, &stream->mt)))
-        {
-            stream->format = old_format;
-            LeaveCriticalSection(&stream->cs);
-            return hr;
-        }
+        old_media_type = stream->mt;

set_mt_from_desc(&stream->mt, format);