Nikolay Sivov : mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Apr 15 16:47:37 2020 +0300

mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfplat/mediatype.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index ddbffd5441..620e144d34 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -2128,7 +2128,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA
 
     if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
     {
-        mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &wfex->SubFormat, &hr);
+        memcpy(&subtype, &wfex->SubFormat, sizeof(subtype));
 
         if (wfex->dwChannelMask)
             mediatype_set_uint32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, wfex->dwChannelMask, &hr);
@@ -2140,10 +2140,10 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA
     {
         memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype));
         subtype.Data1 = format->wFormatTag;
-        mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr);
 
         mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr);
     }
+    mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr);
 
     if (format->nChannels)
         mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr);