[PATCH] amstream: Fix compilation on systems that don't support nameless unions.

Józef Kucia jkucia at codeweavers.com
Wed May 10 09:20:52 CDT 2017


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 dlls/amstream/mediastream.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index 188ab88..1029f9d 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
 #include "wine/debug.h"
 
 #define COBJMACROS
@@ -1021,11 +1024,11 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD
         desc.dwWidth = 100;
         desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat);
         desc.ddpfPixelFormat.dwFlags = DDPF_RGB;
-        desc.ddpfPixelFormat.dwRGBBitCount = 32;
-        desc.ddpfPixelFormat.dwRBitMask = 0xff0000;
-        desc.ddpfPixelFormat.dwGBitMask = 0x00ff00;
-        desc.ddpfPixelFormat.dwBBitMask = 0x0000ff;
-        desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0;
+        desc.ddpfPixelFormat.u1.dwRGBBitCount = 32;
+        desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000;
+        desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00;
+        desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff;
+        desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0;
         desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN;
         desc.lpSurface = NULL;
 
-- 
2.10.2




More information about the wine-patches mailing list