Alexandre Julliard : d3d8/tests: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8d86c6d9d9f4d159e6592158c1f615f09d78e1e4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8d86c6d9d9f4d159e6592158c1f615f...

Author: Alexandre Julliard 
Date:   Tue Aug 15 16:44:55 2023 +0200

d3d8/tests: Use nameless unions/structs.

---

dlls/d3d8/tests/stateblock.c | 16 ++++++++--------
 dlls/d3d8/tests/visual.c     | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c
index 4a27738d5d4..d9a610d5438 100644
--- a/dlls/d3d8/tests/stateblock.c
+++ b/dlls/d3d8/tests/stateblock.c
@@ -957,14 +957,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage,
             "\t\t%.8e, %.8e, %.8e, %.8e,\n"
             "\t} received\n",
             chain_stage, name,
-            U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0],
-            U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1],
-            U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2],
-            U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3],
-            U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0],
-            U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1],
-            U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2],
-            U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]);
+            expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0],
+            expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1],
+            expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2],
+            expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3],
+            received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0],
+            received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1],
+            received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2],
+            received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]);
 }

static void transform_check_data(IDirect3DDevice8 *device, const struct state_test *test,
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index f80ff86010e..b7688e9251a 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -7736,8 +7736,8 @@ static void test_pointsize(void)
     ok(color == 0x00ffff00, "pSprite: Pixel (64 + 4),(64 - 4) has color 0x%08x, expected 0x00ffff00\n", color);
     IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

-    U(matrix).m[0][0] =  1.0f / 64.0f;
-    U(matrix).m[1][1] = -1.0f / 64.0f;
+    matrix.m[0][0] =  1.0f / 64.0f;
+    matrix.m[1][1] = -1.0f / 64.0f;
     hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &matrix);
     ok(SUCCEEDED(hr), "Failed to set projection matrix, hr %#lx.\n", hr);

@@ -7756,7 +7756,7 @@ static void test_pointsize(void)
     ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr);
     hr = IDirect3DDevice8_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c);
     ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr);
-    hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &S(U(matrix))._11, 4);
+    hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &matrix._11, 4);
     ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr);

if (caps.MaxPointSize < 63.0f)
@@ -12222,8 +12222,8 @@ START_TEST(visual)
     /* Only Windows XP's default VGA driver should have an empty description */
     ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n");
     trace("Driver version %d.%d.%d.%d\n",
-            HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart),
-            HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart));
+            HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart),
+            HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart));

IDirect3D8_Release(d3d);