[ros-diffs] [dchapyshev] 39431: - Implement GetVolumePathNameA/W

[dchapyshev at svn.reactos.org]

Author: dchapyshev
Date: Fri Feb  6 02:13:11 2009
New Revision: 39431

URL: http://svn.reactos.org/svn/reactos?rev=39431&view=rev
Log:
- Implement GetVolumePathNameA/W

Modified:
    trunk/reactos/dll/win32/kernel32/file/volume.c
    trunk/reactos/dll/win32/kernel32/misc/stubs.c

Modified: trunk/reactos/dll/win32/kernel32/file/volume.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/volume.c?rev=39431&r1=39430&r2=39431&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Fri Feb  6 02:13:11 2009
@@ -1179,4 +1179,142 @@
     return RtlFreeHeap(GetProcessHeap(), 0, hFindVolume);
 }
 
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+GetVolumePathNameA(LPCSTR lpszFileName,
+                   LPSTR lpszVolumePathName,
+                   DWORD cchBufferLength)
+{
+    PWCHAR FileNameW = NULL;
+    WCHAR VolumePathName[MAX_PATH];
+    BOOL Result;
+
+    if (lpszFileName)
+    {
+        if (!(FileNameW = FilenameA2W(lpszFileName, FALSE)))
+            return FALSE;
+    }
+
+    Result = GetVolumePathNameW(FileNameW, VolumePathName, cchBufferLength);
+
+    if (Result)
+        FilenameW2A_N(lpszVolumePathName, MAX_PATH, VolumePathName, -1);
+
+    return Result;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+GetVolumePathNameW(LPCWSTR lpszFileName,
+                   LPWSTR lpszVolumePathName,
+                   DWORD cchBufferLength)
+{
+    DWORD PathLength;
+    UNICODE_STRING UnicodeFilePath;
+    LPWSTR FilePart;
+    PWSTR FullFilePath, FilePathName;
+    ULONG PathSize;
+    WCHAR VolumeName[MAX_PATH];
+    DWORD ErrorCode;
+    BOOL Result = FALSE;
+
+    if (!(PathLength = GetFullPathNameW(lpszFileName, 0, NULL, NULL)))
+    {
+        return Result;
+    }
+    else
+    {
+        PathLength = PathLength + 10;
+        PathSize = PathLength * sizeof(WCHAR);
+
+        if (!(FullFilePath = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathSize)))
+        {
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+            return Result;
+        }
+
+        if (!GetFullPathNameW(lpszFileName, PathLength, FullFilePath, &FilePart))
+        {
+            RtlFreeHeap(RtlGetProcessHeap(), 0, FullFilePath);
+            return Result;
+        }
+
+        RtlInitUnicodeString(&UnicodeFilePath, FullFilePath);
+
+        if (UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR) - 1] != '\\')
+        {
+            UnicodeFilePath.Length += sizeof(WCHAR);
+            UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR) - 1] = '\\';
+            UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR)] = '\0';
+        }
+
+        if (!(FilePathName = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathSize)))
+        {
+            RtlFreeHeap(RtlGetProcessHeap(), 0, FullFilePath);
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+            return Result;
+        }
+
+        while (!GetVolumeNameForVolumeMountPointW(UnicodeFilePath.Buffer,
+                                                  VolumeName,
+                                                  MAX_PATH))
+        {
+            if (((UnicodeFilePath.Length == 4) && (UnicodeFilePath.Buffer[0] == '\\') &&
+                (UnicodeFilePath.Buffer[1] == '\\')) || ((UnicodeFilePath.Length == 6) &&
+                (UnicodeFilePath.Buffer[1] == ':')))
+            {
+                break;
+            }
+
+            UnicodeFilePath.Length -= sizeof(WCHAR);
+            UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR)] = '\0';
+
+            memcpy(FilePathName, UnicodeFilePath.Buffer, UnicodeFilePath.Length);
+            FilePathName[UnicodeFilePath.Length / sizeof(WCHAR)] = '\0';
+
+            if (!GetFullPathNameW(FilePathName, PathLength, FullFilePath, &FilePart))
+            {
+                goto Cleanup2;
+            }
+
+            if (!FilePart)
+            {
+                RtlInitUnicodeString(&UnicodeFilePath, FullFilePath);
+                UnicodeFilePath.Length += sizeof(WCHAR);
+                UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR) - 1] = '\\';
+                UnicodeFilePath.Buffer[UnicodeFilePath.Length / sizeof(WCHAR)] = '\0';
+                break;
+            }
+
+            FilePart[0] = '\0';
+            RtlInitUnicodeString(&UnicodeFilePath, FullFilePath);
+        }
+    }
+
+    if (UnicodeFilePath.Length > (cchBufferLength * sizeof(WCHAR)) - sizeof(WCHAR))
+    {
+        ErrorCode = ERROR_FILENAME_EXCED_RANGE;
+        goto Cleanup1;
+    }
+
+    memcpy(lpszVolumePathName, UnicodeFilePath.Buffer, UnicodeFilePath.Length);
+    lpszVolumePathName[UnicodeFilePath.Length / sizeof(WCHAR)] = '\0';
+
+    Result = TRUE;
+    goto Cleanup2;
+
+Cleanup1:
+    SetLastError(ErrorCode);
+Cleanup2:
+    RtlFreeHeap(RtlGetProcessHeap(), 0, FullFilePath);
+    RtlFreeHeap(RtlGetProcessHeap(), 0, FilePathName);
+    return Result;
+}
+
 /* EOF */

Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/stubs.c?rev=39431&r1=39430&r2=39431&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Feb  6 02:13:11 2009
@@ -629,22 +629,6 @@
  */
 BOOL
 WINAPI
-GetVolumePathNameW(
-    LPCWSTR lpszFileName,
-    LPWSTR lpszVolumePathName,
-    DWORD cchBufferLength
-    )
-{
-    STUB;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
 GetVolumePathNamesForVolumeNameW(
     LPCWSTR lpszVolumeName,
     LPWSTR lpszVolumePathNames,
@@ -771,21 +755,6 @@
  */
 BOOL
 WINAPI
-GetVolumePathNameA(
-    LPCSTR lpszFileName,
-    LPSTR lpszVolumePathName,
-    DWORD cchBufferLength
-    )
-{
-    STUB;
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
 GetVolumePathNamesForVolumeNameA(
     LPCSTR lpszVolumeName,
     LPSTR lpszVolumePathNames,