Changeset 37596 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Jun 22, 2011 7:30:06 PM (13 years ago)

Author:

vboxsync

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldr.cpp (modified) (1 diff)
• ldrFile.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/ldr/ldr.cpp

@@ -39 +39 @@
 #include <iprt/log.h>
 #include "internal/ldr.h"
-
-
-/*******************************************************************************
-*   Structures and Typedefs                                                    *
-*******************************************************************************/
-typedef struct RTLDRREADERFILE
-{
-    /** The core. */
-    RTLDRREADER     Core;
-    /** The file. */
-    RTFILE          File;
-    /** The file size. */
-    RTFOFF          cbFile;
-    /** The current offset. */
-    RTFOFF          off;
-    /** The filename (variable size). */
-    char            szFilename[1];
-} RTLDRREADERFILE, *PRTLDRREADERFILE;
-
 
 

trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp

@@ -55 +55 @@
     RTLDRREADER     Core;
     /** The file. */
-    RTFILE          File;
+    RTFILE          hFile;
     /** The file size. */
     RTFOFF          cbFile;
@@ -79 +79 @@
     if (pFileReader->off != off)
     {
-        int rc = RTFileSeek(pFileReader->File, off, RTFILE_SEEK_BEGIN, NULL);
+        int rc = RTFileSeek(pFileReader->hFile, off, RTFILE_SEEK_BEGIN, NULL);
         if (RT_FAILURE(rc))
         {
@@ -91 +91 @@
      * Read.
      */
-    int rc = RTFileRead(pFileReader->File, pvBuf, cb, NULL);
+    int rc = RTFileRead(pFileReader->hFile, pvBuf, cb, NULL);
     if (RT_SUCCESS(rc))
         pFileReader->off += cb;
@@ -185 +185 @@
     int rc = VINF_SUCCESS;
     PRTLDRREADERFILE pFileReader = (PRTLDRREADERFILE)pReader;
-    if (pFileReader->File != NIL_RTFILE)
-    {
-        rc = RTFileClose(pFileReader->File);
+    if (pFileReader->hFile != NIL_RTFILE)
+    {
+        rc = RTFileClose(pFileReader->hFile);
         AssertRC(rc);
-        pFileReader->File = NIL_RTFILE;
+        pFileReader->hFile = NIL_RTFILE;
     }
     RTMemFree(pFileReader);
@@ -211 +211 @@
     {
         memcpy(pFileReader->szFilename, pszFilename, cchFilename + 1);
-        rc = RTFileOpen(&pFileReader->File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+        rc = RTFileOpen(&pFileReader->hFile, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
         if (RT_SUCCESS(rc))
         {
-            rc = RTFileGetSize(pFileReader->File, (uint64_t *)&pFileReader->cbFile);
+            rc = RTFileGetSize(pFileReader->hFile, (uint64_t *)&pFileReader->cbFile);
             if (RT_SUCCESS(rc))
             {
@@ -230 +230 @@
                 return VINF_SUCCESS;
             }
-            RTFileClose(pFileReader->File);
+
+            RTFileClose(pFileReader->hFile);
         }
         RTMemFree(pFileReader);