I got the test for failure on NT wrong in my last patch. The function
returns 0 on error and sets last error to ERROR_INVALID_FLAGS.
This commit is contained in:
parent
31f6cf32b8
commit
55b57417e1
|
@ -1469,7 +1469,7 @@ static void test_FoldStringA(void)
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
ret = pFoldStringA(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
|
ret = pFoldStringA(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
|
||||||
/* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
|
/* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
|
||||||
if (ret != ERROR_INVALID_FLAGS) {
|
if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) {
|
||||||
EXPECT_LEN(sizeof(ligatures_dst)); EXPECT_VALID;
|
EXPECT_LEN(sizeof(ligatures_dst)); EXPECT_VALID;
|
||||||
ok(strcmp(dst, ligatures_dst) == 0,
|
ok(strcmp(dst, ligatures_dst) == 0,
|
||||||
"MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", ligatures_dst, dst);
|
"MAP_EXPAND_LIGATURES: Expected '%s', got '%s'\n", ligatures_dst, dst);
|
||||||
|
@ -1856,7 +1856,7 @@ static void test_FoldStringW(void)
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
|
ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
|
||||||
/* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
|
/* NT 4.0 doesnt support MAP_EXPAND_LIGATURES */
|
||||||
if (ret != ERROR_INVALID_FLAGS) {
|
if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) {
|
||||||
EXPECT_LEN(sizeof(ligatures_dst)/sizeof(ligatures_dst[0])); EXPECT_VALID;
|
EXPECT_LEN(sizeof(ligatures_dst)/sizeof(ligatures_dst[0])); EXPECT_VALID;
|
||||||
ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)),
|
ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)),
|
||||||
"MAP_EXPAND_LIGATURES: Expanded incorrectly\n");
|
"MAP_EXPAND_LIGATURES: Expanded incorrectly\n");
|
||||||
|
|
Loading…
Reference in New Issue