ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi/tests: Fix a test failure on Vista/W2K8.

This commit is contained in:
Paul Vriens 2008-12-11 11:12:24 +01:00 committed by Alexandre Julliard
parent a3daf27b7e
commit e755a96fc8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/setupapi/tests/parser.c
View File

@ -52,6 +52,7 @@ static const char tmpfilename[] = ".\\tmp.inf";
#define A400 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \ #define A400 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
"aaaaaaaaaaaaaaaa" A256 "aaaaaaaaaaaaaaaa" A256
#define A1200 A400 A400 A400
#define A511 A255 A256 #define A511 A255 A256
#define A4097 "a" A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 #define A4097 "a" A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256
@ -61,7 +62,7 @@ static const char tmpfilename[] = ".\\tmp.inf";
"per%%cent=abcd\nper=1\ncent=2\n22=foo\n" \ "per%%cent=abcd\nper=1\ncent=2\n22=foo\n" \
"big=" A400 "\n" \ "big=" A400 "\n" \
"mydrive=\"C:\\\"\n" \ "mydrive=\"C:\\\"\n" \
"verybig=" A400 A400 A400 "\n" "verybig=" A1200 "\n"
/* create a new file with specified contents and open it */ /* create a new file with specified contents and open it */
static HINF test_file_contents( const char *data, UINT *err_line ) static HINF test_file_contents( const char *data, UINT *err_line )
@ -315,7 +316,7 @@ static const struct
{ "loop=%loop%\n" STR_SECTION, "loop", { "%loop2%" } }, { "loop=%loop%\n" STR_SECTION, "loop", { "%loop2%" } },
{ "%per%%cent%=100\n" STR_SECTION, "12", { "100" } }, { "%per%%cent%=100\n" STR_SECTION, "12", { "100" } },
{ "a=%big%\n" STR_SECTION, "a", { A400 } }, { "a=%big%\n" STR_SECTION, "a", { A400 } },
{ "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511 */ { "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */
{ "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } },
{ "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } },
{ "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } },
@ -384,8 +385,16 @@ static void test_key_names(void)
{ {
ok( err == 0, "line %u: bad error %u\n", i, err ); ok( err == 0, "line %u: bad error %u\n", i, err );
if (key_names[i].fields[index]) if (key_names[i].fields[index])
{
if (i == 49)
ok( !strcmp( field, key_names[i].fields[index] ) ||
!strcmp( field, A1200), /* Vista, W2K8 */
"line %u: bad field %s/%s\n",
i, field, key_names[i].fields[index] );
else
ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n", ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n",
i, field, key_names[i].fields[index] ); i, field, key_names[i].fields[index] );
}
else else
ok( 0, "line %u: got extra field %s\n", i, field ); ok( 0, "line %u: got extra field %s\n", i, field );
strcat( buffer, "," ); strcat( buffer, "," );