From 2d438bced6e22f11caa2df96d9894ef29ae3b96a Mon Sep 17 00:00:00 2001
From: Dmitry Chapyshev <dmitry@reactos.org>
Date: Tue, 22 Apr 2008 19:01:56 +0000
Subject: [PATCH] - Keyboard layout switching works now in ReactOS!

svn path=/trunk/; revision=33106
---
 reactos/base/applications/kbswitch/kbswitch.c | 35 +++++++++++--------
 reactos/base/applications/kbswitch/kbswitch.h |  1 +
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/reactos/base/applications/kbswitch/kbswitch.c b/reactos/base/applications/kbswitch/kbswitch.c
index dea20f06aad..c940aaf58b6 100644
--- a/reactos/base/applications/kbswitch/kbswitch.c
+++ b/reactos/base/applications/kbswitch/kbswitch.c
@@ -9,7 +9,6 @@
 #include "kbswitch.h"
 
 #define WM_NOTIFYICONMSG (WM_USER + 248)
-#define BUFSIZE 256
 
 HINSTANCE hInst;
 HWND      hwnd;
@@ -48,14 +47,14 @@ GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID)
 {
     DWORD dwBufLen;
     HKEY hKey;
-    TCHAR szTempLCID[CCH_LAYOUT_ID + 1];
+    TCHAR szTempLCID[MAX_PATH];
 
     // Get the Layout ID
     if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-        dwBufLen = sizeof(szTempLCID);
+        dwBufLen = MAX_PATH;
 
-        if(RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS)
+        if (RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS)
         {
             RegCloseKey(hKey);
             return FALSE;
@@ -65,11 +64,11 @@ GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID)
     }
 
     // Look for a substitude of this layout
-    if(RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-        dwBufLen = sizeof(szTempLCID);
+        dwBufLen = MAX_PATH;
 
-        if(RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS)
+        if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS)
         {
             // No substitute found, then use the old LCID
             lstrcpy(szLCID, szTempLCID);
@@ -97,11 +96,11 @@ GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName)
     if(!GetLayoutID(szLayoutNum, szLCID))
         return FALSE;
 
-    wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID);
+    _stprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID);
 
     if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-        dwBufLen = MAX_PATH * sizeof(TCHAR);
+        dwBufLen = MAX_PATH;
 
         if(RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS)
         {
@@ -115,20 +114,26 @@ GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName)
     return TRUE;
 }
 
+BOOL CALLBACK
+EnumWindowsProc(HWND hwnd, LPARAM lParam)
+{
+	SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam);
+	return TRUE;
+}
+
 static VOID
 ActivateLayout(ULONG uLayoutNum)
 {
     HKL hKl;
     TCHAR szLayoutNum[CCH_ULONG_DEC + 1];
     TCHAR szLCID[CCH_LAYOUT_ID + 1];
-    DWORD Ret;
 
     _ultot(uLayoutNum, szLayoutNum, 10);
     GetLayoutID(szLayoutNum, szLCID);
 
     // Switch to the new keyboard layout
     hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE);
-    Ret = SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE);
+	EnumWindows(EnumWindowsProc, (LPARAM) hKl);
 }
 
 static HMENU
@@ -137,7 +142,7 @@ BuildPopupMenu()
     HMENU hMenu;
     HKEY hKey;
     DWORD dwIndex, dwSize;
-    LPTSTR szExit;
+    TCHAR szExit[MAX_PATH];
     TCHAR szLayoutNum[CCH_ULONG_DEC + 1];
     TCHAR szName[MAX_PATH];
 
@@ -160,7 +165,7 @@ BuildPopupMenu()
         RegCloseKey(hKey);
     }
 
-    LoadString(hInst, IDS_EXIT, (LPTSTR)&szExit, 0);
+    LoadString(hInst, IDS_EXIT, szExit, MAX_PATH);
     AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
     AppendMenu(hMenu, MF_STRING, MENU_ID_EXIT, szExit);
 
@@ -230,11 +235,11 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdSho
     WndClass.hCursor       = NULL;
     WndClass.hbrBackground = NULL;
     WndClass.lpszMenuName  = NULL;
-    WndClass.lpszClassName = L"kbswitch";
+    WndClass.lpszClassName = _T("kbswitch");
 
     if (!RegisterClass(&WndClass)) return 0;
 
-    hwnd = CreateWindow(L"kbswitch", L"kbswitch", 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL);
+    hwnd = CreateWindow(_T("kbswitch"), _T("kbswitch"), 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL);
 
     while(GetMessage(&msg,NULL,0,0))
     {
diff --git a/reactos/base/applications/kbswitch/kbswitch.h b/reactos/base/applications/kbswitch/kbswitch.h
index 9630da63c73..5415936b597 100644
--- a/reactos/base/applications/kbswitch/kbswitch.h
+++ b/reactos/base/applications/kbswitch/kbswitch.h
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <windows.h>
 #include <tchar.h>