Index: dlls/kernel/tests/atom.pl =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/atom.pl,v retrieving revision 1.3 diff -u -r1.3 atom.pl --- dlls/kernel/tests/atom.pl 1 Apr 2002 21:00:42 -0000 1.3 +++ dlls/kernel/tests/atom.pl 10 Apr 2002 16:22:40 -0000 @@ -29,12 +29,12 @@ # Add an atom my $atom = GlobalAddAtomA( $name ); -ok( ($atom >= 0xc000) && ($atom <= 0xffff) && !defined($wine::err) ); +named_ok( "Adding atom \"$name\" via GlobalAddAtomA()", ($atom >= 0xc000) && ($atom <= 0xffff) && !defined($wine::err) ); # Verify that it can be found (or not) appropriately -ok( GlobalFindAtomA($name) == $atom ); +named_ok( "Testing added atom \"".$name."\"", GlobalFindAtomA($name) == $atom ); ok( GlobalFindAtomA(uc $name) == $atom ); -ok( !GlobalFindAtomA( "_" . $name ) ); +named_ok( "Checking can't find atom \"_$name\"", !GlobalFindAtomA( "_" . $name ) ); # Add the same atom, specifying string as unicode; should # find the first one, not add a new one @@ -68,16 +68,19 @@ ok( !GlobalAddAtomW(0xffff) && ($wine::err == ERROR_INVALID_PARAMETER) ); # test some in between +set_name( "Checking GlobalAddAtom[AW](i) i < 0xbffff"); for ($i = 0x0001; ($i <= 0xbfff); $i += 27) { ok( GlobalAddAtomA($i) && !defined($wine::err) ); ok( GlobalAddAtomW($i) && !defined($wine::err) ); } +set_name( "Checking GlobalAddAtom[AW](i) 0xc000 < i < 0xfffff"); for ($i = 0xc000; ($i <= 0xffff); $i += 29) { ok( !GlobalAddAtomA($i) && ($wine::err == ERROR_INVALID_PARAMETER) ); ok( !GlobalAddAtomW($i) && ($wine::err == ERROR_INVALID_PARAMETER) ); } +unset_name(); ################################################################ Index: dlls/kernel/tests/directory.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/directory.c,v retrieving revision 1.2 diff -u -r1.2 directory.c --- dlls/kernel/tests/directory.c 1 Apr 2002 21:00:26 -0000 1.2 +++ dlls/kernel/tests/directory.c 10 Apr 2002 16:22:40 -0000 @@ -32,8 +32,10 @@ lstrcpyA(buf, "foo"); len_with_null = GetWindowsDirectoryA(buf, 1); - ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer"); - ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH"); + named_ok("Testing GetWindowsDirectoryA() doesn't touch buffer", + lstrcmpA(buf, "foo") == 0, "should not touch the buffer"); + named_ok("Testing GetWindowsDirectoryA() returns <= MAX_PATH", + len_with_null <= MAX_PATH, "should fit into MAX_PATH"); lstrcpyA(buf, "foo"); len = GetWindowsDirectoryA(buf, len_with_null - 1); @@ -41,10 +43,12 @@ ok(len == len_with_null, "should return length with terminating 0"); lstrcpyA(buf, "foo"); + set_name( "Testing GetWindowsDirectoryA"); len = GetWindowsDirectoryA(buf, len_with_null); ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer"); ok(len == lstrlenA(buf), "returned length should be equal to the length of string"); ok(len == (len_with_null - 1), "should return length without terminating 0"); + unset_name(); } static void test_GetWindowsDirectoryW(void)