From 99c23ccf353fc517bbe1ef266df173dfe5a6d206 Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Sun, 28 Sep 2008 14:48:40 -0500 Subject: [PATCH] mlang/tests: windows 2008's version of mlang E_FAILs when you pass in a rgelt in IEnumCodePage::Next. --- dlls/mlang/tests/mlang.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 96aef1c2605..f5e7c01114e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -298,9 +298,15 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); - ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + if (ret == S_FALSE) + ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + else if (ret == E_FAIL) + ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); - ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); + if (ret == S_FALSE) + ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); + else if (ret == E_FAIL) + ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2); -- 2.11.4.GIT