- Add the actual function for switching the keyboard layout

- Handle keyboard layout substitutes (like the "German (IBM)" layout)
- Refactor many parts of the code:
   * Always close hKey handles after they were successfully opened
   * Build the keyboard layout menu one time and not everytime, when it's opened
   * Use smaller sizes for some string variables, defined with CCH_LAYOUT_ID and CCH_ULONG_DEC.
     This also ensures that we don't retrieve bigger values, which would be invalid.
- Use a consistent indentation

svn path=/trunk/; revision=33062

reactos/base/applications/kbswitch/kbswitch.c

@@ -1,4 +1,12 @@
-#include <kbswitch.h>
+/*
+ * PROJECT:         Keyboard Layout Switcher
+ * FILE:            base\applications\kbswitch\kbswitch.c
+ * PURPOSE:         Switching Keyboard Layouts
+ * PROGRAMMERS:     Dmitry Chapyshev (dmitry@reactos.org)
+ *                  Colin Finck (mail@colinfinck.de)
+ */
+
+#include "kbswitch.h"
 
 #define WM_NOTIFYICONMSG (WM_USER + 248)
 #define BUFSIZE 256
@@ -36,95 +44,135 @@ DelTrayIcon(HWND hwnd)
 }
 
 static BOOL
-GetLayoutName(LPCTSTR lcid, LPTSTR name)
+GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID)
+{
+    DWORD dwBufLen;
+    DWORD dwTest;
+    HKEY hKey;
+    TCHAR szTempLCID[CCH_LAYOUT_ID + 1];
+
+    // Get the Layout ID
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    {
+        dwBufLen = sizeof(szTempLCID);
+
+        if(RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS)
+        {
+            RegCloseKey(hKey);
+            return FALSE;
+        }
+
+        RegCloseKey(hKey);
+    }
+
+    // Look for a substitude of this layout
+    if(RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    {
+        dwBufLen = sizeof(szTempLCID);
+
+        if(RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS)
+        {
+            // No substitute found, then use the old LCID
+            lstrcpy(szLCID, szTempLCID);
+        }
+
+        RegCloseKey(hKey);
+    }
+    else
+    {
+        // Substitutes key couldn't be opened, so use the old LCID
+        lstrcpy(szLCID, szTempLCID);
+    }
+
+    return TRUE;
+}
+
+static BOOL
+GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName)
 {
     HKEY hKey;
     DWORD dwBufLen;
-    TCHAR szBuf[BUFSIZE];
+    TCHAR szBuf[MAX_PATH];
+    TCHAR szLCID[CCH_LAYOUT_ID + 1];
 
-    _stprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"),lcid);
+    if(!GetLayoutID(szLayoutNum, szLCID))
+        return FALSE;
+
+    wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID);
 
     if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-        dwBufLen = BUFSIZE;
+        dwBufLen = MAX_PATH * sizeof(TCHAR);
-        if (RegQueryValueEx(hKey,_T("Layout Text"),NULL,NULL,(LPBYTE)name,&dwBufLen) == ERROR_SUCCESS)
+
+        if(RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS)
         {
             RegCloseKey(hKey);
-            return TRUE;
-        }
-    }
-
             return FALSE;
-}
+        }
 
-static VOID
-ActivateLayout(INT LayoutID)
-{
-	TCHAR szLayoutID[MAX_PATH], szNewLayout[MAX_PATH];
-	HKEY hKey;
-	DWORD dwBufLen;
-
-	_stprintf(szLayoutID, _T("%d"), LayoutID);
-
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
-	{
-		dwBufLen = MAX_PATH;
-		if (RegQueryValueEx(hKey, szLayoutID, NULL, NULL, (LPBYTE)szNewLayout, &dwBufLen) == ERROR_SUCCESS)
-		{
-			MessageBox(0, szNewLayout, _T(""), MB_OK);
         RegCloseKey(hKey);
     }
-	}
+
+    return TRUE;
 }
 
 static VOID
-ShowPopupMenu(HWND hwnd, POINT pt)
+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);
+}
+
+static HMENU
+BuildPopupMenu()
 {
     HMENU hMenu;
     HKEY hKey;
-	DWORD dwIndex = 0, dwSize, dwType;
+    DWORD dwIndex, dwSize;
-	LONG Ret;
+    TCHAR szLayoutNum[CCH_ULONG_DEC + 1];
-	TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szName[MAX_PATH];
+    TCHAR szName[MAX_PATH];
 
     hMenu = CreatePopupMenu();
 
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"),
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
-        0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-		dwSize = MAX_PATH;
+        for(dwIndex = 0; ; dwIndex++)
-		Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL);
-		if (Ret == ERROR_SUCCESS)
         {
-			while (Ret == ERROR_SUCCESS)
+            dwSize = sizeof(szLayoutNum);
-			{
+            if(RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
-				dwSize = MAX_PATH;
+                break;
-				RegQueryValueEx(hKey, szBuf, NULL, NULL, (LPBYTE)szPreload, &dwSize);
 
-				GetLayoutName(szPreload, szName);
+            if(!GetLayoutName(szLayoutNum, szName))
-				AppendMenu(hMenu, MF_STRING, _ttoi(szBuf), szName);
+                break;
 
-				dwIndex++;
+            AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName);
-
-				dwSize = MAX_PATH;
-				Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL);
-			}
-		}
         }
 
-	TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
-	DestroyMenu(hMenu);
         RegCloseKey(hKey);
+    }
+
+    return hMenu;
 }
 
 LRESULT CALLBACK
 WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
-	POINT pt;
+    static HMENU hPopupMenu;
 
     switch (Message)
     {
         case WM_CREATE:
             AddTrayIcon(hwnd, LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN)));
+            hPopupMenu = BuildPopupMenu(hwnd);
             break;
 
         case WM_NOTIFYICONMSG:
@@ -134,8 +182,10 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                 case WM_LBUTTONDOWN:
                 case WM_RBUTTONDOWN:
                 {
+                    POINT pt;
+
                     GetCursorPos(&pt);
-					ShowPopupMenu(hwnd, pt);
+                    TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
                 }
                 break;
             }
@@ -146,6 +196,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_DESTROY:
+            DestroyMenu(hPopupMenu);
             DelTrayIcon(hwnd);
             PostQuitMessage(0);
             break;

reactos/base/applications/kbswitch/kbswitch.h

@@ -1,6 +1,11 @@
+#include <stdlib.h>
 #include <windows.h>
 #include <tchar.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "resource.h"
+
+// Character Count of a layout ID like "00000409"
+#define CCH_LAYOUT_ID    8
+
+// Maximum Character Count of a ULONG in decimal
+#define CCH_ULONG_DEC    10