Changeset 8003 for trunk/tools

Timestamp:

Feb 24, 2002, 3:47:28 AM (24 years ago)

Author:

bird

Message:

New kFile* classes; now in sync with os2tools.

Location:

trunk/tools/common

Files:

• LXexe.h (added)
• MZexe.h (added)
• NEexe.h (added)
• PEexe.h (added)
• common.mak (modified) (2 diffs)
• kAssert.c (added)
• kDef2Wat.cpp (modified) (4 diffs)
• kDump.cpp (modified) (4 diffs)
• kError.cpp (added)
• kError.h (added)
• kFile.cpp (modified) (60 diffs)
• kFile.h (modified) (3 diffs)
• kFileDef.cpp (modified) (30 diffs)
• kFileDef.h (modified) (4 diffs)
• kFileFormatBase.cpp (modified) (4 diffs)
• kFileFormatBase.h (modified) (2 diffs)
• kFileInterfaces.cpp (added)
• kFileInterfaces.h (added)
• kFileLX.cpp (modified) (31 diffs)
• kFileLX.h (modified) (2 diffs)
• kFilePE.cpp (modified) (15 diffs)
• kFilePE.h (modified) (5 diffs)
• kFileSDF.cpp (modified) (8 diffs)
• kFileSDF.h (modified) (3 diffs)
• kLIFO.cpp (modified) (3 diffs)
• kLIFO.h (modified) (2 diffs)
• kList.cpp (modified) (3 diffs)
• kList.h (modified) (2 diffs)
• kTypes.h (added)

trunk/tools/common/common.mak

@@ -1 @@
-# $Id: common.mak,v 1.5 2002-02-23 23:27:18 bird Exp $
+# $Id: common.mak,v 1.6 2002-02-24 02:47:23 bird Exp $
 
 #
@@ -40 +40 @@
 $(OBJDIR)\kFileSDF.obj \
 $(OBJDIR)\kFileFormatBase.obj \
-$(OBJDIR)\kFile.obj
+$(OBJDIR)\kFile.obj \
+$(OBJDIR)\kFileInterfaces.obj \
+$(OBJDIR)\kAssert.obj \
+$(OBJDIR)\kError.obj \
 
 

trunk/tools/common/kDef2Wat.cpp

@@ -1 @@
-/* $Id: kDef2Wat.cpp,v 1.2 2001-04-17 00:26:10 bird Exp $
+/* $Id: kDef2Wat.cpp,v 1.3 2002-02-24 02:47:23 bird Exp $
  *
  * Converter for IBM/MS linker definition files (.DEF) to Watcom linker directives and options.
@@ -14 +14 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
-
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
+#include "kFileInterfaces.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
 #include "kFileDef.h"
 
@@ -58 +58 @@
     try
     {
-        kFile    InFile(pszInput);
-        kFileDef def(&InFile);
+        kFileDef def(new kFile(pszInput));
         try
         {
@@ -75 +74 @@
                     kFile::StdOut.printf("Successfully converted %s to %s\n", pszInput, pszOutput);
                 }
-                catch (int errorcode)
+                catch (kError err)
                 {
-                    kFile::StdErr.printf("Append file %s to %s, errorcode=%d\n", pszAppend, pszInput, errorcode);
+                    kFile::StdErr.printf("Append file %s to %s, errorcode=%d\n", pszAppend, pszInput, err.getErrno());
                     return -3;
                 }
             }
         }
-        catch (int errorcode)
+        catch (kError err)
         {
-            kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, errorcode);
+            kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, err.getErrno());
             return -3;
         }
     }
-    catch (int errorcode)
+    catch (kError err)
     {
-        kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, errorcode);
+        kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, err.getErrno());
         return -2;
     }

trunk/tools/common/kDump.cpp

@@ -1 @@
-/* $Id: kDump.cpp,v 1.3 2001-04-17 00:26:10 bird Exp $
+/* $Id: kDump.cpp,v 1.4 2002-02-24 02:47:24 bird Exp $
  *
  * Generic dumper...
@@ -19 +19 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
-
 #include <stdio.h>
 
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
+#include "kFileInterfaces.h"
 #include "kFileDef.h"
 #include "kFileLX.h"
@@ -42 +42 @@
         try
         {
-            kFile               file(argv[argi]);
             kFileFormatBase *   pFile = NULL;
-            try {pFile = new kFilePE(&file);}
-            catch (int err)
+            try {pFile = new kFilePE(new kFile(argv[argi]));}
+            catch (kError err)
             {
-                try {pFile = new kFileLX(&file);}
-                catch (int err)
+                try {pFile = new kFileLX(new kFile(argv[argi]));}
+                catch (kError err)
                 {
-                    try {pFile = new kFileDef(&file);}
-                    catch (int err)
+                    try {pFile = new kFileDef(new kFile(argv[argi]));}
+                    catch (kError err)
                     {
                         kFile::StdErr.printf("Failed to recognize file %s.\n", argv[argi]);
@@ -68 +67 @@
             }
         }
-        catch (int err)
+        catch (kError err)
         {
-            fprintf(stderr, "Fatal: Failed to open file %s err=%d.\n", argv[argi], err);
+            fprintf(stderr, "Fatal: Failed to open file %s err=%d.\n", argv[argi], err.getErrno());
             return -1;
         }

trunk/tools/common/kFile.cpp

@@ -1 @@
-/* $Id: kFile.cpp,v 1.9 2001-10-17 14:21:10 bird Exp $
+/* $Id: kFile.cpp,v 1.10 2002-02-24 02:47:24 bird Exp $
  *
  * kFile - Simple (for the time being) file class.
@@ -27 +27 @@
 #include <stdlib.h>
 
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 
@@ -43 +45 @@
  * @remark
  */
-BOOL    kFile::refreshFileStatus()
+KBOOL   kFile::refreshFileStatus()
 {
     if (fStdDev)
@@ -50 +52 @@
     if (!fStatusClean)
     {
-        rc = DosQueryFileInfo(hFile, FIL_QUERYEASIZE, &filestatus, sizeof(filestatus));
+        rc = DosQueryFileInfo(OSData.os2.hFile, FIL_QUERYEASIZE, &OSData.os2.filestatus, sizeof(OSData.os2.filestatus));
         fStatusClean = (rc == NO_ERROR);
         if (!fStatusClean && fThrowErrors)
-            throw ((int)rc);
+            throw (kError(rc));
     }
     else
@@ -66 +68 @@
  * @returns     Success indicator.
  */
-BOOL    kFile::position()
+KBOOL   kFile::position()
 {
     /*
@@ -75 +77 @@
     {
         ULONG   off;
-        rc = DosSetFilePtr(hFile, offVirtual, FILE_BEGIN, &off);
+        rc = DosSetFilePtr(OSData.os2.hFile, offVirtual, FILE_BEGIN, &off);
         if (rc != NO_ERROR || off != offVirtual)
         {
             if (fThrowErrors)
-                throw ((int)rc);
+                throw (kError(rc));
             return FALSE;
         }
@@ -99 +101 @@
  * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-BOOL kFile::bufferRead(ULONG offFile) throw (int)
+KBOOL kFile::bufferRead(unsigned long offFile) throw(kError)
 {
     ULONG   cbRead;
@@ -108 +110 @@
 
     /* check that the request is valid */
-    if (offFile > filestatus.cbFile)
+    if (offFile > OSData.os2.filestatus.cbFile)
         return FALSE;
 
@@ -123 +125 @@
 
     /* If readonly file optimize end of file */
-    if (fReadOnly && cbBuffer + offFile > filestatus.cbFile)
-        offFile = filestatus.cbFile > cbBuffer ? filestatus.cbFile - cbBuffer : 0UL;
+    if (fReadOnly && cbBuffer + offFile > OSData.os2.filestatus.cbFile)
+        offFile = OSData.os2.filestatus.cbFile > cbBuffer ? OSData.os2.filestatus.cbFile - cbBuffer : 0UL;
 
     /* need to change file ptr? */
@@ -130 +132 @@
     {
         ULONG ul;
-        rc = DosSetFilePtr(hFile, offFile, FILE_BEGIN, &ul);
+        rc = DosSetFilePtr(OSData.os2.hFile, offFile, FILE_BEGIN, &ul);
         if (rc != NO_ERROR)
         {
             if (fThrowErrors)
-                throw ((int)rc);
+                throw (kError(rc));
             return FALSE;
         }
@@ -141 +143 @@
 
     /* read from the file */
-    cbRead = min(filestatus.cbFile - offFile, cbBuffer);
-    rc = DosRead(hFile, pachBuffer, cbRead, &cbRead);
+    cbRead = KMIN(OSData.os2.filestatus.cbFile - offFile, cbBuffer);
+    rc = DosRead(OSData.os2.hFile, pachBuffer, cbRead, &cbRead);
     if (rc == NO_ERROR)
     {
@@ -156 +158 @@
         fBufferDirty    = FALSE;
         if (fThrowErrors)
-            throw ((int)rc);
+            throw (kError(rc));
         return FALSE;
     }
@@ -169 +171 @@
  * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-BOOL kFile::bufferCommit(void) throw (int)
+KBOOL kFile::bufferCommit(void) throw(kError)
 {
     ULONG   cbWrote;
@@ -181 +183 @@
     if (offBuffer != offReal)
     {
-        rc = DosSetFilePtr(hFile, offBuffer, FILE_BEGIN, &ul);
+        rc = DosSetFilePtr(OSData.os2.hFile, offBuffer, FILE_BEGIN, &ul);
         if (rc != NO_ERROR)
         {
             if (fThrowErrors)
-                throw ((int)rc);
+                throw (kError(rc));
             return FALSE;
         }
@@ -192 +194 @@
 
     /* write to the file */
-    rc = DosWrite(hFile, pachBuffer, cbBufferValid, &cbWrote);
+    rc = DosWrite(OSData.os2.hFile, pachBuffer, cbBufferValid, &cbWrote);
     fStatusClean = FALSE;
     if (rc == NO_ERROR)
@@ -201 +203 @@
     else
     {
-        DosSetFilePtr(hFile, offReal, FILE_BEGIN, &ul);
+        DosSetFilePtr(OSData.os2.hFile, offReal, FILE_BEGIN, &ul);
         if (fThrowErrors)
-            throw ((int)rc);
+            throw (kError(rc));
         return FALSE;
     }
@@ -222 +224 @@
  * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-kFile::kFile(HFILE hFile, BOOL fReadOnly)
+kFile::kFile(HFILE hFile, KBOOL fReadOnly)
 :   fReadOnly(fReadOnly),
     fStatusClean(FALSE),
@@ -229 +231 @@
     offReal(0),
     pszFilename(NULL),
-    hFile(hFile),
     fStdDev(TRUE),
     pachBuffer(NULL),
@@ -236 +237 @@
     fBufferDirty(FALSE)
 {
+    OSData.os2.hFile = hFile;
     if (!refreshFileStatus())
-        throw ((int)rc);
+        throw (kError(rc));
     this->pszFilename = strdup("");
 }
@@ -252 +254 @@
  * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-kFile::kFile(const char *pszFilename, BOOL fReadOnly/*=TRUE*/)
+kFile::kFile(const char *pszFilename, KBOOL fReadOnly/*=TRUE*/)
 :   fReadOnly(fReadOnly),
     fStatusClean(FALSE),
@@ -283 +285 @@
     }
 
-    rc = DosOpen((PCSZ)pszFilename, &hFile, &ulAction, 0, FILE_NORMAL,
+    rc = DosOpen((PCSZ)pszFilename, &OSData.os2.hFile, &ulAction, 0, FILE_NORMAL,
                  fulOpenFlags, fulOpenMode, NULL);
     if (rc != NO_ERROR)
-        throw ((int)rc);
+        throw (kError(rc));
 
     if (!refreshFileStatus())
-        throw ((int)rc);
+        throw (kError(rc));
 
     char szFullName[CCHMAXPATH];
@@ -299 +301 @@
 
     /* Buffering */
-    cbBuffer   = (fReadOnly && filestatus.cbFile < 32768) ? filestatus.cbFile : 8192;
+    cbBuffer   = (fReadOnly && OSData.os2.filestatus.cbFile < 32768) ? OSData.os2.filestatus.cbFile : 8192;
     pachBuffer = new char[cbBuffer];
     if (pachBuffer == NULL)
         throw (ERROR_NOT_ENOUGH_MEMORY);
-    if (fReadOnly && filestatus.cbFile < 32768)
+    if (fReadOnly && OSData.os2.filestatus.cbFile < 32768)
     {
         if (!bufferRead(0))
-            throw ((int)rc);
+            throw (kError(rc));
     }
 }
@@ -320 +322 @@
     if (pachBuffer)
         delete pachBuffer;
-    DosClose(hFile);
+    DosClose(OSData.os2.hFile);
 }
 
@@ -326 +328 @@
 /**
  * Reads <cbBuffer> bytes from the current file posistion into the buffer.
- * @returns     success indicator. (TRUE/FALSE)
+ * @returns     0 on success. kError error number.
  * @param       pvBuffer    Output buffer.
  * @param       cbBuffer    Amount of bytes to read.
  */
-BOOL            kFile::read(void *pvBuffer, long cbBuffer)
+int             kFile::read(void *pvBuffer, long cbBuffer)
 {
     ULONG   cbRead;
@@ -336 +338 @@
     /* Validate parameters */
     if (cbBuffer == 0)
-        return TRUE;
+        return NO_ERROR;
     if (cbBuffer < 0)
     {
         rc = ERROR_INVALID_PARAMETER;
         if (fThrowErrors)
-            throw ((int)rc);
-        return FALSE;
+            throw (kError(rc));
+        return rc;
     }
 
     /* refresh file status (cbFile) */
     if (!refreshFileStatus())
-        return FALSE;
+        return rc;
 
     /* check if valid request */
-    if (    offVirtual > filestatus.cbFile
-        ||  offVirtual + cbBuffer > filestatus.cbFile
+    if (    offVirtual > OSData.os2.filestatus.cbFile
+        ||  offVirtual + cbBuffer > OSData.os2.filestatus.cbFile
         )
     {   /* invalid request */
         rc = ERROR_NO_DATA;
     }
-    else if (this->cbBufferValid == filestatus.cbFile && offBuffer == 0)
+    else if (this->cbBufferValid == OSData.os2.filestatus.cbFile && offBuffer == 0)
     {
         /*
@@ -386 +388 @@
             {   /* copy data from buffer */
                 cbRead = cbBufferValid - offVirtual + offBuffer;
-                cbRead = min(cbRead, cbBuffer);
+                cbRead = KMIN(cbRead, cbBuffer);
                 memcpy(pvBuffer, &pachBuffer[offVirtual - offBuffer], (size_t)cbRead);
                 offVirtual += cbRead;
@@ -396 +398 @@
                 /* read into buffer */
                 if (!bufferRead(offVirtual))
-                    return FALSE;
+                    return rc;
             }
         }
@@ -406 +408 @@
          * unbuffered read.
          */
-        rc = DosRead(hFile, pvBuffer, cbBuffer, &cbRead);
+        rc = DosRead(OSData.os2.hFile, pvBuffer, cbBuffer, &cbRead);
         if (rc == NO_ERROR)
             offVirtual = offReal += cbRead;
@@ -412 +414 @@
 
     /* check for error and return accordingly */
-    if (rc)
-    {
-        if (fThrowErrors)
-            throw ((int)rc);
-        return FALSE;
-    }
-    return TRUE;
+    if (rc && fThrowErrors)
+        throw (kError(rc));
+    return rc;
 }
 
@@ -424 +422 @@
 /**
  * Reads <cbBuffer> bytes at file offset <off>.
- * @returns     success indicator. (TRUE/FALSE)
+ * @returns     0 on success. kError error number.
  * @param       pvBuffer    Output buffer.
  * @param       cbBuffer    Amount of bytes to read.
  * @param       off         Absolute file offset.
  */
-BOOL            kFile::readAt(void *pvBuffer, long cbBuffer, long off)
-{
-    return set(off) && read(pvBuffer, cbBuffer);
+int             kFile::readAt(void *pvBuffer, long cbBuffer, long off)
+{
+    if (set(off))
+        return rc;
+    read(pvBuffer, cbBuffer);
+    return rc;
 }
 
@@ -439 +440 @@
  * (The memory block has a '\0' at the end just in case you
  *  are using it as a long string.)
+ * Must call the static kFile::mapFree function to free the memory block.
  * @returns     Pointer to file in memory.
  */
-void *          kFile::readFile() throw(int)
+void *          kFile::mapFile() throw(kError)
 {
     void *pv;
@@ -450 +452 @@
     {
         if (fThrowErrors)
-            throw(ERROR_NOT_ENOUGH_MEMORY);
+            throw (kError(kError::NOT_ENOUGH_MEMORY));
         return NULL;
     }
 
     /* go the start of the file and read it. */
-    if (start() && read(pv, this->getSize()))
+    if (!start() && !read(pv, this->getSize()))
         return pv; // successfull exit!
 
@@ -467 +469 @@
  * Reads a single line from the file into the given buffer.
  * Newline is stripped!
- * @returns Success indicator.
+ * @returns 0 on success. kError error number.
  * @param   pszBuffer   Pointer to string buffer.
  *                      Will hold a zero-string upon successful return.
@@ -475 +477 @@
  * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-BOOL            kFile::readln(char *pszBuffer, long cchBuffer) throw (int)
+int             kFile::readln(char *pszBuffer, long cchBuffer) throw(kError)
 {
     long    cbRead;
@@ -481 +483 @@
     /* refresh file status (cbFile) */
     if (!refreshFileStatus())
-        return FALSE;
+        return rc;
 
     /*
@@ -488 +490 @@
      *      Loop buffer by buffer looking for a newline.
      */
-    cbRead = min(max((long)filestatus.cbFile - (long)offVirtual, 0), cchBuffer-1);
+    cbRead = KMIN(KMAX((long)OSData.os2.filestatus.cbFile - (long)offVirtual, 0), cchBuffer-1);
     if (cbRead == 0)
-        return FALSE;
+        return rc = ERROR_HANDLE_EOF;
 
     while (cbRead > 0)
@@ -502 +504 @@
         if (offVirtual >= offBuffer + cbBufferValid || offVirtual < offBuffer)
             if (!bufferRead(offVirtual))
-                return FALSE;
+                return rc;
 
         /* Scan buffer for new line */
@@ -542 +544 @@
             else
                 offVirtual++;
-            return TRUE;
-        }
-    }
-
-    return TRUE;
+            return NO_ERROR;
+        }
+    }
+
+    return NO_ERROR;
 }
 
@@ -552 +554 @@
 /**
  * Writes <cbBuffer> bytes to the file at the current file position.
- * @returns     success indicator. (TRUE/FALSE)
+ * @returns     0 on success. kError error number.
  * @param       pvBuffer    Output buffer.
  * @param       cbBuffer    Amount of bytes to write.
  */
-BOOL            kFile::write(const void *pv, long cb)
+int             kFile::write(const void *pv, long cb)
 {
     if (fReadOnly)
@@ -604 +606 @@
                     offVirtual += cb + cbAddPost;
                     fBufferDirty = TRUE;
-                    return TRUE;
+                    return NO_ERROR;
                 }
 
@@ -634 +636 @@
                 {   /* don't fit anywhere... */
                     if (!bufferCommit())
-                        return FALSE;
+                        return rc;
                     offBuffer = offVirtual;
                     cbWrite = cbBufferValid = cb > cbBuffer ? cbBuffer : cb;
@@ -648 +650 @@
             offVirtual += cbAddPost;
 
-            return TRUE;
+            return NO_ERROR;
         }
         else if (position())
@@ -654 +656 @@
             ULONG   cbWrote;
 
-            rc = DosWrite(hFile, (PVOID)pv, cb, &cbWrote);
+            rc = DosWrite(OSData.os2.hFile, (PVOID)pv, cb, &cbWrote);
             if (rc == NO_ERROR)
             {
                 offVirtual = offReal += cbWrote;
-                return TRUE;
+                return NO_ERROR;
             }
         }
