Skip to content

W
wine-cw
Commit 32af90d5 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Fix some failures on win9x.

parent cc57b863
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 14 deletions
dlls/kernel32/tests/locale.c
View file @ 32af90d5
...@@ -2196,25 +2196,41 @@ static void test_EnumDateFormatsA(void) ...@@ -2196,25 +2196,41 @@ static void test_EnumDateFormatsA(void)
trace("EnumDateFormatsA 0\n"); trace("EnumDateFormatsA 0\n");
date_fmt_buf[0] = 0; date_fmt_buf[0] = 0;
SetLastError(0xdeadbeef);
ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0); ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0);
ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError()); if (!ret && (GetLastError() == ERROR_INVALID_FLAGS))
trace("%s\n", date_fmt_buf); {
/* test the 1st enumerated format */ win_skip("0 for dwFlags is not supported\n");
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; }
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); else
ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); {
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf));
ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
}
trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n"); trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n");
date_fmt_buf[0] = 0; date_fmt_buf[0] = 0;
SetLastError(0xdeadbeef);
ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP);
ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); if (!ret && (GetLastError() == ERROR_INVALID_FLAGS))
trace("%s\n", date_fmt_buf); {
/* test the 1st enumerated format */ win_skip("LOCALE_USE_CP_ACP is not supported\n");
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; }
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); else
ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); {
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError());
trace("%s\n", date_fmt_buf);
/* test the 1st enumerated format */
if ((p = strchr(date_fmt_buf, '\n'))) *p = 0;
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf));
ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError());
ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf);
}
trace("EnumDateFormatsA DATE_SHORTDATE\n"); trace("EnumDateFormatsA DATE_SHORTDATE\n");
date_fmt_buf[0] = 0; date_fmt_buf[0] = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment