[PATCH v3 0/2] MR6819: Draft: include: Fix WM_IME_KEY* typo.
As far as I can tell, ime.h is only included by the x11 keyboard driver and `WM_IMEKEYDOWN` and `WM_IMEKEYUP` are not used there, so this change should only bring the naming convention in line with what is already in winuser and MSDN. -- v3: winex11: Do not include ime.h. include: Add Japanese IME virtual key codes to winuser.rh. https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
From: Marc-Aurel Zent <mzent(a)codeweavers.com> --- include/winuser.rh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winuser.rh b/include/winuser.rh index fd984a91742..a61f8e8fafd 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -275,19 +275,33 @@ #define VK_OEM_WSCTRL 0xEE #define VK_OEM_CUSEL 0xEF #define VK_OEM_ATTN 0xF0 +#define VK_DBE_ALPHANUMERIC VK_OEM_ATTN #define VK_OEM_FINISH 0xF1 +#define VK_DBE_KATAKANA VK_OEM_FINISH #define VK_OEM_COPY 0xF2 +#define VK_DBE_HIRAGANA VK_OEM_COPY #define VK_OEM_AUTO 0xF3 +#define VK_DBE_SBCSCHAR VK_OEM_AUTO #define VK_OEM_ENLW 0xF4 +#define VK_DBE_DBCSCHAR VK_OEM_ENLW #define VK_OEM_BACKTAB 0xF5 +#define VK_DBE_ROMAN VK_OEM_BACKTAB #define VK_ATTN 0xF6 +#define VK_DBE_NOROMAN VK_ATTN #define VK_CRSEL 0xF7 +#define VK_DBE_ENTERWORDREGISTERMODE VK_CRSEL #define VK_EXSEL 0xF8 +#define VK_DBE_ENTERIMECONFIGMODE VK_EXSEL #define VK_EREOF 0xF9 +#define VK_DBE_FLUSHSTRING VK_EREOF #define VK_PLAY 0xFA +#define VK_DBE_CODEINPUT VK_PLAY #define VK_ZOOM 0xFB +#define VK_DBE_NOCODEINPUT VK_ZOOM #define VK_NONAME 0xFC +#define VK_DBE_DETERMINESTRING VK_NONAME #define VK_PA1 0xFD +#define VK_DBE_ENTERDLGCONVERSIONMODE VK_PA1 #define VK_OEM_CLEAR 0xFE /* 0xFF Unassigned */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
From: Marc-Aurel Zent <mzent(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bb5bf6220e1..8841a24e51b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -46,7 +46,6 @@ #include "winuser.h" #include "winreg.h" #include "winnls.h" -#include "ime.h" #include "wine/server.h" #include "wine/debug.h" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
Fwiw `ime.h` exists in the Windows SDK and it has these WM_IMEKEYDOWN / WM_IMEKEYUP definitions. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87605
Rémi Bernon (@rbernon) commented about include/winuser.rh:
#define VK_OEM_WSCTRL 0xEE #define VK_OEM_CUSEL 0xEF #define VK_OEM_ATTN 0xF0 +#define VK_DBE_ALPHANUMERIC VK_OEM_ATTN These are supposed to be in `ime.h` and `kbd.h`, any reason not to put them there?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87604
participants (3)
-
Marc-Aurel Zent -
Marc-Aurel Zent (＠mzent)
-
Rémi Bernon