Use Arc* infrastructure to read the .inf file

svn path=/trunk/; revision=42539

diff --git a/reactos/boot/freeldr/freeldr/inffile/inffile.c b/reactos/boot/freeldr/freeldr/inffile/inffile.c
index 420e086..de3de98 100644 (file)
--- a/reactos/boot/freeldr/freeldr/inffile/inffile.c
+++ b/reactos/boot/freeldr/freeldr/inffile/inffile.c
@@ -873,91 +873,107 @@ InfOpenFile(PHINF InfHandle,
            PCSTR FileName,
            PULONG ErrorLine)
 {
-  PFILE FileHandle;
-  PCHAR FileBuffer;
-  ULONG FileSize;
-  PINFCACHE Cache;
-  BOOLEAN Success;
-
+    FILEINFORMATION Information;
+    ULONG FileId;
+    PCHAR FileBuffer;
+    ULONG FileSize, Count;
+    PINFCACHE Cache;
+    BOOLEAN Success;
+    LONG ret;
 
-  *InfHandle = NULL;
-  *ErrorLine = (ULONG)-1;
+    *InfHandle = NULL;
+    *ErrorLine = (ULONG)-1;
 
-
-  /* Open the inf file */
-  FileHandle = FsOpenFile (FileName);
-  if (FileHandle == NULL)
+    //
+    // Open the .inf file
+    //
+    FileId = FsOpenFile(FileName);
+    if (!FileId)
     {
-//      DPRINT("NtOpenFile() failed (Status %lx)\n", Status);
-      return FALSE;
+        return FALSE;
     }
 
-//  DPRINT("NtOpenFile() successful\n");
-
-  /* Query file size */
-  FileSize = FsGetFileSize (FileHandle);
-  if (FileSize == 0)
+    //
+    // Query file size
+    //
+    ret = ArcGetFileInformation(FileId, &Information);
+    if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0)
     {
-//      DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status);
-      FsCloseFile (FileHandle);
-      return FALSE;
+        ArcClose(FileId);
+        return FALSE;
     }
+    FileSize = Information.EndingAddress.LowPart;
 
-//  DPRINT("File size: %lu\n", FileLength);
-
-  /* Allocate file buffer */
-  FileBuffer = MmHeapAlloc (FileSize + 1);
-  if (FileBuffer == NULL)
+    //
+    // Allocate buffer to cache the file
+    //
+    FileBuffer = MmHeapAlloc(FileSize + 1);
+    if (!FileBuffer)
     {
-//      DPRINT1("RtlAllocateHeap() failed\n");
-      FsCloseFile (FileHandle);
-      return FALSE;
+        ArcClose(FileId);
+        return FALSE;
     }
 
-  /* Read file */
-  Success = FsReadFile(FileHandle, FileSize, NULL, FileBuffer);
-
-  FsCloseFile (FileHandle);
-  if (!Success)
+    //
+    // Read file into memory
+    //
+    ret = ArcRead(FileId, FileBuffer, FileSize, &Count);
+    if (ret != ESUCCESS || Count != FileSize)
     {
-//      DPRINT("FsReadFile() failed\n");
-      MmHeapFree (FileBuffer);
-      return FALSE;
+        ArcClose(FileId);
+        MmHeapFree(FileBuffer);
+        return FALSE;
     }
 
-  /* Append string terminator */
-  FileBuffer[FileSize] = 0;
+    //
+    // We don't need the file anymore. Close it
+    //
+    ArcClose(FileId);
 
-  /* Allocate infcache header */
-  Cache = (PINFCACHE)MmHeapAlloc (sizeof(INFCACHE));
-  if (Cache == NULL)
+    //
+    // Append string terminator
+    //
+    FileBuffer[FileSize] = 0;
+
+    //
+    // Allocate infcache header
+    //
+    Cache = (PINFCACHE)MmHeapAlloc(sizeof(INFCACHE));
+    if (!Cache)
     {
-//      DPRINT("RtlAllocateHeap() failed\n");
-      MmHeapFree (FileBuffer);
-      return FALSE;
+        MmHeapFree (FileBuffer);
+        return FALSE;
     }
 
-  /* Initialize inicache header */
-  RtlZeroMemory(Cache,
-               sizeof(INFCACHE));
+    //
+    // Initialize inicache header
+    //
+    RtlZeroMemory(Cache, sizeof(INFCACHE));
 
-  /* Parse the inf buffer */
-  Success = InfpParseBuffer (Cache,
-                            FileBuffer,
-                            FileBuffer + FileSize,
-                            ErrorLine);
-  if (!Success)
+    //
+    // Parse the inf buffer
+    //
+    Success = InfpParseBuffer(Cache,
+                              FileBuffer,
+                              FileBuffer + FileSize,
+                              ErrorLine);
+    if (!Success)
     {
-      MmHeapFree (Cache);
-      Cache = NULL;
+        MmHeapFree(Cache);
+        Cache = NULL;
     }
 
-  /* Free file buffer */
-  MmHeapFree (FileBuffer);
+    //
+    // Free file buffer, as it has been parsed
+    //
+    MmHeapFree(FileBuffer);
 
-  *InfHandle = (HINF)Cache;
+    //
+    // Return .inf parsed contents
+    //
+    *InfHandle = (HINF)Cache;
 
-  return Success;
+    return Success;
 }