Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 13:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add locale information to registry

Browse source 
- Change main.cpl to input.dll

svn path=/trunk/; revision=31649
This commit is contained in:
Dmitry Chapyshev 2008-01-07 17:36:02 +00:00
parent bd334b2185
commit b9fe66f51c
1 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
reactos/dll/win32/syssetup/wizard.c
View file

@ -801,7 +801,7 @@ RunControlPanelApplet(HWND hwnd, WCHAR *lpCommandLine)
&StartupInfo, &StartupInfo,
&ProcessInformation)) &ProcessInformation))
{ {
MessageBox(hwnd, _T("Error: failed to launch rundll32"), _T("Error"), MB_ICONERROR); MessageBox(hwnd, _T("Error: failed to launch rundll32"), NULL, MB_ICONERROR);
return FALSE; return FALSE;
} }
@ -811,6 +811,36 @@ RunControlPanelApplet(HWND hwnd, WCHAR *lpCommandLine)
return TRUE; return TRUE;
} }
static VOID
WriteUserLocale(VOID)
{
HKEY hKey;
LCID lcid;
TCHAR Locale[8];
DWORD dwDisp;
lcid = GetSystemDefaultLCID();
if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Locale, sizeof(Locale)) == 0)
{
return;
}
if (RegOpenKey(HKEY_CURRENT_USER, L"Control Panel\\International", &hKey) != ERROR_SUCCESS)
{
if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Control Panel\\International",
0, NULL, REG_OPTION_NON_VOLATILE,
KEY_WRITE, NULL, &hKey, &dwDisp))
{
return;
}
}
RegSetValueExW(hKey, L"Locale", 0, REG_SZ, (LPBYTE) Locale, (DWORD)(sizeof(Locale) / sizeof(TCHAR)));
RegCloseKey(hKey);
}
static INT_PTR CALLBACK static INT_PTR CALLBACK
LocalePageDlgProc(HWND hwndDlg, LocalePageDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -830,10 +860,9 @@ LocalePageDlgProc(HWND hwndDlg,
/* Save pointer to the global setup data */ /* Save pointer to the global setup data */
SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData);
WriteUserLocale();
SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT)); SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT));
} }
break; break;
@ -852,7 +881,7 @@ LocalePageDlgProc(HWND hwndDlg,
case IDC_CUSTOMLAYOUT: case IDC_CUSTOMLAYOUT:
{ {
wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL input.dll,@1"));
RunControlPanelApplet(hwndDlg, szBuffer); RunControlPanelApplet(hwndDlg, szBuffer);
} }
break; break;
@ -1933,8 +1962,10 @@ FinishDlgProc(HWND hwndDlg,
break; break;
case WM_DESTROY: case WM_DESTROY:
{
SetupIsActive(0); SetupIsActive(0);
return TRUE; return TRUE;
}
case WM_TIMER: case WM_TIMER:
{ {