Module: wine Branch: master Commit: 9cb4c21f1a864e8002f868956fa18a8fb5a63f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb4c21f1a864e8002f868956f...
Author: Ken Thomases ken@codeweavers.com Date: Wed Feb 9 22:41:34 2011 -0600
user32: Rename GetKeyboardLayout param; it's a thread ID, not a layout.
---
dlls/user32/driver.c | 6 +++--- dlls/user32/input.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index f2f9892..5d49882 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -176,7 +176,7 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) return 0; }
-static HKL CDECL nulldrv_GetKeyboardLayout( DWORD layout ) +static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) { return 0; } @@ -529,9 +529,9 @@ static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size return load_driver()->pGetKeyNameText( lparam, buffer, size ); }
-static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD layout ) +static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD thread_id ) { - return load_driver()->pGetKeyboardLayout( layout ); + return load_driver()->pGetKeyboardLayout( thread_id ); }
static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6e1e459..48430e9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -688,9 +688,9 @@ UINT WINAPI GetKBCodePage(void) * the language id. This is the way Windows default works. * - the thread identifier (dwLayout) is also ignored. */ -HKL WINAPI GetKeyboardLayout(DWORD dwLayout) +HKL WINAPI GetKeyboardLayout(DWORD thread_id) { - return USER_Driver->pGetKeyboardLayout(dwLayout); + return USER_Driver->pGetKeyboardLayout(thread_id); }
/****************************************************************************