[INTL]

Update date and time examples according to the current settings.
CORE-10074

svn path=/trunk/; revision=69497

diff --git a/reactos/dll/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c
index c820238..c694c3d 100644 (file)
--- a/reactos/dll/cpl/intl/date.c
+++ b/reactos/dll/cpl/intl/date.c
@@ -503,13 +503,15 @@ UpdateDateLocaleSamples(HWND hwndDlg,
     WCHAR OutBuffer[MAX_SAMPLES_STR_SIZE];
 
     /* Get short date format sample */
-    GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL, OutBuffer,
+    GetDateFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szShortDateFormat, OutBuffer,
                    MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hwndDlg, IDC_SHRTDATESAMPLE_EDIT, WM_SETTEXT,
                         0, (LPARAM)OutBuffer);
 
     /* Get long date sample */
-    GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL, OutBuffer,
+    GetDateFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szLongDateFormat, OutBuffer,
                    MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hwndDlg, IDC_LONGDATESAMPLE_EDIT,
                         WM_SETTEXT, 0, (LPARAM)OutBuffer);

diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index aa1c660..ceb7101 100644 (file)
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -127,20 +127,23 @@ UpdateLocaleSample(
     ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR));
 
     /* Get time format sample */
-    GetTimeFormatW(pGlobalData->UserLCID, NO_FLAG, NULL, NULL,
+    GetTimeFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szTimeFormat,
                    OutBuffer, MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hwndDlg, IDC_TIMESAMPLE_EDIT,
                         WM_SETTEXT, 0, (LPARAM)OutBuffer);
     ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR));
 
     /* Get short date format sample */
-    GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL,
+    GetDateFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szShortDateFormat,
                    OutBuffer, MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hwndDlg, IDC_SHORTTIMESAMPLE_EDIT,
                         WM_SETTEXT, 0, (LPARAM)OutBuffer);
 
     /* Get long date sample */
-    GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL,
+    GetDateFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szLongDateFormat,
                    OutBuffer, MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hwndDlg, IDC_FULLTIMESAMPLE_EDIT,
                         WM_SETTEXT, 0, (LPARAM)OutBuffer);

diff --git a/reactos/dll/cpl/intl/time.c b/reactos/dll/cpl/intl/time.c
index 1e1e720..d0d38e4 100644 (file)
--- a/reactos/dll/cpl/intl/time.c
+++ b/reactos/dll/cpl/intl/time.c
@@ -41,9 +41,11 @@ TimeFormatEnumProc(PWSTR lpTimeFormatString)
 static VOID
 UpdateTimeSample(HWND hWnd, PGLOBALDATA pGlobalData)
 {
-    WCHAR szBuffer[80];
+    WCHAR szBuffer[MAX_SAMPLES_STR_SIZE];
 
-    GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, pGlobalData->szTimeFormat, szBuffer, 80);
+    GetTimeFormatW(pGlobalData->UserLCID, 0, NULL,
+                   pGlobalData->szTimeFormat, szBuffer,
+                   MAX_SAMPLES_STR_SIZE);
     SendDlgItemMessageW(hWnd, IDC_TIMESAMPLE, WM_SETTEXT, 0, (LPARAM)szBuffer);
 }