}\r
\r
CopySize = StrSize(*Destination);\r
- *Destination = CopyMem(*Destination+Count-sizeof(CHAR16), *Destination, CopySize);\r
- *Destination = CopyMem(*Destination, Source, Count);\r
+ CopyMem((*Destination)+((Count-2)/sizeof(CHAR16)), *Destination, CopySize);\r
+ CopyMem(*Destination, Source, Count-2);\r
return (*Destination);\r
}\r
\r
// We got info... do we have a name? if yes preceed the current path with it...\r
//\r
if (StrLen (FileInfo->FileName) == 0) {\r
- *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"/", 0);\r
+ if (*FullFileName == NULL) {\r
+ *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
+ }\r
FreePool(FileInfo);\r
break;\r
} else {\r
+ if (*FullFileName == NULL) {\r
+ *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
+ }\r
*FullFileName = StrnCatGrowLeft(FullFileName, &Size, FileInfo->FileName, 0);\r
- *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"/", 0);\r
+ *FullFileName = StrnCatGrowLeft(FullFileName, &Size, L"\\", 0);\r
FreePool(FileInfo);\r
}\r
}\r
//\r
if ((CountSoFar+1)*sizeof(CHAR16) < *Size){\r
((CHAR16*)Buffer)[CountSoFar] = CharBuffer;\r
- ((CHAR16*)Buffer)[CountSoFar+1] = '\0';\r
+ ((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;\r
}\r
}\r
\r