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

ntdll: Fix a few failing tests in Vista.

This commit is contained in:
James Hawkins 2008-09-02 01:06:52 -05:00 committed by Alexandre Julliard
parent 43c97f4477
commit f6a9514e96
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/ntdll/tests/path.c
View File

@ -251,7 +251,6 @@ static void test_RtlGetFullPathName_U(void)
{ "c:/TEST", "c:\\test", "test"}, { "c:/TEST", "c:\\test", "test"},
{ "c:/test/file", "c:\\test\\file", "file"}, { "c:/test/file", "c:\\test\\file", "file"},
{ "c:/test./file", "c:\\test\\file", "file"}, { "c:/test./file", "c:\\test\\file", "file"},
{ "c:/test../file", "c:\\test.\\file", "file"},
{ "c:/test.. /file", "c:\\test.. \\file","file"}, { "c:/test.. /file", "c:\\test.. \\file","file"},
{ "c:/test/././file", "c:\\test\\file", "file"}, { "c:/test/././file", "c:\\test\\file", "file"},
{ "c:/test\\.\\.\\file", "c:\\test\\file", "file"}, { "c:/test\\.\\.\\file", "c:\\test\\file", "file"},
@ -267,6 +266,7 @@ static void test_RtlGetFullPathName_U(void)
WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH]; WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH];
CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH]; CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH];
ULONG ret; ULONG ret;
NTSTATUS status;
WCHAR *file_part; WCHAR *file_part;
DWORD reslen; DWORD reslen;
UINT len; UINT len;
@ -292,6 +292,23 @@ static void test_RtlGetFullPathName_U(void)
} }
} }
/* "c:/test../file", "c:\\test.\\file", "file"}, */
pRtlMultiByteToUnicodeN(pathbufW, sizeof(pathbufW), NULL,
"c:/test../file", strlen("c:/test../file") + 1);
ret = pRtlGetFullPathName_U(pathbufW, MAX_PATH, rbufferW, &file_part);
ok(ret == strlen("c:\\test.\\file") * sizeof(WCHAR) ||
ret == strlen("c:\\test..\\file") * sizeof(WCHAR), /* Vista */
"Expected 26 or 28, got %d\n", ret);
status = pRtlUnicodeToMultiByteN(rbufferA, MAX_PATH, &reslen, rbufferW,
(lstrlenW(rbufferW) + 1) * sizeof(WCHAR));
ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n");
ok(!lstrcmpiA(rbufferA, "c:\\test.\\file") ||
!lstrcmpiA(rbufferA, "c:\\test..\\file"),
"Expected \"c:\\test.\\file\" or \"c:\\test..\\file\", got \"%s\"\n", rbufferA);
status = pRtlUnicodeToMultiByteN(rfileA, MAX_PATH, &reslen, file_part,
(lstrlenW(file_part) + 1) * sizeof(WCHAR));
ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n");
ok(!lstrcmpiA(rfileA, "file"), "Got \"%s\" expected \"file\"\n", rfileA);
} }
START_TEST(path) START_TEST(path)