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

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Mon Jun 25 12:09:21 2007 +0200

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

---

dlls/ddraw/tests/d3d.c      |    8 ++++----
 dlls/ddraw/tests/dsurface.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 35d6192..e994097 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -93,10 +93,10 @@ static BOOL CreateDirect3D(void)
     ddsd.dwSize = sizeof(ddsd);
     ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
     ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
-    ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
-    ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER;
-    ddsd.ddpfPixelFormat.dwZBufferBitDepth = 16;
-    ddsd.ddpfPixelFormat.dwZBitMask = 0x0000FFFF;
+    U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat);
+    U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER;
+    U1(U4(ddsd).ddpfPixelFormat).dwZBufferBitDepth = 16;
+    U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0x0000FFFF;
     ddsd.dwWidth = 256;
     ddsd.dwHeight = 256;
     rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDSdepth, NULL);
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index a21a76d..b0a2195 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -2259,7 +2259,7 @@ static void BltParamTest(void)
     /* Blt(non-fast) tests */
     memset(&BltFx, 0, sizeof(BltFx));
     BltFx.dwSize = sizeof(BltFx);
-    BltFx.dwFillColor = 0xaabbccdd;
+    U5(BltFx).dwFillColor = 0xaabbccdd;

hr = IDirectDrawSurface_Blt(surface1, &valid, NULL, NULL, DDBLT_COLORFILL, &BltFx);
     ok(hr == DD_OK, "IDirectDrawSurface_Blt with a valid rectangle for color fill returned %08x\n", hr);