mlang/tests: GetLastError may not be set if Japanese conversions fail with…

mlang/tests: GetLastError may not be set if Japanese conversions fail with S_FAIL so do not require that to skip the Japanese tests.

mlang/tests: GetLastError may not be set if Japanese conversions fail with…
c209245f · Aric Stewart · Alexandre Julliard · 86de5c25 · c209245f
Commit c209245f authored Sep 28, 2008 by Aric Stewart Committed by Alexandre Julliard Oct 01, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

mlang.c dlls/mlang/tests/mlang.c +4 -8

No files found.
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1197,9 +1197,8 @@ 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)
+        if (hr == S_FALSE)
        {
            skip("Code page identifier 50220 is not supported\n");
            break;
@@ -1236,9 +1235,8 @@ 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)
+        if (hr == S_FALSE)
        {
            skip("Code page identifier 932 is not supported\n");
            break;
@@ -1265,9 +1263,8 @@ 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)
+        if (hr == S_FALSE)
        {
            skip("Code page identifier 51932 is not supported\n");
            break;
@@ -1291,9 +1288,8 @@ 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)
+    if (hr == S_FALSE)
    {
        skip("Code page identifier 50932 is not supported\n");
        return;