/*++\r
\r
-Copyright (c) 2006, Intel Corporation \r
+Copyright (c) 2006 - 2007, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
WinNtSimpleFileSystemDriverBindingSupported,\r
WinNtSimpleFileSystemDriverBindingStart,\r
WinNtSimpleFileSystemDriverBindingStop,\r
- 0x10,\r
+ 0xa,\r
NULL,\r
NULL\r
};\r
ASSERT (0);\r
}\r
\r
- for (Pointer = Str; *(Pointer + Count); Pointer++) {\r
- *Pointer = *(Pointer + Count);\r
+ if (Count != 0) {\r
+ for (Pointer = Str; *(Pointer + Count); Pointer++) {\r
+ *Pointer = *(Pointer + Count);\r
+ }\r
+ *Pointer = *(Pointer + Count); \r
}\r
-\r
- *Pointer = *(Pointer + Count);\r
}\r
\r
\r
EFI_STATUS Status;\r
WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *Private;\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL || Root == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+\r
Private = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (This);\r
\r
PrivateFile = NULL;\r
}\r
}\r
\r
+ gBS->RestoreTPL (OldTpl);\r
+\r
return Status;\r
}\r
\r
CHAR16 TempChar;\r
DWORD LastError;\r
UINTN Count;\r
- BOOLEAN TrailingDash;\r
BOOLEAN LoopFinish;\r
UINTN InfoSize;\r
EFI_FILE_INFO *Info;\r
\r
- TrailingDash = FALSE;\r
-\r
//\r
// Check for obvious invalid parameters.\r
//\r
}\r
\r
//\r
- //\r
+ // Init local variables\r
//\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
NewPrivateFile = NULL;\r
\r
+ //\r
+ // Allocate buffer for FileName as the passed in FileName may be read only\r
+ //\r
+ Status = gBS->AllocatePool (\r
+ EfiBootServicesData,\r
+ StrSize (FileName),\r
+ &TempFileName\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ StrCpy (TempFileName, FileName);\r
+ FileName = TempFileName;\r
+\r
//\r
// BUGBUG: assume an open of root\r
// if current location, return current data\r
}\r
\r
if (FileName[StrLen (FileName) - 1] == L'\\') {\r
- TrailingDash = TRUE;\r
FileName[StrLen (FileName) - 1] = 0;\r
}\r
\r
+ //\r
+ // If file name does not equal to "." or "..", \r
+ // then we trim the leading/trailing blanks and trailing dots\r
+ //\r
+ if (StrCmp (FileName, L".") != 0 && StrCmp (FileName, L"..") != 0) {\r
+ //\r
+ // Trim leading blanks\r
+ //\r
+ Count = 0;\r
+ for (TempFileName = FileName;\r
+ *TempFileName != 0 && *TempFileName == L' ';\r
+ TempFileName++) {\r
+ Count++;\r
+ }\r
+ CutPrefix (FileName, Count);\r
+ //\r
+ // Trim trailing dots and blanks\r
+ //\r
+ for (TempFileName = FileName + StrLen (FileName) - 1; \r
+ TempFileName >= FileName && (*TempFileName == L' ' || *TempFileName == L'.');\r
+ TempFileName--) {\r
+ ;\r
+ }\r
+ *(TempFileName + 1) = 0;\r
+ }\r
+\r
//\r
// Attempt to open the file\r
//\r
StrCat (NewPrivateFile->FileName, FileName + 1);\r
} else {\r
StrCpy (NewPrivateFile->FileName, NewPrivateFile->FilePath);\r
- StrCat (NewPrivateFile->FileName, L"\\");\r
- StrCat (NewPrivateFile->FileName, FileName);\r
+ if (StrCmp (FileName, L"") != 0) {\r
+ //\r
+ // In case the filename becomes empty, especially after trimming dots and blanks\r
+ // \r
+ StrCat (NewPrivateFile->FileName, L"\\");\r
+ StrCat (NewPrivateFile->FileName, FileName);\r
+ }\r
}\r
\r
//\r
}\r
\r
Done: ;\r
- if (TrailingDash) {\r
- FileName[StrLen (FileName) + 1] = 0;\r
- FileName[StrLen (FileName)] = L'\\';\r
- }\r
+ gBS->FreePool (FileName);\r
\r
if (EFI_ERROR (Status)) {\r
if (NewPrivateFile) {\r
// TODO: EFI_INVALID_PARAMETER - add return value to function comment\r
{\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->LHandle != INVALID_HANDLE_VALUE) {\r
}\r
\r
gBS->FreePool (PrivateFile);\r
+\r
+ gBS->RestoreTPL (OldTpl);\r
+ \r
return EFI_SUCCESS;\r
}\r
\r
{\r
EFI_STATUS Status;\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
Status = EFI_WARN_DELETE_FAILURE;\r
gBS->FreePool (PrivateFile->FileName);\r
gBS->FreePool (PrivateFile);\r
\r
+ gBS->RestoreTPL (OldTpl);\r
+\r
return Status;\r
}\r
\r
UINT64 Pos;\r
UINT64 FileSize;\r
UINTN FileInfoSize;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL || BufferSize == NULL || Buffer == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
if (!PrivateFile->IsDirectoryPath) {\r
\r
if (This->GetPosition (This, &Pos) != EFI_SUCCESS) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
FileInfoSize = SIZE_OF_EFI_FILE_SYSTEM_INFO;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
FileSize = FileInfo->FileSize;\r
if (Pos >= FileSize) {\r
*BufferSize = 0;\r
if (Pos == FileSize) {\r
- return EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ goto Done;\r
} else {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
}\r
\r
- return PrivateFile->WinNtThunk->ReadFile (\r
+ Status = PrivateFile->WinNtThunk->ReadFile (\r
PrivateFile->LHandle,\r
Buffer,\r
*BufferSize,\r
BufferSize,\r
NULL\r
) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
//\r
//\r
if (!PrivateFile->IsValidFindBuf) {\r
*BufferSize = 0;\r
- return EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ goto Done;\r
}\r
\r
Size = SIZE_OF_EFI_FILE_INFO;\r
\r
*BufferSize = ResultSize;\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
// TODO: EFI_INVALID_PARAMETER - add return value to function comment\r
{\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL || BufferSize == NULL || Buffer == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
if (PrivateFile->IsDirectoryPath) {\r
- return EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
+ goto Done;\r
}\r
\r
if (PrivateFile->IsOpenedByRead) {\r
- return EFI_ACCESS_DENIED;\r
+ Status = EFI_ACCESS_DENIED;\r
+ goto Done;\r
}\r
\r
- return PrivateFile->WinNtThunk->WriteFile (\r
+ Status = PrivateFile->WinNtThunk->WriteFile (\r
PrivateFile->LHandle,\r
Buffer,\r
*BufferSize,\r
NULL\r
) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
+ return Status;\r
+\r
//\r
// bugbug: need to access windows error reporting\r
//\r
UINT32 PosLow;\r
UINT32 PosHigh;\r
CHAR16 *FileName;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->IsDirectoryPath) {\r
if (Position != 0) {\r
- return EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
+ goto Done;\r
}\r
\r
Status = gBS->AllocatePool (\r
);\r
\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto Done;\r
}\r
\r
StrCpy (FileName, PrivateFile->FileName);\r
Status = (PosLow == 0xFFFFFFFF) ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
}\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
INT32 PositionHigh;\r
UINT64 PosHigh64;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL || Position == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
PositionHigh = 0;\r
\r
if (PrivateFile->IsDirectoryPath) {\r
\r
- return EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
+ goto Done;\r
\r
} else {\r
\r
}\r
\r
Done:\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
BOOL NtStatus;\r
UINTN Index;\r
WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE *PrivateRoot;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL || InformationType == NULL || BufferSize == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+\r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem);\r
\r
if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
if (*BufferSize < SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel)) {\r
*BufferSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel);\r
- return EFI_BUFFER_TOO_SMALL;\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ goto Done;\r
}\r
\r
FileSystemInfoBuffer = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
&DriveName\r
);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto Done;\r
}\r
\r
StrCpy (DriveName, PrivateFile->FilePath);\r
NULL\r
);\r
if (!NtStatus) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
}\r
\r
if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
if (*BufferSize < StrSize (PrivateRoot->VolumeLabel)) {\r
*BufferSize = StrSize (PrivateRoot->VolumeLabel);\r
- return EFI_BUFFER_TOO_SMALL;\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ goto Done;\r
}\r
\r
StrCpy ((CHAR16 *) Buffer, PrivateRoot->VolumeLabel);\r
Status = EFI_SUCCESS;\r
}\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
FILETIME NewLastWriteFileTime;\r
WIN32_FIND_DATA FindBuf;\r
EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
+ EFI_TPL OldTpl;\r
\r
//\r
// Check for invalid parameters.\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+\r
//\r
// Initialise locals.\r
//\r
//\r
if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (PrivateRoot->VolumeLabel)) {\r
- return EFI_BAD_BUFFER_SIZE;\r
+ Status = EFI_BAD_BUFFER_SIZE;\r
+ goto Done;\r
}\r
\r
NewFileSystemInfo = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
\r
StrCpy (PrivateRoot->VolumeLabel, NewFileSystemInfo->VolumeLabel);\r
\r
- return EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ goto Done;\r
}\r
\r
//\r
//\r
if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
if (BufferSize < StrSize (PrivateRoot->VolumeLabel)) {\r
- return EFI_BAD_BUFFER_SIZE;\r
+ Status = EFI_BAD_BUFFER_SIZE;\r
+ goto Done;\r
}\r
\r
StrCpy (PrivateRoot->VolumeLabel, (CHAR16 *) Buffer);\r
\r
- return EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ goto Done;\r
}\r
\r
if (!CompareGuid (InformationType, &gEfiFileInfoGuid)) {\r
- return EFI_UNSUPPORTED;\r
+ Status = EFI_UNSUPPORTED;\r
+ goto Done;\r
}\r
\r
if (BufferSize < SIZE_OF_EFI_FILE_INFO) {\r
- return EFI_BAD_BUFFER_SIZE;\r
+ Status = EFI_BAD_BUFFER_SIZE;\r
+ goto Done;\r
}\r
\r
//\r
(NewFileInfo->Attribute &~(EFI_FILE_VALID_ATTR)) ||\r
(sizeof (UINTN) == 4 && NewFileInfo->Size > 0xFFFFFFFF)\r
) {\r
- return EFI_INVALID_PARAMETER;\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
}\r
\r
//\r
gBS->FreePool (NewFileName);\r
}\r
\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
{\r
BY_HANDLE_FILE_INFORMATION FileInfo;\r
WIN_NT_EFI_FILE_PRIVATE *PrivateFile;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+ \r
PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This);\r
\r
if (PrivateFile->LHandle == INVALID_HANDLE_VALUE) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto Done;\r
}\r
\r
if (PrivateFile->IsDirectoryPath) {\r
- return EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ goto Done;\r
}\r
\r
if (PrivateFile->IsOpenedByRead) {\r
- return EFI_ACCESS_DENIED;\r
+ Status = EFI_ACCESS_DENIED;\r
+ goto Done;\r
}\r
\r
PrivateFile->WinNtThunk->GetFileInformationByHandle (PrivateFile->LHandle, &FileInfo);\r
\r
if (FileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {\r
- return EFI_ACCESS_DENIED;\r
+ Status = EFI_ACCESS_DENIED;\r
+ goto Done;\r
}\r
\r
- return PrivateFile->WinNtThunk->FlushFileBuffers (PrivateFile->LHandle) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ Status = PrivateFile->WinNtThunk->FlushFileBuffers (PrivateFile->LHandle) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
+ return Status;\r
//\r
// bugbug: - Use Windows error reporting.\r
//\r
}\r
\r
+\r
projects / mirror_edk2.git / blobdiff