[PATCH 0/1] MR4716: win32u: Use 32-bit window extra size on wow64.

[Jacek Caban (＠jacek)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55582

I don't know any application requiring the size to be 8, so I hope this is fine. If we find one, I guess we could guard it with a Windows version check.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4716

[PATCH 1/1] win32u: Use 32-bit window extra size on wow64.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55582
---
 dlls/win32u/class.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c
index 1fb5044b2e5..52d6b59cb05 100644
--- a/dlls/win32u/class.c
+++ b/dlls/win32u/class.c
@@ -1125,14 +1125,6 @@ static const struct builtin_class_descr builtin_classes[] =
         .extra = DLGWINDOWEXTRA,
         .cursor = IDC_ARROW,
     },
-    /* edit */
-    {
-        .name = "Edit",
-        .style = CS_DBLCLKS | CS_PARENTDC,
-        .proc = WINPROC_EDIT,
-        .extra = sizeof(UINT64),
-        .cursor = IDC_IBEAM,
-    },
     /* icon title */
     {
         .name = MAKEINTRESOURCEA(ICONTITLE_CLASS_ATOM),
@@ -1233,7 +1225,20 @@ static void register_builtins(void)
     ULONG ret_len, i;
     void *ret_ptr;
 
+    /* 64-bit Windows use sizeof(UINT64) for all processes, while 32-bit Windows use 6 for
+     * extra bytes size. Civilization II depends on the size being 6, so we preserve use
+     * that even in wow64. */
+    const struct builtin_class_descr edit_class =
+    {
+        .name = "Edit",
+        .style = CS_DBLCLKS | CS_PARENTDC,
+        .proc = WINPROC_EDIT,
+        .extra = sizeof(void *) == 4 || NtCurrentTeb()->WowTebOffset ? 6 : sizeof(UINT64),
+        .cursor = IDC_IBEAM,
+    };
+
     for (i = 0; i < ARRAYSIZE(builtin_classes); i++) register_builtin( &builtin_classes[i] );
+    register_builtin( &edit_class );
     KeUserModeCallback( NtUserInitBuiltinClasses, NULL, 0, &ret_ptr, &ret_len );
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4716

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/win32u/class.c:
> ULONG ret_len, i;
>      void *ret_ptr;
>
> +    /* 64-bit Windows use sizeof(UINT64) for all processes, while 32-bit Windows use 6 for
> +     * extra bytes size. Civilization II depends on the size being 6, so we preserve use

```suggestion:-0+0
     * extra bytes size. Civilization II depends on the size being 6, so we use
```

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4716#note_56215