Francois Gouget : dxdiagn: Fix compilation on systems that don' t support nameless unions.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Tue Jul 31 18:59:43 2007 +0200

dxdiagn: Fix compilation on systems that don't support nameless unions.

---

dlls/dxdiagn/provider.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index fe0543c..c30600b 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -20,9 +20,9 @@
  */

#include "config.h"
-#include "wine/debug.h"

#define COBJMACROS
+#define NONAMELESSUNION
 #include "dxdiag_private.h"
 #include "wine/unicode.h"
 #include "winver.h"
@@ -33,6 +33,8 @@
 #include "mmddk.h"
 #include <ddraw.h>

+#include "wine/debug.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);

/* IDxDiagProvider IUnknown parts follow: */
@@ -478,7 +480,7 @@ static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont)
         if (surface_descr.dwFlags & DDSD_HEIGHT)
             add_prop_ui4( pDisplayAdapterSubCont, dwHeight, surface_descr.dwHeight );
         if (surface_descr.dwFlags & DDSD_PIXELFORMAT)
-            add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.ddpfPixelFormat.dwRGBBitCount );
+            add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount );
     }

add_prop_str( pDisplayAdapterSubCont, szVendorId, szEmpty );