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

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 27e3b82d493bc64b15be80e642f08705063b637d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=27e3b82d493bc64b15be80e6...

Author: Vitaliy Margolen 
Date:   Wed Jun 21 07:35:13 2006 -0600

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

---

dlls/ntdll/path.c       |    7 ++-----
 dlls/ntdll/tests/path.c |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c
index e9286a0..78ee9fd 100644
--- a/dlls/ntdll/path.c
+++ b/dlls/ntdll/path.c
@@ -356,11 +356,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWST
         end = p - 1;
         if (end >= dos_name && *end == ':') end--;  /* remove trailing ':' before extension */
     }
-    else
-    {
-        /* no extension, remove trailing spaces */
-        while (end >= dos_name && *end == ' ') end--;
-    }
+    /* remove trailing spaces */
+    while (end >= dos_name && *end == ' ') end--;

/* now we have a potential device name between start and end, check it */
     switch(end - start + 1)
diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 3c35624..14af1cf 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.c
@@ -105,13 +105,13 @@ static void test_RtlIsDosDeviceName(void
         { "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 },
         { " . . . :",      0, 0 },
         { ":",             0, 0 },
         { "c:nul. . . :",  4, 6 },
-        { "c:nul . . :",   0, 0 },
+        { "c:nul . . :",   4, 6 },
         { "c:nul0",        0, 0 },
         { "c:prn:aaa",     0, 0 },
         { "c:PRN:.txt",    4, 6 },