From 048a29ec85fc3a969b5c67abd5f64b0c3471cd36 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Fri, 15 Jul 2011 01:44:03 +0000
Subject: [PATCH] [KERNEL32/RTL]: Fix build.

svn path=/trunk/; revision=52686
---
 reactos/dll/win32/kernel32/file/find.c  | 16 ++++++++--------
 reactos/dll/win32/kernel32/misc/utils.c | 12 ++++++------
 reactos/lib/rtl/path.c                  |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c
index 0060e662889..3cd0ef9cbe0 100644
--- a/reactos/dll/win32/kernel32/file/find.c
+++ b/reactos/dll/win32/kernel32/file/find.c
@@ -259,7 +259,7 @@ InternalFindFirstFile (
 	PWSTR NtPathBuffer;
 	BOOLEAN RemovedLastChar = FALSE;
 	BOOL bResult;
-	CURDIR DirInfo;
+	RTL_RELATIVE_NAME_U DirInfo;
 	ULONG DeviceNameInfo;
 	HANDLE hDirectory = NULL;
 
@@ -292,20 +292,20 @@ InternalFindFirstFile (
 	}
 	PathFileName.MaximumLength = PathFileName.Length;
 
-	if (DirInfo.DosPath.Length != 0 && DirInfo.DosPath.Buffer != PathFileName.Buffer)
+	if (DirInfo.RelativeName.Length != 0 && DirInfo.RelativeName.Buffer != PathFileName.Buffer)
 	{
 	    if (PathFileName.Buffer != NULL)
 	    {
-	        /* This is a relative path to DirInfo.Handle, adjust NtPathU! */
+	        /* This is a relative path to DirInfo.ContainingDirectory, adjust NtPathU! */
 	        NtPathU.Length = NtPathU.MaximumLength =
-	            (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)DirInfo.DosPath.Buffer);
-	        NtPathU.Buffer = DirInfo.DosPath.Buffer;
+	            (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)DirInfo.RelativeName.Buffer);
+	        NtPathU.Buffer = DirInfo.RelativeName.Buffer;
 	    }
 	}
 	else
 	{
 	    /* This is an absolute path, NtPathU receives the full path */
-	    DirInfo.Handle = NULL;
+	    DirInfo.ContainingDirectory = NULL;
 	    if (PathFileName.Buffer != NULL)
 	    {
 	        NtPathU.Length = NtPathU.MaximumLength =
@@ -332,12 +332,12 @@ InternalFindFirstFile (
 	TRACE("lpFileName: \"%ws\"\n", lpFileName);
 	TRACE("NtPathU: \"%wZ\"\n", &NtPathU);
 	TRACE("PathFileName: \"%wZ\"\n", &PathFileName);
-	TRACE("RelativeTo: 0x%p\n", DirInfo.Handle);
+	TRACE("RelativeTo: 0x%p\n", DirInfo.ContainingDirectory);
 
 	InitializeObjectAttributes (&ObjectAttributes,
 	                            &NtPathU,
 	                            OBJ_CASE_INSENSITIVE,
-	                            DirInfo.Handle,
+	                            DirInfo.ContainingDirectory,
 	                            NULL);
 
 	Status = NtOpenFile (&hDirectory,
diff --git a/reactos/dll/win32/kernel32/misc/utils.c b/reactos/dll/win32/kernel32/misc/utils.c
index a011ff5e6e3..ff0276e42f8 100644
--- a/reactos/dll/win32/kernel32/misc/utils.c
+++ b/reactos/dll/win32/kernel32/misc/utils.c
@@ -424,7 +424,7 @@ BasepMapFile(IN LPCWSTR lpApplicationName,
              OUT PHANDLE hSection,
              IN PUNICODE_STRING ApplicationName)
 {
-    CURDIR RelativeName;
+    RTL_RELATIVE_NAME_U RelativeName;
     OBJECT_ATTRIBUTES ObjectAttributes;
     NTSTATUS Status;
     HANDLE hFile = NULL;
@@ -433,7 +433,7 @@ BasepMapFile(IN LPCWSTR lpApplicationName,
     DPRINT("BasepMapFile\n");
     
     /* Zero out the Relative Directory */
-    RelativeName.Handle = NULL;
+    RelativeName.ContainingDirectory = NULL;
 
     /* Find the application name */
     if (!RtlDosPathNameToNtPathName_U(lpApplicationName,
@@ -445,19 +445,19 @@ BasepMapFile(IN LPCWSTR lpApplicationName,
     }
 
     DPRINT("ApplicationName %wZ\n", ApplicationName);
-    DPRINT("RelativeName %wZ\n", &RelativeName.DosPath);
+    DPRINT("RelativeName %wZ\n", &RelativeName.RelativeName);
     
     /* Did we get a relative name? */
-    if (RelativeName.DosPath.Length)
+    if (RelativeName.RelativeName.Length)
     {
-        ApplicationName = &RelativeName.DosPath;
+        ApplicationName = &RelativeName.RelativeName;
     }
 
     /* Initialize the Object Attributes */
     InitializeObjectAttributes(&ObjectAttributes,
                                ApplicationName,
                                OBJ_CASE_INSENSITIVE,
-                               RelativeName.Handle,
+                               RelativeName.ContainingDirectory,
                                NULL);
 
     /* Try to open the executable */
diff --git a/reactos/lib/rtl/path.c b/reactos/lib/rtl/path.c
index 196f3ec389b..cc03333cb0d 100644
--- a/reactos/lib/rtl/path.c
+++ b/reactos/lib/rtl/path.c
@@ -1014,7 +1014,6 @@ RtlDoesFileExists_UStr(IN PUNICODE_STRING FileName)
  * @implemented
  */
 BOOLEAN
-BOOLEAN
 NTAPI
 RtlDoesFileExists_UEx(IN PCWSTR FileName,
                       IN BOOLEAN SucceedIfBusy)