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

Alexandre Julliard julliard at winehq.org
Fri May 9 13:32:36 CDT 2014


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Fri May  9 16:06:56 2014 +0200

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

---

 dlls/ddraw/tests/ddraw7.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index b61172c..8c5f6ac 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -6688,19 +6688,19 @@ static void test_material(void)
     ok(!memcmp(&U(material).diffuse, &null_color, sizeof(null_color)),
             "Got unexpected diffuse color {%.8e, %.8e, %.8e, %.8e}.\n",
             U1(U(material).diffuse).r, U2(U(material).diffuse).g,
-            U3(U(material).diffuse).b, U3(U(material).diffuse).a);
+            U3(U(material).diffuse).b, U4(U(material).diffuse).a);
     ok(!memcmp(&U1(material).ambient, &null_color, sizeof(null_color)),
             "Got unexpected ambient color {%.8e, %.8e, %.8e, %.8e}.\n",
             U1(U1(material).ambient).r, U2(U1(material).ambient).g,
-            U3(U1(material).ambient).b, U3(U1(material).ambient).a);
+            U3(U1(material).ambient).b, U4(U1(material).ambient).a);
     ok(!memcmp(&U2(material).specular, &null_color, sizeof(null_color)),
             "Got unexpected specular color {%.8e, %.8e, %.8e, %.8e}.\n",
             U1(U2(material).specular).r, U2(U2(material).specular).g,
-            U3(U2(material).specular).b, U3(U2(material).specular).a);
+            U3(U2(material).specular).b, U4(U2(material).specular).a);
     ok(!memcmp(&U3(material).emissive, &null_color, sizeof(null_color)),
             "Got unexpected emissive color {%.8e, %.8e, %.8e, %.8e}.\n",
             U1(U3(material).emissive).r, U2(U3(material).emissive).g,
-            U3(U3(material).emissive).b, U3(U3(material).emissive).a);
+            U3(U3(material).emissive).b, U4(U3(material).emissive).a);
     ok(U4(material).power == 0.0f, "Got unexpected power %.8e.\n", U4(material).power);
 
     refcount = IDirect3DDevice7_Release(device);




More information about the wine-cvs mailing list