Module: wine Branch: master Commit: 7929155e55e1f25a09eb1174293ca9d098768657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929155e55e1f25a09eb117429...
Author: Francois Gouget fgouget@free.fr Date: Sat Apr 25 09:52:46 2015 +0200
ddraw/tests: Fix compilation on systems that don't support nameless unions.
---
dlls/ddraw/tests/ddraw1.c | 10 +++++----- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ab6bf36..839b2b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5612,11 +5612,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, &light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 11248f5..42f65bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6587,11 +6587,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport2_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aedc11c..ddb7a1d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3938,11 +3938,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 1.0f; - U2(U(light_desc).dcvColor).g = 1.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 1.0f; + U2(light_desc.dcvColor).g = 1.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light);