Re: wine/dlls x11drv/x11drv_main.c x11drv/x11drv.s ...

[Aric Stewart]

Doh! and i thought i had cleaned up all my shotgun attempts to get 
Japanese office 2000 working again. Yes. this needs to be fixed. I will 
make the patch to return this to normal and submit it asap.

-aric

Dmitry Timoshkov wrote:
"Alexandre Julliard" <[EMAIL PROTECTED]> wrote:


Log message:
Aric Stewart <[EMAIL PROTECTED]>
Use X11 XIM callbacks to enable full IME support.
Correct some timing issues with XIM input.
Start to provide the framework for the MSIME messages.


    langid = PRIMARYLANGID(LANGIDFROMLCID(layout));
    if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN)
-        layout |= 0xe001 << 16; /* FIXME */
+        layout = 0xe001 << 16; /* FIXME */


The above change looks wrong. This thrashes low 16 bits of layout id.
Moreover, 0xe001 was added already in the global keyboard table list
for Japanese kbd layout (btw, why not for Chinese and Korean?).