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

[Dmitry Timoshkov]

"Alexandre Julliard" <julliard(a)winehq.org> wrote:
> Log message:
> Aric Stewart <aric(a)codeweavers.com>
> 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?).

-- 
Dmitry.

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" <julliard(a)winehq.org> wrote:
> > Log message:
> > Aric Stewart <aric(a)codeweavers.com>
> > 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?).

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

[Aric Stewart]

Ok patch submitted...

I did not add the 0xe001 to Chinese and Korean because i have not tested 
those yet. It was in response to behavior in Office 2k Japanese. I 
highly suspect that adding the 0xe001 is correct for Korean and CHinese 
also but wanted to do some more testing in those locals before making 
that change. Once that is made then we can probably remove this chunk of 
code. Which would be nice.

-aric

Dmitry Timoshkov wrote:
> "Alexandre Julliard" <julliard(a)winehq.org> wrote:
> > Log message:
> > Aric Stewart <aric(a)codeweavers.com>
> > 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?).