Paul Vriens : kernel32/tests: Skip tests when codepage is not available.
Alexandre Julliard
julliard at winehq.org
Mon Aug 4 08:53:29 CDT 2008
Module: wine
Branch: master
Commit: b2093dc86aeaeb0ee12649ced079e731a2787389
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2093dc86aeaeb0ee12649ced079e731a2787389
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Fri Aug 1 17:33:44 2008 +0200
kernel32/tests: Skip tests when codepage is not available.
---
dlls/kernel32/tests/codepage.c | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c
index 0c5d697..7ca4a6f 100644
--- a/dlls/kernel32/tests/codepage.c
+++ b/dlls/kernel32/tests/codepage.c
@@ -290,6 +290,26 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar)
ok(!strcmp(mbs, "??"), "mbs is %s\n", mbs);
if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
+ /* Length-only tests */
+ SetLastError(0xdeadbeef);
+ ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar);
+ ok(ret == 1, "ret is %d\n", ret);
+ if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
+ ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError());
+
+ SetLastError(0xdeadbeef);
+ ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar);
+ ok(ret == 5, "ret is %d\n", ret);
+ if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
+ ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError());
+
+ if (!IsValidCodePage(950))
+ {
+ skip("Codepage 950 not available\n");
+ return;
+ }
+
+ /* Double-byte tests */
SetLastError(0xdeadbeef);
ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar);
ok(ret == 5, "ret is %d\n", ret);
@@ -313,18 +333,6 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar)
/* Length-only tests */
SetLastError(0xdeadbeef);
- ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar);
- ok(ret == 1, "ret is %d\n", ret);
- if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
- ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError());
-
- SetLastError(0xdeadbeef);
- ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar);
- ok(ret == 5, "ret is %d\n", ret);
- if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
- ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError());
-
- SetLastError(0xdeadbeef);
ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar);
ok(ret == 2, "ret is %d\n", ret);
if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);
More information about the wine-cvs
mailing list