From 990000928fcb967fa98a59596a9b853e947fe0a1 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 12 Jul 2023 15:47:55 +0200 Subject: [PATCH] dxdiagn: Use nameless unions/structs. --- dlls/dxdiagn/provider.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0df10ea56ef..696acf7dc51 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -22,8 +22,6 @@ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dxdiag_private.h" #include "winver.h" #include "objidl.h" @@ -792,7 +790,7 @@ static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) if (SUCCEEDED(hr)) { dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.u1.dwCaps4 = 0; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, available_mem, NULL); IDirectDraw7_Release(pDirectDraw); if (SUCCEEDED(hr)) @@ -887,8 +885,8 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node goto cleanup; swprintf(buffer, ARRAY_SIZE(buffer), L"%u.%u.%04u.%04u", - HIWORD(adapter_info.DriverVersion.u.HighPart), LOWORD(adapter_info.DriverVersion.u.HighPart), - HIWORD(adapter_info.DriverVersion.u.LowPart), LOWORD(adapter_info.DriverVersion.u.LowPart)); + HIWORD(adapter_info.DriverVersion.HighPart), LOWORD(adapter_info.DriverVersion.HighPart), + HIWORD(adapter_info.DriverVersion.LowPart), LOWORD(adapter_info.DriverVersion.LowPart)); hr = add_bstr_property(display_adapter, L"szDriverVersion", buffer); if (FAILED(hr)) @@ -1154,7 +1152,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container return S_OK; dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.u1.dwCaps4 = 0; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, &tmp, NULL); if (SUCCEEDED(hr)) { @@ -1190,7 +1188,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container if (surface_descr.dwFlags & DDSD_PIXELFORMAT) { hr = add_ui4_property(display_adapter, L"dwBpp", - surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount); + surface_descr.ddpfPixelFormat.dwRGBBitCount); if (FAILED(hr)) goto cleanup; }