Aric Stewart : mlang/tests: windows 2008' s version of mlang E_FAILs when you pass in a rgelt in IEnumCodePage::Next.

Alexandre Julliard julliard at winehq.org
Wed Oct 1 14:09:48 CDT 2008


Module: wine
Branch: master
Commit: 99c23ccf353fc517bbe1ef266df173dfe5a6d206
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=99c23ccf353fc517bbe1ef266df173dfe5a6d206

Author: Aric Stewart <aric at codeweavers.com>
Date:   Sun Sep 28 14:48:40 2008 -0500

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 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 96aef1c..f5e7c01 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);
 




More information about the wine-cvs mailing list