From 108af8baae2c5a7d01f1389f78befbe7d41eb87e Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Tue, 20 Oct 2009 10:32:37 +0000 Subject: [PATCH] [fastfat_new] - When creating a DCB with a known file handle, always build a full file name, because FullFAT opening code always needs a full name. - Fix debug prints (%Z -> %wZ). svn path=/trunk/; revision=43643 --- reactos/drivers/filesystems/fastfat_new/dir.c | 5 +++++ reactos/drivers/filesystems/fastfat_new/fastfat.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/reactos/drivers/filesystems/fastfat_new/dir.c b/reactos/drivers/filesystems/fastfat_new/dir.c index 4d3456e5b7d..ca04e84c191 100644 --- a/reactos/drivers/filesystems/fastfat_new/dir.c +++ b/reactos/drivers/filesystems/fastfat_new/dir.c @@ -168,8 +168,13 @@ FatCreateDcb(IN PFAT_IRP_CONTEXT IrpContext, /* Set names */ if (FileHandle) + { FatSetFcbNames(IrpContext, Fcb); + /* Ensure the full name is set */ + FatSetFullFileNameInFcb(IrpContext, Fcb); + } + return Fcb; } diff --git a/reactos/drivers/filesystems/fastfat_new/fastfat.c b/reactos/drivers/filesystems/fastfat_new/fastfat.c index 21ec0fb34ce..64736afc797 100644 --- a/reactos/drivers/filesystems/fastfat_new/fastfat.c +++ b/reactos/drivers/filesystems/fastfat_new/fastfat.c @@ -317,7 +317,7 @@ FatDecodeFileObject(IN PFILE_OBJECT FileObject, TypeOfOpen = (*Ccb == NULL ? DirectoryFile : UserDirectoryOpen); - DPRINT1("Referencing a directory: %Z\n", &(*FcbOrDcb)->FullFileName); + DPRINT1("Referencing a directory: %wZ\n", &(*FcbOrDcb)->FullFileName); break; /* File */ @@ -327,7 +327,7 @@ FatDecodeFileObject(IN PFILE_OBJECT FileObject, TypeOfOpen = (*Ccb == NULL ? EaFile : UserFileOpen); - DPRINT("Referencing a file: %Z\n", &(*FcbOrDcb)->FullFileName); + DPRINT("Referencing a file: %wZ\n", &(*FcbOrDcb)->FullFileName); break;