Paul Vriens : mlang/tests: Skip tests for unsupported code page identifiers .

Alexandre Julliard julliard at winehq.org
Mon Aug 4 08:53:29 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Fri Aug  1 18:21:57 2008 +0200

mlang/tests: Skip tests for unsupported code page identifiers.

---

 dlls/mlang/tests/mlang.c |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index b5d77f7..b173842 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1182,7 +1182,13 @@ static void test_JapaneseConversion(void)
         destsz = 30;
         outlen = jis_jp[i][0];
         srcsz = unc_jp[i][0];
+        SetLastError(0xdeadbeef);
         hr = pConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz);
+        if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME)
+        {
+            skip("Code page identifier 50220 is not supported\n");
+            break;
+        }
         ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr);
         ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz);
         ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz);
@@ -1215,7 +1221,13 @@ static void test_JapaneseConversion(void)
         outlen = sjis_jp[i][0];
         srcsz = unc_jp[i][0];
 
+        SetLastError(0xdeadbeef);
         hr = pConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz);
+        if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME)
+        {
+            skip("Code page identifier 932 is not supported\n");
+            break;
+        }
         ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
         ok(destsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,destsz);
         ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz);
@@ -1238,7 +1250,13 @@ static void test_JapaneseConversion(void)
         outlen = euc_jp[i][0];
         srcsz = unc_jp[i][0];
 
+        SetLastError(0xdeadbeef);
         hr = pConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz);
+        if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME)
+        {
+            skip("Code page identifier 51932 is not supported\n");
+            break;
+        }
         ok(hr == S_OK, "(%i) Expected S_OK, got %08x\n",i,hr);
         ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz);
         ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
@@ -1258,7 +1276,13 @@ static void test_JapaneseConversion(void)
     i = 0;
     destsz = 30;
     srcsz = jis_jp[i][0];
+    SetLastError(0xdeadbeef);
     hr = pConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz);
+    if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME)
+    {
+        skip("Code page identifier 50932 is not supported\n");
+        return;
+    }
     ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
     ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
     ok(srcsz == jis_jp[i][0],"(%i) Expected %i, got %i\n",i,jis_jp[i][0],srcsz);
@@ -1276,7 +1300,8 @@ static void test_JapaneseConversion(void)
     i = 2;
     destsz = 30;
     srcsz = euc_jp[i][0];
-    hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz); ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
+    hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz);
+    ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
     ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
     ok(srcsz == euc_jp[i][0],"(%i) Expected %i, got %i\n",i,euc_jp[i][0],srcsz);
     ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i);




More information about the wine-cvs mailing list