From 6a97fcb4f71a0db0f6dabf2076f2c108b23cc5a8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 6 Jun 2002 19:01:04 +0000
Subject: [PATCH] Added full short name (8.3 name) support.

svn path=/trunk/; revision=3016
---
 reactos/drivers/fs/cdfs/dirctl.c |  4 +-
 reactos/drivers/fs/cdfs/fcb.c    | 63 ++++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/reactos/drivers/fs/cdfs/dirctl.c b/reactos/drivers/fs/cdfs/dirctl.c
index 467298ae14c..6632577af55 100644
--- a/reactos/drivers/fs/cdfs/dirctl.c
+++ b/reactos/drivers/fs/cdfs/dirctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dirctl.c,v 1.6 2002/06/06 16:20:52 ekohl Exp $
+/* $Id: dirctl.c,v 1.7 2002/06/06 19:01:04 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -141,7 +141,7 @@ CdfsFindFile(PDEVICE_EXTENSION DeviceExt,
 {
   WCHAR name[256];
   WCHAR TempStr[2];
-  WCHAR ShortNameBuffer[12];
+  WCHAR ShortNameBuffer[13];
   UNICODE_STRING ShortName;
   UNICODE_STRING LongName;
   PVOID Block;
diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c
index 9fc58ef999c..39fb779eded 100644
--- a/reactos/drivers/fs/cdfs/fcb.c
+++ b/reactos/drivers/fs/cdfs/fcb.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fcb.c,v 1.6 2002/05/14 23:16:23 ekohl Exp $
+/* $Id: fcb.c,v 1.7 2002/06/06 19:01:04 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -268,8 +268,6 @@ CdfsMakeRootFCB(PDEVICE_EXTENSION Vcb)
 
   Fcb = CdfsCreateFCB(L"\\");
 
-//  memset(Fcb->entry.Filename, ' ', 11);
-
   Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize;
   Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart;
   Fcb->Entry.FileFlags = 0x02; // FILE_ATTRIBUTE_DIRECTORY;
@@ -307,7 +305,7 @@ CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
 		    PDIR_RECORD Record,
 		    PWSTR Name)
 /*
- * FUNCTION: Retrieves the file name, be it in short or long file name format
+ * FUNCTION: Retrieves the file name from a directory record.
  */
 {
   if (Record->FileIdLength == 1 && Record->FileId[0] == 0)
@@ -330,7 +328,9 @@ CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
 	}
       else
 	{
-	  CdfsSwapString(Name, Record->FileId, Record->FileIdLength);
+	  CdfsSwapString(Name,
+			 Record->FileId,
+			 Record->FileIdLength);
 	}
     }
 
@@ -341,7 +341,8 @@ CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
 NTSTATUS
 CdfsMakeFCBFromDirEntry(PVCB Vcb,
 			PFCB DirectoryFCB,
-			PWSTR Name,
+			PWSTR LongName,
+			PWSTR ShortName,
 			PDIR_RECORD Record,
 			PFCB * fileFCB)
 {
@@ -349,8 +350,8 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
   PFCB rcFCB;
   ULONG Size;
 
-  if (Name [0] != 0 && wcslen (DirectoryFCB->PathName) +
-        sizeof(WCHAR) + wcslen (Name) > MAX_PATH)
+  if (LongName [0] != 0 && wcslen (DirectoryFCB->PathName) +
+        sizeof(WCHAR) + wcslen (LongName) > MAX_PATH)
     {
       return(STATUS_OBJECT_NAME_INVALID);
     }
@@ -361,9 +362,9 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
       wcscat(pathName, L"\\");
     }
 
-  if (Name[0] != 0)
+  if (LongName[0] != 0)
     {
-      wcscat(pathName, Name);
+      wcscat(pathName, LongName);
     }
   else
     {
@@ -376,17 +377,22 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
   rcFCB = CdfsCreateFCB(pathName);
   memcpy(&rcFCB->Entry, Record, sizeof(DIR_RECORD));
 
+  /* Copy short name into FCB */
+  rcFCB->ShortNameLength = wcslen(ShortName) * sizeof(WCHAR);
+  wcscpy(rcFCB->ShortName, ShortName);
+
   Size = rcFCB->Entry.DataLengthL;
 
   rcFCB->RFCB.FileSize.QuadPart = Size;
   rcFCB->RFCB.ValidDataLength.QuadPart = Size;
   rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, BLOCKSIZE);
-//  DPRINT1("%S %d %d\n", longName, Size, (ULONG)rcFCB->RFCB.AllocationSize.QuadPart);
   CdfsFCBInitializeCache(Vcb, rcFCB);
   rcFCB->RefCount++;
   CdfsAddFCBToTable(Vcb, rcFCB);
   *fileFCB = rcFCB;
 
+  DPRINT("%S %d %I64d\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart);
+
   return(STATUS_SUCCESS);
 }
 
@@ -453,6 +459,13 @@ CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt,
   LARGE_INTEGER StreamOffset;
   PVOID Context;
 
+  WCHAR ShortNameBuffer[13];
+  UNICODE_STRING ShortName;
+  UNICODE_STRING LongName;
+  BOOLEAN HasSpaces;
+  GENERATE_NAME_CONTEXT NameContext;
+
+
   assert(DeviceExt);
   assert(DirectoryFcb);
   assert(FileToFind);
@@ -498,12 +511,38 @@ CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt,
       CdfsGetDirEntryName(DeviceExt, Record, Name);
       DPRINT("Name '%S'\n", Name);
 
-      if (wstrcmpjoki(Name, FileToFind))
+      RtlInitUnicodeString(&LongName, Name);
+      ShortName.Length = 0;
+      ShortName.MaximumLength = 26;
+      ShortName.Buffer = ShortNameBuffer;
+      memset(ShortNameBuffer, 0, 26);
+
+      if ((RtlIsNameLegalDOS8Dot3(&LongName, NULL, &HasSpaces) == FALSE) ||
+	  (HasSpaces == TRUE))
+	{
+	  /* Build short name */
+	  RtlGenerate8dot3Name(&LongName,
+			       FALSE,
+			       &NameContext,
+			       &ShortName);
+	}
+      else
+	{
+	  /* copy short name */
+	  RtlUpcaseUnicodeString(&ShortName,
+				 &LongName,
+				 FALSE);
+	}
+
+      DPRINT("ShortName '%wZ'\n", &ShortName);
+
+      if (wstrcmpjoki(Name, FileToFind) || wstrcmpjoki(ShortNameBuffer, FileToFind))
 	{
 	  DPRINT("Match found, %S\n", Name);
 	  Status = CdfsMakeFCBFromDirEntry(DeviceExt,
 					   DirectoryFcb,
 					   Name,
+					   ShortNameBuffer,
 					   Record,
 					   FoundFCB);