commit 4d48dd304856c904d4b6f15a141e95c1dcc08b08
author Dimitrie O. Paun <dimi@cs.toronto.edu> Sun Apr 30 12:22:18 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Apr 30 12:22:18 2000 +0000
tree 359ba2f24b79b0484d5ffde51229ca48c356bb83
parent 04c16b828ec53da4cd467e5611c2be1026d89159

Removed HEAP_xalloc.

windows/input.c

diff --git a/windows/input.c b/windows/input.c
index 089e468..1adf1ae 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -940,10 +940,9 @@
  */
 INT WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
-	LPSTR buf = HEAP_xalloc( GetProcessHeap(), 0, strlen("00000409")+1);
+	char buf[9];
 	int res = GetKeyboardLayoutNameA(buf);
 	lstrcpyAtoW(pwszKLID,buf);
-	HeapFree( GetProcessHeap(), 0, buf );
 	return res;
 }
 
@@ -960,8 +959,10 @@
  */
 INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
 {
-	LPSTR buf = HEAP_xalloc( GetProcessHeap(), 0, nSize );
-	int res = GetKeyNameTextA(lParam,buf,nSize);
+	int res;
+	LPSTR buf = HeapAlloc( GetProcessHeap(), 0, nSize );
+	if(buf == NULL) return 0; /* FIXME: is this the correct failure value?*/
+	res = GetKeyNameTextA(lParam,buf,nSize);
 
 	lstrcpynAtoW(lpBuffer,buf,nSize);
 	HeapFree( GetProcessHeap(), 0, buf );
@@ -1069,11 +1070,9 @@
  */
 HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
 {
-    LPSTR buf = HEAP_xalloc( GetProcessHeap(), 0, strlen("00000409")+1);
-    int res;
+    char buf[9];
+    
     lstrcpynWtoA(buf,pwszKLID,8);
     buf[8] = 0;
-    res = LoadKeyboardLayoutA(buf, Flags);
-    HeapFree( GetProcessHeap(), 0, buf );
-    return res;
+    return LoadKeyboardLayoutA(buf, Flags);
 }