Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 09:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Forgot to enable the GeoId code.

Browse source 
- Fixed another hardcoded Unicode string.
- More indentation fixes.
- No code changes.

svn path=/trunk/; revision=28877
This commit is contained in:
Eric Kohl 2007-09-05 14:42:24 +00:00
parent 63d106c29f
commit 0addcc009e
1 changed files with 103 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/dll/cpl/intl/generalp.c
View file

@ -41,7 +41,7 @@
HWND hList;
HWND hLocaleList, hGeoList;
BOOL CALLBACK
static BOOL CALLBACK
LocalesEnumProc(LPTSTR lpLocale)
{
LCID lcid;
@ -112,8 +112,9 @@ CreateLanguagesList(HWND hwnd)
hList = hwnd;
EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED);
// Select current locale
GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System and not user?
/* Select current locale */
/* or should it be System and not user? */
GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel));
SendMessage(hList,
CB_SELECTSTRING,
@ -121,7 +122,7 @@ CreateLanguagesList(HWND hwnd)
(LPARAM)langSel);
}
// Sets new locale
/* Sets new locale */
VOID
SetNewLocale(LCID lcid)
{
@ -176,7 +177,7 @@ SetNewLocale(LCID lcid)
return;
}
wsprintf(value, L"%04X", (DWORD)lcid);
wsprintf(value, _T("%04X"), (DWORD)lcid);
valuesize = (_tcslen(value) + 1) * sizeof(TCHAR);
RegSetValueEx(localeKey, _T("Locale"), 0, REG_SZ, (BYTE *)value, valuesize);
@ -213,7 +214,6 @@ SetNewLocale(LCID lcid)
}
/* Location enumerate procedure */
#if 0
BOOL
CALLBACK
LocationsEnumProc(GEOID gId)
@ -234,14 +234,12 @@ LocationsEnumProc(GEOID gId)
return TRUE;
}
#endif
/* Enumerate all system locations identifiers */
static
VOID
CreateLocationsList(HWND hWnd)
{
#if 0
GEOID userGeoID;
TCHAR loc[MAX_STR_SIZE];
@ -261,7 +259,6 @@ CreateLocationsList(HWND hWnd)
CB_SELECTSTRING,
(WPARAM) -1,
(LPARAM)loc);
#endif
}
DWORD
@ -290,6 +287,7 @@ VerifyUnattendLCID(HWND hwndDlg)
return 1;
}
}
return 0;
}
@ -317,6 +315,7 @@ GeneralPageProc(HWND hwndDlg,
return TRUE;
}
break;
case WM_COMMAND:
switch (LOWORD(wParam))
{
@ -326,6 +325,7 @@ GeneralPageProc(HWND hwndDlg,
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
}
break;
case IDC_SETUP_BUTTON:
SetupApplet(hwndDlg, uMsg, wParam, lParam);
break;
@ -335,13 +335,14 @@ GeneralPageProc(HWND hwndDlg,
case WM_NOTIFY:
{
LPNMHDR lpnm = (LPNMHDR)lParam;
if (lpnm->code == (UINT)PSN_APPLY)
{
// Apply changes
/* Apply changes */
LCID NewLcid;
int iCurSel;
INT iCurSel;
// Acquire new value
/* Acquire new value */
iCurSel = SendMessage(hList,
CB_GETCURSEL,
0,
@ -353,16 +354,16 @@ GeneralPageProc(HWND hwndDlg,
CB_GETITEMDATA,
iCurSel,
0);
if (NewLcid == (LCID)CB_ERR)
break;
// Actually set new locale
/* Set new locale */
SetNewLocale(NewLcid);
}
}
break;
}
return FALSE;
}