diff --git a/ExplorerPatcher/GUI.c b/ExplorerPatcher/GUI.c index c9f359c..50c57fe 100644 --- a/ExplorerPatcher/GUI.c +++ b/ExplorerPatcher/GUI.c @@ -1080,6 +1080,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt) else if (!_stricmp(funcName, "IsWindows10StartMenu") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE; else if (!_stricmp(funcName, "!IsWindows10StartMenu") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1))) bSkipLines = TRUE; else if (!_stricmp(funcName, "IsWeatherEnabled") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced\\People", L"PeopleBand", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE; + else if (!_stricmp(funcName, "IsWindows11Version22H2OrHigher") && !IsWindows11Version22H2OrHigher()) bSkipLines = TRUE; else if (!_stricmp(funcName, "!IsWindows11Version22H2OrHigher") && IsWindows11Version22H2OrHigher()) bSkipLines = TRUE; else if (!_stricmp(funcName, "!(IsWindows11Version22H2OrHigher&&!IsOldTaskbar)") && (IsWindows11Version22H2OrHigher() && (dwRes = 1, RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), L"OldTaskbar", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1)))) bSkipLines = TRUE; if (bSkipLines) diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c index e73ea83..ce177a2 100644 --- a/ExplorerPatcher/dllmain.c +++ b/ExplorerPatcher/dllmain.c @@ -6363,6 +6363,11 @@ void WINAPI LoadSettings(LPARAM lParam) &dwIMEStyle, &dwSize ); + if (IsWindows11Version22H2OrHigher()) + { + if (!dwIMEStyle) dwIMEStyle = 7; + else if (dwIMEStyle == 7) dwIMEStyle = 0; + } dwSize = sizeof(DWORD); RegQueryValueExW( hKey, diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg index 00d8d57..354cf2e 100644 --- a/ExplorerPatcher/settings.reg +++ b/ExplorerPatcher/settings.reg @@ -160,12 +160,23 @@ ;x 0 Windows 10 flyout (default) ;x 1 Windows 7 "UseWin32BatteryFlyout"=dword:00000000 +;s SystemTray_LanguageSwitcherBefore22H2 !IsWindows11Version22H2OrHigher [HKEY_CURRENT_USER\Software\ExplorerPatcher] ;c 3 Language switcher * ;x 0 Windows 11 (default) ;x 1 Windows 10 (with link to "Language Preferences") ;x 4 Windows 10 "IMEStyle"=dword:00000000 +;g SystemTray_LanguageSwitcherBefore22H2 +;s SystemTray_LanguageSwitcherAfter22H2 IsWindows11Version22H2OrHigher +[HKEY_CURRENT_USER\Software\ExplorerPatcher] +;c 4 Language switcher * +;x 0 Windows 11 (default) +;x 7 Windows 10 +;x 1 Windows 10 (with link to "Language Preferences") (no animation) +;x 4 Windows 10 (no animation) +"IMEStyle"=dword:00000000 +;g SystemTray_LanguageSwitcherAfter22H2 ;g SystemTray_Windows10Section