James Hawkins : ntdll: Fix two tests that fail on all NT platforms.
Alexandre Julliard
julliard at winehq.org
Fri May 2 07:06:31 CDT 2008
Module: wine
Branch: master
Commit: b779aac8cf1b95932e5c8a186586496f19f32e85
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b779aac8cf1b95932e5c8a186586496f19f32e85
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Fri May 2 03:12:43 2008 -0500
ntdll: Fix two tests that fail on all NT platforms.
---
dlls/ntdll/tests/path.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 9d67b2c..99d9482 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.c
@@ -114,11 +114,9 @@ static void test_RtlIsDosDeviceName(void)
{ "c:nul. . . :", 4, 6 },
{ "c:nul . . :", 4, 6 },
{ "c:nul0", 0, 0 },
- { "c:prn:aaa", 0, 0 },
{ "c:PRN:.txt", 4, 6 },
{ "c:aux:.txt...", 4, 6 },
{ "c:prn:.txt:", 4, 6 },
- { "c:nul:aaa", 0, 0 },
{ "con:", 0, 6 },
{ "lpt1:", 0, 8 },
{ "c:com5:", 4, 8 },
@@ -147,6 +145,18 @@ static void test_RtlIsDosDeviceName(void)
"Wrong result (%d,%d)/(%d,%d) for %s\n",
HIWORD(ret), LOWORD(ret), test->pos, test->len, test->path );
}
+
+ pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, "c:prn:aaa", strlen("c:prn:aaa")+1 );
+ ret = pRtlIsDosDeviceName_U( buffer );
+ ok( ret == MAKELONG( 6, 4 ) || /* NT */
+ ret == MAKELONG( 0, 0), /* win9x */
+ "Wrong result (%d,%d)/(4,6) or (0,0) for c:prn:aaa\n", HIWORD(ret), LOWORD(ret) );
+
+ pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, "c:nul:aaa", strlen("c:nul:aaa")+1 );
+ ret = pRtlIsDosDeviceName_U( buffer );
+ ok( ret == MAKELONG( 6, 4 ) || /* NT */
+ ret == MAKELONG( 0, 0), /* win9x */
+ "Wrong result (%d,%d)/(4,6) or (0,0) for c:nul:aaa\n", HIWORD(ret), LOWORD(ret) );
}
static void test_RtlIsNameLegalDOS8Dot3(void)
More information about the wine-cvs
mailing list