From 1e22e3b3bae2fe96aca7a8b575c0d38f45a2261e Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Tue, 29 Oct 2002 21:23:33 +0000
Subject: [PATCH] Fixed mismatches between the Wine headers and the Microsoft
 headers.

---
 include/wingdi.h  | 2 +-
 include/winuser.h | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/wingdi.h b/include/wingdi.h
index 8dc40b2a7e9..302293a27da 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -2395,7 +2395,7 @@ typedef struct {
     DWORD iUsageSrc;
     DWORD iStartScan;
     DWORD cScans;
-} EMRSETDIBITSTODEIVCE, *PEMRSETDIBITSTODEVICE;
+} EMRSETDIBITSTODEVICE, *PEMRSETDIBITSTODEVICE;
 
 typedef struct {
     EMR   emr;
diff --git a/include/winuser.h b/include/winuser.h
index 0bc490c3e38..4f8b4667d98 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1844,7 +1844,6 @@ typedef struct
 typedef struct
 {
     BYTE   fVirt;
-    BYTE   pad0;
     WORD   key;
     WORD   cmd;
 } ACCEL, *LPACCEL;
@@ -2380,21 +2379,21 @@ DECL_WINELIB_TYPE_AW(LPMSGBOXPARAMS)
 
 typedef struct tagMONITORINFO
 {
-    DWORD   cbSize;
+    DWORD cbSize;
     RECT  rcMonitor;
     RECT  rcWork;
-    DWORD   dwFlags;
+    DWORD dwFlags;
 } MONITORINFO, *LPMONITORINFO;
 
 typedef struct tagMONITORINFOEXA
 {
-    MONITORINFO dummy;
+    MONITORINFO DUMMYSTRUCTNAME;
     CHAR        szDevice[CCHDEVICENAME];
 } MONITORINFOEXA, *LPMONITORINFOEXA;
 
 typedef struct tagMONITORINFOEXW
 {
-    MONITORINFO dummy;
+    MONITORINFO DUMMYSTRUCTNAME;
     WCHAR       szDevice[CCHDEVICENAME];
 } MONITORINFOEXW, *LPMONITORINFOEXW;