Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.

Alexandre Julliard julliard at winehq.org
Mon Oct 28 15:13:04 CDT 2013


Module: wine
Branch: master
Commit: 4dc152bd707282ad1a2a45c1636a1cb52345ce9b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4dc152bd707282ad1a2a45c1636a1cb52345ce9b

Author: Francois Gouget <fgouget at free.fr>
Date:   Sun Oct 27 00:23:45 2013 +0200

ddraw/tests: Fix compilation on systems that don't support nameless unions.

---

 dlls/ddraw/tests/ddraw1.c |    2 +-
 dlls/ddraw/tests/ddraw2.c |    2 +-
 dlls/ddraw/tests/ddraw4.c |    2 +-
 dlls/ddraw/tests/ddraw7.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 0f84529..1525662 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -3381,7 +3381,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH;
-            ddsd.dwZBufferBitDepth = z_depth;
+            U2(ddsd).dwZBufferBitDepth = z_depth;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
 
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f4702f1..7ff6075 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -4041,7 +4041,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH;
-            ddsd.dwZBufferBitDepth = z_depth;
+            U2(ddsd).dwZBufferBitDepth = z_depth;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
 
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 61a54bb..ac885b4 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -4665,7 +4665,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_PIXELFORMAT;
-            ddsd.ddpfPixelFormat = z_fmt;
+            U4(ddsd).ddpfPixelFormat = z_fmt;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
         ddsd.ddsCaps.dwCaps2 = tests[i].caps2;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 44a68c4..c4a6acb 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -4551,7 +4551,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_PIXELFORMAT;
-            ddsd.ddpfPixelFormat = z_fmt;
+            U4(ddsd).ddpfPixelFormat = z_fmt;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
         ddsd.ddsCaps.dwCaps2 = tests[i].caps2;




More information about the wine-cvs mailing list