ntdll: Fix 2 failing test on native. Change Wine accordingly.

This commit is contained in:
Vitaliy Margolen 2006-06-21 07:35:13 -06:00 committed by Alexandre Julliard
parent ca9f266ac0
commit 27e3b82d49
2 changed files with 4 additions and 7 deletions

View File

@ -356,11 +356,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name )
end = p - 1; end = p - 1;
if (end >= dos_name && *end == ':') end--; /* remove trailing ':' before extension */ if (end >= dos_name && *end == ':') end--; /* remove trailing ':' before extension */
} }
else /* remove trailing spaces */
{ while (end >= dos_name && *end == ' ') end--;
/* no extension, remove trailing spaces */
while (end >= dos_name && *end == ' ') end--;
}
/* now we have a potential device name between start and end, check it */ /* now we have a potential device name between start and end, check it */
switch(end - start + 1) switch(end - start + 1)

View File

@ -105,13 +105,13 @@ static void test_RtlIsDosDeviceName(void)
{ "c:prn ", 4, 6 }, { "c:prn ", 4, 6 },
{ "c:prn.......", 4, 6 }, { "c:prn.......", 4, 6 },
{ "c:prn... ...", 4, 6 }, { "c:prn... ...", 4, 6 },
{ "c:NUL .... ", 0, 0 }, { "c:NUL .... ", 4, 6 },
{ "c: . . .", 0, 0 }, { "c: . . .", 0, 0 },
{ "c:", 0, 0 }, { "c:", 0, 0 },
{ " . . . :", 0, 0 }, { " . . . :", 0, 0 },
{ ":", 0, 0 }, { ":", 0, 0 },
{ "c:nul. . . :", 4, 6 }, { "c:nul. . . :", 4, 6 },
{ "c:nul . . :", 0, 0 }, { "c:nul . . :", 4, 6 },
{ "c:nul0", 0, 0 }, { "c:nul0", 0, 0 },
{ "c:prn:aaa", 0, 0 }, { "c:prn:aaa", 0, 0 },
{ "c:PRN:.txt", 4, 6 }, { "c:PRN:.txt", 4, 6 },