mirror of
https://github.com/reactos/reactos.git
synced 2025-07-03 23:31:22 +00:00
Fix a bug.
svn path=/trunk/; revision=25760
This commit is contained in:
parent
011bca506e
commit
0675bc2424
1 changed files with 23 additions and 22 deletions
|
@ -158,34 +158,35 @@ static BOOL UserLoadKbdDll(WCHAR *wsKLID,
|
||||||
|
|
||||||
*phModule = EngLoadImage(FullLayoutPath.Buffer);
|
*phModule = EngLoadImage(FullLayoutPath.Buffer);
|
||||||
|
|
||||||
if(!*phModule)
|
if(*phModule)
|
||||||
{
|
{
|
||||||
DPRINT1( "Failed to load %wZ\n", &FullLayoutPath );
|
DPRINT("Loaded %wZ\n", &FullLayoutPath);
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
DPRINT1("Failed to load the keyboard layout.\n");
|
||||||
|
EngUnloadImage(*phModule);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath );
|
DPRINT1("Failed to load dll %wZ\n", &FullLayoutPath);
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
DPRINT1("Failed to load the keyboard layout.\n");
|
|
||||||
EngUnloadImage(*phModule);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue