Use UEFI EFI_FILE_PROTOCOL to replace EFI_FILE

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9300 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 8ca9808c593f7231327f3a3e2a91c228dd60c85b..eb8971febeca87c57825ed280a75e23d3c5b058c 100644 (file)
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -504,7 +504,7 @@ EFI_STATUS
 EFIAPI\r
 WinNtSimpleFileSystemOpenVolume (\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
-  OUT EFI_FILE                        **Root\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 /*++\r
 \r
@@ -808,11 +808,11 @@ IsFileNameValid (
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemOpen (\r
-  IN  EFI_FILE  *This,\r
-  OUT EFI_FILE  **NewHandle,\r
-  IN  CHAR16    *FileName,\r
-  IN  UINT64    OpenMode,\r
-  IN  UINT64    Attributes\r
+  IN  EFI_FILE_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL  **NewHandle,\r
+  IN  CHAR16             *FileName,\r
+  IN  UINT64             OpenMode,\r
+  IN  UINT64             Attributes\r
   )\r
 /*++\r
 \r
@@ -822,7 +822,7 @@ Routine Description:
 \r
 Arguments:\r
 \r
-  This        - A pointer to the seource file location.\r
+  This        - A pointer to the source file location.\r
 \r
   NewHandle   - Pointer to storage for the new file handle.\r
 \r
@@ -1309,7 +1309,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemClose (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1368,7 +1368,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemDelete (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -1476,9 +1476,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemRead (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1691,9 +1691,9 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemWrite (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  IN     VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -1778,8 +1778,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemSetPosition (\r
-  IN EFI_FILE  *This,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -1870,8 +1870,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemGetPosition (\r
-  IN  EFI_FILE  *This,\r
-  OUT UINT64    *Position\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT UINT64              *Position\r
   )\r
 /*++\r
 \r
@@ -2109,10 +2109,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemGetInfo (\r
-  IN     EFI_FILE  *This,\r
-  IN     EFI_GUID  *InformationType,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -2290,7 +2290,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemSetInfo (\r
-  IN EFI_FILE         *This,\r
+  IN EFI_FILE_PROTOCOL*This,\r
   IN EFI_GUID         *InformationType,\r
   IN UINTN            BufferSize,\r
   IN VOID             *Buffer\r
@@ -2869,7 +2869,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemFlush (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
index 691868a8baedc260056a0b9edecf47110dc17c00..50db9a5506b026ca30922e9b41a6a84f084d998b 100644 (file)
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
@@ -1,6 +1,6 @@
 /**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2009, 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
@@ -58,7 +58,7 @@ typedef struct {
   UINTN                           Signature;\r
   EFI_WIN_NT_THUNK_PROTOCOL       *WinNtThunk;\r
   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;\r
-  EFI_FILE                        EfiFile;\r
+  EFI_FILE_PROTOCOL               EfiFile;\r
   HANDLE                          LHandle;\r
   HANDLE                          DirHandle;\r
   BOOLEAN                         IsRootDirectory;\r
@@ -197,7 +197,7 @@ EFI_STATUS
 EFIAPI\r
 WinNtSimpleFileSystemOpenVolume (\r
   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE                        **Root\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 /*++\r
 \r
@@ -235,11 +235,11 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemOpen (\r
-  IN  EFI_FILE  *This,\r
-  OUT EFI_FILE  **NewHandle,\r
-  IN  CHAR16    *FileName,\r
-  IN  UINT64    OpenMode,\r
-  IN  UINT64    Attributes\r
+  IN  EFI_FILE_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL  **NewHandle,\r
+  IN  CHAR16             *FileName,\r
+  IN  UINT64             OpenMode,\r
+  IN  UINT64             Attributes\r
   )\r
 /*++\r
 \r
@@ -287,7 +287,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemClose (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -309,7 +309,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemDelete (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r
@@ -333,9 +333,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemRead (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -370,9 +370,9 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemWrite (\r
-  IN     EFI_FILE  *This,\r
-  IN OUT UINTN     *BufferSize,\r
-  IN     VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -413,8 +413,8 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemSetPosition (\r
-  IN EFI_FILE  *This,\r
-  IN UINT64    Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 /*++\r
 \r
@@ -440,8 +440,8 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemGetPosition (\r
-  IN  EFI_FILE  *This,\r
-  OUT UINT64    *Position\r
+  IN  EFI_FILE_PROTOCOL   *This,\r
+  OUT UINT64              *Position\r
   )\r
 /*++\r
 \r
@@ -467,10 +467,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemGetInfo (\r
-  IN     EFI_FILE  *This,\r
-  IN     EFI_GUID  *InformationType,\r
-  IN OUT UINTN     *BufferSize,\r
-  OUT    VOID      *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT    VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -510,10 +510,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemSetInfo (\r
-  IN EFI_FILE  *This,\r
-  IN EFI_GUID  *InformationType,\r
-  IN UINTN     BufferSize,\r
-  IN VOID      *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 /*++\r
 \r
@@ -557,7 +557,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 WinNtSimpleFileSystemFlush (\r
-  IN EFI_FILE  *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 /*++\r
 \r