Changeset 2858 for trunk/kLdr/kLdrRdrFile.c

Timestamp:

Nov 6, 2006, 1:23:14 AM (19 years ago)

Author:

bird

Message:

bugfixing - dinner break.

File:

• trunk/kLdr/kLdrRdrFile.c (modified) (11 diffs)

trunk/kLdr/kLdrRdrFile.c

@@ -232 +232 @@
 
         SetLastError(0);
-        offLow = SetFilePointer(pRdrFile->File, 0, &offHigh, FILE_BEGIN);
+        offLow = SetFilePointer(pRdrFile->File, 0, &offHigh, FILE_CURRENT);
         rc = GetLastError();
         if (rc)
@@ -325 +325 @@
 #ifdef __OS2__
         ULONG ulNew;
-        APIRET rc = DosSetFilePtr(pRdrFile->File, off, FILE_BEGIN, &ulNew);
+        APIRET rc;
+
+        rc = DosSetFilePtr(pRdrFile->File, off, FILE_BEGIN, &ulNew);
         if (rc)
         {
@@ -333 +335 @@
 
 #elif defined(__WIN__)
-        LONG offHigh = (LONG)(off >> 32);
-        LONG offLow = SetFilePointer(pRdrFile->File, (LONG)off, &offHigh, FILE_BEGIN);
+        LONG offHigh;
+        LONG offLow;
+
+        offHigh = sizeof(off_t) == 4 ? 0 : (off >> 32);
+        offLow = SetFilePointer(pRdrFile->File, (LONG)off, &offHigh, FILE_BEGIN);
         if (    offLow != (LONG)off
-            &&  offHigh != (LONG)(off >> 32))
+            ||  offHigh != (LONG)(sizeof(off_t) == 4 ? 0 : (off >> 32)))
         {
             int rc = GetLastError();
@@ -405 +410 @@
 
 #elif defined(__WIN__)
+    rc = 0;
     if (!CloseHandle(pRdrFile->File))
         rc = GetLastError();
@@ -433 +439 @@
      */
 #ifdef __OS2__
-    ULONG ulAction = 0;
-    FILESTATUS3 Info;
-    APIRET rc;
-    HFILE File = 0;
-    off_t cb;
+    ULONG           ulAction = 0;
+    FILESTATUS3     Info;
+    APIRET          rc;
+    HFILE           File = 0;
+    off_t           cb;
+    char            szFilename[CCHMAXPATH];
 
     if ((uintptr_t)pszFilename >= 0x20000000)
@@ -451 +458 @@
     if (rc)
         return rc;
+
+    rc = DosQueryPathInfo(pszFilename, FIL_QUERYFULLNAME, szFilename, sizeof(szFilename));
+    if (rc)
+    {
+        DosClose(File);
+        return rc;
+    }
 
     rc = DosQueryFileInfo(File, FIL_STANDARD, &Info, sizeof(Info));
@@ -467 +481 @@
     HANDLE              File;
     off_t               cb;
+    char                szFilename[MAX_PATH];
 
     SecAttr.bInheritHandle = FALSE;
@@ -475 +490 @@
         return GetLastError();
 
+    if (!GetFullPathName(pszFilename, sizeof(szFilename), szFilename, NULL))
+    {
+        rc = GetLastError();
+        CloseHandle(File);
+        return rc;
+    }
+
     SetLastError(0);
     Low = GetFileSize(File, &High);
@@ -483 +505 @@
         return rc;
     }
-    cb = ((off_t)High << 32) | Low;
+    if (sizeof(off_t) == 4)
+        cb = High ? 0x7fffffff : Low;
+    else
+        cb = ((off_t)High << 32) | Low;
 
 #else
@@ -493 +518 @@
      * Allocate the reader instance.
      */
-    cchFilename = kLdrHlpStrLen(pszFilename);
+    cchFilename = kLdrHlpStrLen(szFilename);
     pRdrFile = (PKLDRRDRFILE)kldrHlpAlloc(sizeof(*pRdrFile) + cchFilename);
     if (!pRdrFile)
@@ -513 +538 @@
      * Initialize it and return successfully.
      */
+    pRdrFile->Core.u32Magic = KLDRRDR_MAGIC;
     pRdrFile->Core.pOps = &g_kLdrRdrFileOps;
     pRdrFile->File = File;
+    pRdrFile->cb = cb;
     pRdrFile->off = 0;
-    kLdrHlpMemCopy(&pRdrFile->szFilename[0], pszFilename, cchFilename + 1);
+    kLdrHlpMemCopy(&pRdrFile->szFilename[0], szFilename, cchFilename + 1);
 
     *ppRdr = &pRdrFile->Core;