Sync with trunk head (part 1 of 2)

[reactos.git] / dll / win32 / kernel32 / file / dir.c

diff --git a/dll/win32/kernel32/file/dir.c b/dll/win32/kernel32/file/dir.c
index 97c0447..848d4f8 100644 (file)
--- a/dll/win32/kernel32/file/dir.c
+++ b/dll/win32/kernel32/file/dir.c
@@ -741,7 +741,7 @@ GetShortPathNameW (
     }
 
     /* check for drive letter */
-    if (longpath[1] == ':' )
+    if (longpath[0] != '/' && longpath[1] == ':' )
     {
         tmpshortpath[0] = longpath[0];
         tmpshortpath[1] = ':';
@@ -772,7 +772,7 @@ GetShortPathNameW (
         tmplen = p - (longpath + lp);
         lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1);
         /* Check, if the current element is a valid dos name */
-        if (tmplen <= 8+1+3+1)
+        if (tmplen <= 8+1+3)
         {
             BOOLEAN spaces;
             memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR));