[mkupfer] 38692: Michael von Glasow <michael AT vonglasow DOT com> - Remove hardcoded Alt Gr behavior. - Tested with german layout and installation, patch doesn't break system, further tests are recommended. - See issue #3887 for more details.

Author: mkupfer
Date: Sun Jan 11 04:10:31 2009
New Revision: 38692

URL: http://svn.reactos.org/svn/reactos?rev=38692&view=rev
Log:
Michael von Glasow <michael AT vonglasow DOT com>
- Remove hardcoded Alt Gr behavior.
- Tested with german layout and installation, patch doesn't break system, further
tests are recommended.
- See issue #3887 for more details.

Modified:
    trunk/reactos/dll/keyboard/kbdusx/kbdusx.c
    trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c

Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] Sun Jan 11 04:10:31 2009
@@ -459,7 +459,7 @@
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Russian doesn't have any */
   0,

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Jan 11
04:10:31 2009
@@ -213,9 +213,10 @@
       ModBits |= GetShiftBit( pkKT, VK_MENU );
 
    /* Handle Alt+Gr */
-   if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) &
-         KS_DOWN_BIT )
-      ModBits |= GetShiftBit( pkKT, VK_CONTROL );
+   if (pkKT->fLocalFlags & 0x1) 
+      if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) &
+            KS_DOWN_BIT)
+         ModBits |= GetShiftBit( pkKT, VK_CONTROL );
 
    /* Deal with VK_CAPITAL */
    if (KeysSet( pkKT, KeyState, VK_CAPITAL, 0 ) & KS_LOCK_BIT)