src/java.desktop/windows/native/libawt/windows/awt_Component.cpp

*** 3521,3531 ****
          } // ctrlIsDown
      } // modifiers
  
      WORD wChar[2];
      int converted = 1;
!     UINT ch = ::MapVirtualKey(wkey, 2);
      if (ch & 0x80000000) {
          // Dead key which is handled as a normal key
          isDeadKey = deadKeyActive = TRUE;
      } else if (deadKeyActive) {
          // We cannot use ::ToUnicodeEx if dead key is active because this will
--- 3521,3531 ----
          } // ctrlIsDown
      } // modifiers
  
      WORD wChar[2];
      int converted = 1;
!     UINT ch = ::MapVirtualKeyEx(wkey, 2, GetKeyboardLayout());
      if (ch & 0x80000000) {
          // Dead key which is handled as a normal key
          isDeadKey = deadKeyActive = TRUE;
      } else if (deadKeyActive) {
          // We cannot use ::ToUnicodeEx if dead key is active because this will