Fix a bug.

svn path=/trunk/; revision=25760
This commit is contained in:
Saveliy Tretiakov 2007-02-10 08:09:04 +00:00
parent 011bca506e
commit 0675bc2424

View file

@ -158,34 +158,35 @@ static BOOL UserLoadKbdDll(WCHAR *wsKLID,
*phModule = EngLoadImage(FullLayoutPath.Buffer);
if(!*phModule)
if(*phModule)
{
DPRINT1( "Failed to load %wZ\n", &FullLayoutPath );
}
else
{
DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath );
}
DPRINT("Loaded %wZ\n", &FullLayoutPath);
RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" );
LdrGetProcedureAddress((PVOID)*phModule,
&kbdProcedureName,
0,
(PVOID*)&layerDescGetFn);
RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" );
LdrGetProcedureAddress((PVOID)*phModule,
&kbdProcedureName,
0,
(PVOID*)&layerDescGetFn);
if(layerDescGetFn)
{
*pKbdTables = layerDescGetFn();
}
else
{
DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath);
}
if(layerDescGetFn)
{
*pKbdTables = layerDescGetFn();
if(!layerDescGetFn || !*pKbdTables)
{
DPRINT1("Failed to load the keyboard layout.\n");
EngUnloadImage(*phModule);
return FALSE;
}
}
else
{
DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath);
}
if(!layerDescGetFn || !*pKbdTables)
{
DPRINT1("Failed to load the keyboard layout.\n");
EngUnloadImage(*phModule);
DPRINT1("Failed to load dll %wZ\n", &FullLayoutPath);
return FALSE;
}