Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Freed the path string for the keyboard dll.

Browse source 
- Freed some strings in all cases.

svn path=/trunk/; revision=17835
This commit is contained in:
Hartmut Birr 2005-09-13 18:08:18 +00:00
parent 535a223492
commit 7f94d6e5bf
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -616,7 +616,8 @@ void InitKbdLayout( PVOID *pkKeyboardLayout )
RtlInitUnicodeString(&LayoutValueName,L"Layout File");
Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile);
RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR);
RtlFreeUnicodeString(&LayoutKeyName);
if( !NT_SUCCESS(Status) )
{
@ -627,8 +628,8 @@ void InitKbdLayout( PVOID *pkKeyboardLayout )
{
DPRINT("Read registry and got %wZ\n", &LayoutFile);
RtlFreeUnicodeString(&LayoutKeyName);
RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR);
AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE);
DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath);
@ -647,7 +648,7 @@ void InitKbdLayout( PVOID *pkKeyboardLayout )
return;
}
memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer,
FullLayoutPath.Length + sizeof(WCHAR));
FullLayoutPath.Length);
KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0;
kbModule = EngLoadImage(KeyboardLayoutWSTR);
@ -656,6 +657,7 @@ void InitKbdLayout( PVOID *pkKeyboardLayout )
if( !kbModule )
DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath );
ExFreePool(KeyboardLayoutWSTR);
RtlFreeUnicodeString(&FullLayoutPath);
}
}
@ -694,7 +696,7 @@ void InitKbdLayout( PVOID *pkKeyboardLayout )
#undef XX_STATUS
}
PKBDTABLES W32kGetDefaultKeyLayout()
PKBDTABLES W32kGetDefaultKeyLayout(VOID)
{
PKBDTABLES pkKeyboardLayout = 0;
InitKbdLayout( (PVOID) &pkKeyboardLayout );