Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INTL] Rename some variables and functions. #179

Browse source
This commit is contained in:
Amine Khaldi 2017-12-23 14:07:33 +01:00
parent eff73544ec
commit fc93f23830
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/cpl/intl/generalp.c
View file

@ -38,7 +38,7 @@
HWND hList;
HWND hLocaleList, hGeoList;
BOOL bSpain = FALSE;
BOOL isSpain = FALSE;
GROUPINGDATA
GroupingFormats[MAX_GROUPINGFORMATS] =
@ -49,7 +49,7 @@ GroupingFormats[MAX_GROUPINGFORMATS] =
};
static BOOL CALLBACK
LocalesEnumProc(LPTSTR lpLocale)
GeneralPropertyPageLocalesEnumProc(LPTSTR lpLocale)
{
LCID lcid;
WCHAR lang[255];
@ -65,10 +65,10 @@ LocalesEnumProc(LPTSTR lpLocale)
if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) ||
lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT))
{
if (bSpain == FALSE)
if (isSpain == FALSE)
{
LoadStringW(hApplet, IDS_SPAIN, lang, 255);
bSpain = TRUE;
isSpain = TRUE;
}
else
{
@ -169,8 +169,8 @@ CreateLanguagesList(HWND hwnd)
WCHAR langSel[255];
hList = hwnd;
bSpain = FALSE;
EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED);
isSpain = FALSE;
EnumSystemLocalesW(GeneralPropertyPageLocalesEnumProc, LCID_SUPPORTED);
/* Select current locale */
/* or should it be System and not user? */

8
dll/cpl/intl/intl.c
View file

@ -77,7 +77,7 @@ ResourceMessageBox(
}
static VOID
InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
InitIntlPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
{
ZeroMemory(psp, sizeof(PROPSHEETPAGE));
psp->dwSize = sizeof(PROPSHEETPAGE);
@ -183,14 +183,14 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
psh.nStartPage = 0;
psh.ppsp = psp;
InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
InitIntlPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
psh.nPages++;
InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
InitIntlPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
psh.nPages++;
if (pGlobalData->bIsUserAdmin)
{
InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
InitIntlPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
psh.nPages++;
}

6
dll/cpl/intl/time.c
View file

@ -26,12 +26,12 @@
#include "intl.h"
static HWND hwndEnum = NULL;
static HWND hwndTimeEnum = NULL;
static BOOL CALLBACK
TimeFormatEnumProc(PWSTR lpTimeFormatString)
{
SendMessageW(hwndEnum,
SendMessageW(hwndTimeEnum,
CB_ADDSTRING,
0,
(LPARAM)lpTimeFormatString);
@ -62,7 +62,7 @@ InitTimeFormatCB(
CB_LIMITTEXT, MAX_TIMEFORMAT, 0);
/* Add available time formats to the list */
hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT);
hwndTimeEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT);
EnumTimeFormatsW(TimeFormatEnumProc, pGlobalData->UserLCID, 0);
SendDlgItemMessageW(hwndDlg, IDC_TIMEFORMAT,