From c84240932322e8621bbcf7d4820f40fe27f5d7d9 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 28 Apr 1999 14:19:34 +0000
Subject: [PATCH] Added missing features in GetFullPathName[A/W]().

svn path=/trunk/; revision=420
---
 reactos/lib/kernel32/file/dir.c | 153 ++++++++++++++++++++++++++++++--
 1 file changed, 148 insertions(+), 5 deletions(-)

diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c
index 1e1172f2c62..2b7ffc7ef33 100644
--- a/reactos/lib/kernel32/file/dir.c
+++ b/reactos/lib/kernel32/file/dir.c
@@ -163,6 +163,24 @@ WINBOOL STDCALL RemoveDirectoryW(LPCWSTR lpPathName)
    return TRUE;
 }
 
+
+static DWORD GetDotSequenceLengthA (PSTR p)
+{
+    DWORD dwCount = 0;
+
+    for (;;)
+    {
+	if (*p == '.')
+	    dwCount++;
+	else if ((*p == '\\' || *p == '\0') && dwCount)
+	    return dwCount;
+	else
+	    return 0;
+	p++;
+    }
+    return 0;
+}
+
 DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
 			       DWORD nBufferLength,
 			       LPSTR lpBuffer,
@@ -199,12 +217,63 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
      }
    
    DPRINT("lpBuffer %s\n",lpBuffer);
-   
+
    p = lpBuffer + 2;
-   
+
    while ((*p) != 0) 
      {
-        DPRINT("prev %s p %s\n",prev,p);
+	DWORD dwDotLen;
+
+	dwDotLen = GetDotSequenceLengthA (p+1);
+	DPRINT("DotSequenceLength %u\n", dwDotLen);
+	DPRINT("prev %s p %s\n",prev,p);
+
+	if (dwDotLen == 0)
+	{
+		prev = p;
+		do
+		{
+			p++;
+		}
+		while ((*p) != 0 && (*p) != '\\');
+	}
+	else if (dwDotLen == 1)
+	{
+		lstrcpyA(p, p+2);
+	}
+	else
+	{
+		if (dwDotLen > 2)
+		{
+			int n = dwDotLen - 2;
+
+			while (n > 0)
+			{
+				prev--;
+				if ((*prev) == '\\')
+					n--;
+				if (prev == (lpBuffer+2))
+					break;
+			}
+		}
+
+		lstrcpyA (prev, p+dwDotLen+1);
+		p = prev;
+		if (prev == (lpBuffer+2))
+		{
+			prev = NULL;
+		}
+		else
+		{
+			prev--;
+			while ((*prev) != '\\')
+			{
+				prev--;
+			}
+		}
+	}
+
+#if 0
 	if (p[1] == '.' && (p[2] == '\\' || p[2] == 0))
 	  {
              lstrcpyA(p, p+2);
@@ -236,11 +305,12 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
 	       } 
 	     while ((*p) != 0 && (*p) != '\\');
 	  }
+#endif
      }
    
    if (lpFilePart != NULL)
      {
-	(*lpFilePart) = prev;
+	(*lpFilePart) = prev + 1;
      }
    
    DPRINT("lpBuffer %s\n",lpBuffer);
@@ -248,6 +318,25 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
    return strlen(lpBuffer);
 }
 
+
+static DWORD GetDotSequenceLengthW (PWSTR p)
+{
+    DWORD dwCount = 0;
+
+    for (;;)
+    {
+	if (*p == '.')
+	    dwCount++;
+	else if ((*p == '\\' || *p == '\0') && dwCount)
+	    return dwCount;
+	else
+	    return 0;
+	p++;
+    }
+    return 0;
+}
+
+
 DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
 			       DWORD nBufferLength,
 			       LPWSTR lpBuffer,
@@ -289,6 +378,59 @@ DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
    
    while ((*p) != 0) 
      {
+	DWORD dwDotLen;
+
+	dwDotLen = GetDotSequenceLengthW (p+1);
+	DPRINT("DotSequenceLength %u\n", dwDotLen);
+	DPRINT("prev %w p %w\n",prev,p);
+
+	if (dwDotLen == 0)
+	{
+		prev = p;
+		do
+		{
+			p++;
+		}
+		while ((*p) != 0 && (*p) != '\\');
+	}
+	else if (dwDotLen == 1)
+	{
+		lstrcpyW(p, p+2);
+	}
+	else
+	{
+		if (dwDotLen > 2)
+		{
+			int n = dwDotLen - 2;
+
+			while (n > 0)
+			{
+				prev--;
+				if ((*prev) == '\\')
+					n--;
+				if (prev == (lpBuffer+2))
+					break;
+			}
+		}
+
+		lstrcpyW (prev, p+dwDotLen+1);
+		p = prev;
+		if (prev == (lpBuffer+2))
+		{
+			prev = NULL;
+		}
+		else
+		{
+			prev--;
+			while ((*prev) != '\\')
+			{
+				prev--;
+			}
+		}
+	}
+
+
+#if 0
 	DPRINT("prev %w p %w\n",prev,p);
 	if (p[1] == '.' && (p[2] == '\\' || p[2] == 0))
 	  {
@@ -321,11 +463,12 @@ DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
 	       } 
 	     while ((*p) != 0 && (*p) != '\\');
 	  }
+#endif
      }
    
    if (lpFilePart != NULL)
      {
-	(*lpFilePart) = prev;
+	(*lpFilePart) = prev + 1;
      }
    
    DPRINT("lpBuffer %w\n",lpBuffer);