// construct the new file info block\r
//\r
NewSize = StrSize(DestPath);\r
- NewSize += StrSize(Node->FileName) + sizeof(EFI_FILE_INFO) + sizeof(CHAR16);\r
+ NewSize += StrSize(Node->FileName) + SIZE_OF_EFI_FILE_INFO + sizeof(CHAR16);\r
NewFileInfo = AllocateZeroPool(NewSize);\r
if (NewFileInfo == NULL) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
- CopyMem(NewFileInfo, Node->Info, sizeof(EFI_FILE_INFO));\r
+ CopyMem(NewFileInfo, Node->Info, SIZE_OF_EFI_FILE_INFO);\r
if (DestPath[0] != L'\\') {\r
StrCpy(NewFileInfo->FileName, L"\\");\r
StrCat(NewFileInfo->FileName, DestPath);\r
}\r
StrCat(NewFileInfo->FileName, Node->FileName);\r
}\r
- NewFileInfo->Size = sizeof(EFI_FILE_INFO) + StrSize(NewFileInfo->FileName);\r
+ NewFileInfo->Size = SIZE_OF_EFI_FILE_INFO + StrSize(NewFileInfo->FileName);\r
ShellPrintEx(-1, -1, HiiOutput, Node->FullName, NewFileInfo->FileName);\r
\r
if (!EFI_ERROR(ShellFileExists(NewFileInfo->FileName))) {\r