ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: GetTimeFormat and GetDateFormat should fail if LOCALE_NOUSEROVERRIDE is specified simultaneously with a format string.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2007-01-05 14:25:39 +08:00 committed by Alexandre Julliard
parent 5b692005e8
commit f70fb8ec4c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/kernel32/lcformat.c
View File

@ -329,10 +329,10 @@ BOOL NLS_IsUnicodeOnlyLcid(LCID lcid)
#define IsTimeFmtChar(p) (p == 'H'||p == 'h'||p == 'm'||p == 's'||p == 't') #define IsTimeFmtChar(p) (p == 'H'||p == 'h'||p == 'm'||p == 's'||p == 't')
/* Only the following flags can be given if a date/time format is specified */ /* Only the following flags can be given if a date/time format is specified */
#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY|LOCALE_NOUSEROVERRIDE) #define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY)
#define TIME_FORMAT_FLAGS (TIME_TIMEVARSONLY|TIME_FORCE24HOURFORMAT| \ #define TIME_FORMAT_FLAGS (TIME_TIMEVARSONLY|TIME_FORCE24HOURFORMAT| \
TIME_NOMINUTESORSECONDS|TIME_NOSECONDS| \ TIME_NOMINUTESORSECONDS|TIME_NOSECONDS| \
TIME_NOTIMEMARKER|LOCALE_NOUSEROVERRIDE) TIME_NOTIMEMARKER)
/****************************************************************************** /******************************************************************************
* NLS_GetDateTimeFormatW <internal> * NLS_GetDateTimeFormatW <internal>

13
dlls/kernel32/tests/locale.c
View File

@ -183,6 +183,11 @@ static void test_GetTimeFormatA(void)
ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;
/* MSDN: LOCALE_NOUSEROVERRIDE can't be specified with a format string */
SetLastError(0xdeadbeef);
ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA;
STRINGSA("tt HH':'mm'@'ss", "A"); /* Insufficent buffer */ STRINGSA("tt HH':'mm'@'ss", "A"); /* Insufficent buffer */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2); ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2);
@ -339,6 +344,12 @@ static void test_GetDateFormatA(void)
ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;
/* Same as above but with LOCALE_NOUSEROVERRIDE */
STRINGSA("ddd',' MMM dd yy",""); /* Simple case */
SetLastError(0xdeadbeef);
ret = GetDateFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA;
STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Format containing "'" */ STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Format containing "'" */
ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;
@ -370,12 +381,14 @@ static void test_GetDateFormatA(void)
/* test for expected DATE_YEARMONTH behavior with null format */ /* test for expected DATE_YEARMONTH behavior with null format */
/* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */
STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */
SetLastError(0xdeadbeef);
ret = GetDateFormat(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); ret = GetDateFormat(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer));
EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA; EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA;
/* Test that using invalid DATE_* flags results in the correct error */ /* Test that using invalid DATE_* flags results in the correct error */
/* and return values */ /* and return values */
STRINGSA("m/d/y", ""); /* Invalid flags */ STRINGSA("m/d/y", ""); /* Invalid flags */
SetLastError(0xdeadbeef);
ret = GetDateFormat(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, ret = GetDateFormat(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE,
&curtime, input, buffer, COUNTOF(buffer)); &curtime, input, buffer, COUNTOF(buffer));
EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA; EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA;