Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only load the US keyboard layout if no other was loaded successfully

Browse source 
svn path=/trunk/; revision=6366
This commit is contained in:
Thomas Bluemel 2003-10-18 21:48:18 +00:00
parent 0eb7b64bdc
commit ce73b32829
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/subsys/win32k/ntuser/keyboard.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: keyboard.c,v 1.12 2003/10/18 21:29:26 mf Exp $ /* $Id: keyboard.c,v 1.13 2003/10/18 21:48:18 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -590,19 +590,16 @@ void InitKbdLayout( PVOID *pkKeyboardLayout ) {
RtlFreeUnicodeString(&FullLayoutPath); RtlFreeUnicodeString(&FullLayoutPath);
} }
if( !kbModule ) { if( !kbModule )
DbgPrint("Trying to load GER Keyboard Layout\n"); {
kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdgr.dll"); DbgPrint("Trying to load US Keyboard Layout\n");
kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll");
if( !kbModule ) {
DbgPrint("Trying to load US Keyboard Layout\n"); if (!kbModule)
kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll"); {
DbgPrint("Failed to load any Keyboard Layout\n");
if (!kbModule) { return;
DbgPrint("Failed to load any Keyboard Layout\n"); }
return;
}
}
} }
RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" );