Alexey Zavyalov: Add functionally Numbers, Currency, Time, Date tabs. Fix some bugs.

[reactos.git] / reactos / dll / cpl / intl_new / locale.c

diff --git a/reactos/dll/cpl/intl_new/locale.c b/reactos/dll/cpl/intl_new/locale.c
index b24d9c8..68f9d13 100644 (file)
--- a/reactos/dll/cpl/intl_new/locale.c
+++ b/reactos/dll/cpl/intl_new/locale.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS International Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            lib/cpl/intl/locale.h
+ * FILE:            dll/cpl/intl/locale.h
  * PURPOSE:         Regional parameters page
  * PROGRAMMERS:     Eric Kohl
  *                  Alexey Zavyalov (gen_x@mail.ru)
@@ -34,7 +34,7 @@ LocationsEnumProc(GEOID gId)
     int index;
 
     GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT);
-    index = SendMessageW(hGeoList,
+    index = (int) SendMessageW(hGeoList,
                          CB_ADDSTRING,
                          0,
                          (LPARAM)loc);
@@ -69,7 +69,7 @@ CreateLocationsList(HWND hWnd)
 
     SendMessageW(hGeoList,
                  CB_SELECTSTRING,
-                 -1,
+                 (WPARAM) -1,
                  (LPARAM)loc);
 }
 
@@ -85,14 +85,14 @@ LocalesEnumProc(LPTSTR lpLocale)
     lcid = wcstoul(lpLocale, NULL, 16);
 
     GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang));
-    index = SendMessageW(hLocaleList,
+    index = (int) SendMessageW(hLocaleList,
                          CB_ADDSTRING,
                          0,
                          (LPARAM)lang);
 
     SendMessageW(hLocaleList,
                  CB_SETITEMDATA,
-                 index,
+                 (WPARAM) index,
                  (LPARAM)lcid);
 
     return TRUE;
@@ -117,7 +117,7 @@ CreateLanguagesList(HWND hWnd)
 
     SendMessageW(hLocaleList,
                  CB_SELECTSTRING,
-                 -1,
+                 (WPARAM) -1,
                  (LPARAM)langSel);
 }
 
@@ -208,7 +208,7 @@ SetNewLocale(LCID LcidLocale)
     }
 
     wsprintf(Value, L"%04X", (DWORD)LcidLocale);
-    ValueSize = (wcslen(Value) + 1) * sizeof(WCHAR);
+    ValueSize = (DWORD) (wcslen(Value) + 1) * sizeof(WCHAR);
 
     RegSetValueExW(LocaleKey, L"Locale", 0, REG_SZ, (BYTE *)Value, ValueSize);
     RegCloseKey(LocaleKey);
@@ -235,10 +235,9 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
+                /* If setup button pressed */
                 case IDC_SETUP_BUTTON:
-                        // setup button code...
-                        MessageBox(NULL, L"Not implemented yet", L"Info",
-                            MB_OK | MB_ICONINFORMATION);
+                    SetupApplet(hwndDlg, uMsg, wParam, lParam);
                 break;
 
                 /* If selected other locale */
@@ -246,9 +245,9 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     if (HIWORD(wParam) == CBN_SELCHANGE ||
                         HIWORD(wParam) == CBN_EDITCHANGE)
                     {
-                        CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL,
+                        CurrSel = (int) SendMessageW((HWND)lParam, CB_GETCURSEL,
                             0, 0);
-                        NewLCID = SendMessageW((HWND)lParam, CB_GETITEMDATA,
+                        NewLCID = (LCID) SendMessageW((HWND)lParam, CB_GETITEMDATA,
                             CurrSel, 0);
                         UpdateLocaleSample(hwndDlg,
                                            MAKELCID(NewLCID, SORT_DEFAULT));
@@ -256,10 +255,12 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     }
                 break;
 
+                /* If changed location */
                 case IDC_LOCATION_COMBO:
                     if (HIWORD(wParam) == CBN_SELCHANGE ||
                         HIWORD(wParam) == CBN_EDITCHANGE)
                     {
+                        /* Set "Apply" button enabled */
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                 break;
@@ -273,20 +274,20 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
             if (lpnm->code == (UINT)PSN_APPLY)
             {
                 /* Set locale */
-                CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
+                CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
                     CB_GETCURSEL, 0, 0);
-                NewLCID = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
+                NewLCID = (LCID) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
                     CB_GETITEMDATA, CurrSel, 0);
                 if (NewLCID == (LCID)CB_ERR) break;
 
                 SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT));
 
                 /* Set geo location */
-                CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
+                CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
                                CB_GETCURSEL,
                                0,
                                0);
-                NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
+                NewLocation = (GEOID) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
                               CB_GETITEMDATA,
                               CurrSel,
                               0);