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

2 files changed, 54 insertions, 54 deletions

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 8ca9808c59..eb8971febe 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -504,7 +504,7 @@ EFI_STATUS
 EFIAPI

 WinNtSimpleFileSystemOpenVolume (

   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,

-  OUT EFI_FILE                        **Root

+  OUT EFI_FILE_PROTOCOL               **Root

   )

 /*++

 

@@ -808,11 +808,11 @@ IsFileNameValid (
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemOpen (

-  IN  EFI_FILE  *This,

-  OUT EFI_FILE  **NewHandle,

-  IN  CHAR16    *FileName,

-  IN  UINT64    OpenMode,

-  IN  UINT64    Attributes

+  IN  EFI_FILE_PROTOCOL  *This,

+  OUT EFI_FILE_PROTOCOL  **NewHandle,

+  IN  CHAR16             *FileName,

+  IN  UINT64             OpenMode,

+  IN  UINT64             Attributes

   )

 /*++

 

@@ -822,7 +822,7 @@ Routine Description:
 

 Arguments:

 

-  This        - A pointer to the seource file location.

+  This        - A pointer to the source file location.

 

   NewHandle   - Pointer to storage for the new file handle.

 

@@ -1309,7 +1309,7 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemClose (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -1368,7 +1368,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemDelete (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -1476,9 +1476,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemRead (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -1691,9 +1691,9 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemWrite (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  IN     VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  IN     VOID               *Buffer

   )

 /*++

 

@@ -1778,8 +1778,8 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemSetPosition (

-  IN EFI_FILE  *This,

-  IN UINT64    Position

+  IN EFI_FILE_PROTOCOL  *This,

+  IN UINT64             Position

   )

 /*++

 

@@ -1870,8 +1870,8 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemGetPosition (

-  IN  EFI_FILE  *This,

-  OUT UINT64    *Position

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT UINT64              *Position

   )

 /*++

 

@@ -2109,10 +2109,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemGetInfo (

-  IN     EFI_FILE  *This,

-  IN     EFI_GUID  *InformationType,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN     EFI_GUID           *InformationType,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -2290,7 +2290,7 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemSetInfo (

-  IN EFI_FILE         *This,

+  IN EFI_FILE_PROTOCOL*This,

   IN EFI_GUID         *InformationType,

   IN UINTN            BufferSize,

   IN VOID             *Buffer

@@ -2869,7 +2869,7 @@ Done:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemFlush (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
index 691868a8ba..50db9a5506 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -58,7 +58,7 @@ typedef struct {
   UINTN                           Signature;

   EFI_WIN_NT_THUNK_PROTOCOL       *WinNtThunk;

   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem;

-  EFI_FILE                        EfiFile;

+  EFI_FILE_PROTOCOL               EfiFile;

   HANDLE                          LHandle;

   HANDLE                          DirHandle;

   BOOLEAN                         IsRootDirectory;

@@ -197,7 +197,7 @@ EFI_STATUS
 EFIAPI

 WinNtSimpleFileSystemOpenVolume (

   IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,

-  OUT EFI_FILE                        **Root

+  OUT EFI_FILE_PROTOCOL               **Root

   )

 /*++

 

@@ -235,11 +235,11 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemOpen (

-  IN  EFI_FILE  *This,

-  OUT EFI_FILE  **NewHandle,

-  IN  CHAR16    *FileName,

-  IN  UINT64    OpenMode,

-  IN  UINT64    Attributes

+  IN  EFI_FILE_PROTOCOL  *This,

+  OUT EFI_FILE_PROTOCOL  **NewHandle,

+  IN  CHAR16             *FileName,

+  IN  UINT64             OpenMode,

+  IN  UINT64             Attributes

   )

 /*++

 

@@ -287,7 +287,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemClose (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -309,7 +309,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemDelete (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++

 

@@ -333,9 +333,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemRead (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -370,9 +370,9 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemWrite (

-  IN     EFI_FILE  *This,

-  IN OUT UINTN     *BufferSize,

-  IN     VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN OUT UINTN              *BufferSize,

+  IN     VOID               *Buffer

   )

 /*++

 

@@ -413,8 +413,8 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemSetPosition (

-  IN EFI_FILE  *This,

-  IN UINT64    Position

+  IN EFI_FILE_PROTOCOL  *This,

+  IN UINT64             Position

   )

 /*++

 

@@ -440,8 +440,8 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemGetPosition (

-  IN  EFI_FILE  *This,

-  OUT UINT64    *Position

+  IN  EFI_FILE_PROTOCOL   *This,

+  OUT UINT64              *Position

   )

 /*++

 

@@ -467,10 +467,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemGetInfo (

-  IN     EFI_FILE  *This,

-  IN     EFI_GUID  *InformationType,

-  IN OUT UINTN     *BufferSize,

-  OUT    VOID      *Buffer

+  IN     EFI_FILE_PROTOCOL  *This,

+  IN     EFI_GUID           *InformationType,

+  IN OUT UINTN              *BufferSize,

+  OUT    VOID               *Buffer

   )

 /*++

 

@@ -510,10 +510,10 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemSetInfo (

-  IN EFI_FILE  *This,

-  IN EFI_GUID  *InformationType,

-  IN UINTN     BufferSize,

-  IN VOID      *Buffer

+  IN EFI_FILE_PROTOCOL  *This,

+  IN EFI_GUID           *InformationType,

+  IN UINTN              BufferSize,

+  IN VOID               *Buffer

   )

 /*++

 

@@ -557,7 +557,7 @@ Returns:
 EFI_STATUS

 EFIAPI

 WinNtSimpleFileSystemFlush (

-  IN EFI_FILE  *This

+  IN EFI_FILE_PROTOCOL  *This

   )

 /*++