Author: pschweitzer Date: Sat Nov 19 21:59:12 2011 New Revision: 54449
URL: http://svn.reactos.org/svn/reactos?rev=54449&view=rev Log: [MSVCRT_APITEST] Fix tests according to the platform they are run on. This fixes msvcrt_apitest crash on w2k3.
Modified: trunk/rostests/apitests/msvcrt/splitpath.c
Modified: trunk/rostests/apitests/msvcrt/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath.... ============================================================================== --- trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] Sat Nov 19 21:59:12 2011 @@ -23,6 +23,9 @@ char dir[64]; char fname[32]; char ext[10]; + DWORD Major; + + Major = (DWORD)(LOBYTE(LOWORD(GetVersion())));
_splitpath("c:\dir1\dir2\file.ext", drive, dir, fname, ext); ok_str(drive, "c:"); @@ -34,17 +37,32 @@ _splitpath("c:\dir1\dir2\file.ext", 0, 0, 0, 0); ok_int(*_errno(), 0);
- *_errno() = 0; - _splitpath(0, drive, dir, fname, ext); - ok_int(*_errno(), EINVAL); - ok_str(drive, ""); - ok_str(dir, ""); - ok_str(fname, ""); - ok_str(ext, ""); + if (Major >= 6) + { + *_errno() = 0; + _splitpath(0, drive, dir, fname, ext); + ok_int(*_errno(), EINVAL); + ok_str(drive, ""); + ok_str(dir, ""); + ok_str(fname, ""); + ok_str(ext, ""); + } + else + { + win_skip("This test only succeed on NT6+\n"); + }
_splitpath("\\?\c:\dir1\dir2\file.ext", drive, dir, fname, ext); - ok_str(drive, "c:"); - ok_str(dir, "\dir1\dir2\"); + if (Major >= 6) + { + ok_str(drive, "c:"); + ok_str(dir, "\dir1\dir2\"); + } + else + { + ok_str(drive, ""); + ok_str(dir, "\\?\c:\dir1\dir2\"); + } ok_str(fname, "file"); ok_str(ext, ".ext");
@@ -61,8 +79,16 @@ ok_str(ext, ".ext");
_splitpath("\\?\0:/dir1\dir2/file.", drive, dir, fname, ext); - ok_str(drive, "0:"); - ok_str(dir, "/dir1\dir2/"); + if (Major >= 6) + { + ok_str(drive, "0:"); + ok_str(dir, "/dir1\dir2/"); + } + else + { + ok_str(drive, ""); + ok_str(dir, "\\?\0:/dir1\dir2/"); + } ok_str(fname, "file"); ok_str(ext, ".");