Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +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 hList;
HWND hLocaleList, hGeoList; HWND hLocaleList, hGeoList;
BOOL bSpain = FALSE; BOOL isSpain = FALSE;
GROUPINGDATA GROUPINGDATA
GroupingFormats[MAX_GROUPINGFORMATS] = GroupingFormats[MAX_GROUPINGFORMATS] =
@ -49,7 +49,7 @@ GroupingFormats[MAX_GROUPINGFORMATS] =
}; };
static BOOL CALLBACK static BOOL CALLBACK
LocalesEnumProc(LPTSTR lpLocale) GeneralPropertyPageLocalesEnumProc(LPTSTR lpLocale)
{ {
LCID lcid; LCID lcid;
WCHAR lang[255]; WCHAR lang[255];
@ -65,10 +65,10 @@ LocalesEnumProc(LPTSTR lpLocale)
if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) ||
lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT))
{ {
if (bSpain == FALSE) if (isSpain == FALSE)
{ {
LoadStringW(hApplet, IDS_SPAIN, lang, 255); LoadStringW(hApplet, IDS_SPAIN, lang, 255);
bSpain = TRUE; isSpain = TRUE;
} }
else else
{ {
@ -169,8 +169,8 @@ CreateLanguagesList(HWND hwnd)
WCHAR langSel[255]; WCHAR langSel[255];
hList = hwnd; hList = hwnd;
bSpain = FALSE; isSpain = FALSE;
EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); EnumSystemLocalesW(GeneralPropertyPageLocalesEnumProc, LCID_SUPPORTED);
/* Select current locale */ /* Select current locale */
/* or should it be System and not user? */ /* or should it be System and not user? */

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

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

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

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