[PATCH v4 0/2] MR6819: Add Japanese IME virtual key codes to winuser.rh.
Also removes ime.h from x11 keyboard driver. In the that file imported from the mingw-w64 runtime seem also to be typos like `WM_IMEKEYDOWN` and `WM_IMEKEYUP` and is not used at all in wine, so theoretically it could be removed entirely... Not too sure if there are any winelib considerations to be had here though. -- v4: winex11: Include kbd.h instead of ime.h. include: Add Japanese IME virtual key codes to kbd.h. https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
From: Marc-Aurel Zent <mzent(a)codeweavers.com> --- include/kbd.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/kbd.h b/include/kbd.h index da805b7cefc..56ec97afa8d 100644 --- a/include/kbd.h +++ b/include/kbd.h @@ -343,4 +343,19 @@ typedef struct tagKbdLayer #error "Unsupported KBD_TYPE" #endif +#define VK_DBE_ALPHANUMERIC 0x0f0 +#define VK_DBE_KATAKANA 0x0f1 +#define VK_DBE_HIRAGANA 0x0f2 +#define VK_DBE_SBCSCHAR 0x0f3 +#define VK_DBE_DBCSCHAR 0x0f4 +#define VK_DBE_ROMAN 0x0f5 +#define VK_DBE_NOROMAN 0x0f6 +#define VK_DBE_ENTERWORDREGISTERMODE 0x0f7 +#define VK_DBE_ENTERIMECONFIGMODE 0x0f8 +#define VK_DBE_FLUSHSTRING 0x0f9 +#define VK_DBE_CODEINPUT 0x0fa +#define VK_DBE_NOCODEINPUT 0x0fb +#define VK_DBE_DETERMINESTRING 0x0fc +#define VK_DBE_ENTERDLGCONVERSIONMODE 0x0fd + #endif /* __WINE_KBD_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
From: Marc-Aurel Zent <mzent(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bb5bf6220e1..7b7371ed696 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -46,7 +46,7 @@ #include "winuser.h" #include "winreg.h" #include "winnls.h" -#include "ime.h" +#include "kbd.h" #include "wine/server.h" #include "wine/debug.h" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
On Fri Nov 15 13:37:26 2024 +0000, Marc-Aurel Zent wrote:
changed this line in [version 4 of the diff](/wine/wine/-/merge_requests/6819/diffs?diff_id=143459&start_sha=0302c7481d47fc84f6410a86448ea92116b09a93#4d359ddf1252548429010df9191fdec02b18654d_278_278) You are right, looking a the public windows SDK, they are indeed there (it just seemed logical to put them there to me on first glance).
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87615
On Fri Nov 15 13:46:09 2024 +0000, Rémi Bernon wrote:
Fwiw `ime.h` exists in the Windows SDK and it has these WM_IMEKEYDOWN / WM_IMEKEYUP definitions. Given that `kbd.h` guards the extra IME virtual keys to WINXP and newer and comments on `ime.h` suggest these are from 1992 or older, I assume the latter is some sort of legacy name (or even typo) since everywhere else `0x0290` and `0x0291` refers to `WM_IME_KEYDOWN` and `WM_IME_KEYUP` respectively.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87616
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819
public windows SDK
So is there a private Windows SDK that I shouldn't touch? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87632
On Fri Nov 15 15:28:53 2024 +0000, Aida Jonikienė wrote:
public windows SDK So is there a private Windows SDK that I shouldn't touch? I believe there are some internal SDKs, especially for driver development (heard some require being some sort of Microsoft partner and even get limited source access and/or access to internal API documentation or more, having signed some sort of NDA).
But yeah with public SDK here, I just meant the bog standard windows SDK any person can download atm. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6819#note_87635
participants (4)
-
Aida Jonikienė -
Marc-Aurel Zent
-
Marc-Aurel Zent (＠mzent)
-
Rémi Bernon