Paul Vriens wrote:
Hans Leidekker wrote:
Passes on win2k3, vista and the win7 release candidate.


Would using IsValidCodePage() be helpful here?

Yep, something like:

        hr = IMultiLanguage2_IsCodePageInstallable(ml2, i);
        if (i == 29001 || /* win2k3 */
i == 50930 || i == 50931 || i == 50933 || i == 50935 || i == 50937 || i == 50939 /* vista */)
        {
ok(hr == S_FALSE || hr == S_OK || broken(!IsValidCodePage(i)), "%u: expected S_FALSE or S_OK, got 0x%08x\n", i, hr);
            j++;
        }
        else if (i == cp[j])
        {
ok(hr == S_OK || broken(!IsValidCodePage(i)), "%u: expected S_OK, got 0x%08x\n", i, hr);
            j++;
        }
        else
ok(hr == E_INVALIDARG, "%u: expected E_INVALIDARG, got 0x%08x\n", i, hr);

does the trick.

--
Cheers,

Paul.


Reply via email to