From 19b19ec305637be14f8e42e32b073268cbac81be Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Tue, 9 Jun 2026 13:52:46 +0900
Subject: [PATCH] [USER32][COMCTL32] Edit control: Fix alignment mask (#9115)

Based on JIRA user I_Kill_Bug's "Edit Alignment.patch".
JIRA issue: CORE-20631
- Add (ES_LEFT | ES_RIGHT | ES_CENTER) flags to
  style_change_mask variable.
---
 dll/win32/comctl32/edit.c                     |   5 +
 modules/rostests/win32/user32/CMakeLists.txt  |   1 +
 .../win32/user32/editalign/CMakeLists.txt     |   6 +
 .../win32/user32/editalign/editalign.c        | 107 ++++++++++++++++++
 .../win32/user32/editalign/editalign.ico      | Bin 0 -> 23558 bytes
 .../win32/user32/editalign/editalign.rc       |  29 +++++
 .../win32/user32/editalign/resource.h         |   2 +
 win32ss/user/user32/controls/edit.c           |   5 +
 8 files changed, 155 insertions(+)
 create mode 100644 modules/rostests/win32/user32/editalign/CMakeLists.txt
 create mode 100644 modules/rostests/win32/user32/editalign/editalign.c
 create mode 100644 modules/rostests/win32/user32/editalign/editalign.ico
 create mode 100644 modules/rostests/win32/user32/editalign/editalign.rc
 create mode 100644 modules/rostests/win32/user32/editalign/resource.h

diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c
index ca52e7e496b..ed3829ed1ee 100644
--- a/dll/win32/comctl32/edit.c
+++ b/dll/win32/comctl32/edit.c
@@ -3991,8 +3991,13 @@ static LRESULT  EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
                 /* Only a subset of changes can be applied after the control
                  * has been created.
                  */
+#ifdef __REACTOS__
+                style_change_mask = ES_UPPERCASE | ES_LOWERCASE |
+                                    ES_NUMBER | ES_LEFT | ES_RIGHT | ES_CENTER;
+#else
                 style_change_mask = ES_UPPERCASE | ES_LOWERCASE |
                                     ES_NUMBER;
+#endif
                 if (es->style & ES_MULTILINE)
                         style_change_mask |= ES_WANTRETURN;
 
diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt
index 757220d2aa3..be1aa50f51b 100644
--- a/modules/rostests/win32/user32/CMakeLists.txt
+++ b/modules/rostests/win32/user32/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(biditext)
+add_subdirectory(editalign)
 add_subdirectory(messagebox)
 add_subdirectory(paintdesktop)
 add_subdirectory(psmtest)
diff --git a/modules/rostests/win32/user32/editalign/CMakeLists.txt b/modules/rostests/win32/user32/editalign/CMakeLists.txt
new file mode 100644
index 00000000000..ed9f7188d2a
--- /dev/null
+++ b/modules/rostests/win32/user32/editalign/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+add_rc_deps(editalign.rc ${CMAKE_CURRENT_SOURCE_DIR}/editalign.ico)
+add_executable(editalign editalign.c editalign.rc)
+set_module_type(editalign win32gui UNICODE)
+add_importlibs(editalign gdi32 user32 comctl32 msvcrt kernel32 ntdll)
+add_rostests_file(TARGET editalign SUBDIR suppl)
diff --git a/modules/rostests/win32/user32/editalign/editalign.c b/modules/rostests/win32/user32/editalign/editalign.c
new file mode 100644
index 00000000000..78c216817a5
--- /dev/null
+++ b/modules/rostests/win32/user32/editalign/editalign.c
@@ -0,0 +1,107 @@
+/*
+ * PROJECT:     ReactOS Tests
+ * LICENSE:     LGPL-2.0+ (https://spdx.org/licenses/LGPL-2.0+)
+ * PURPOSE:     Tests text alignment of EDIT control
+ * COPYRIGHT:   Copyright 2026 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <commctrl.h>
+#include <dlgs.h>
+#include "resource.h"
+
+static HINSTANCE g_hInstance = NULL;
+static HWND g_hMainWnd = NULL;
+
+static void SetEditAlign(HWND hwndEdit, LONG_PTR add_style)
+{
+    LONG_PTR style = GetWindowLongPtr(hwndEdit, GWL_STYLE);
+    style &= ~(ES_LEFT | ES_CENTER | ES_RIGHT);
+    style |= add_style;
+    SetWindowLongPtr(hwndEdit, GWL_STYLE, style);
+    InvalidateRect(hwndEdit, NULL, TRUE);
+}
+
+static void SetMultiline(HWND hwnd, HWND hwndEdit, BOOL bMultiline)
+{
+    TCHAR text[1024];
+    GetWindowText(hwndEdit, text, ARRAYSIZE(text));
+
+    RECT rc;
+    GetWindowRect(hwndEdit, &rc);
+    MapWindowPoints(NULL, hwnd, (LPPOINT)&rc, sizeof(RECT) / sizeof(POINT));
+
+    DWORD exstyle = (LONG)GetWindowLongPtr(hwndEdit, GWL_EXSTYLE);
+    DWORD style = (LONG)GetWindowLongPtr(hwndEdit, GWL_STYLE);
+    style &= ~ES_MULTILINE;
+    if (bMultiline)
+        style |= ES_MULTILINE;
+
+    DestroyWindow(hwndEdit);
+    CreateWindowEx(exstyle, TEXT("EDIT"), text, style,
+                   rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
+                   hwnd, (HMENU)UlongToHandle(edt1), g_hInstance, NULL);
+
+    HFONT hFont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
+    SendDlgItemMessage(hwnd, edt1, WM_SETFONT, (WPARAM)hFont, TRUE);
+}
+
+static INT_PTR CALLBACK
+DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            g_hMainWnd = hwnd;
+            SetDlgItemText(hwnd, edt1, TEXT("Text"));
+            CheckRadioButton(hwnd, rad1, rad3, rad1);
+            return TRUE;
+        }
+        case WM_COMMAND:
+        {
+            HWND hwndEdit = GetDlgItem(hwnd, edt1);
+            switch (LOWORD(wParam))
+            {
+            case IDCANCEL: // Cancel
+                EndDialog(hwnd, LOWORD(wParam));
+                break;
+            case rad1: // Left
+                if (HIWORD(wParam) == BN_CLICKED)
+                    SetEditAlign(hwndEdit, ES_LEFT);
+                break;
+            case rad2: // Center
+                if (HIWORD(wParam) == BN_CLICKED)
+                    SetEditAlign(hwndEdit, ES_CENTER);
+                break;
+            case rad3: // Right
+                if (HIWORD(wParam) == BN_CLICKED)
+                    SetEditAlign(hwndEdit, ES_RIGHT);
+                break;
+            case chx1: // Multiline
+                if (HIWORD(wParam) == BN_CLICKED)
+                {
+                    if (IsDlgButtonChecked(hwnd, chx1) == BST_CHECKED)
+                        SetMultiline(hwnd, hwndEdit, TRUE);
+                    else
+                        SetMultiline(hwnd, hwndEdit, FALSE);
+                }
+            }
+            break;
+        }
+    }
+    return 0;
+}
+
+INT WINAPI
+wWinMain(HINSTANCE   hInstance,
+         HINSTANCE   hPrevInstance,
+         LPWSTR      lpCmdLine,
+         INT         nCmdShow)
+{
+    g_hInstance = hInstance;
+    InitCommonControls();
+    DialogBoxW(hInstance, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc);
+    return 0;
+}
diff --git a/modules/rostests/win32/user32/editalign/editalign.ico b/modules/rostests/win32/user32/editalign/editalign.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1073447c20ca46dca11c7f8ed0297cdf1188a5e0
GIT binary patch
literal 23558
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
S2uFK+=#hr_`y5^6R{sMo*qd?y

literal 0
HcmV?d00001

diff --git a/modules/rostests/win32/user32/editalign/editalign.rc b/modules/rostests/win32/user32/editalign/editalign.rc
new file mode 100644
index 00000000000..9b08113af92
--- /dev/null
+++ b/modules/rostests/win32/user32/editalign/editalign.rc
@@ -0,0 +1,29 @@
+/*
+ * PROJECT:     ReactOS Tests
+ * LICENSE:     LGPL-2.0+ (https://spdx.org/licenses/LGPL-2.0+)
+ * PURPOSE:     Tests text alignment of EDIT control
+ * COPYRIGHT:   Copyright 2026 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
+ */
+
+#include <windows.h>
+#include "resource.h"
+
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS EditAlign test program"
+#define REACTOS_STR_INTERNAL_NAME      "editalign"
+#define REACTOS_STR_ORIGINAL_FILENAME  "editalign.exe"
+#include <reactos/version.rc>
+#include <reactos/manifest_exe.rc>
+
+IDI_MAIN ICON "editalign.ico"
+
+IDD_MAIN DIALOG 0, 0, 215, 135
+CAPTION "EditAlign"
+STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+FONT 9, "MS Shell Dlg"
+{
+    EDITTEXT edt1, 37, 13, 122, 61, ES_WANTRETURN
+    AUTORADIOBUTTON "ES_LEFT", rad1, 11, 83, 60, 14, WS_TABSTOP
+    AUTORADIOBUTTON "ES_CENTER", rad2, 77, 83, 60, 14, WS_TABSTOP
+    AUTORADIOBUTTON "ES_RIGHT", rad3, 145, 83, 60, 14, WS_TABSTOP
+    AUTOCHECKBOX "Multiline", chx1, 141, 115, 60, 14
+}
diff --git a/modules/rostests/win32/user32/editalign/resource.h b/modules/rostests/win32/user32/editalign/resource.h
new file mode 100644
index 00000000000..729562acb26
--- /dev/null
+++ b/modules/rostests/win32/user32/editalign/resource.h
@@ -0,0 +1,2 @@
+#define IDD_MAIN 100
+#define IDI_MAIN 100
diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c
index ceff2843f15..28e53c8cc24 100644
--- a/win32ss/user/user32/controls/edit.c
+++ b/win32ss/user/user32/controls/edit.c
@@ -4158,8 +4158,13 @@ static LRESULT  EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
                 /* Only a subset of changes can be applied after the control
                  * has been created.
                  */
+#ifdef __REACTOS__
+                style_change_mask = ES_UPPERCASE | ES_LOWERCASE |
+                                    ES_NUMBER | ES_LEFT | ES_RIGHT | ES_CENTER;
+#else
                 style_change_mask = ES_UPPERCASE | ES_LOWERCASE |
                                     ES_NUMBER;
+#endif
                 if (es->style & ES_MULTILINE)
                         style_change_mask |= ES_WANTRETURN;