@@ -664 +666 @@
 
     if (fThrowErrors)
-        throw ((int)rc);
-    return FALSE;
+        throw (kError(rc));
+    return rc;
 }
 
@@ -671 +673 @@
 /**
  * Write <cbBuffer> bytes at file offset <off> from <pvBuffer>.
- * @returns     success indicator. (TRUE/FALSE)
+ * @returns     0 on success. kError error number.
  * @param       pvBuffer    Output buffer.
  * @param       cbBuffer    Amount of bytes to write.
  * @param       off         Absolute file offset.
  */
-BOOL            kFile::writeAt(void *pvBuffer, long cbBuffer, long off)
-{
-    return set(off) && write(pvBuffer, cbBuffer);
+int             kFile::writeAt(const void *pvBuffer, long cbBuffer, long off)
+{
+    if (set(off))
+        return rc;
+    return write(pvBuffer, cbBuffer);
 }
 
@@ -693 +697 @@
  * @remark      Currently limited to 64KB of result data.
  */
-int             kFile::printf(const char *pszFormat, ...) throw (int)
+int             kFile::printf(const char *pszFormat, ...) throw(kError)
 {
     long        offStart = getPos();
@@ -725 +729 @@
 /**
  * Sets the filesize.
- * @returns     Success indicator.
+ * @returns     0 on success. kError error number.
  * @param       cbFile      New filesize.
  *                          Defaults to 0xffffffff, which results in
  *                          cutting the file at the current position.
  */
-BOOL            kFile::setSize(unsigned long cbFile/*= ~0UL*/)
+int             kFile::setSize(unsigned long cbFile/*= ~0UL*/)
 {
     if (cbFile == ~0UL)
         cbFile = offVirtual;
-    rc = DosSetFileSize(hFile, cbFile);
+    rc = DosSetFileSize(OSData.os2.hFile, cbFile);
     if (rc != NO_ERROR && fThrowErrors)
-        throw ((int)rc);
-
-    return rc == NO_ERROR;
+        throw (kError(rc));
+
+    return rc;
 }
 
@@ -752 +756 @@
     char *  pachBuffer  = new char[1024*256];
     long    pos         = AppendFile.getPos();
-    BOOL    fAppend     = AppendFile.fThrowErrors;
-    BOOL    fThis       = fThrowErrors;
+    KBOOL   fAppend     = AppendFile.fThrowErrors;
+    KBOOL   fThis       = fThrowErrors;
 
     setThrowOnErrors();
@@ -762 +766 @@
     AppendFile.refreshFileStatus();
 
-    cb = min(1024*256, AppendFile.filestatus.cbFile);
+    cb = KMIN(1024*256, AppendFile.OSData.os2.filestatus.cbFile);
     while (cb > 0)
     {
         AppendFile.read(pachBuffer, cb);
         write(pachBuffer, cb);
-        cb = min(1024*256, (long)AppendFile.filestatus.cbFile - (long)AppendFile.offVirtual);
+        cb = KMIN(1024*256, (long)AppendFile.OSData.os2.filestatus.cbFile - (long)AppendFile.offVirtual);
     }
 
@@ -781 +785 @@
 /**
  * Seek relative to the current position.
- * @returns     Success indicator.
+ * @returns     0 on success. kError error number.
  * @param       off     Relative reposition.
  */
-BOOL            kFile::move(long off)
+int             kFile::move(long off)
 {
     if ((off + offVirtual) & 0x80000000UL) /* above 2GB or negative */
@@ -790 +794 @@
     else
     {
-        if (off + offVirtual > filestatus.cbFile && fReadOnly) /* can't expand readonly file. */
+        if (off + offVirtual > OSData.os2.filestatus.cbFile && fReadOnly) /* can't expand readonly file. */
             rc = ERROR_HANDLE_EOF;
         else
         {
             offVirtual += off;
-            return TRUE;
+            return rc = NO_ERROR;
         }
     }
 
     if (fThrowErrors)
-        throw ((int)rc);
-    return FALSE;
+        throw (kError(rc));
+    return rc;
 }
 
@@ -807 +811 @@
 /**
  * Seek to an absolute position in the file (off).
- * @returns     Success indicator.
+ * @returns     0 on success. kError error number.
  * @param       off     New file position.
  */
-BOOL            kFile::set(long off)
+int             kFile::set(long off)
 {
     if (off < 0)
@@ -816 +820 @@
     else
     {
-        if ((unsigned long)off > filestatus.cbFile && fReadOnly)
+        if ((unsigned long)off > OSData.os2.filestatus.cbFile && fReadOnly)
             rc = ERROR_HANDLE_EOF;
         else
         {
             offVirtual = off;
-            rc = NO_ERROR;
-            return TRUE;
+            return rc = NO_ERROR;
         }
     }
     if (fThrowErrors)
-        throw ((int)rc);
-    return FALSE;
+        throw (kError(rc));
+    return rc;
 }
 
@@ -833 +836 @@
 /**
  * Seek to the end of the file.
- * @returns     Success indicator. TRUE / FALSE.
+ * @returns     0 on success. kError error number.
  * @remark      Will only throw error if refreshFileStatus failes.
  */
-BOOL            kFile::end()
+int             kFile::end()
 {
     if (!refreshFileStatus())
-        return FALSE;
-
-    if (!fReadOnly && pachBuffer && offBuffer != ~0UL && offBuffer + cbBufferValid > filestatus.cbFile)
+        return rc;
+
+    if (!fReadOnly && pachBuffer && offBuffer != ~0UL && offBuffer + cbBufferValid > OSData.os2.filestatus.cbFile)
         /* a writable file with buffer might have uncommited data in the buffer. */
         offVirtual = offBuffer + cbBufferValid;
     else
-        offVirtual = filestatus.cbFile;
-
-    rc = NO_ERROR;
-    return TRUE;
+        offVirtual = OSData.os2.filestatus.cbFile;
+
+    return rc = NO_ERROR;
 }
 
@@ -854 +856 @@
 /**
  * Seek to the start of the file.
- * @returns     TRUE.
+ * @returns     0 on success. kError error number.
  * @remark      Will never throw errors.
  */
-BOOL            kFile::start()
+int             kFile::start()
 {
     offVirtual = 0;
-    rc = NO_ERROR;
-    return TRUE;
+    return rc = NO_ERROR;
 }
 
@@ -876 +877 @@
         return -1;
 
-    return filestatus.cbFile;
+    return OSData.os2.filestatus.cbFile;
 }
 
@@ -897 +898 @@
  * @remark      Will only throw error if refreshFileStatus failes.
  */
-BOOL            kFile::isEOF()
+KBOOL           kFile::isEOF()
 {
     #if 0
-    throw(ERROR_NOT_SUPPORTED); //this method don't currently work! Need to use flag!
+    throw (kError(kError::NOT_SUPPORTED)); //this method don't currently work! Need to use flag!
     #else
     if (!fReadOnly && !refreshFileStatus())
-        return (BOOL)-1;
-
-    return filestatus.cbFile <= offVirtual; //??? - !!!
+        return (KBOOL)-1;
+
+    return OSData.os2.filestatus.cbFile <= offVirtual; //??? - !!!
     #endif
 }
@@ -913 +914 @@
  * Set error behaviour to fail by throwing the OS/2 return code when an
  * error occures.
- * @returns     TRUE;
  * @remark      Will never throw errors.
  */
-BOOL            kFile::setThrowOnErrors()
+void            kFile::setThrowOnErrors()
 {
     fThrowErrors = TRUE;
     rc = NO_ERROR;
-    return TRUE;
 }
 
@@ -926 +925 @@
 /**
  * Set error behaviour to fail by return FALSE when an error has occures.
- * @returns     TRUE;
  * @remark      Will never throw errors.
  */
-BOOL            kFile::setFailOnErrors()
+void            kFile::setFailOnErrors()
 {
     fThrowErrors = FALSE;
     rc = NO_ERROR;
-    return TRUE;
 }
 
@@ -957 +954 @@
  * @remark  May throw errors.
  */
-void *kFile::readFile(const char *pszFilename)
+void *kFile::mapFile(const char *pszFilename)
 {
     kFile file(pszFilename);
-    return file.readFile();
-}
-
+    file.setThrowOnErrors();
+    return file.mapFile();
+}
+
+
+
+/**
+ * Frees a file mapping done by one of the mapFile members of kFile.
+ * @param   pvFileMapping   The pointer mapFile returned.
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ */
+void kFile::mapFree(void *pvFileMapping)
+{
+    if (pvFileMapping)
+        free(pvFileMapping);
+}
+

trunk/tools/common/kFile.h

@@ -1 @@
-/* $Id: kFile.h,v 1.9 2001-10-17 14:22:33 bird Exp $
+/* $Id: kFile.h,v 1.10 2002-02-24 02:47:24 bird Exp $
  *
  * kFile - Simple (for the time being) file class.
@@ -22 +22 @@
 class kFile
 {
+    /** @cat constructors */
+private:
+    #ifndef __OS2DEFS__
+    kFile(unsigned long hFile, KBOOL fReadOnly);
+    #else
+    kFile(HFILE hFile, KBOOL fReadOnly);
+    #endif
+public:
+    kFile(const char *pszFilename, KBOOL fReadOnly = TRUE) throw(kError);
+    ~kFile();
+
+    /** @cat File I/O methods */
+    int             read(void *pvBuffer, long cbBuffer) throw(kError);
+    int             readAt(void *pvBuffer, long cbBuffer, long off) throw(kError);
+    int             readln(char *pszBuffer, long cchBuffer);
+
+    int             write(const void *pvBuffer, long cbBuffer) throw(kError);
+    int             writeAt(const void *pvBuffer, long cbBuffer, long off) throw(kError);
+
+    int             printf(const char *pszFormat, ...) throw(kError);
+
+    int             setSize(unsigned long cbFile = ~0UL);
+
+    kFile &         operator+=(kFile &AppendFile);
+
+    void *          mapFile() throw(kError);
+    static void *   mapFile(const char *pszFilename) throw(kError);
+    static void     mapFree(void *pvFileMapping) throw(kError);
+
+
+    /** @cat File seek methods */
+    int             move(long off) throw(kError);
+    int             set(long off) throw(kError);
+    int             end() throw(kError);
+    int             start();
+
+    /** @cat Query methods */
+    long            getSize() throw(kError);
+    long            getPos() const throw(kError);
+    KBOOL           isEOF() throw(kError);
+    const char *    getFilename()       { return pszFilename; }
+
+    /** @cat Error handling */
+    void            setThrowOnErrors();
+    void            setFailOnErrors();
+    int             getLastError() const;
+
+    /** standard files */
+    static kFile    StdOut;
+    static kFile    StdIn;
+    static kFile    StdErr;
+
+
 protected:
     /** @cat Main datamembers */
-    HFILE           hFile;              /* Pointer to stdio filehandle */
-    BOOL            fReadOnly;          /* True if readonly access, False is readwrite. */
-    BOOL            fStdDev;            /* True if stdio, stderr or stdin. Filestatus is invalid with this is set.*/
-    APIRET          rc;                 /* Last error (return code). */
-    FILESTATUS4     filestatus;         /* Filestatus data. */
-    BOOL            fStatusClean;       /* True if filestatus is clean. False is not clean */
-    BOOL            fThrowErrors;       /* When true we'll throw the rc on errors, else return FALSE. */
-    PSZ             pszFilename;        /* Pointer to filename. */
+    KBOOL           fReadOnly;          /* True if readonly access, False is readwrite. */
+    KBOOL           fStdDev;            /* True if stdio, stderr or stdin. Filestatus is invalid with this is set.*/
+    unsigned long   rc;                 /* Last error (return code). */
+    KBOOL           fStatusClean;       /* True if filestatus is clean. False is not clean */
+    KBOOL           fThrowErrors;       /* When true we'll throw the rc on errors, else return FALSE. */
+    char *          pszFilename;        /* Pointer to filename. */
 
     /** @cat Position datamembers */
@@ -42 +93 @@
     unsigned long   offBuffer;          /* Virtual file offset where the buffer starts. */
     unsigned long   cbBufferValid;      /* Count of valid bytes in the buffer. */
-    BOOL            fBufferDirty;       /* Dirty flag. Set when the buffer needs to be committed. */
+    KBOOL           fBufferDirty;       /* Dirty flag. Set when the buffer needs to be committed. */
+
+    /** @cat OS specific data */
+    union _kFileOSSpecific
+    {
+        char        achFiller[14+2 + 16]; /* OS2 uses 16 bytes currently. Add 16-bytes just in case. */
+        #ifdef __OS2DEF__
+        struct _kFileOS2
+        {
+            HFILE           hFile;        /* Pointer to stdio filehandle */
+            FILESTATUS4     filestatus;   /* Filestatus data. */
+        } os2;
+        #endif
+    } OSData;
 
     /** @cat internal buffer methods */
-    BOOL            bufferRead(ULONG offFile) throw (int);
-    BOOL            bufferCommit(void) throw (int);
+    KBOOL           bufferRead(unsigned long offFile) throw(kError);
+    KBOOL           bufferCommit(void) throw(kError);
 
     /** @cat internal methods for maintaing internal structures. */
-    BOOL            refreshFileStatus() throw(int);
-    BOOL            position() throw(int);
+    KBOOL           refreshFileStatus() throw(kError);
+    KBOOL           position() throw(kError);
 
-    /** @cat constructors */
-private:
-    kFile(HFILE hFile, BOOL fReadOnly);
-public:
-    kFile(const char *pszFilename, BOOL fReadOnly = TRUE) throw(int);
-    ~kFile();
-
-    /** @cat File I/O methods */
-    BOOL            read(void *pvBuffer, long cbBuffer) throw(int);
-    BOOL            readAt(void *pvBuffer, long cbBuffer, long off) throw(int);
-    void *          readFile() throw(int);
-    static void *   readFile(const char *pszFilename) throw(int);
-    BOOL            readln(char *pszBuffer, long cchBuffer);
-
-    BOOL            write(const void *pv, long cb) throw(int);
-    BOOL            writeAt(void *pvBuffer, long cbBuffer, long off) throw(int);
-
-    int             printf(const char *pszFormat, ...) throw (int);
-
-    BOOL            setSize(unsigned long cbFile = ~0UL);
-
-    kFile &         operator+=(kFile &AppendFile);
-
-    /** @cat File seek methods */
-    BOOL            move(long off) throw(int);
-    BOOL            set(long off) throw(int);
-    BOOL            end() throw(int);
-    BOOL            start();
-
-    /** @cat Query methods */
-    long            getSize() throw(int);
-    long            getPos() const throw(int);
-    BOOL            isEOF() throw(int);
-    const char *    getFilename()       { return pszFilename; }
-
-    /** @cat Error handling */
-    BOOL            setThrowOnErrors();
-    BOOL            setFailOnErrors();
-    int             getLastError() const;
-
-    /** standard files */
-    static kFile    StdOut;
-    static kFile    StdIn;
-    static kFile    StdErr;
 };
 

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/*
+/* $Id: kFileDef.cpp,v 1.8 2002-02-24 02:47:25 bird Exp $
+ *
  * kFileDef - Definition files.
  *
- * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen
  *
  */
@@ -21 +22 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
-
+
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
+#include "kFileInterfaces.h"
 #include "kFileDef.h"
+
 
 /*******************************************************************************
@@ -43 +45 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static char *dupeString(const char *psz, BOOL fSkipFirstWord = FALSE);
+static char *dupeString(const char *psz, KBOOL fSkipFirstWord = FALSE);
 static char *trim(char *psz);
 static char *ltrim(const char *psz);
@@ -57 +59 @@
  * @param   fSkipFirstWord  Skips the first word before duplicating the string.
  */
-static char *dupeString(const char *psz, BOOL fSkipFirstWord/* = FALSE*/)
+static char *dupeString(const char *psz, KBOOL fSkipFirstWord/* = FALSE*/)
 {
     char *pszDupe;
@@ -117 +119 @@
 
 
-kFileDef::kFileDef(kFile *pFile) throw(int)
-    :pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
+kFileDef::kFileDef(kFile *pFile) :
+    kFileFormatBase(pFile),
+    pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
     pszExeType(NULL), pszHeapSize(NULL), pszOld(NULL), pszProtmode(NULL), pszStackSize(NULL),
     pszStub(NULL), pSegments(NULL), pImports(NULL), pExports(NULL),
@@ -125 +128 @@
     chAppType(kFileDef::unknown)
 {
-    /* determin file size */
-
-    if (pFile->start())
-    {
-        try
-        {
-            this->read(pFile);
-        }
-        catch (int err)
-        {
-            throw (err);
-        }
-    }
-    else
-        throw (0x001);
-}
+    pFile->setThrowOnErrors();
+    pFile->start();
+    read(pFile);
+        }
 
 
@@ -191 +182 @@
  * @remark  throws errorcode on error (TODO: errorhandling)
  */
