From cba35b6ba1a5deb18f721780181907050091c596 Mon Sep 17 00:00:00 2001
From: Julius Schwartzenberg <julius.schwartzenberg@gmail.com>
Date: Tue, 6 Oct 2009 22:59:54 +0200
Subject: Fix for bug #2181. Changes the extra value of the standard edit class from 4 to 6.

---
 dlls/user32/edit.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 8ad945b..e1159f9 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -5410,13 +5410,19 @@ static LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
  * edit class descriptor
  */
 static const WCHAR editW[] = {'E','d','i','t',0};
+#ifdef _WIN64
+#define EDIT_EXTRA_VALUE sizeof(EDITSTATE *)
+#else
+#define EDIT_EXTRA_VALUE 6 /* This has to be 6 for 32-bit, otherwise Civilization II crashes, bug #2181  */
+#endif
 const struct builtin_class_descr EDIT_builtin_class =
 {
     editW,                /* name */
     CS_DBLCLKS | CS_PARENTDC,   /* style */
     EditWndProcA,         /* procA */
     EditWndProcW,         /* procW */
-    sizeof(EDITSTATE *),  /* extra */
+    EDIT_EXTRA_VALUE,     /* extra */
     IDC_IBEAM,            /* cursor */
     0                     /* brush */
 };
+#undef EDIT_EXTRA_VALUE
-- 
1.6.0.4