From fd30e6953807741a439061307435a90ca13141ec Mon Sep 17 00:00:00 2001 From: Austin Lund Date: Wed, 6 Oct 2010 12:04:42 +1000 Subject: [PATCH] advapi32/tests: Fix RegEnumValue overflow tests for broken behaviour on XP Pro Chinese. --- dlls/advapi32/tests/registry.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8b0dbeef9da..505d5ad30e8 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -462,7 +462,7 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data ); @@ -477,12 +477,12 @@ static void test_enum_value(void) ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); /* Win9x returns 2 as specified by MSDN but NT returns 3... */ ok( val_count == 2 || val_count == 3, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow empty name */ @@ -494,11 +494,11 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow data */