-void kFileDef::read(kFile *pFile) throw (int)
+void kFileDef::read(kFile *pFile)
 {
     char *pszTmp;
@@ -201 +192 @@
     while (psz != NULL)
     {
-        BOOL fNext = TRUE;
+        KBOOL   fNext = TRUE;
 
         /* if-switch */
         if (StringCase(psz, "LIBRARY"))
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fLibrary = TRUE;
             if (!setModuleName())
-                throw (0x107);
+                throw (kError(kError::DEF_BAD_LIBRARY_STATEMENT));
             fInitInstance = stristr(pszType, "INITINSTANCE") != NULL;
             fInitGlobal   = stristr(pszType, "INITGLOBAL")   != NULL || !fInitInstance;
@@ -218 +209 @@
         else if (StringCase(psz, "NAME"))
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fProgram = TRUE;
@@ -233 +224 @@
         else if (StringCase(psz, "PHYSICAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fPhysicalDevice = TRUE;
@@ -240 +231 @@
         else if (StringCase(psz, "VIRTUAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fVirtualDevice = TRUE;
@@ -301 +292 @@
                 {
                     (**ppi).ulOrdinal = strtol(psz, &pszTmp, 0);
-                    if (psz ==pszTmp) throw(0x102);
+                    if (psz ==pszTmp) throw (kError(kError::DEF_BAD_IMPORT));
                 }
                 else
@@ -355 +346 @@
                         psz = pszTmp + 1;
                         (**ppe).ulOrdinal = strtol(psz, &pszTmp, 0);
-                        if (pszTmp == psz) throw (0x103);
+                        if (pszTmp == psz) throw (kError(kError::DEF_BAD_EXPORT));
                         psz = trim(pszTmp);
 
@@ -380 +371 @@
                     {   /* 2 */
                         (**ppe).cParam = strtol(psz, &pszTmp, 0);
-                        if (pszTmp == psz) throw (0x104);
+                        if (pszTmp == psz) throw (kError(kError::DEF_BAD_EXPORT));
                     }
                 }
@@ -391 +382 @@
         }
         else
-            throw(0x105);
+            throw (kError(kError::DEF_UNKOWN_VERB));
 
         /* next ? */
@@ -400 +391 @@
     /* sanity check */
     if (pszType == NULL)
-        throw ((int)0x106);
+        throw (kError(kError::DEF_NO_MODULE_STATEMENT));
 }
 
@@ -412 +403 @@
  * @remark    tabs are expanded. string is trimmed. comments removed.
  */
-char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (int)
+char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer)
 {
     int i;
@@ -420 +411 @@
     {
         /* read line */
-        if (!pFile->readln(pszBuffer, cbBuffer))
+        if (pFile->readln(pszBuffer, cbBuffer))
         {
             if (!pFile->isEOF())
-                throw (0x201);
-            return FALSE;
+                throw (kError(pFile->getLastError()));
+            return NULL;
         }
 
@@ -472 +463 @@
  * @remark    TODO - we are going to check WORDS.
  */
-BOOL kFileDef::isKeyword(const char *psz)
+KBOOL kFileDef::isKeyword(const char *psz)
 {
     return  psz != NULL
@@ -503 +494 @@
  * @remark    Assumes that pszBuffer is large enough.
  */
-BOOL  kFileDef::setModuleName(void)
+KBOOL  kFileDef::setModuleName(void)
 {
     char *pszEnd;
     char *pszStart;
 
-    assert(pszType);
+    kASSERT(pszType);
 
     /* skip the first word */
@@ -534 +525 @@
  * @param   cchBuffer   Size of the buffer (defaults to 260 chars).
  */
-BOOL  kFileDef::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
+KBOOL  kFileDef::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
 {
     int cch;
@@ -554 +545 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL  kFileDef::exportFindFirst(kExportEntry *pExport)
+KBOOL kFileDef::exportFindFirst(kExportEntry *pExport)
 {
     if (pExports != NULL && pExport != NULL)
@@ -581 +572 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL  kFileDef::exportFindNext(kExportEntry *pExport)
+KBOOL kFileDef::exportFindNext(kExportEntry *pExport)
 {
     if (pExport != NULL && pExport->pv != NULL)
@@ -624 +615 @@
  * @remark  stub
  */
-BOOL kFileDef::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileDef::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     ulOrdinal = ulOrdinal;
     pExport = pExport;
@@ -639 +630 @@
  * @remark  stub
  */
-BOOL kFileDef::exportLookup(const char *  pszName, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileDef::exportLookup(const char *  pszName, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     pszName = pszName;
     pExport = pExport;
@@ -658 +649 @@
  * @remark
  */
-BOOL  kFileDef::makeWatcomLinkFileAddtion(kFile *pFile) throw(int)
+KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut)
 {
     PDEFSEGMENT pSeg;
     PDEFIMPORT  pImp;
     PDEFEXPORT  pExp;
-    pFile->setThrowOnErrors();
+    pOut->setThrowOnErrors();
 
     /*
      * Write a little remark first to tell that converted stuff starts here.
      */
-    pFile->printf("#\n# Directives generated from .DEF-file.\n#\n");
+    pOut->printf("#\n# Directives generated from .DEF-file.\n#\n");
 
     /* Format - Module type */
-    pFile->printf("FORMAT OS2 LX %s %s %s\n",
+    pOut->printf("FORMAT OS2 LX %s %s %s\n",
                   fLibrary                               ? "DLL" :
                     (fProgram ? (chAppType == pm         ? "PM"
@@ -684 +675 @@
     /* Module name */
     if (pszModName)
-        pFile->printf("OPTION MODNAME=%s\n", pszModName);
+        pOut->printf("OPTION MODNAME=%s\n", pszModName);
 
     /* Description */
     if (pszDescription)
-        pFile->printf("OPTION DESCRIPTION '%s'\n", pszDescription);
+        pOut->printf("OPTION DESCRIPTION '%s'\n", pszDescription);
 
     /* Base */
     if (pszBase)
-        pFile->printf("OPTION OFFSET=%s\n", pszBase);
+        pOut->printf("OPTION OFFSET=%s\n", pszBase);
 
     /* Stub */
     if (pszStub)
-        pFile->printf("OPTION STUB='%s'\n", pszStub);
+        pOut->printf("OPTION STUB='%s'\n", pszStub);
 
     /* Old */
     if (pszOld)
-        pFile->printf("OPTION OLDLIBRARY=%s\n", pszOld);
+        pOut->printf("OPTION OLDLIBRARY=%s\n", pszOld);
 
     /* Protected mode */
     if (pszProtmode)
-        pFile->printf("OPTION PROTMODE\n", pszProtmode);
+        pOut->printf("OPTION PROTMODE\n", pszProtmode);
 
     /* Stacksize */
     if (pszStackSize)
-        pFile->printf("OPTION STACK=%s\n", pszStackSize);
+        pOut->printf("OPTION STACK=%s\n", pszStackSize);
 
     /* HeapSize */
     if (pszHeapSize)
-        pFile->printf("OPTION HEAPSIZE=%s\n", pszHeapSize);
+        pOut->printf("OPTION HEAPSIZE=%s\n", pszHeapSize);
 
     /* Code  -  not supported */
@@ -724 +715 @@
     while (pSeg != NULL)
     {
-        pFile->printf("SEGMENT %s\n", pSeg->psz);
+        pOut->printf("SEGMENT %s\n", pSeg->psz);
         pSeg = pSeg->pNext;
     }
@@ -735 +726 @@
     {
         if (pImp->pszName == NULL)
-            pFile->printf("IMPORT '%s' '%s'.%d\n", pImp->pszIntName, pImp->pszDll, pImp->ulOrdinal);
+            pOut->printf("IMPORT '%s' '%s'.%d\n", pImp->pszIntName, pImp->pszDll, pImp->ulOrdinal);
         else
-            pFile->printf("IMPORT '%s' '%s'.'%s'\n", pImp->pszIntName, pImp->pszDll, pImp->pszName);
+            pOut->printf("IMPORT '%s' '%s'.'%s'\n", pImp->pszIntName, pImp->pszDll, pImp->pszName);
         pImp = pImp->pNext;
     }
@@ -747 +738 @@
     while (pExp != NULL)
     {
-        pFile->printf("EXPORT '%s'", pExp->pszName);
+        pOut->printf("EXPORT '%s'", pExp->pszName);
         if (pExp->ulOrdinal != ~0UL)
-            pFile->printf(".%d", pExp->ulOrdinal);
+            pOut->printf(".%d", pExp->ulOrdinal);
         if (pExp->pszIntName)
-            pFile->printf("='%s'", pExp->pszIntName);
+            pOut->printf("='%s'", pExp->pszIntName);
         if (pExp->fResident)
-            pFile->printf(" RESIDENT");
+            pOut->printf(" RESIDENT");
         if (pExp->cParam != ~0UL)
-            pFile->printf(" %d", pExp->cParam * 2); /* .DEFs this is number of words. Watcom should have bytes. */
-        pFile->printf("\n");
+            pOut->printf(" %d", pExp->cParam * 2); /* .DEFs this is number of words. Watcom should have bytes. */
+        pOut->printf("\n");
         pExp = pExp->pNext;
     }

trunk/tools/common/kFileDef.h

@@ -50 +50 @@
     char               *pszName;
     char               *pszIntName;
-    BOOL                fResident;
+    KBOOL               fResident;
     unsigned long       cParam;
     struct _DefExport  *pNext;
@@ -66 +66 @@
         /**@cat pointers to different sections */
         char *pszType;
-        BOOL  fProgram;
-        BOOL  fLibrary;
-        BOOL  fPhysicalDevice;
-        BOOL  fVirtualDevice;
-        BOOL  fInitInstance;
-        BOOL  fTermInstance;
-        BOOL  fInitGlobal;
-        BOOL  fTermGlobal;
+        KBOOL fProgram;
+        KBOOL fLibrary;
+        KBOOL fPhysicalDevice;
+        KBOOL fVirtualDevice;
+        KBOOL fInitInstance;
+        KBOOL fTermInstance;
+        KBOOL fInitGlobal;
+        KBOOL fTermGlobal;
         char *pszModName;
         char  chAppType;
@@ -94 +94 @@
 
         /**@cat internal functions */
-        void  read(kFile *pFile) throw (int);
-        char *readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (int);
-        BOOL  isKeyword(const char *psz);
-        BOOL  setModuleName(void);
+        void  read(kFile *pFile) throw (kError);
+        char *readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (kError);
+        KBOOL isKeyword(const char *psz);
+        KBOOL setModuleName(void);
 
     public:
         /**@cat Constructor/Destructor */
-        kFileDef(kFile *pFile) throw(int);
+        kFileDef(kFile *pFile) throw(kError);
         virtual ~kFileDef();
 
         /** @cat Module information methods. */
-        BOOL        moduleGetName(char *pszBuffer, int cchSize = 260);
+        KBOOL       moduleGetName(char *pszBuffer, int cchSize = 260);
 
         /** @cat Export enumeration methods. */
-        BOOL        exportFindFirst(kExportEntry *pExport);
-        BOOL        exportFindNext(kExportEntry *pExport);
+        KBOOL       exportFindFirst(kExportEntry *pExport);
+        KBOOL       exportFindNext(kExportEntry *pExport);
         void        exportFindClose(kExportEntry *pExport);
 
         /** @cat Export Lookup methods */
-        BOOL        exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
-        BOOL        exportLookup(const char *  pszName, kExportEntry *pExport);
+        KBOOL       exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
+        KBOOL       exportLookup(const char *  pszName, kExportEntry *pExport);
 
         /**@cat queries... */
-        BOOL        isDef() const                { return TRUE;}
+        KBOOL       isDef() const                { return TRUE;}
         char const *queryModuleName(void) const  { return pszModName;     }
         char const *queryType(void) const        { return pszType;        }
@@ -132 +132 @@
 
         /**@cat Operations */
-        BOOL        makeWatcomLinkFileAddtion(kFile *pFile) throw(int);
+        KBOOL       makeWatcomLinkFileAddtion(kFile *pFile) throw(kError);
 
         enum {fullscreen = 0, pmvio = 2, pm = 3, unknown = 255};

trunk/tools/common/kFileFormatBase.cpp

@@ -1 @@
-/* $Id: kFileFormatBase.cpp,v 1.5 2001-06-22 17:07:47 bird Exp $
+/* $Id: kFileFormatBase.cpp,v 1.6 2002-02-24 02:47:25 bird Exp $
  *
  * kFileFormatBase - Base class for kFile<format> classes.
  *
- * Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * Copyright (c) 1999-2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -14 +14 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
+#include "kTypes.h"
+#include "kError.h"
+#include "kFile.h"
+#include "kFileInterfaces.h"
+#include "kFileFormatBase.h"
 
-#include <malloc.h>
-#include <string.h>
-#include <stdio.h>
 
-#include "kFile.h"
-#include "kInterfaces.h"
-#include "kFileFormatBase.h"
+
+/**
+ * Constructor.
+ * Saves the file object pointer.
+ * @param   pFile   This will be deleted if the object is
+ *                  successfully constructed (by the destructor).
+ * @status  completely implemented.
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ */
+kFileFormatBase::kFileFormatBase(kFile *pFile)
+    : pFile(pFile)
+{
+}
+
+
+/**
+ * Destructor.
+ * Deletes the file object if it exists.
+ * @status  completely implemented.
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ */
+kFileFormatBase::~kFileFormatBase()
+{
+    if (pFile)
+        delete pFile;
+    pFile = NULL;
+}
 
 
@@ -30 +55 @@
  * @param   pOut    Output file.
  */
-BOOL   kFileFormatBase::dump(kFile *pOut)
+KBOOL   kFileFormatBase::dump(kFile *pOut)
 {
     pOut->printf("Sorry, dump() is not implemented for this file format.\n");
@@ -36 +61 @@
 }
 
-
-kFileFormatBase::~kFileFormatBase()
-{
-
-}
-

trunk/tools/common/kFileFormatBase.h

@@ -1 @@
-/* $Id: kFileFormatBase.h,v 1.6 2001-06-22 17:07:47 bird Exp $
+/* $Id: kFileFormatBase.h,v 1.7 2002-02-24 02:47:25 bird Exp $
  *
  * kFileFormatBase - Base class for kFile<format> classes.
@@ -33 +33 @@
 {
 public:
+    virtual KBOOL isDef() const { return FALSE;}
+    virtual KBOOL isPe() const  { return FALSE;}
+    virtual KBOOL isLx() const  { return FALSE;}
+    virtual KBOOL dump(kFile *pOut);
 
-    virtual ~kFileFormatBase();
+    kFileFormatBase(kFile *pFile) throw (kError);
+    virtual ~kFileFormatBase() throw (kError);
 
-    virtual BOOL  isDef() const { return FALSE;}
-    virtual BOOL  isPe() const  { return FALSE;}
-    virtual BOOL  isLx() const  { return FALSE;}
-    virtual BOOL  dump(kFile *pOut);
-
+protected:
+    kFile *pFile;
 };
 

trunk/tools/common/kFileLX.cpp

@@ -1 @@
-/* $Id: kFileLX.cpp,v 1.6 2001-10-03 01:44:49 bird Exp $
+/* $Id: kFileLX.cpp,v 1.7 2002-02-24 02:47:26 bird Exp $
  *
  *
@@ -9 +9 @@
  */
 
-/*******************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
-/* emx fixups */
-#ifdef __EMX__
-    #define __stdcall
-     #define max(a,b) (((a) > (b)) ? (a) : (b))
-     #define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-#define INCL_DOSERRORS
-#define FOR_EXEHDR          1           /* exe386.h flag */
-#define DWORD               ULONG       /* Used by exe386.h / newexe.h */
-#define WORD                USHORT      /* Used by exe386.h / newexe.h */
-
-
 /******************************************************************************
 *   Header Files                                                              *
 ******************************************************************************/
-#ifdef __EMX__
-#define INT INT_
-#define PCHAR PCHAR_
-#endif
-#include <os2.h>
-#ifdef __EMX__
-#undef PCHAR
-#undef INT
-#endif
-#include <newexe.h>
-#include <exe386.h>
+#include <MZexe.h>
+#include <LXexe.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
-
-#include <assert.h>
-
+
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
+#include "kFileInterfaces.h"
 #include "kFileLX.h"
 
@@ -55 +30 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef struct _export_state
+typedef struct _LXExportState
 {
     struct b32_bundle * pb32;           /* Pointer to current bundle. */
@@ -62 +37 @@
     int                 iOrdinal;       /* The current ordinal. */
 } EXPSTATE, *PEXPSTATE;
+
+
+/**
+ * relocFind*() state info.
+ * Stored as kRelocEntry::pv1.
+ */
+typedef struct _LXRelocState
+{
+    unsigned long   ulSegment;          /* The current segment. (0-based) */
+    unsigned long   ulPage;             /* The current page. (0-based index) */
+    char *          pchFixupRec;        /* The current fixup record. */
+    unsigned short  usSrcOffIdx;        /* The current source offset index. (0-based) */
+} LXRELOCSTATE, *PLXRELOCSTATE;
 
 
@@ -72 +60 @@
 
 
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+inline void memcpyw(char *pch1, const char *pch2, size_t cch);
+inline void memcpyb(char *pch1, const char *pch2, size_t cch);
+
+
 /**
  * Internal worker which lookup the name corresponding to an ordinal.
@@ -78 +73 @@
  * @param   pszBuffer.
  */
-BOOL kFileLX::queryExportName(int iOrdinal, char *pszBuffer)
-{
-    PUSHORT pus;
-    PUCHAR  puch;
+KBOOL kFileLX::queryExportName(int iOrdinal, char *pszBuffer)
+{
+    unsigned short *pus;
+    unsigned char * puch;
 
     /* resident name table */
     if (pe32->e32_restab)
     {
-        puch = (PUCHAR)pvBase + offLXHdr + pe32->e32_restab;
+        puch = (unsigned char *)pvBase + offLXHdr + pe32->e32_restab;
         while (*puch != 0)
         {
-            pus = (PUSHORT)(puch + 1 + *puch);
+            pus = (unsigned short *)(puch + 1 + *puch);
             if (*pus == iOrdinal)
             {
@@ -103 +98 @@
     if (pe32->e32_nrestab)
     {
-        puch = (PUCHAR)pvBase + pe32->e32_nrestab;
+        puch = (unsigned char *)pvBase + pe32->e32_nrestab;
         while (*puch != 0)
         {
-            pus = (PUSHORT)(puch + 1 + *puch);
+            pus = (unsigned short *)(puch + 1 + *puch);
             if (*pus == iOrdinal)
             {
@@ -120 +115 @@
 }
 
+/**
+ * Converts a FLAT address to an obj:offset address.
+ * @returns The offset into the object.
+ *          -1 (0xffffffff) on error.
+ * @param   ulAddress   Address to map.
+ * @param   pulObject   Pointer to variable which will receive the object number (0-based).
+ */
+unsigned long kFileLX::lxAddressToObjectOffset(unsigned long ulAddress, unsigned long * pulObject) const
+{
+    int     i;
+
+    /* look for a object which contains the given address */
+    for (i = 0; i < pe32->e32_objcnt; i++)
+    {
+        if (    paObject[i].o32_base <= ulAddress
+            &&  paObject[i].o32_base + paObject[i].o32_size > ulAddress)
+        {
+            if (pulObject)
+                *pulObject = i;
+            return ulAddress - paObject[i].o32_base;
+        }
+    }
+
+    return ~0UL;                        /* not found */
+}
+
+
+/**
+ * Converts an sel:off address, where sel is one of the special selectors,
+ * to a obj:off address.
+ * @returns The offset into the object.
+ *          -1 (0xffffffff) on error.
+ * @param   offObject   Offset into the selector described by *pulObject.
+ * @param   pulObject   IN: Special selector.
+ *                      OUT: Pointer to variable which will receive the object number (0-based).
+ */
+unsigned long kFileLX::lxSpecialSelectorToObjectOffset(unsigned long offObject, unsigned long * pulObject) const
+{
+    switch (*pulObject)
+    {
+        case kRelocEntry::enmRVASelector:
+            return lxAddressToObjectOffset(offObject + paObject[0].o32_base, pulObject);
+
+        case kRelocEntry::enmVASelector:
+            return lxAddressToObjectOffset(offObject, pulObject);
+
+        default:
+            kASSERT(!"Internal error line");
+    }
+
+    return ~0UL;
+}
+
+
+/**
+ * Validates a FLAT address.
+ * @returns TRUE if valid, FALSE if invalid.
+ * @param   ulAddress   FLAT address to validate.
+ */
+KBOOL kFileLX::lxValidateAddress(unsigned long ulAddress) const
+{
+    int     i;
+
+    /* look for a object which contains the given address */
+    for (i = 0; i < pe32->e32_objcnt; i++)
+    {
+        if (    paObject[i].o32_base <= ulAddress
+            &&  paObject[i].o32_base + paObject[i].o32_size > ulAddress)
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+
+/**
+ * Validates a object:offset address.
+ * @returns TRUE if valid, FALSE if invalid.
+ * @param   ulObject    Object number. (0-based)
+ * @param   offObject   Offset into that object.
+ */
+KBOOL kFileLX::lxValidateObjectOffset(unsigned long ulObject, unsigned long offObject) const
+{
+    return pe32->e32_objcnt > ulObject && offObject < paObject[ulObject].o32_size;
+}
+
+
+
+/**
+ * Gets the module name corresponding to the given ordinal.
+ * @returns Pointer to sz of the modulename. The caller is responsible for freeing it.
+ *          NULL if invalid ordinal.
+ * @param   ordModule   Ordinal number of the module name. (1-based)
+ */
+char *kFileLX::lxGetImportModuleName(unsigned long ordModule) const
+{
+    if (pe32->e32_impmodcnt < ordModule)
+        return NULL;
+
+    char *pch = (char*)pe32 + pe32->e32_impmod;
+    while (--ordModule)
+        pch += *pch + 1;
+
+    if (!*pch)
+        return NULL;
+
+    /* Copy the module name. */
+    char *psz = new char[*pch + 1];
+    strncpy(psz, pch + 1, *pch);
+    psz[*pch] = '\0';
+    return psz;
+}
+
+
+/**
+ * Gets the proc name at the given offset.
+ * @returns Pointer to sz of the proc name. The caller is responsible for freeing it.
+ *          NULL if invalid offset.
+ * @param   offProc     Offset of the proc name.
+ */
+char *kFileLX::lxGetImportProcName(unsigned long offProc) const
+{
+    char *pch = (char*)pe32 + pe32->e32_impproc + offProc;
+    if (!*pch)
+        return NULL;
+
+    /* Copy the proc name. */
+    char *psz = new char[*pch + 1];
+    strncpy(psz, pch + 1, *pch);
+    psz[*pch] = '\0';
+    return psz;
+}
+
 
 
@@ -126 +256 @@
  * @param     pszFilename   LX executable image name.
  */
-kFileLX::kFileLX(const char *pszFilename)  throw (int)
-: pvBase(NULL)
+kFileLX::kFileLX(const char *pszFilename) :
+    kFileFormatBase(NULL), pvBase(NULL)
 {
     struct exe_hdr * pehdr;
 
     /* create filemapping */
-    pvBase = kFile::readFile(pszFilename);
-    if (pvBase == NULL)
-        throw(1);
-
+    pvBase = kFile::mapFile(pszFilename);
     pehdr = (struct exe_hdr*)pvBase;
     if (pehdr->e_magic == EMAGIC)
@@ -143 +270 @@
 
     pe32 = (struct e32_exe*)((char*)pvBase + offLXHdr);
-    if (*(PUSHORT)pe32 != E32MAGIC)
-    {
-        free(pvBase);
+    if (*(unsigned short *)pe32 != E32MAGIC)
+    {
+        kFile::mapFree(pvBase);
         pvBase = NULL;
-        throw(2);
+        throw(kError(kError::INVALID_EXE_SIGNATURE));
     }
 
     paObject = pe32->e32_objtab && pe32->e32_objcnt
-        ? (struct o32_obj*)((char*)pvBase + pe32->e32_objtab + offLXHdr) : NULL;
+        ? (struct o32_obj *)((char *)pe32 + pe32->e32_objtab) : NULL;
     paMap = pe32->e32_objmap
-        ? (struct o32_map*)((char*)pvBase + pe32->e32_objmap + offLXHdr) : NULL;
+        ? (struct o32_map *)((char *)pe32 + pe32->e32_objmap) : NULL;
+    paulFixupPageTable = pe32->e32_fpagetab
+        ? (unsigned long *)((char *)pe32 + pe32->e32_fpagetab) : NULL;
+    pchFixupRecs = pe32->e32_frectab
+        ? (char *)((char *)pe32 + pe32->e32_frectab) : NULL;
 }
 
@@ -161 +292 @@
  * @param     pFile     Pointer to opened LX file.
  */
-kFileLX::kFileLX(kFile *pFile) throw (int)
-: pvBase(NULL)
+kFileLX::kFileLX(kFile *pFile) :
+    kFileFormatBase(pFile), pvBase(NULL)
 {
     struct exe_hdr * pehdr;
 
     /* create filemapping */
-    pvBase = pFile->readFile();
-    if (pvBase == NULL)
-        throw(1);
+    pFile->setThrowOnErrors();
+    pvBase = pFile->mapFile();
 
     pehdr = (struct exe_hdr*)pvBase;
@@ -178 +308 @@
 
     pe32 = (struct e32_exe*)((char*)pvBase + offLXHdr);
-    if (*(PUSHORT)pe32 != E32MAGIC)
-    {
-        free(pvBase);
+    if (*(unsigned short *)pe32 != E32MAGIC)
+    {
+        kFile::mapFree(pvBase);
         pvBase = NULL;
-        throw(2);
+        throw(kError(kError::INVALID_EXE_SIGNATURE));
     }
 
     paObject = pe32->e32_objtab && pe32->e32_objcnt
-        ? (struct o32_obj*)((char*)pvBase + pe32->e32_objtab + offLXHdr) : NULL;
+        ? (struct o32_obj *)((char *)pe32 + pe32->e32_objtab) : NULL;
     paMap = pe32->e32_objmap
-        ? (struct o32_map*)((char*)pvBase + pe32->e32_objmap + offLXHdr) : NULL;
+        ? (struct o32_map *)((char *)pe32 + pe32->e32_objmap) : NULL;
+    paulFixupPageTable = pe32->e32_fpagetab
+        ? (unsigned long *)((char *)pe32 + pe32->e32_fpagetab) : NULL;
+    pchFixupRecs = pe32->e32_frectab
+        ? (char *)((char *)pe32 + pe32->e32_frectab) : NULL;
 }
 
@@ -199 +333 @@
 {
     if (pvBase != NULL)
-        free(pvBase);
+        kFile::mapFree(pvBase);
     pvBase = NULL;
 }
@@ -211 +345 @@
  * @param   cchBuffer   Size of the buffer (defaults to 260 chars).
  */
-BOOL kFileLX::moduleGetName(char *pszBuffer, int cchBuffer/*= 260*/)
+KBOOL kFileLX::moduleGetName(char *pszBuffer, int cchBuffer/*= 260*/)
 {
     /* The module name is the 0 ordinal entry in resident name table */
-    assert(cchBuffer >= 255);
+    kASSERT(cchBuffer >= 255);
     return queryExportName(0, pszBuffer);
 }
@@ -224 +358 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL kFileLX::exportFindFirst(kExportEntry *pExport)
+KBOOL kFileLX::exportFindFirst(kExportEntry *pExport)
 {
     struct b32_bundle * pBundle = (struct b32_bundle*)((char*)pvBase + pe32->e32_enttab + offLXHdr);
@@ -274 +408 @@
                         break;
                     default:
-                        assert(!"ARG!!!! invalid bundle type!");
+                        kASSERT(!"ARG!!!! invalid bundle type!");
                 }
 
                 /* store status - current export entry */
-                PEXPSTATE pExpState = (PEXPSTATE)malloc(sizeof(EXPSTATE));
+                PEXPSTATE pExpState = new EXPSTATE;
                 pExport->pv         = pExpState;
                 pExpState->pb32     = pBundle;
@@ -300 +434 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL kFileLX::exportFindNext(kExportEntry *pExport)
+KBOOL kFileLX::exportFindNext(kExportEntry *pExport)
 {
     static int      acbEntry[] =
@@ -357 +491 @@
     pExpState->pb32 = (struct b32_bundle*)((char*)(pExpState->pb32 + 1) +
                         pExpState->pb32->b32_cnt * acbEntry[pExpState->pb32->b32_type & ~TYPEINFO]);
-    pExpState->iOrdinal++;
     while (pExpState->pb32->b32_cnt != 0)
     {
         /* skip empty bundles */
-        if (pExpState->pb32->b32_cnt != 0 && pExpState->pb32->b32_type == EMPTY)
+        while (pExpState->pb32->b32_cnt != 0 && pExpState->pb32->b32_type == EMPTY)
         {
             pExpState->iOrdinal += pExpState->pb32->b32_cnt;
             pExpState->pb32 = (struct b32_bundle*)((char*)pExpState->pb32 + 2);
-            continue;
         }
 
         /* FIXME forwarders are not implemented so we'll skip them too. */
-        if (pExpState->pb32->b32_cnt != 0 && (pExpState->pb32->b32_type & ~TYPEINFO) == ENTRYFWD)
+        while (pExpState->pb32->b32_cnt != 0 && (pExpState->pb32->b32_type & ~TYPEINFO) == ENTRYFWD)
         {
             pExpState->iOrdinal += pExpState->pb32->b32_cnt;
             pExpState->pb32 = (struct b32_bundle*)((char*)(pExpState->pb32 + 1) + pExpState->pb32->b32_cnt * 7);
-            continue;
         }
 
@@ -403 +534 @@
                     pExport->ulOffset = pExpState->pe32->e32_variant.e32_callgate.offset;
                     break;
-
                 default:
-                    assert(!"ARG!!!! invalid bundle type!");
+                    kASSERT(!"ARG!!!! invalid bundle type!");
             }
 
@@ -430 +560 @@
 void kFileLX::exportFindClose(kExportEntry *pExport)
 {
-    free(pExport->pv);
+    delete pExport->pv;
     pExport->pv = NULL;
     return;
@@ -443 +573 @@
  * @remark  stub
  */
-BOOL kFileLX::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileLX::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     ulOrdinal = ulOrdinal;
     pExport = pExport;
@@ -458 +588 @@
  * @remark  stub
  */
-BOOL kFileLX::exportLookup(const char *  pszName, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileLX::exportLookup(const char *  pszName, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     pszName = pszName;
     pExport = pExport;
@@ -490 +620 @@
 }
 
-#if 0
-
-/** @cat Get and put page methods. (the first ones are generic) */
-BOOL kFileLX::getPage(char *pachPage, ULONG ulAddress)
+
+/**
+ * Get a code, data or resource page from the file.
+ * @returns 0 on success. kError number on error.
+ * @param   pachPage    Pointer to a buffer of the size of a page which
+ *                      will receive the page data on the specified address.
+ * @param   ulAddress   Page address. This must be page aligned.
+ */
+int     kFileLX::pageGet(char *pachPage, unsigned long ulAddress) const
 {
     int iObj;
 
     for (iObj = 0; iObj < pe32->e32_objcnt; iObj++)
-        if (    paObject[iObj].o32_base > ulAddress
+        if (    paObject[iObj].o32_base <= ulAddress
             &&  paObject[iObj].o32_base + paObject[iObj].o32_size > ulAddress
             )
-            return getPage(pachPage, iObj, ulAddress - paObject[iObj].o32_base);
-
-    return FALSE;
-}
-
-BOOL kFileLX::getPage(char *pachPage, int iObject, int offObject)
-{
-    offObject &= ~(PAGESIZE - 1);
-    if (    iObject >= pe32->e32_objcnt
-        &&  offObject >= paObject[iObject].o32_size
-        )
-        return FALSE;
+            return pageGet(pachPage, iObj, ulAddress - paObject[iObj].o32_base);
+
+    return kError::INVALID_ADDRESS;
+}
+
+/**
+ * Get a code, data or resource page from the file.
+ * @returns 0 on success. kError number on error.
+ * @param   pachPage    Pointer to a buffer of the size of a page which
+ *                      will receive the page data on the specified address.
+ * @param   iSegment    Segment number.  (0-based)
+ * @param   offObject   Offset into the object. This must be page aligned.
+ * @remark  Object = Section.
+ */
+int     kFileLX::pageGet(char *pachPage, int iSegment, int offObject) const
+{
+    /*
+     * Validation.
+     */
+    if (offObject & (pe32->e32_pagesize - 1))
+        return kError::BAD_ALIGNMENT;
+    if (iSegment >= pe32->e32_objcnt)
+        return kError::INVALID_SEGMENT_NUMBER;
+    if (offObject >= paObject[iSegment].o32_size)
+        return kError::INVALID_OFFSET;
 
     /*
      * Is there a pagemap entry for the requested page?
      */
-    if ((offObject >> PAGESHIFT) < paObject[iObject].o32_mapsize)
+    if ((offObject / pe32->e32_pagesize) < paObject[iSegment].o32_mapsize)
     {   /* yes */
-        int     iPage = (offObject >> PAGESIZE) + paObject[iObject].o32_pagemap - 1;
+        int     iPage = (offObject / pe32->e32_pagesize) + paObject[iSegment].o32_pagemap - 1;
         char *  pchPageData = (char*)((paMap[iPage].o32_pagedataoffset << pe32->e32_pageshift) + pe32->e32_datapage + (char*)pvBase);
 
-        if (pchPageData )
+        switch (paMap[iPage].o32_pageflags)
         {
+            case VALID:
+                memcpy(pachPage, pchPageData, paMap[iPage].o32_pagesize);
+                if (paMap[iPage].o32_pagesize < pe32->e32_pagesize)
+                    memset(pachPage + paMap[iPage].o32_pagesize, 0, pe32->e32_pagesize - paMap[iPage].o32_pagesize);
+                break;
+
+            case ITERDATA:
+            {
+                char achTempBuffer[0x1004];
+                memcpy(achTempBuffer, pchPageData, paMap[iPage].o32_pagesize);
+                memset(achTempBuffer + paMap[iPage].o32_pagesize, 0, 4);
+                return kFileLX::expandPage1(pachPage, pe32->e32_pagesize, achTempBuffer, paMap[iPage].o32_pagesize);
+            }
+
+            case INVALID:
+                return kError::INVALID_PAGE;
+
+            case ZEROED:
+                memset(pachPage, 0, pe32->e32_pagesize);
+                break;
+
+            case ITERDATA2:
+        {
+                char achTempBuffer[0x1004];
+                memcpy(achTempBuffer, pchPageData, paMap[iPage].o32_pagesize);
+                memset(achTempBuffer + paMap[iPage].o32_pagesize, 0, 4);
+                return kFileLX::expandPage2(pachPage, pe32->e32_pagesize, achTempBuffer, paMap[iPage].o32_pagesize);
+            }
+
+            case RANGE:
+            default:
+                return kError::BAD_EXE_FORMAT;
         }
 
     }
     else
-    {   /* no, so it's a zero page */
-        memset(pachPage, 0, PAGESIZE);
-    }
-
-    return FALSE;
-}
-
-BOOL kFileLX::putPage(const char *pachPage, ULONG ulAddress)
-{
-    return FALSE;
-}
-
-BOOL kFileLX::putPage(const char *pachPage, int iObject, int offObject)
-{
-    return FALSE;
-}
-
-BOOL kFileLX::getPageLX(char *pachPage, int iObject, int iPage)
-{
-    return FALSE;
-}
-
-BOOL kFileLX::getPageLX(char *pachPage, int iPage)
-{
-    return FALSE;
-}
-
-BOOL kFileLX::putPageLX(const char *pachPage, int iObject, int iPage)
-{
-    return FALSE;
-}
-
-BOOL kFileLX::putPageLX(const char *pachPage, int iPage)
-{
-    return FALSE;
+    {   /* no, so it's a zerofilled page */
+        memset(pachPage, 0, pe32->e32_pagesize);
+    }
+
+    return 0;
+}
+
+
+/**
+ * Updates or adds a code, data, or resource page to the file.
+ * @returns 0 on success. kError number on error.
+ * @param   pachPage    Pointer to a buffer of the size of a page which
+ *                      holds the page data.
+ * @param   ulAddress   Page address. This must be page aligned.
+ */
+int kFileLX::pagePut(const char *pachPage, unsigned long ulAddress)
+{
+    int iObj;
+
+    for (iObj = 0; iObj < pe32->e32_objcnt; iObj++)
+        if (    paObject[iObj].o32_base <= ulAddress
+            &&  paObject[iObj].o32_base + paObject[iObj].o32_size > ulAddress
+            )
+            return pagePut(pachPage, iObj, ulAddress - paObject[iObj].o32_base);
+
+    return kError::INVALID_ADDRESS;
+}
+
+
+/**
+ * Updates or adds a code, data, or resource page to the file.
+ * @returns 0 on success. kError number on error.
+ * @param   pachPage    Pointer to a buffer of the size of a page which
+ *                      holds the page data.
+ * @param   iSegment    Segment number. (0-based)
+ * @param   offObject   Offset into the object. This must be page aligned.
+ */
+int kFileLX::pagePut(const char *pachPage, int iSegment, int offObject)
+{
+    /*
+     * Validation.
+     */
+    if (offObject & (pe32->e32_pagesize - 1))
+        return kError::BAD_ALIGNMENT;
+    if (iSegment >= pe32->e32_objcnt)
+        return kError::INVALID_SEGMENT_NUMBER;
+    if (offObject >= paObject[iSegment].o32_size)
+        return kError::INVALID_OFFSET;
+
+    /*
+     * Is there a pagemap entry for the page?
+     */
+    if ((offObject / pe32->e32_pagesize) < paObject[iSegment].o32_mapsize)
+    {   /* yes */
+        int         iPage = (offObject / pe32->e32_pagesize) + paObject[iSegment].o32_pagemap - 1;
+        char *      pchPageData = (char*)((paMap[iPage].o32_pagedataoffset << pe32->e32_pageshift) + pe32->e32_datapage + (char*)pvBase);
+        const char *pchPageToWrite = NULL;
+        int         cchPageToWrite = 0;
+        long        offPageToWrite = (paMap[iPage].o32_pagedataoffset << pe32->e32_pageshift) + pe32->e32_datapage;
+
+        switch (paMap[iPage].o32_pageflags)
+        {
+            case VALID:
+                pchPageToWrite = pachPage;
+                cchPageToWrite = 0x1000;
+                if (paMap[iPage].o32_pagesize != 0x1000)
+                {
+                    /*
+                     * Check that everything after pagesize is zero.
+                     */
+                    for (const char *pch = &pachPage[paMap[iPage].o32_pagesize]; pch < &pachPage[0x1000]; pch++)
+                        if (*pch)
+                            return kError::NOT_SUPPORTED;
+                    cchPageToWrite = paMap[iPage].o32_pagesize;
+}
+                break;
+
+            case ITERDATA:
+            case ITERDATA2:
+            {
+                char * pchCompressedPage = (char*)alloca(pe32->e32_pagesize+4);
+
+                /* remove spaces at the end of the page. */
+                int cchPage = pe32->e32_pagesize;
+                while (pachPage[cchPage-1] == '\0')
+                    cchPage--;
+
+                /* call the compression function */
+                if (paMap[iPage].o32_pageflags == ITERDATA)
+                    cchPageToWrite = kFileLX::compressPage1(pchCompressedPage, pachPage, cchPage);
+                else
+                    cchPageToWrite = kFileLX::compressPage2(pchCompressedPage, pachPage, cchPage);
+                //if (cchPageToWrite != paMap[iPage].o32_pagesize)
+                //    printf("compressPageX returned %d (%x)  previous size %d (%x)\n", cchPageToWrite, cchPageToWrite, paMap[iPage].o32_pagesize, paMap[iPage].o32_pagesize);
+                if (cchPageToWrite < 0)
+                    return kError::NOT_SUPPORTED;
+                #if 0
+                int cbLeft = KMIN(2, paMap[iPage].o32_pagesize - cchPageToWrite);
+                if (cbLeft > 0)
+{
+                   memset(&pchCompressedPage[cchPageToWrite], 0, cbLeft);
+                   cchPageToWrite += cbLeft;
+                }
+                #else
+                kASSERT(paMap[iPage].o32_pagesize - cchPageToWrite >= 0);
+                memset(&pchCompressedPage[cchPageToWrite], 0, paMap[iPage].o32_pagesize - cchPageToWrite);
+                cchPageToWrite = paMap[iPage].o32_pagesize;
+                #endif
+                pchPageToWrite = pchCompressedPage;
+                break;
+}
+
+            case ZEROED:
+{
+                /*
+                 * If the passed in page is not a zero page we'll fail.
+                 */
+                for (unsigned long * pul = (unsigned long *)pachPage; (char*)pul < &pachPage[0x1000]; pul++)
+                    if (*pul)
+                        return kError::NOT_SUPPORTED;
+                return 0;
+            }
+
+            case INVALID:
+                return kError::INVALID_PAGE;
+
+            case RANGE:
+            default:
+                return kError::BAD_EXE_FORMAT;
+        }
+
+        /*
+         * Write stuff to file.
+         */
+        pFile->setFailOnErrors();
+        return pFile->writeAt((void*)pchPageToWrite, cchPageToWrite, offPageToWrite);
+    }
+    else
+    {   /*
+         * No, it's a zerofilled page
+         * If the passed in page is not a zero page we'll fail.
+         */
+        for (unsigned long *  pul = (unsigned long *)pachPage; (char*)pul < &pachPage[0x1000]; pul++)
+             if (*pul)
+                 return kError::NOT_SUPPORTED;
+}
+
+    return 0;
+}
+
+
+/**
+ * Get pagesize for the file.
+ * @returns Pagesize in bytes.
+ */
+int kFileLX::pageGetPageSize() const
+{
+    return pe32->e32_pagesize;
 }
 
@@ -569 +872 @@
  * Expands a page compressed with the old exepack method introduced with OS/2 2.0.
  * (/EXEPACK or just /EXEPACK)
- * @returns Successindicator.
- * @param   pachPage        Pointer to output page. size: PAGESIZE
+ * @returns 0 on success. kError error code on error.
+ * @param   pachPage        Pointer to output page. size: cchPage
  *                          Upon successful return this will contain the expanded page data.
+ * @param   cchPage         Page size.
  * @param   pachSrcPage     Pointer to source data. size: cchSrcPage.
  *                          This data should be compressed with EXEPACK:2!
+ * @param   cchSrcPage      Size of compressed data.
  * @sketch  Have no good idea right now.
  * @status  Completely implemented.
@@ -579 +884 @@
  * @remark
  */
-BOOL kFileLX::expandPage1(char *pachPage, const char * pachSrcPage, int cchSrcPage)
+int kFileLX::expandPage1(char *pachPage, int cchPage, const char * pachSrcPage, int cchSrcPage)
 {
     struct LX_Iter *pIter = (struct LX_Iter *)pachSrcPage;
@@ -585 +890 @@
 
     /* Validate size of data. */
-    if (cchSrcPage >= PAGESIZE - 2)
-        return FALSE;
+    if (cchSrcPage >= cchPage - 2)
+        return kError::BAD_ITERPAGE;
 
     /*
      * Expand the page.
      */
-    while (pIter->LX_nIter)
+    while (pIter->LX_nIter && cchSrcPage > 0)
     {
         /* Check if we're out of bound. */
-        if (    pachPage - pachDesPage + pIter->LX_nIter * pIter->LX_nBytes > PAGESIZE
+        if (    pachPage - pachDestPage + pIter->LX_nIter * pIter->LX_nBytes > cchPage
             ||  cchSrcPage <= 0)
-            return FALSE;
+            return kError::BAD_ITERPAGE;
+
+        //if (pIter->LX_nIter == 1)
+        //    printf("get 0x%03x  stored  %3d bytes\n", pachPage - pachDestPage, pIter->LX_nBytes);
+        //else
+        //    printf("get 0x%03x   %3d iterations  %3d bytes\n", pachPage - pachDestPage, pIter->LX_nIter, pIter->LX_nBytes);
 
         if (pIter->LX_nBytes == 1)
         {   /* one databyte */
-            memset(pachPage, &pIter->LX_Iterdata, pIter->LX_nIter);
-            pchPage += pIter->LX_nIter;
-            cchSrcPage -= pIter->LX_nIter + 4;
+            memset(pachPage, pIter->LX_Iterdata, pIter->LX_nIter);
+            pachPage += pIter->LX_nIter;
+            cchSrcPage -= 4 + 1;
             pIter++;
         }
         else
         {
-            for (int i = 0; i < pIter->LX_nIter; i++, pachPage += pIter->LX_nBytes)
+            for (int i = pIter->LX_nIter; i > 0; i--, pachPage += pIter->LX_nBytes)
                 memcpy(pachPage, &pIter->LX_Iterdata, pIter->LX_nBytes);
             cchSrcPage -= 4 + pIter->LX_nBytes;
-            pIter   = (pIter)((char*)pIter 4 + pIter->LX_nBytes);
-        }
-    }
-    return TRUE;
-#if 0
-/* example code */
-    int             off;
-    struct LX_Iter *pIter;
-    char *          pch = pvPage; /* Current position on page */
-
-    off = pe32->e32_datapage + (pObjMap->o32_pagedataoffset << pe32->e32_pageshift);
-    if (pObjMap->o32_pagesize && (off + pObjMap->o32_pagesize - 1) >= cbFile)
-    {
-        fprintf(stderr, "Error: Page resides outside of the file.\n");
-        return 1;
-    }
-    pIter = (struct LX_Iter *)((char*)pvFile + off);
-
-    /* expand page */
-    while (pIter->LX_nIter > 0)
-    {
-        if (pch + (pIter->LX_nBytes * pIter->LX_nIter) > (char*)pvPage + OBJPAGELEN)
-        {
-            fprintf(stderr, "Error: Iterated page expands to more than a page!\n");
-            return 1;
-        }
-
-        if (pIter->LX_nBytes == 1)
-        {
-            memset(pch, pIter->LX_Iterdata, pIter->LX_nIter);
-            pch += pIter->LX_nIter;
-            pIter++;
-        }
-        else
-        {
-            int i;
-            for (i = 0; i < pIter->LX_nIter; i++, pch += pIter->LX_nBytes)
-                memcpy(pch, &pIter->LX_Iterdata, pIter->LX_nBytes);
-            #if 1 /* curious */
-            if (pIter->LX_nBytes > 2) fprintf(stdout, "pIter->LX_nBytes = %\n", pIter->LX_nBytes);
-            #endif
-
-            pIter = (struct LX_Iter*)((char*)pIter + 4 + pIter->LX_nBytes);
-        }
-    }
-
-    return FALSE;
-#endif
-}
+            pIter   = (struct LX_Iter *)((char*)pIter + 4 + pIter->LX_nBytes);
+        }
+        }
+
+    /*
+     * Zero remaining part of the page.
+     */
+    if (pachPage - pachDestPage < cchPage)
+        memset(pachPage, 0, cchPage - (pachPage - pachDestPage));
+
+    return 0;
+    }
 
 
@@ -664 +937 @@
  * Expands a page compressed with the exepack method introduced with OS/2 Warp 3.0.
  * (/EXEPACK:2)
- * @returns Successindicator.
+ * @returns 0 on success. kError error code on error.
  * @param   pachPage        Pointer to output page. size: PAGESIZE
  *                          Upon successful return this will contain the expanded page data.
+ * @param   cchPage         Page size.
  * @param   pachSrcPage     Pointer to source data. size: cchSrcPage.
  *                          This data should be compressed with EXEPACK:2!
+ * @param   cchSrcPage      Size of compressed data.
  * @sketch  Have no good idea right now.
- * @status  Stub.
+ * @status  Completely implemented and tested.
  * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * @remark  tested.
+ */
+int kFileLX::expandPage2(char *pachPage, int cchPage, const char * pachSrcPage, int cchSrcPage)
+{
+    char *          pachDestPage = pachPage; /* Store the pointer for boundrary checking. */
+
+    while (cchSrcPage > 0)
+    {
+        /*
+         * Bit 0 and 1 is the encoding type.
+         */
+        switch (*pachSrcPage & 0x03)
+        {
+            /*
+             *
+             *  0  1  2  3  4  5  6  7
+             *  type  |              |
+             *        ----------------
+             *             cch        <cch bytes of data>
+             *
+             * Bits 2-7 is, if not zero, the length of an uncompressed run
+             *   starting at the following byte.
+             *
+             *  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+             *  type  |              |  |                    | |                     |
+             *        ----------------  ---------------------- -----------------------
+             *             zero                 cch                char to multiply
+             *
+             * If the bits are zero, the following two bytes describes a
+             *   1 byte interation run. First byte is count, second is the byte to copy.
+             *   A count of zero is means end of data, and we simply stops. In that case
+             *   the rest of the data should be zero.
+             */
+            case 0:
+            {
+                if (*pachSrcPage)
+                {
+                    int cch = *pachSrcPage >> 2;
+                    if (cchPage  < cch || cchSrcPage < cch + 1)
+                        return kError::BAD_COMPESSED_PAGE;
+                    memcpy(pachPage, pachSrcPage+1, cch);
+                    pachPage += cch, cchPage -= cch;
+                    pachSrcPage += cch + 1, cchSrcPage -= cch + 1;
+                    break;
+                }
+                if (cchSrcPage < 2)
+                    return kError::BAD_COMPESSED_PAGE;
+                int cch = pachSrcPage[1];
+                if (cch)
+    {
+                    if (cchSrcPage < 3 || cchPage < cch)
+                        return kError::BAD_COMPESSED_PAGE;
+                    memset(pachPage, pachSrcPage[2], cch);
+                    pachPage += cch, cchPage -= cch;
+                    pachSrcPage += 3, cchSrcPage -= 3;
+                    break;
+                }
+                goto endloop;
+    }
+
+
+            /*
+             *  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+             *  type  |  |  |     |  |                       |
+             *        ----  -------  -------------------------
+             *        cch1  cch2 - 3          offset            <cch1 bytes of data>
+             *
+             *  Two bytes layed out as described above, followed by cch1 bytes of data to be copied.
+             *  The cch2(+3) and offset describes an amount of data to be copied from the expanded
+             *    data relative to the current position. The data copied as you would expect it to be.
+             */
+            case 1:
+    {
+                if (cchSrcPage < 2)
+                    return kError::BAD_COMPESSED_PAGE;
+                int off = *(unsigned short*)pachSrcPage >> 7;
+                int cch1 = *pachSrcPage >> 2 & 3;
+                int cch2 = (*pachSrcPage >> 4 & 7) + 3;
+                pachSrcPage += 2, cchSrcPage -= 2;
+                if (cchSrcPage < cch1 || cchPage < cch1 + cch2 || pachPage + cch1 - off < pachDestPage)
+                    return kError::BAD_COMPESSED_PAGE;
+                memcpy(pachPage, pachSrcPage, cch1);
+                pachPage += cch1, cchPage -= cch1;
+                pachSrcPage += cch1, cchSrcPage -= cch1;
+                memcpyb(pachPage, pachPage - off, cch2); //memmove doesn't do a good job here for some stupid reason.
+                pachPage += cch2, cchPage -= cch2;
+                break;
+            }
+
+
+            /*
+             *  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+             *  type  |  |  |                                |
+             *        ----  ----------------------------------
+             *       cch-3              offset
+             *
+             *  Two bytes layed out as described above.
+             *  The cch(+3) and offset describes an amount of data to be copied from the expanded
+             *  data relative to the current position.
+             *
+             *  If offset == 1 the data is not copied as expected, but in the memcpyw manner.
+             */
+            case 2:
+        {
+                if (cchSrcPage < 2)
+                    return kError::BAD_COMPESSED_PAGE;
+                int off = *(unsigned short*)pachSrcPage >> 4;
+                int cch = (*pachSrcPage >> 2 & 3) + 3;
+                pachSrcPage += 2, cchSrcPage -= 2;
+                if (cchPage < cch || pachPage - off < pachDestPage)
+                    return kError::BAD_COMPESSED_PAGE;
+                memcpyw(pachPage, pachPage - off, cch);
+                pachPage += cch, cchPage -= cch;
+                break;
+        }
+
+
+            /*
+             *  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+             *  type  |        |  |              |  |                                |
+             *        ----------  ----------------  ----------------------------------
+             *           cch1           cch2                     offset                <cch1 bytes of data>
+             *
+             *  Three bytes layed out as described above, followed by cch1 bytes of data to be copied.
+             *  The cch2 and offset describes an amount of data to be copied from the expanded
+             *  data relative to the current position.
+             *
+             *  If offset == 1 the data is not copied as expected, but in the memcpyw manner.
+             */
+            case 3:
+        {
+                if (cchSrcPage < 3)
+                    return kError::BAD_COMPESSED_PAGE;
+                int cch1 = *pachSrcPage >> 2 & 0x000f;
+                int cch2 = *(unsigned short*)pachSrcPage >> 6 & 0x003f;
+                int off  = *(unsigned short*)(pachSrcPage+1) >> 4;
+                pachSrcPage += 3, cchSrcPage -= 3;
+                if (cchSrcPage < cch1 || cchPage < cch1 + cch2 || pachPage - off + cch1 < pachDestPage)
+                    return kError::BAD_COMPESSED_PAGE;
+                memcpy(pachPage, pachSrcPage, cch1);
+                pachPage += cch1, cchPage -= cch1;
+                pachSrcPage += cch1, cchSrcPage -= cch1;
+                memcpyw(pachPage, pachPage - off, cch2);
+                pachPage += cch2, cchPage -= cch2;
+                break;
+            }
+        }
+        }
+
+endloop:;
+
+
+    /*
+     * Zero the rest of the page.
+     */
+    if (cchPage > 0)
+        memset(pachPage, 0, cchPage);
+
+    return 0;
+        }
+
+
+/**
+ * This is a special memcpy for expandPage2 which performs a word based copy.
+ * The difference between this, memmove and memcpy is that we'll allways read words.
+ * @param   pch1    Target pointer.
+ * @param   pch2    Source pointer.
+ * @param   cch     size of memory block to copy from pch2 to pch1.
+ * @author  knut st. osmundsen (kosmunds@csc.com)
  * @remark
  */
-BOOL kFileLX::expandPage2(char *pachPage, const char * pachSrcPage, int cchSrcPage)
-{
-    NOREF(pachPage);
-    NOREF(pachSrcPage);
-    NOREF(cchSrcPage);
-    return FALSE;
-}
+inline void memcpyw(char *pch1, const char *pch2, size_t cch)
+{
+    /*
+     * Use memcpy if possible.
+     */
+    if ((pch2 > pch1 ? pch2 - pch1 : pch1 - pch2) >= 4)
+    {
+        memcpy(pch1, pch2, cch);        /* BUGBUG! ASSUMES that memcpy move NO more than 4 bytes at the time! */
+        return;
+    }
+
+    /*
+     * Difference is less than 3 bytes.
+     */
+    if (cch & 1)
+        *pch1++ = *pch2++;
+
+    #if 0 //haven't found anyone yet. (not a big surprize!)
+    /* Looking for a very special case! I wanna see if my theory is right. */
+    if ((pch2 > pch1 ? pch2 - pch1 : pch1 - pch2) <= 1)
+        INT3();
+#endif
+
+    for (cch >>= 1; cch > 0; cch--, pch1 += 2, pch2 += 2)
+        *(unsigned short *)pch1 = *(unsigned short *)pch2;
+}
+
+
+/**
+ * This is a special memcpy for expandPage2 which performs a memmove operation.
+ * The difference between this and memmove is that this one works.
+ *
+ * @param   pch1    Target pointer.
+ * @param   pch2    Source pointer.
+ * @param   cch     size of memory block to copy from pch2 to pch1.
+ * @author  knut st. osmundsen (kosmunds@csc.com)
+ */
+inline void memcpyb(char *pch1, const char *pch2, size_t cch)
+{
+    /*
+     * Use memcpy if possible.
+ */
+    if ((pch2 > pch1 ? pch2 - pch1 : pch1 - pch2) >= 4)
+{
+        memcpy(pch1, pch2, cch);        /* BUGBUG! ASSUMES that memcpy move NO more than 4 bytes at the time! */
+        return;
+    }
+
+    /*
+     * Difference is less than 3 bytes.
+     */
+    while(cch--)
+        *pch1++ = *pch2++;
+}
+
 
 
@@ -689 +1181 @@
  *          PAGESIZE if failed to compress the page.
  *          -1 on error.
- * @param   pachPage        Pointer to output buffer. size: PAGESIZE.
+ * @param   pachPage        Pointer to output buffer. size: cchSrcPage.
  *                          This will hold the compressed page data upon return.
- * @param   pachSrcPage     Pointer to page to compress. size: PAGESIZE.
+ * @param   pachSrcPage     Pointer to page to compress. size: cchSrcPage.
+ * @param   cchSrcPage      Page size.
  * @sketch
  * @status  stub.
@@ -697 +1190 @@
  * @remark  Not implemented.
  */
-int kFileLX::compressPage1(char *pachPage, const char * pachSrcPage)
-{
-    NOREF(pachPage);
-    NOREF(pachSrcPage);
+
+int compressPage1Search(const char *pch, const char **ppchSearch, const char *pchEnd, int *pcIterations)
+{
+    int         cch;
+    const char* pchStart = pch;
+    const char* pchSearch = *ppchSearch;
+
+//    if (pch < pchSearch)
+//        pch = pchSearch - 1;
+    while ((cch = pchSearch - pch) > 0)
+{
+        int cchLeft = pchEnd - pchSearch;
+        if (cchLeft < cch)
+            {pch++; continue;}
+        int cIter = 1;
+        const char *pchMatch = pchSearch;
+        while (pchMatch < pchEnd && !memcmp(pchMatch, pch, cch))
+            pchMatch += cch, cIter++;
+
+        int cchCost = pchStart < pch ? cch + 8 : cch + 4;
+        if (cIter == 1 || cIter * cch < cchCost)
+            {pch++; continue;}
+        *ppchSearch = pch;
+        *pcIterations = cIter;
+        return cch;
+    }
+
     return -1;
 }
+
+int compressPage1SearchStored(const char *pchStart, const char *pchEnd, int *pcchRun)
+{
+    if (pchStart+1 == pchEnd)
+        return FALSE;
+
+    const char *pch = pchStart;
+    char ch = *pch++;
+    while (pch < pchEnd)
+        if (*pch++ != ch)
+            break;
+
+    if (pch == pchEnd)
+    {
+        *pcchRun = 1;
+        return TRUE;
+    }
+
+    int cch = pchEnd - pchStart;
+    if (cch < 4 && cch % 2 != 0)
+        return FALSE;
+
+    unsigned short* pus = (unsigned short*)pchStart;
+    unsigned short  us = *pus++;
+    while ((const char*)pus < pchEnd)
+        if (*pus++ != us)
+            return 0;
+
+    *pcchRun = 2;
+    return TRUE;
+}
+
+
+int kFileLX::compressPage1(char *pachPage, const char * pachSrcPage, int cchSrcPage)
+{
+    union
+    {
+        char           *  pch;
+        unsigned short *  push;
+        struct LX_Iter *  pIter;
+    } Dst;
+    Dst.pch = pachPage;
+    const char *pch = pachSrcPage;
+    const char *pchSearch = pch;
+    const char *pchEnd = pch + cchSrcPage;
+    while (pchSearch < pchEnd)
+    {
+        int cIterations;
+        int cchPattern = compressPage1Search(pch, &pchSearch, pchEnd, &cIterations);
+        if (cchPattern > 0)
+        {   /* Found pattern. */
+            /* make uncompressed chunk. */
+            if (pch < pchSearch)
+            {
+                int cchRun;
+                int cch = pchSearch - pch;
+                if (cch < 9 && cch > 1 && compressPage1SearchStored(pch, pchSearch, &cchRun))
+                {
+                    /* make compressed chunk. */
+                    Dst.pIter->LX_nIter = cch / cchRun;
+                    Dst.pIter->LX_nBytes = cchRun;
+                    memcpy(&Dst.pIter->LX_Iterdata, pch, cchPattern);
+                    //printf("put 0x%03x   %3d iterations  %3d bytes\n", pch - pachSrcPage, Dst.pIter->LX_nIter, Dst.pIter->LX_nBytes);
+                    Dst.pch += cchRun + 4;
+                }
+                else
+                {   /* make uncompressed chunk */
+                    Dst.pIter->LX_nIter = 1;
+                    Dst.pIter->LX_nBytes = cch;
+                    memcpy(&Dst.pIter->LX_Iterdata, pch, cch);
+                    //printf("put 0x%03x  stored  %3d bytes\n", pch - pachSrcPage, Dst.pIter->LX_nBytes);
+                    Dst.pch += cch + 4;
+                }
+                pch += cch;
+            }
+
+            /* make compressed chunk. */
+            Dst.pIter->LX_nIter = cIterations;
+            Dst.pIter->LX_nBytes = cchPattern;
+            memcpy(&Dst.pIter->LX_Iterdata, pch, cchPattern);
+            //printf("put 0x%03x   %3d iterations  %3d bytes\n", pch - pachSrcPage, Dst.pIter->LX_nIter, Dst.pIter->LX_nBytes);
+            Dst.pch += cchPattern + 4;
+            pchSearch = pch += cchPattern * cIterations;
+        }
+        else
+        {   /* No pattern - got the next byte in the source page. */
+            pchSearch++;
+        }
+    }
+
+    /* make final uncompressed chunk(s) */
+    if (pch < pchSearch)
+    {
+        int cch = pchSearch - pch;
+        Dst.pIter->LX_nIter = 1;
+        Dst.pIter->LX_nBytes = cch;
+        memcpy(&Dst.pIter->LX_Iterdata, pch, cch);
+        //printf("put 0x%03x  stored  %3d bytes %d\n", pch - pachSrcPage, Dst.pIter->LX_nBytes, cch);
+        Dst.pch += cch + 4;
+        pch += cch;
+    }
+
+
+
+    /* write terminating word - this is really not needed AFAIK, but it makes debugging easier. */
+    //*Dst.push++ = 0;
+    return Dst.pch - pachPage;
+}
+
 
 
@@ -711 +1336 @@
  *          PAGESIZE if failed to compress the page.
  *          -1 on error.
- * @param   pachPage        Pointer to output buffer. size: PAGESIZE.
+ * @param   pachPage        Pointer to output buffer. size: cchSrcPage.
  *                          This will hold the compressed page data upon return.
- * @param   pachSrcPage     Pointer to page to compress. size: PAGESIZE.
+ * @param   pachSrcPage     Pointer to page to compress. size: cchSrcPage.
+ * @param   cchSrcPage      Page size.
  * @sketch  Have no idea!
  * @status  stub.
@@ -719 +1345 @@
  * @remark  Not implemented.
  */
-int kFileLX::compressPage2(char *pachPage, const char * pachSrcPage)
-{
-    NOREF(pachPage);
-    NOREF(pachSrcPage);
+int kFileLX::compressPage2(char *pachPage, const char * pachSrcPage, int cchSrcPage)
+{
+    KNOREF(pachPage);
+    KNOREF(pachSrcPage);
+    KNOREF(cchSrcPage);
     return -1;
 }
 
-#endif
+
+/**
+ * Start a relocation enumeration.
+ * @returns TRUE:   Found relocation.
+ *          FALSE:  No more relocations.
+ * @param   ulSegment   Segment number. Special selector may be specified.
+ * @param   offSegment  Offset into the segment described by ulSegment.
+ * @param   preloc      Pointer to a relocation 'handle' structure.
+ *                      This is used for communicating the relocations in
+ *                      a generic format and for keeping track of the current position.
+ *                      Please, DO NOT change any members of this structure.
+ */
+KBOOL kFileLX::relocFindFirst(unsigned long ulSegment, unsigned long offSegment, kRelocEntry *preloc)
+{
+    if (ulSegment >= kRelocEntry::enmFirstSelector)
+        offSegment = lxSpecialSelectorToObjectOffset(offSegment, &ulSegment);
+
+    if (    lxValidateObjectOffset(ulSegment, offSegment)
+        &&  pe32->e32_frectab != 0
+        &&  pe32->e32_fpagetab != 0
+        )
+    {
+        PLXRELOCSTATE  pState = new LXRELOCSTATE;
+        pState->ulSegment = ulSegment;
+        pState->ulPage = paObject[ulSegment].o32_pagemap - 1;
+        pState->pchFixupRec = pchFixupRecs + paulFixupPageTable[pState->ulPage];
+        pState->usSrcOffIdx = 0;
+        preloc->pv1 = (void*)pState;
+        preloc->fFlags = 0;
+        preloc->Info.Name.pszModule = NULL;
+        preloc->Info.Name.pszName = NULL;
+        return relocFindNext(preloc);
+}
+
+    return FALSE;
+}
+
+
+/**
+ * Start a relocation enumeration.
+ * @returns TRUE:   Found relocation.
+ *          FALSE:  No more relocations.
+ * @param   ulAddress   Address to start from.
+ * @param   preloc      Pointer to a relocation 'handle' structure.
+ *                      This is used for communicating the relocations in
+ *                      a generic format and for keeping track of the current position.
+ *                      Please, DO NOT change any members of this structure.
+ */
+KBOOL kFileLX::relocFindFirst(unsigned long ulAddress, kRelocEntry *preloc)
+{
+    return relocFindFirst(kRelocEntry::enmVASelector, ulAddress, preloc);
+}
+
+
+/**
+ * Get the next relocation.
+ * @returns TRUE:   Found relocation.
+ *          FALSE:  No more relocations.
+ * @param   preloc  Pointer to a relocation 'handle' structure.
+ * @remark  preloc have to be opened by relocFindFirst before calling relocFindNext!
+ */
+KBOOL kFileLX::relocFindNext(kRelocEntry *preloc)
+{
+    PLXRELOCSTATE   pState = (PLXRELOCSTATE)preloc->pv1;
+    int             iObj = pState->ulSegment;
+    KBOOL           fFound = FALSE;
+
+    while (iObj < pe32->e32_objcnt)
+    {
+        int iPage = pState->ulPage;
+
+        while (iPage < paObject[iObj].o32_mapsize + paObject[iObj].o32_pagemap - 1)
+        {
+            char *  pchFixupRecEnd = pchFixupRecs + paulFixupPageTable[iPage + 1];
+
+            while (pState->pchFixupRec < pchFixupRecEnd)
+            {
+                char *  pch;            /* Fixup record walker. */
+                union _rel
+                {
+                    unsigned long   ul;
+                    char *          pch;
+                    struct r32_rlc *prlc;
+                } rel;                  /* Fixup record */
+
+                /*
+                 * If we're completed here we'll simply return.
+                 */
+                if (fFound)
+                    return TRUE;
+
+
+                /*
+                 * Do some init and cleanup.
+                 */
+                rel.pch = pState->pchFixupRec;
+                if (preloc->isName())
+                {
+                    delete (void*)preloc->Info.Name.pszModule;
+                    delete (void*)preloc->Info.Name.pszName;
+                    preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
+                }
+
+
+                /*
+                 * We've got a problem! chained relocation records!
+                 */
+                switch (rel.prlc->nr_stype & NRSTYP)
+                {
+                    case NRSBYT:    preloc->fFlags = kRelocEntry::enm8      | kRelocEntry::enmOffset; break;
+                    case NRSSEG:    preloc->fFlags = kRelocEntry::enm16_00  | kRelocEntry::enmOffset; break;
+                    case NRSPTR:    preloc->fFlags = kRelocEntry::enm16_16  | kRelocEntry::enmOffset; break;
+                    case NRSOFF:    preloc->fFlags = kRelocEntry::enm16     | kRelocEntry::enmOffset; break;
+                    case NRPTR48:   preloc->fFlags = kRelocEntry::enm16_32  | kRelocEntry::enmOffset; break;
+                    case NROFF32:   preloc->fFlags = kRelocEntry::enm32     | kRelocEntry::enmOffset; break;
+                    case NRSOFF32:  preloc->fFlags = kRelocEntry::enm32     | kRelocEntry::enmRelEnd; break;
+                    default:
+                        kASSERT(FALSE);
+                        return FALSE;
+                }
+
+                /* Set endian flag. */
+                if (pe32->e32_border == E32LEBO && pe32->e32_border == E32LEWO)
+                    preloc->fFlags |= kRelocEntry::enmLittleEndian;
+                else if (pe32->e32_border == E32BEBO && pe32->e32_border == E32BEWO)
+                    preloc->fFlags |= kRelocEntry::enmBigEndian;
+                else
+                {
+                    kASSERT(FALSE);
+                    return FALSE;
+                }
+
+
+                /*
+                 * LX target type.
+                 */
+                pch = rel.pch + 3 + (rel.prlc->nr_stype & NRCHAIN ? 0 : 1); /* place pch at the 4th member. */
+                switch (rel.prlc->nr_flags & NRRTYP)
+                {
+                    case NRRINT:
+                        preloc->fFlags |= kRelocEntry::enmInternal;
+                        if (rel.prlc->nr_flags & NR16OBJMOD)
+                        {
+                            preloc->Info.Internal.ulSegment = *(unsigned short *)pch - 1;
+                            pch += 2;
+                        }
+                        else
+                        {
+                            preloc->Info.Internal.ulSegment = *(unsigned char *)pch - 1;
+                            pch += 1;
+                        }
+                        if (rel.prlc->nr_flags & NR32BITOFF)
+                        {
+                            preloc->Info.Internal.offSegment = *(unsigned long *)pch;
+                            pch += 4;
+                        }
+                        else
+                        {
+                            preloc->Info.Internal.offSegment = *(unsigned short *)pch;
+                            pch += 2;
+                        }
+                        break;
+
+                    case NRRORD:
+                        preloc->fFlags |= kRelocEntry::enmOrdDLL;
+                        if (rel.prlc->nr_flags & NR16OBJMOD)
+                        {
+                            preloc->Info.Name.pszModule = lxGetImportModuleName(*(unsigned short *)pch);
+                            pch += 2;
+                        }
+                        else
+                        {
+                            preloc->Info.Name.pszModule = lxGetImportModuleName(*(unsigned char *)pch);
+                            pch += 1;
+                        }
+                        if (rel.prlc->nr_flags & NR32BITOFF)
+                        {
+                            sprintf(preloc->Info.Name.pszName = new char[16], "#%lu", *(unsigned long *)pch);
+                            preloc->Info.Name.ulOrdinal = (unsigned)*(unsigned long *)pch;
+                            pch += 4;
+                        }
+                        else if (rel.prlc->nr_flags & NR8BITORD)
+                        {
+                            sprintf(preloc->Info.Name.pszName = new char[8], "#%u", (unsigned)*(unsigned char *)pch);
+                            preloc->Info.Name.ulOrdinal = (unsigned)*(unsigned char *)pch;
+                            pch += 1;
+                        }
+                        else
+                        {
+                            sprintf(preloc->Info.Name.pszName = new char[12], "#%u", (unsigned)*(unsigned short *)pch);
+                            preloc->Info.Name.ulOrdinal = (unsigned)*(unsigned short *)pch;
+                            pch += 2;
+                        }
+                        break;
+
+                    case NRRNAM:
+                        preloc->fFlags |= kRelocEntry::enmNameDLL;
+                        if (rel.prlc->nr_flags & NR16OBJMOD)
+                        {
+                            preloc->Info.Name.pszModule = lxGetImportModuleName(*(unsigned short *)pch);
+                            pch += 2;
+                        }
+                        else
+                        {
+                            preloc->Info.Name.pszModule = lxGetImportModuleName(*(unsigned char *)pch);
+                            pch += 1;
+                        }
+                        preloc->Info.Name.ulOrdinal = ~0UL;;
+                        if (rel.prlc->nr_flags & NR32BITOFF)
+                        {
+                            preloc->Info.Name.pszName = lxGetImportProcName(*(unsigned long *)pch);
+                            pch += 4;
+                        }
+                        else
+                        {
+                            preloc->Info.Name.pszName = lxGetImportProcName(*(unsigned short *)pch);
+                            pch += 2;
+                        }
+                        break;
+
+                    case NRRENT:
+                        preloc->fFlags |= kRelocEntry::enmInternal;
+                        kASSERT(!"Not Implemented");
+                        return FALSE;
+                }
+
+                /* addiative fixup? */
+                if (rel.prlc->nr_flags & NRADD)
+                {
+                    preloc->fFlags |= kRelocEntry::enmAdditive;
+                    if (rel.prlc->nr_flags & NR32BITADD)
+                    {
+                        preloc->ulAdd = *(unsigned long *)pch;
+                        pch += 4;
+                    }
+                    else
+                    {
+                        preloc->ulAdd = *(unsigned short *)pch;
+                        pch += 2;
+                    }
+                }
+
+                /*
+                 * obj:offset of the fixup
+                 * If the offset is negative we'll skip it (ie. not set the found flag).
+                 */
+                preloc->ulSegment = iObj;
+                preloc->offSegment = (iPage - paObject[iObj].o32_pagemap + 1) * pe32->e32_pagesize;
+                if (rel.prlc->nr_stype & NRCHAIN)
+                {
+                    while (pState->usSrcOffIdx < (unsigned char)rel.prlc->r32_soff)
+                    {
+                        if (!(((unsigned short *)pch)[pState->usSrcOffIdx] & 0x8000))
+                        {
+                            preloc->offSegment += ((unsigned short*)pch)[pState->usSrcOffIdx];
+                            fFound = TRUE;
+                            break;
+                        }
+                        pState->usSrcOffIdx++;
+                    }
+                }
+                else
+                {
+                    preloc->offSegment += rel.prlc->r32_soff;
+                    if (!(rel.prlc->r32_soff & 0x8000))
+                        fFound = TRUE;
+                }
+
+
+                /*
+                 * Go to the next relocation.
+                 */
+                if (rel.prlc->nr_stype & NRCHAIN)
+                {
+                    if (++pState->usSrcOffIdx >= (unsigned char)rel.prlc->r32_soff)
+                    {
+                        pState->pchFixupRec = pState->pchFixupRec + (KSIZE)pch - rel.ul + ((unsigned char)rel.prlc->r32_soff) * 2;
+                        pState->usSrcOffIdx = 0;
+                    }
+                }
+                else
+                    pState->pchFixupRec = pState->pchFixupRec + (KSIZE)pch - rel.ul;
+            }
+
+
+            /* next page */
+            pState->ulPage = ++iPage;
+            pState->pchFixupRec = pchFixupRecEnd;
+            pState->usSrcOffIdx = 0;            /* Source Offset Index */
+        }
+
+
+        /* next object */
+        pState->ulSegment = ++iObj;
+        if (iObj >= pe32->e32_objcnt)
+            break;
+        pState->ulPage = paObject[iObj].o32_pagemap - 1;
+        pState->pchFixupRec = pchFixupRecs + paulFixupPageTable[pState->ulPage];
+        pState->usSrcOffIdx = 0;                /* Source Offset Index */
+    }
+
+    return fFound;
+}
+
+
+/**
+ * Closes a relocatation search/enumeration.
+ * Will free any internally allocated resources.
+ *
+ * @param   preloc  The enumeration 'handel'.
+ * @remark  This function *must* be called to close a search/enumeration.
+ */
+void kFileLX::relocFindClose(kRelocEntry *preloc)
+{
+    /* free name storage */
+    if (preloc->isName())
+    {
+        delete (void*)preloc->Info.Name.pszModule;
+        delete (void*)preloc->Info.Name.pszName;
+        preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
+    }
+
+    /* free state info */
+    memset(preloc->pv1, 0xff, sizeof(LXRELOCSTATE));
+    delete preloc->pv1;
+    preloc->pv1 = (void*)0xdeadbeef;
+}
+
+
+

trunk/tools/common/kFileLX.h

@@ -1 @@
-/* $Id: kFileLX.h,v 1.5 2001-04-17 00:26:11 bird Exp $
+/* $Id: kFileLX.h,v 1.6 2002-02-24 02:47:26 bird Exp $
  *
  * kFileLX - Linear Executable file reader.
@@ -12 +12 @@
 #define _kFileLX_h_
 
+struct e32_exe;
+struct o32_obj;
+struct o32_map;
 
 
-
-class kFileLX : public kFileFormatBase, public kExecutableI /*, public kPageI*/
+class kFileLX : public kFileFormatBase, public kExecutableI, public kPageI, public kRelocI
 {
-protected:
-    PVOID               pvBase;         /* Pointer to filemapping. */
-    ULONG               cbFile;         /* Size of filemapping. */
-    ULONG               offLXHdr;       /* Offset of the LX header. */
-    struct e32_exe *    pe32;           /* Pointer to the exe header within the filemapping. */
-    struct o32_obj *    paObject;       /* Pointer to the objecttable. */
-    struct o32_map *    paMap;          /* Pointer to page map table. */
-
-    BOOL                queryExportName(int iOrdinal, char *pszBuffer);
-
 public:
-    kFileLX(const char *pszFilename) throw (int);
-    kFileLX(kFile *pFile) throw (int);
+    kFileLX(const char *pszFilename) throw (kError);
+    kFileLX(kFile *pFile) throw (kError);
     ~kFileLX();
 
     /** @cat Module information methods. */
-    BOOL        moduleGetName(char *pszBuffer, int cchSize = 260);
+    KBOOL               moduleGetName(char *pszBuffer, int cchSize = 260);
 
-    /** @cat Export enumeration methods. */
-    BOOL        exportFindFirst(kExportEntry *pExport);
-    BOOL        exportFindNext(kExportEntry *pExport);
-    void        exportFindClose(kExportEntry *pExport);
-
-    /** @cat Export Lookup methods */
-    BOOL        exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
-    BOOL        exportLookup(const char *  pszName, kExportEntry *pExport);
-
-    virtual BOOL        isLx() const {return TRUE;};
+    /** @cat Misc */
+    virtual KBOOL       isLx() const {return TRUE;};
 
     struct o32_obj *    getObject(int iObject);
     int                 getObjectCount();
 
-#if 0
-    /** @cat Get and put page methods. (the first ones are generic) */
-    BOOL                getPage(char *pachPage, ULONG ulAddress);
-    BOOL                getPage(char *pachPage, int iObject, int offObject);
-    BOOL                putPage(const char *pachPage, ULONG ulAddress);
-    BOOL                putPage(const char *pachPage, int iObject, int offObject);
+    /** @cat Export enumeration methods. */
+    KBOOL               exportFindFirst(kExportEntry *pExport);
+    KBOOL               exportFindNext(kExportEntry *pExport);
+    void                exportFindClose(kExportEntry *pExport);
 
-    BOOL                getPageLX(char *pachPage, int iObject, int iPage);
-    BOOL                getPageLX(char *pachPage, int iPage);
-    BOOL                putPageLX(const char *pachPage, int iObject, int iPage);
-    BOOL                putPageLX(const char *pachPage, int iPage);
+    /** @cat Export Lookup methods */
+    KBOOL               exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
+    KBOOL               exportLookup(const char *  pszName, kExportEntry *pExport);
+
+    /** @cat Get and put page methods. */
+    int                 pageGet(char *pachPage, unsigned long ulAddress) const;
+    int                 pageGet(char *pachPage, int iObject, int offObject) const;
+    int                 pagePut(const char *pachPage, unsigned long ulAddress);
+    int                 pagePut(const char *pachPage, int iObject, int offObject);
+    int                 pageGetPageSize() const;
 
     /** @cat Compression and expansion methods compatible with exepack:1 and exepack:2. */
-    static BOOL         expandPage1(char *pachPage, const char * pachSrcPage, int cchSrcPage);
-    static BOOL         expandPage2(char *pachPage, const char * pachSrcPage, int cchSrcPage);
-    static int          compressPage1(char *pachPage, const char * pachSrcPage);
-    static int          compressPage2(char *pachPage, const char * pachSrcPage);
+    static int          expandPage1(char *pachPage, int cchPage, const char * pachSrcPage, int cchSrcPage);
+    static int          expandPage2(char *pachPage, int cchPage, const char * pachSrcPage, int cchSrcPage);
+    static int          compressPage1(char *pachPage, const char * pachSrcPage, int cchSrcPage);
+    static int          compressPage2(char *pachPage, const char * pachSrcPage, int cchSrcPage);
+
+    /** @cat Relocation methods */
+    KBOOL               relocFindFirst(unsigned long iSegment, unsigned long offObject, kRelocEntry *preloc);
+    KBOOL               relocFindFirst(unsigned long ulAddress, kRelocEntry *preloc);
+    KBOOL               relocFindNext(kRelocEntry *preloc);
+    void                relocFindClose(kRelocEntry *preloc);
+
+
+protected:
+    /** @cat Internal data */
+    void *              pvBase;         /* Pointer to filemapping. */
+    unsigned long       cbFile;         /* Size of filemapping. */
+    unsigned long       offLXHdr;       /* Offset of the LX header. */
+    struct e32_exe *    pe32;           /* Pointer to the exe header within the filemapping. */
+    struct o32_obj *    paObject;       /* Pointer to the objecttable. */
+    struct o32_map *    paMap;          /* Pointer to page map table. */
+    unsigned long   *   paulFixupPageTable; /* Pointer to the fixup page table. */
+    char *              pchFixupRecs;   /* Pointer to the fixup record table. */
+
+    /** @cat Export and Module information worker. */
+    KBOOL               queryExportName(int iOrdinal, char *pszBuffer);
+
+    /** @cat Get and put page workers. */
+    /*
+    int                 pageGetLX(char *pachPage, int iObject, int iPage) const;
+    int                 pageGetLX(char *pachPage, int iPage) const;
+    int                 pagePutLX(const char *pachPage, int iObject, int iPage);
+    int                 pagePutLX(const char *pachPage, int iPage);
+    */
+
+    /** @cat Address mapping helpers. */
+    unsigned long       lxAddressToObjectOffset(unsigned long ulAddress, unsigned long * pulObject) const;
+    unsigned long       lxSpecialSelectorToObjectOffset(unsigned long offObject, unsigned long * pulObject) const;
+    KBOOL               lxValidateObjectOffset(unsigned long ulObject, unsigned long offOffset) const;
+    KBOOL               lxValidateAddress(unsigned long ulAddress) const;
+
+    /** @cat Import Helpers */
+    char *              lxGetImportModuleName(unsigned long ordModule) const;
+    char *              lxGetImportProcName(unsigned long offProc) const;
+};
+
 #endif
-};
-#endif

trunk/tools/common/kFilePE.cpp

@@ -1 @@
-/*
+/* $Id: kFilePE.cpp,v 1.5 2002-02-24 02:47:26 bird Exp $
+ *
  * kFilePE - PE files.
  *
@@ -6 +7 @@
  */
 
-/*******************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
-/* emx fixups */
-#ifdef __EMX__
-    #define __stdcall
-     #define max(a,b) (((a) > (b)) ? (a) : (b))
-     #define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
 /******************************************************************************
 *   Header Files                                                              *
 ******************************************************************************/
-#ifdef __EMX__
-#define INT INT_
-#define PCHAR PCHAR_
-#endif
-#include <os2.h>
-#ifdef __EMX__
-#undef PCHAR
-#undef INT
-#endif
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
-#include <assert.h>
-#include <peexe.h>
+
+#include "MZexe.h"
+#include "PEexe.h"
+
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
-#include "kFilePe.h"
+#include "kFileInterfaces.h"
+#include "kFilePE.h"
+
 
 /*******************************************************************************
@@ -46 +30 @@
 #endif
 
+
 /**
  * Constructs a kFilePE object for a file.
  * @param     pFile     File to create object from.
- * @remark    throws errorcode (TODO: errorhandling.)
- */
-kFilePE::kFilePE(kFile *pFile) throw(int) : pvBase(NULL),
+ * @remark    throws errorcode
+ */
+kFilePE::kFilePE(kFile *pFile) :
+    kFileFormatBase(pFile),
+    pvBase(NULL),
     pDosHdr(NULL), pFileHdr(NULL), pOptHdr(NULL), paDataDir(NULL), paSectionHdr(NULL),
     pExportDir(NULL),
@@ -67 +54 @@
 {
     IMAGE_DOS_HEADER doshdr;
-
-    /* read dos-header - assumes there is one */
-    if (   pFile->readAt(&doshdr, sizeof(doshdr), 0)
-        && doshdr.e_magic == IMAGE_DOS_SIGNATURE
-        && doshdr.e_lfanew > sizeof(doshdr)
-        )
-    {
-        IMAGE_NT_HEADERS pehdr;
-
-        /* read pe headers */
-        if (   pFile->readAt(&pehdr, sizeof(pehdr), doshdr.e_lfanew)
-            && pehdr.Signature == IMAGE_NT_SIGNATURE
-            && pehdr.FileHeader.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER)
-            && pehdr.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR_MAGIC)
-        {
+    long                offPEHdr = 0;
+    IMAGE_NT_HEADERS pehdr;
+
+    /* read dos-header (If tehre is one) */
+    pFile->setThrowOnErrors();
+    pFile->readAt(&doshdr, sizeof(doshdr), 0);
+    if (doshdr.e_magic == IMAGE_DOS_SIGNATURE)
+    {
+        if (doshdr.e_lfanew <= sizeof(doshdr))
+            throw(kError(kError::INVALID_EXE_SIGNATURE));
+        offPEHdr = doshdr.e_lfanew;
+    }
+
+    /* read pe headers and do minor verifications */
+    pFile->readAt(&pehdr, sizeof(pehdr), offPEHdr);
+    if (pehdr.Signature != IMAGE_NT_SIGNATURE)
+        throw(kError(kError::INVALID_EXE_SIGNATURE));
+    if (   pehdr.FileHeader.SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER)
+        || pehdr.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC)
+        throw(kError(kError::BAD_EXE_FORMAT));
+
             /* create mapping */
-            pvBase = calloc((size_t)pehdr.OptionalHeader.SizeOfImage, 1);
-            if (pvBase != NULL)
-            {
+   pvBase = new char [pehdr.OptionalHeader.SizeOfImage];
+   if (pvBase == NULL)
+       throw(kError(kError::NOT_ENOUGH_MEMORY));
+   memset(pvBase, 0, pehdr.OptionalHeader.SizeOfImage);
+
                 /*
                 printf("%ld\n", pehdr.OptionalHeader.SizeOfHeaders);
                 printf("%ld\n", sizeof(IMAGE_NT_HEADERS) + sizeof(IMAGE_SECTION_HEADER) * pehdr.FileHeader.NumberOfSections);
-                assert(pehdr.OptionalHeader.SizeOfHeaders ==
+   kASSERT(pehdr.OptionalHeader.SizeOfHeaders ==
                        sizeof(IMAGE_NT_HEADERS) + sizeof(IMAGE_SECTION_HEADER) * pehdr.FileHeader.NumberOfSections);
                 */
-                if (pFile->readAt(pvBase, pehdr.OptionalHeader.SizeOfHeaders, 0))
+   try
                 {
+       /* read optional header */
+       pFile->readAt(pvBase, pehdr.OptionalHeader.SizeOfHeaders, 0);
+
                     /* read sections */
                     for (int i = 0; i < pehdr.FileHeader.NumberOfSections; i++)
                     {
-                        ULONG  cbSection;
+           unsigned long  cbSection;
                         PIMAGE_SECTION_HEADER pSectionHdr =
                         #if 0
-                            IMAGE_FIRST_SECTION(((ULONG)pvBase + ((PIMAGE_DOS_HEADER)pvBase)->e_lfanew));
+               IMAGE_FIRST_SECTION(((unsigned long)pvBase + ((PIMAGE_DOS_HEADER)pvBase)->e_lfanew));
                         #else
-                            (PIMAGE_SECTION_HEADER) ( (ULONG)pvBase + doshdr.e_lfanew + sizeof(IMAGE_NT_HEADERS) );
+               (PIMAGE_SECTION_HEADER) ( (unsigned long)pvBase + doshdr.e_lfanew + sizeof(IMAGE_NT_HEADERS) );
                         #endif
                         pSectionHdr += i;
 
-                        cbSection = min(pSectionHdr->Misc.VirtualSize, pSectionHdr->SizeOfRawData);
-                        if (    cbSection
-                            &&  !pFile->readAt((char*)pvBase + pSectionHdr->VirtualAddress,
-                                               cbSection,
-                                               pSectionHdr->PointerToRawData)
-                            )
-                        {
-                            /* error */
-                            free(pvBase);
-                            pvBase = NULL;
-                            throw(6);
-                        }
-                    }
+           cbSection = KMIN(pSectionHdr->Misc.VirtualSize, pSectionHdr->SizeOfRawData);
+           if (cbSection)
+               pFile->readAt((char*)pvBase + pSectionHdr->VirtualAddress,
+                             cbSection, pSectionHdr->PointerToRawData);
+       }
 
                     /* set pointers */
@@ -124 +114 @@
                     {
                         pDosHdr = (PIMAGE_DOS_HEADER)pvBase;
-                        pFileHdr = (PIMAGE_FILE_HEADER)((DWORD)pvBase + pDosHdr->e_lfanew + 4);
+           pFileHdr = (PIMAGE_FILE_HEADER)((char*)pvBase + pDosHdr->e_lfanew + 4);
                     }
                     else
-                        pFileHdr = (PIMAGE_FILE_HEADER)((DWORD)pvBase + 4);
+           pFileHdr = (PIMAGE_FILE_HEADER)((char*)pvBase + 4);
 
                     pOptHdr = (PIMAGE_OPTIONAL_HEADER)((int)pFileHdr + sizeof(*pFileHdr));
@@ -142 +132 @@
                         {
                             if (paDataDir[i].VirtualAddress < pOptHdr->SizeOfImage)
-                                ((PULONG)&this->pExportDir)[i] = (int)pvBase + paDataDir[i].VirtualAddress;
-                            #ifdef DEBUG
-                            else
-                                fprintf(stderr, "bad directory pointer %d\n", i);
-                            #endif
+                   ((unsigned long*)&this->pExportDir)[i] = (int)pvBase + paDataDir[i].VirtualAddress;
                         }
                     }
                 }
-                else
-                    throw(4);
-            }
-            else
-                throw(3);
-        }
-        else
-            throw(2);
-    }
-    else
-        throw(1);
+   catch (kError err)
+   {
+       delete(pvBase);
+       pvBase = NULL;
+       throw(err);
+    }
 }
 
@@ -170 +151 @@
 {
     if (pvBase)
-        delete pvBase;
+        delete(pvBase);
 }
 
@@ -180 +161 @@
  * @param   cchBuffer   Size of the buffer (defaults to 260 chars).
  */
-BOOL  kFilePE::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
+KBOOL  kFilePE::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
 {
     if (pExportDir && pExportDir->Name)
@@ -203 +184 @@
  * @remark
  */
-BOOL  kFilePE::exportFindFirst(kExportEntry *pExport)
+KBOOL   kFilePE::exportFindFirst(kExportEntry *pExport)
 {
     if (pExportDir && pExportDir->NumberOfFunctions)
@@ -222 +203 @@
  * @remark
  */
-BOOL  kFilePE::exportFindNext(kExportEntry *pExport)
+KBOOL   kFilePE::exportFindNext(kExportEntry *pExport)
 {
     if (pExportDir && pExportDir->NumberOfFunctions)
@@ -283 +264 @@
  * @remark  stub
  */
-BOOL kFilePE::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFilePE::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     ulOrdinal = ulOrdinal;
     pExport = pExport;
@@ -298 +279 @@
  * @remark  stub
  */
-BOOL kFilePE::exportLookup(const char *  pszName, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFilePE::exportLookup(const char *  pszName, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     pszName = pszName;
     pExport = pExport;
@@ -310 +291 @@
  * Mini dump function.
  */
-BOOL  kFilePE::dump(kFile *pOut)
+KBOOL  kFilePE::dump(kFile *pOut)
 {
     int i,j,k;
@@ -428 +409 @@
             if (pTLSDir[i].AddressOfCallBacks)
             {
-                PULONG  paulIndex;
-                PULONG  paulCallback;
-                ULONG   ulBorlandRVAFix = 0UL;
+                unsigned long * paulIndex;
+                unsigned long * paulCallback;
+                unsigned long   ulBorlandRVAFix = 0UL;
 
                 /* Check if the addresses in the TLSDir is RVAs or real addresses */
@@ -437 +418 @@
 
                 j = 0;
-                paulIndex    = (PULONG)((ULONG)pTLSDir[i].AddressOfIndex - ulBorlandRVAFix + (ULONG)this->pvBase);
-                paulCallback = (PULONG)((ULONG)pTLSDir[i].AddressOfCallBacks - ulBorlandRVAFix + (ULONG)this->pvBase);
+                paulIndex    = (unsigned long *)((unsigned long)pTLSDir[i].AddressOfIndex - ulBorlandRVAFix + (unsigned long)this->pvBase);
+                paulCallback = (unsigned long *)((unsigned long)pTLSDir[i].AddressOfCallBacks - ulBorlandRVAFix + (unsigned long)this->pvBase);
                 if (*paulCallback)
                 {

trunk/tools/common/kFilePE.h

@@ -1 @@
-/* $Id: kFilePE.h,v 1.4 2001-04-17 00:26:11 bird Exp $
+/* $Id: kFilePE.h,v 1.5 2002-02-24 02:47:27 bird Exp $
+ *
  * kFilePE - PE files.
  *
@@ -9 +10 @@
 #define _kFilePE_h_
 
-/*******************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
-
-#if !defined(__WINE_PEEXE_H) && !defined(_WINNT_)
-#if 1
-    #define PIMAGE_DOS_HEADER           void*
-    #define PIMAGE_FILE_HEADER          void*
-    #define PIMAGE_OPTIONAL_HEADER      void*
-    #define PIMAGE_DATA_DIRECTORY       void*
-    #define PIMAGE_SECTION_HEADER       void*
-    #define PIMAGE_EXPORT_DIRECTORY          void*
-    #define PIMAGE_IMPORT_DESCRIPTOR         void*
-    #define PIMAGE_RESOURCE_DIRECTORY        void*
-    #define PIMAGE_BASE_RELOCATION           void*
-    #define PIMAGE_DEBUG_DIRECTORY           void*
-    #define PSZ                              void*
-    #define PULONG                           void*
-    #define PIMAGE_TLS_DIRECTORY             void*
-    #define PIMAGE_LOAD_CONFIG_DIRECTORY     void*
-    #define PIMAGE_IMPORT_DESCRIPTOR         void*
-    #define PIMAGE_THUNK_DATA                void*
-    #define PIMAGE_IMPORT_DESCRIPTOR         void*
-#else
-#include <peexe.h>
-#endif
+#ifndef _peexe_h_
+#define PIMAGE_DOS_HEADER               void *
+#define PIMAGE_FILE_HEADER              void *
+#define PIMAGE_OPTIONAL_HEADER          void *
+#define PIMAGE_DATA_DIRECTORY           void *
+#define PIMAGE_SECTION_HEADER           void *
+#define PIMAGE_EXPORT_DIRECTORY         void *
+#define PIMAGE_IMPORT_DESCRIPTOR        void *
+#define PIMAGE_RESOURCE_DIRECTORY       void *
+#define PIMAGE_BASE_RELOCATION          void *
+#define PIMAGE_DEBUG_DIRECTORY          void *
+#define PIMAGE_TLS_DIRECTORY            void *
+#define PIMAGE_LOAD_CONFIG_DIRECTORY    void *
+#define PIMAGE_IMPORT_DESCRIPTOR        void *
+#define PIMAGE_THUNK_DATA               void *
+#define PIMAGE_IMPORT_DESCRIPTOR        void *
 #endif
 
 
-/*******************************************************************************
-*   Structures and Typedefs                                                    *
-*******************************************************************************/
-
 /**
  * PE (portable executable) files.
- * TODO: error handling.
  * @author      knut st. osmundsen
  */
@@ -50 +36 @@
 {
     private:
-        void                   *pvBase;
+        void *                          pvBase;         /* The file mapping. */
 
-        /* headers */
-        PIMAGE_DOS_HEADER       pDosHdr;
-        PIMAGE_FILE_HEADER      pFileHdr;
-        PIMAGE_OPTIONAL_HEADER  pOptHdr;
-        PIMAGE_DATA_DIRECTORY   paDataDir;
-        PIMAGE_SECTION_HEADER   paSectionHdr;
+        /* headers - pointers within the filemapping. */
+        PIMAGE_DOS_HEADER               pDosHdr;
+        PIMAGE_FILE_HEADER              pFileHdr;
+        PIMAGE_OPTIONAL_HEADER          pOptHdr;
+        PIMAGE_DATA_DIRECTORY           paDataDir;
+        PIMAGE_SECTION_HEADER           paSectionHdr;
 
         /** @cat
@@ -65 +51 @@
         PIMAGE_IMPORT_DESCRIPTOR        pImportDir;     /* 1 */
         PIMAGE_RESOURCE_DIRECTORY       pRsrcDir;       /* 2 */
-        PVOID                           pExcpDir;       /* 3 */
-        PVOID                           pSecDir;        /* 4 */
+        void *                          pExcpDir;       /* 3 */
+        void *                          pSecDir;        /* 4 */
         PIMAGE_BASE_RELOCATION          pBRelocDir;     /* 5 */
         PIMAGE_DEBUG_DIRECTORY          pDebugDir;      /* 6 */
-        PSZ                             pCopyright;     /* 7 */
-        PULONG                          pulGlobalPtr;   /* 8 */  //is this the correct pointer type?
+        char *                          pCopyright;     /* 7 */
+        unsigned long *                 pulGlobalPtr;   /* 8 */  //is this the correct pointer type?
         PIMAGE_TLS_DIRECTORY            pTLSDir;        /* 9 */
         PIMAGE_LOAD_CONFIG_DIRECTORY    pLoadConfigDir; /* 10 */
@@ -76 +62 @@
         PIMAGE_THUNK_DATA               pIATDir;        /* 12 */ //is this the correct pointer type?
         PIMAGE_IMPORT_DESCRIPTOR        pDelayImportDir;/* 13 */
-        PVOID                           pComDir;        /* 14 */
-        PVOID                           pv15;           /* 15 */
+        void *                          pComDir;        /* 14 */
+        void *                          pv15;           /* 15 */
 
     public:
-        kFilePE(kFile *pFile) throw(int);
+        kFilePE(kFile *pFile) throw (kError);
         virtual ~kFilePE();
 
         /** @cat Module information methods. */
-        BOOL        moduleGetName(char *pszBuffer, int cchSize = 260);
+        KBOOL       moduleGetName(char *pszBuffer, int cchSize = 260);
 
         /** @cat Export enumeration methods. */
-        BOOL        exportFindFirst(kExportEntry *pExport);
-        BOOL        exportFindNext(kExportEntry *pExport);
+        KBOOL       exportFindFirst(kExportEntry *pExport);
+        KBOOL       exportFindNext(kExportEntry *pExport);
         void        exportFindClose(kExportEntry *pExport);
 
         /** @cat Export Lookup methods */
-        BOOL        exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
-        BOOL        exportLookup(const char *  pszName, kExportEntry *pExport);
+        KBOOL       exportLookup(unsigned long ulOrdinal, kExportEntry *pExport);
+        KBOOL       exportLookup(const char *  pszName, kExportEntry *pExport);
 
-        BOOL  isPe() const   { return TRUE;}
+        KBOOL       isPe() const    { return TRUE;}
 
-        BOOL  dump(kFile *pOut);
+        KBOOL       dump(kFile *pOut);
 };
 

trunk/tools/common/kFileSDF.cpp

@@ -1 @@
-/* $Id: kFileSDF.cpp,v 1.1 2001-04-17 04:16:03 bird Exp $
+/* $Id: kFileSDF.cpp,v 1.2 2002-02-24 02:47:27 bird Exp $
  *
  * kFileSDF- Structure Defintion File class Implementation.
@@ -18 +18 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
-
 #include <string.h>
-#include <malloc.h>
-
-#include "kInterfaces.h"
+
+#include "kTypes.h"
+#include "kError.h"
+#include "kFileInterfaces.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
@@ -34 +33 @@
 
 
+
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-#if 1
+#if 0
 static kFileSDF tst((kFile*)NULL);
 #endif
@@ -67 +67 @@
  *
  */
-void kFileSDF::parseSDFFile(void *pvFile) throw(int)
+void kFileSDF::parseSDFFile(void *pvFile)
 {
     /*
@@ -75 +75 @@
     if (    pHdr->cStructs >= 0x8000    /* 32k is a reasonable limit. */
         ||  pHdr->cTypes   >= 0x8000)
-        throw(1);
+        throw(kError(kError::SDF_TOO_MANY));
 
     /*
@@ -160 +160 @@
  * @remark  Will throw error codes.
  */
-kFileSDF::kFileSDF(kFile *pFile) throw(int) :
-    papStructs(NULL), pHdr(NULL), paTypes(NULL)
+kFileSDF::kFileSDF(kFile *pFile) :
+    kFileFormatBase(pFile), papStructs(NULL), pHdr(NULL), paTypes(NULL)
 {
     long    cchFile = pFile->getSize();
-    void *  pvFile = pFile->readFile();
+    void *  pvFile = pFile->mapFile();
 
     /*
@@ -197 +197 @@
     catch (int err)
     {
-        free(pvFile);
+        kFile::mapFree(pvFile);
         if (papStructs);
             delete papStructs;
@@ -209 +209 @@
     if (papStructs);
         delete papStructs;
-    free(pHdr);
-}
+    kFile::mapFree(pHdr);
+}
+
+
+
+kDbgTypeEntry * kFileSDF::dbgtypeFindFirst(int flFlags)
+{
+    return NULL;
+}
+
+kDbgTypeEntry * kFileSDF::dbgtypeFindNext(kDbgTypeEntry *kDbgTypeEntry)
+{
+    return NULL;
+}
+
+void            kFileSDF::dbgtypeFindClose(kDbgTypeEntry *kDbgTypeEntry)
+{
+    return;
+}
+
+kDbgTypeEntry * kFileSDF::dbgtypeLookup(const char *pszName, int flFlags)
+{
+    return NULL;
+}
+
+
+
+
+KBOOL kFileSDF::dump(kFile *pOut)
+{
+    return FALSE;
+}
+

trunk/tools/common/kFileSDF.h

@@ -1 @@
-/* $Id: kFileSDF.h,v 1.1 2001-04-17 04:16:03 bird Exp $
+/* $Id: kFileSDF.h,v 1.2 2002-02-24 02:47:27 bird Exp $
  *
  * kFileSDF- Structure Defintion File class declaration.
@@ -68 +68 @@
  * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  */
-class kFileSDF : public kFileFormatBase
+class kFileSDF : public kFileFormatBase, public kDbgTypeI
 {
 private:
@@ -75 +75 @@
     PSDFTYPE    paTypes;
 
-    void        parseSDFFile(void *pvFile) throw(int);
+    void        parseSDFFile(void *pvFile) throw (kError);
     PSDFTYPE    getType(const char *pszType);
     PSDFSTRUCT  getStruct(const char *pszStruct);
 
 public:
-    kFileSDF(kFile *pFile) throw(int);
+    kFileSDF(kFile *pFile) throw (kError);
     ~kFileSDF();
 
-    BOOL        dump(kFile *pOut);
+    /** @cat Debug Type information methods. */
+    kDbgTypeEntry * dbgtypeFindFirst(int flFlags);
+    kDbgTypeEntry * dbgtypeFindNext(kDbgTypeEntry *kDbgTypeEntry);
+    void            dbgtypeFindClose(kDbgTypeEntry *kDbgTypeEntry);
+
+    kDbgTypeEntry * dbgtypeLookup(const char *pszName, int flFlags);
+
+    /** @cat Generic dump */
+    KBOOL       dump(kFile *pOut);
 };
+

trunk/tools/common/kLIFO.cpp

@@ -1 @@
-/* $Id: kLIFO.cpp,v 1.1 1999-09-05 02:09:17 bird Exp $ */
+/* $Id: kLIFO.cpp,v 1.2 2002-02-24 02:47:27 bird Exp $ */
 /*
  * Simple LIFO template class implementation.
@@ -160 +160 @@
  */
 template <class kEntry>
-BOOL kLIFO<kEntry>::isEmpty(void) const
+KBOOL kLIFO<kEntry>::isEmpty(void) const
 {
     return pTop == NULL;
@@ -190 +190 @@
  */
 template <class kEntry>
-BOOL kLIFO<kEntry>::exists(const kEntry *pEntry) const
+KBOOL kLIFO<kEntry>::exists(const kEntry *pEntry) const
 {
     kEntry *pCurrentEntry = pTop;

trunk/tools/common/kLIFO.h

@@ -1 @@
-/* $Id: kLIFO.h,v 1.1 1999-09-05 02:09:17 bird Exp $ */
+/* $Id: kLIFO.h,v 1.2 2002-02-24 02:47:27 bird Exp $ */
 /*
  * Simple LIFO template class.
@@ -33 +33 @@
             virtual void    unwind(kEntry *pToEntry);
             virtual void    popPush(const kEntry *pToEntry, kLIFO<kEntry> &lifoTo);
-            BOOL            isEmpty(void) const;
+            KBOOL           isEmpty(void) const;
 
             virtual kEntry *find(const char *pszKey) const;
-            virtual BOOL    exists(const kEntry *pEntry) const;
+            virtual KBOOL   exists(const kEntry *pEntry) const;
     };
 

trunk/tools/common/kList.cpp

@@ -1 @@
-/* $Id: kList.cpp,v 1.3 2000-08-31 03:00:13 bird Exp $ */
+/* $Id: kList.cpp,v 1.4 2002-02-24 02:47:28 bird Exp $ */
 /*
  * Simple list and sorted list template class.
@@ -49 +49 @@
     }
     #ifdef DEBUG
-        if (cEntries != 0)
-            fprintf(stderr,
-                    "%s(%d, %s)internal processing warning - cEntires was incorrect upon list destruction.",
-                    __FILE__, __LINE__, __FUNCTION__);
+        kASSERT(cEntries == 0);
     #endif
     cEntries = 0;
@@ -195 +192 @@
     }
     #ifdef DEBUG
-        if (cEntries != 0)
-            fprintf(stderr,
-                    "%s(%d, %s)internal processing warning - cEntires was incorrect upon list destruction.",
-                    __FILE__, __LINE__, __FUNCTION__);
+        kASSERT(cEntries == 0);
     #endif
     cEntries = 0;

trunk/tools/common/kList.h

@@ -1 @@
-/* $Id: kList.h,v 1.3 2000-08-31 03:00:13 bird Exp $ */
+/* $Id: kList.h,v 1.4 2002-02-24 02:47:28 bird Exp $ */
 /*
  * Simple list and sorted list template class.
@@ -77 +77 @@
         public:
             #if 0 //MUST BE IMPLEMENTED!
-            virtual BOOL operator==(const k..Entry &entry) const = 0;
-            virtual BOOL operator!=(const k..Entry &entry) const = 0;
-            virtual BOOL operator< (const k..Entry &entry) const = 0;
-            virtual BOOL operator<=(const k..Entry &entry) const = 0;
-            virtual BOOL operator> (const k..Entry &entry) const = 0;
-            virtual BOOL operator>=(const k..Entry &entry) const = 0;
+            virtual KBOOL operator==(const k..Entry &entry) const = 0;
+            virtual KBOOL operator!=(const k..Entry &entry) const = 0;
+            virtual KBOOL operator< (const k..Entry &entry) const = 0;
+            virtual KBOOL operator<=(const k..Entry &entry) const = 0;
+            virtual KBOOL operator> (const k..Entry &entry) const = 0;
+            virtual KBOOL operator>=(const k..Entry &entry) const = 0;
             #endif
     };