Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
Alexandre Julliard
julliard at winehq.org
Mon Jul 1 14:46:41 CDT 2013
Module: wine
Branch: master
Commit: 67307a9cf1bffdb99201e662d1e615909ed3c727
URL: http://source.winehq.org/git/wine.git/?a=commit;h=67307a9cf1bffdb99201e662d1e615909ed3c727
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Jun 29 08:50:24 2013 +0200
ddraw/tests: Fix compilation on systems that don't support nameless unions.
---
dlls/ddraw/tests/ddraw2.c | 2 +-
dlls/ddraw/tests/ddraw4.c | 2 +-
dlls/ddraw/tests/ddraw7.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 4556afc..1220b65 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -3320,7 +3320,7 @@ static void test_lighting_interface_versions(void)
memset(&mat_desc, 0, sizeof(mat_desc));
mat_desc.dwSize = sizeof(mat_desc);
- mat_desc.dcvEmissive.g = 1.0f;
+ U2(U3(mat_desc).dcvEmissive).g = 1.0f;
hr = IDirect3D2_CreateMaterial(d3d, &emissive, NULL);
ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr);
hr = IDirect3DMaterial2_SetMaterial(emissive, &mat_desc);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 45c399b..9597c8b 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -3633,7 +3633,7 @@ static void test_lighting_interface_versions(void)
memset(&mat_desc, 0, sizeof(mat_desc));
mat_desc.dwSize = sizeof(mat_desc);
- mat_desc.dcvEmissive.g = 1.0f;
+ U2(U3(mat_desc).dcvEmissive).g = 1.0f;
hr = IDirect3D3_CreateMaterial(d3d, &emissive, NULL);
ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr);
hr = IDirect3DMaterial3_SetMaterial(emissive, &mat_desc);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 1ab5dae..45017f2 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -3448,7 +3448,7 @@ static void test_lighting_interface_versions(void)
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
memset(&material, 0, sizeof(material));
- material.emissive.g = 1.0f;
+ U2(U3(material).emissive).g = 1.0f;
hr = IDirect3DDevice7_SetMaterial(device, &material);
ok(SUCCEEDED(hr), "Failed set material, hr %#x.\n", hr);
hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);
More information about the wine-cvs
mailing list