From 88dc5cc365c2aba3e157d4805c8a4ec182118187 Mon Sep 17 00:00:00 2001
From: Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
Date: Sat, 14 Nov 2009 19:58:41 +0000
Subject: [PATCH] 2009-14-09  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>

        * include/wingdi.h (_devicemodeW, _devicemodeA): Correct definition.

        Thanks to Bruno Martinez for the report.
---
 winsup/w32api/ChangeLog        | 10 ++++++++--
 winsup/w32api/include/wingdi.h | 16 ++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c78a6c0be..dd0a1f89a 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,16 +1,22 @@
+2009-14-09  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* include/wingdi.h (_devicemodeW, _devicemodeA): Correct definition.
+
+	Thanks to Bruno Martinez for the report.
+
 2009-14-09  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* include/shlobj.h (IDO_SHGIOI_SHARE, IDO_SHGIOI_LINK, IDO_SHGIOI_SLOWFILE,
 	IDO_SHGIOI_DEFAULT, SHGetIconOverlayIndexW, SHGetIconOverlayIndexA,
 	SHGetIconOverlayIndex): Define.
 
-	Thanks to Tim Kosse for report.
+	Thanks to Tim Kosse for the report.
 
 2009-13-09  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* include/wincon.h (AttachConsole): Correct guard.
 
-	Thanks to Alexander Shaduri for report.
+	Thanks to Alexander Shaduri for the report.
 
 2009-13-09  Robert Moerland  <rjmoerland@users.sourceforge.net>
 
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 8038dec25..c62111da2 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -1502,9 +1502,11 @@ typedef struct _devicemodeA {
       short dmDefaultSource; 
       short dmPrintQuality; 
     } DUMMYSTRUCTNAME;
-    POINTL dmPosition;
-    DWORD  dmDisplayOrientation;
-    DWORD  dmDisplayFixedOutput;
+    _ANONYMOUS_STRUCT struct {
+      POINTL dmPosition;
+      DWORD  dmDisplayOrientation;
+      DWORD  dmDisplayFixedOutput;
+    } DUMMYSTRUCTNAME2;
   } DUMMYUNIONNAME;
 
   short  dmColor; 
@@ -1553,9 +1555,11 @@ typedef struct _devicemodeW {
       short dmDefaultSource; 
       short dmPrintQuality; 
     } DUMMYSTRUCTNAME;
-    POINTL dmPosition;
-    DWORD  dmDisplayOrientation;
-    DWORD  dmDisplayFixedOutput;
+    _ANONYMOUS_STRUCT struct {
+      POINTL dmPosition;
+      DWORD  dmDisplayOrientation;
+      DWORD  dmDisplayFixedOutput;
+    } DUMMYSTRUCTNAME2;
   } DUMMYUNIONNAME;
 
   short  dmColor;