Skip to content

Commit 7cf1e01

Browse files
authored
[SDK][MSUTB] Move WM_IME_SYSTEM to <imm32_undoc.h> (reactos#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.
1 parent 2335229 commit 7cf1e01

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

base/ctf/msutb/precomp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <windows.h>
1616
#include <oleacc.h>
1717
#include <imm.h>
18-
#include <undocuser.h>
18+
#include <imm32_undoc.h>
1919
#include <cguid.h>
2020
#include <msctf.h>
2121
#include <msctf_undoc.h>

sdk/include/ddk/immdev.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,30 +94,6 @@ typedef struct tagGUIDELINE {
9494
#define IMC_SETSOFTKBDSUBTYPE 0x0016
9595
#define IMC_SETSOFTKBDDATA 0x0018
9696

97-
/* wParam for WM_IME_SYSTEM */
98-
#define IMS_NOTIFYIMESHOW 0x05
99-
#define IMS_UPDATEIMEUI 0x06
100-
#define IMS_SETCANDFORM 0x09
101-
#define IMS_SETCOMPFONT 0x0A
102-
#define IMS_SETCOMPFORM 0x0B
103-
#define IMS_CONFIGURE 0x0D
104-
#define IMS_SETOPENSTATUS 0x0F
105-
#define IMS_FREELAYOUT 0x11
106-
#define IMS_SOFTKBDONOFF 0x13
107-
#define IMS_GETCONVSTATUS 0x14
108-
#define IMS_IMEHELP 0x15
109-
#define IMS_IMEACTIVATE 0x17
110-
#define IMS_IMEDEACTIVATE 0x18
111-
#define IMS_ACTIVATELAYOUT 0x19
112-
#define IMS_GETIMEMENU 0x1C
113-
#define IMS_IMEMENUITEMSELECTED 0x1D
114-
#define IMS_GETCONTEXT 0x1E
115-
#define IMS_SENDNOTIFICATION 0x1F
116-
#define IMS_COMPLETECOMPSTR 0x20
117-
#define IMS_LOADTHREADLAYOUT 0x21
118-
#define IMS_SETLANGBAND 0x23
119-
#define IMS_UNSETLANGBAND 0x24
120-
12197
/* wParam for WM_IME_NOTIFY */
12298
#define IMN_SOFTKBDDESTROYED 0x0011
12399

sdk/include/reactos/imm32_undoc.h

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,32 @@ extern "C" {
2929
#define HKL_SWITCH_TO_NON_IME ((HKL)UlongToHandle(1))
3030
#define HKL_RELEASE_IME ((HKL)UlongToHandle(2))
3131

32+
#define WM_IME_SYSTEM 0x00000287
33+
34+
/* wParam for WM_IME_SYSTEM */
35+
#define IMS_NOTIFYIMESHOW 0x05
36+
#define IMS_UPDATEIMEUI 0x06
37+
#define IMS_SETCANDFORM 0x09
38+
#define IMS_SETCOMPFONT 0x0A
39+
#define IMS_SETCOMPFORM 0x0B
40+
#define IMS_CONFIGURE 0x0D
41+
#define IMS_SETOPENSTATUS 0x0F
42+
#define IMS_FREELAYOUT 0x11
43+
#define IMS_SOFTKBDONOFF 0x13
44+
#define IMS_GETCONVSTATUS 0x14
45+
#define IMS_IMEHELP 0x15
46+
#define IMS_IMEACTIVATE 0x17
47+
#define IMS_IMEDEACTIVATE 0x18
48+
#define IMS_ACTIVATELAYOUT 0x19
49+
#define IMS_GETIMEMENU 0x1C
50+
#define IMS_IMEMENUITEMSELECTED 0x1D
51+
#define IMS_GETCONTEXT 0x1E
52+
#define IMS_SENDNOTIFICATION 0x1F
53+
#define IMS_COMPLETECOMPSTR 0x20
54+
#define IMS_LOADTHREADLAYOUT 0x21
55+
#define IMS_SETLANGBAND 0x23
56+
#define IMS_UNSETLANGBAND 0x24
57+
3258
typedef struct tagIMEINFOEX
3359
{
3460
HKL hkl;

sdk/include/reactos/undocuser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ extern "C" {
5959
#define WM_DRAGLOOP 0x0000022D
6060
#define WM_DRAGSELECT 0x0000022E
6161
#define WM_DRAGMOVE 0x0000022F
62-
#define WM_IME_SYSTEM 0x00000287
6362
#define WM_POPUPSYSTEMMENU 0x00000313
6463
#define WM_UAHINIT 0x0000031b
6564
#define WM_CBT 0x000003FF // ReactOS only.

0 commit comments

Comments
 (0)