From 7cf1e01cd4d5e7982bc7a9d01fa7e186034da746 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Sat, 7 Jun 2025 07:52:05 +0900
Subject: [PATCH] [SDK][MSUTB] Move WM_IME_SYSTEM to <imm32_undoc.h> (#8093)

Defining macros in proper place will improve header
compatibility.
JIRA issue: CORE-19268
- Move WM_IME_SYSTEM macro in <undocuser.h>
  into <imm32_undoc.h>.
- Move IMS_... macros in <immdev.h> into
  <imm32_undoc.h>.
- Include <imm32_undoc.h> in base/ctf/msutb.
---
 base/ctf/msutb/precomp.h          |  2 +-
 sdk/include/ddk/immdev.h          | 24 ------------------------
 sdk/include/reactos/imm32_undoc.h | 26 ++++++++++++++++++++++++++
 sdk/include/reactos/undocuser.h   |  1 -
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/base/ctf/msutb/precomp.h b/base/ctf/msutb/precomp.h
index 58813d2e285..4b4de577d50 100644
--- a/base/ctf/msutb/precomp.h
+++ b/base/ctf/msutb/precomp.h
@@ -15,7 +15,7 @@
 #include <windows.h>
 #include <oleacc.h>
 #include <imm.h>
-#include <undocuser.h>
+#include <imm32_undoc.h>
 #include <cguid.h>
 #include <msctf.h>
 #include <msctf_undoc.h>
diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h
index 97a5e9cb4cd..3f2e822e4c5 100644
--- a/sdk/include/ddk/immdev.h
+++ b/sdk/include/ddk/immdev.h
@@ -94,30 +94,6 @@ typedef struct tagGUIDELINE {
 #define IMC_SETSOFTKBDSUBTYPE           0x0016
 #define IMC_SETSOFTKBDDATA              0x0018
 
-/* wParam for WM_IME_SYSTEM */
-#define IMS_NOTIFYIMESHOW       0x05
-#define IMS_UPDATEIMEUI         0x06
-#define IMS_SETCANDFORM         0x09
-#define IMS_SETCOMPFONT         0x0A
-#define IMS_SETCOMPFORM         0x0B
-#define IMS_CONFIGURE           0x0D
-#define IMS_SETOPENSTATUS       0x0F
-#define IMS_FREELAYOUT          0x11
-#define IMS_SOFTKBDONOFF        0x13
-#define IMS_GETCONVSTATUS       0x14
-#define IMS_IMEHELP             0x15
-#define IMS_IMEACTIVATE         0x17
-#define IMS_IMEDEACTIVATE       0x18
-#define IMS_ACTIVATELAYOUT      0x19
-#define IMS_GETIMEMENU          0x1C
-#define IMS_IMEMENUITEMSELECTED 0x1D
-#define IMS_GETCONTEXT          0x1E
-#define IMS_SENDNOTIFICATION    0x1F
-#define IMS_COMPLETECOMPSTR     0x20
-#define IMS_LOADTHREADLAYOUT    0x21
-#define IMS_SETLANGBAND         0x23
-#define IMS_UNSETLANGBAND       0x24
-
 /* wParam for WM_IME_NOTIFY */
 #define IMN_SOFTKBDDESTROYED    0x0011
 
diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h
index ef8004430b7..3d7296bd272 100644
--- a/sdk/include/reactos/imm32_undoc.h
+++ b/sdk/include/reactos/imm32_undoc.h
@@ -29,6 +29,32 @@ extern "C" {
 #define HKL_SWITCH_TO_NON_IME   ((HKL)UlongToHandle(1))
 #define HKL_RELEASE_IME         ((HKL)UlongToHandle(2))
 
+#define WM_IME_SYSTEM 0x00000287
+
+/* wParam for WM_IME_SYSTEM */
+#define IMS_NOTIFYIMESHOW       0x05
+#define IMS_UPDATEIMEUI         0x06
+#define IMS_SETCANDFORM         0x09
+#define IMS_SETCOMPFONT         0x0A
+#define IMS_SETCOMPFORM         0x0B
+#define IMS_CONFIGURE           0x0D
+#define IMS_SETOPENSTATUS       0x0F
+#define IMS_FREELAYOUT          0x11
+#define IMS_SOFTKBDONOFF        0x13
+#define IMS_GETCONVSTATUS       0x14
+#define IMS_IMEHELP             0x15
+#define IMS_IMEACTIVATE         0x17
+#define IMS_IMEDEACTIVATE       0x18
+#define IMS_ACTIVATELAYOUT      0x19
+#define IMS_GETIMEMENU          0x1C
+#define IMS_IMEMENUITEMSELECTED 0x1D
+#define IMS_GETCONTEXT          0x1E
+#define IMS_SENDNOTIFICATION    0x1F
+#define IMS_COMPLETECOMPSTR     0x20
+#define IMS_LOADTHREADLAYOUT    0x21
+#define IMS_SETLANGBAND         0x23
+#define IMS_UNSETLANGBAND       0x24
+
 typedef struct tagIMEINFOEX
 {
     HKL hkl;
diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h
index da2e7e35bfe..0f974c8fedf 100644
--- a/sdk/include/reactos/undocuser.h
+++ b/sdk/include/reactos/undocuser.h
@@ -59,7 +59,6 @@ extern "C" {
 #define WM_DRAGLOOP	        0x0000022D
 #define WM_DRAGSELECT       0x0000022E
 #define WM_DRAGMOVE	        0x0000022F
-#define WM_IME_SYSTEM       0x00000287
 #define WM_POPUPSYSTEMMENU  0x00000313
 #define WM_UAHINIT          0x0000031b
 #define WM_CBT              0x000003FF // ReactOS only.