Changeset 3546

Timestamp:

Aug 25, 2007, 7:28:50 PM (18 years ago)

Author:

bird

Message:

use .cpp. some string fixes.

Location:

trunk/kStuff

Files:

• include/k/kHlpString.h (modified) (3 diffs)
• include/k/kRdr.h (modified) (4 diffs)
• include/k/kRdrAll.h (modified) (2 diffs)
• kRdr/Makefile.kmk (modified) (1 diff)
• kRdr/kRdr.cpp (moved) (moved from trunk/kStuff/kRdr/kRdr.c )
• kRdr/kRdrFile.cpp (moved) (moved from trunk/kStuff/kRdr/kRdrFile.c ) (14 diffs)

trunk/kStuff/include/k/kHlpString.h

@@ -28 +28 @@
 #define ___k_kHlpString_h___
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#if 0 /* optimize / fix this later */
 #ifdef __GNUC__
 /** memchr */
@@ -65 +62 @@
 # error "Port Me"
 #endif
+#endif /* disabled */
 
 #ifdef __cplusplus
@@ -77 +75 @@
 #endif
 #ifndef kHlpMemCopy
-void   *kHlpMemMopy(void *pv1, const void *pv2, KSIZE cb);
+void   *kHlpMemCopy(void *pv1, const void *pv2, KSIZE cb);
 #endif
 #ifndef kHlpMemMove

trunk/kStuff/include/k/kRdr.h

@@ -31 +31 @@
 #include <k/kTypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /** @defgroup grp_kRdr      kRdr - The File Provider
  * @{ */
@@ -43 +38 @@
 /** Pointer to a file provider instance pointer. */
 typedef struct KRDR **PPKRDR;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int     kRdrOpen(PPKRDR ppRdr, const char *pszFilename);
@@ -56 +55 @@
 KSIZE   kRdrPageSize(PKRDR pRdr);
 #ifndef ___k_kLdr___
-int     kRdrMap(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+int     kRdrMap(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
 int     kRdrRefresh( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-int     kRdrProtect( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+int     kRdrProtect( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
 int     kRdrUnmap(   PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 #endif /* !___k_kLdr___ */
 void    kRdrDone(    PKRDR pRdr);
-
-/** @} */
 
 #ifdef __cplusplus
@@ -69 +66 @@
 #endif
 
+/** @} */
+
 #endif
 

trunk/kStuff/include/k/kRdrAll.h

@@ -67 +67 @@
     int     (* pfnDestroy)( PKRDR pRdr);
     /** @copydoc kRdrRead */
-    int     (* pfnRead)(    PKRDR pRdr, void *pvBuf, size_t cb, KFOFF off);
+    int     (* pfnRead)(    PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off);
     /** @copydoc kRdrAllMap */
     int     (* pfnAllMap)(  PKRDR pRdr, const void **ppvBits);
@@ -83 +83 @@
     KSIZE   (* pfnPageSize)(PKRDR pRdr);
     /** @copydoc kRdrMap */
-    int     (* pfnMap)(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+    int     (* pfnMap)(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
     /** @copydoc kRdrRefresh */
     int     (* pfnRefresh)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
     /** @copydoc kRdrProtect */
-    int     (* pfnProtect)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+    int     (* pfnProtect)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
     /** @copydoc kRdrUnmap */
     int     (* pfnUnmap)(   PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);

trunk/kStuff/kRdr/Makefile.kmk

@@ -36 +36 @@
 kRdrStatic_INCS = ../kLdr
 kRdrStatic_SOURCES = \
-        kRdr.c \
-        kRdrFile.c
+        kRdr.cpp \
+        kRdrFile.cpp
 
 # Generate the rules

trunk/kStuff/kRdr/kRdrFile.cpp

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <k/kDefs.h>
+#include "kRdrInternal.h"
+#include <k/kHlpAlloc.h>
+#include <k/kHlpString.h>
 
 #if K_OS == K_OS_OS2
@@ -154 +156 @@
 #endif
 
-#include "kRdrInternal.h"
-#include <k/kHlpAlloc.h>
-#include <k/kHlpString.h>
-
 
 /*******************************************************************************
@@ -215 +213 @@
 static int      krdrFileUnmap(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 static int      krdrFileGenericUnmap(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments);
-static int      krdrFileProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
-static int      krdrFileGenericProtect(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+static int      krdrFileProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
+static int      krdrFileGenericProtect(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
 static int      krdrFileRefresh(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 static int      krdrFileGenericRefresh(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments);
-static int      krdrFileMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
-static int      krdrFileGenericMap(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+static int      krdrFileMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
+static int      krdrFileGenericMap(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
 static KSIZE   krdrFilePageSize(PKRDR pRdr);
 static const char *krdrFileName(PKRDR pRdr);
@@ -370 +368 @@
 
 /** @copydoc KRDROPS::pfnProtect */
-static int      krdrFileProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect)
+static int      krdrFileProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect)
 {
     PKRDRFILE        pRdrFile = (PKRDRFILE)pRdr;
@@ -390 +388 @@
 
 /** Generic implementation of krdrFileProtect. */
-static int krdrFileGenericProtect(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect)
+static int krdrFileGenericProtect(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect)
 {
     KU32 i;
@@ -401 +399 @@
         int rc;
         void *pv;
-        KLDRPROT enmProt;
+        KPROT enmProt;
 
         if (paSegments[i].RVA == NIL_KLDRADDR)
@@ -407 +405 @@
 
         /* calc new protection. */
-        enmProt = paSegments[i].enmProt;
+        enmProt = (KPROT)paSegments[i].enmProt; /** @todo drop cast */
         if (fUnprotectOrProtect)
         {
             switch (enmProt)
             {
-                case KLDRPROT_NOACCESS:
-                case KLDRPROT_READONLY:
-                case KLDRPROT_READWRITE:
-                case KLDRPROT_WRITECOPY:
-                    enmProt = KLDRPROT_READWRITE;
+                case KPROT_NOACCESS:
+                case KPROT_READONLY:
+                case KPROT_READWRITE:
+                case KPROT_WRITECOPY:
+                    enmProt = KPROT_READWRITE;
                     break;
-                case KLDRPROT_EXECUTE:
-                case KLDRPROT_EXECUTE_READ:
-                case KLDRPROT_EXECUTE_READWRITE:
-                case KLDRPROT_EXECUTE_WRITECOPY:
-                    enmProt = KLDRPROT_EXECUTE_READWRITE;
+                case KPROT_EXECUTE:
+                case KPROT_EXECUTE_READ:
+                case KPROT_EXECUTE_READWRITE:
+                case KPROT_EXECUTE_WRITECOPY:
+                    enmProt = KPROT_EXECUTE_READWRITE;
                     break;
                 default:
@@ -432 +430 @@
         {
             /* copy on write -> normal write. */
-            if (enmProt == KLDRPROT_EXECUTE_WRITECOPY)
-                enmProt = KLDRPROT_EXECUTE_READWRITE;
-            else if (enmProt == KLDRPROT_WRITECOPY)
-                enmProt = KLDRPROT_READWRITE;
+            if (enmProt == KPROT_EXECUTE_WRITECOPY)
+                enmProt = KPROT_EXECUTE_READWRITE;
+            else if (enmProt == KPROT_WRITECOPY)
+                enmProt = KPROT_READWRITE;
         }
 
@@ -523 +521 @@
 
 /** @copydoc KRDROPS::pfnMap */
-static int      krdrFileMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed)
+static int      krdrFileMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed)
 {
     PKRDRFILE       pRdrFile = (PKRDRFILE)pRdr;
@@ -751 +749 @@
 
 /** Generic implementation of krdrFileMap. */
-static int  krdrFileGenericMap(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed)
+static int  krdrFileGenericMap(PKRDR pRdr, PKRDRFILEPREP pPrep, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed)
 {
     int rc;
@@ -759 +757 @@
      * Generic mapping code using kHlpPageAlloc(), kHlpPageFree() and kHlpPageProtect().
      */
-    rc = kHlpPageAlloc(&pPrep->pv, pPrep->cb, KLDRPROT_EXECUTE_READWRITE, fFixed);
+    rc = kHlpPageAlloc(&pPrep->pv, pPrep->cb, KPROT_EXECUTE_READWRITE, fFixed);
     if (rc)
         return rc;
@@ -914 +912 @@
     {
         int rc;
-        KFOFF cb = pRdrFile->Core.pOps->pfnSize(pRdr);
+        KFOFF cbFile = pRdrFile->Core.pOps->pfnSize(pRdr);
+        KSIZE cb = (KSIZE)cbFile;
+        if (cb != cbFile)
+            return ERROR_NOT_ENOUGH_MEMORY;
 
         pRdrFile->pvMapping = kHlpAlloc(cb);
@@ -964 +965 @@
         LONG offLow;
 
-        offHigh = sizeof(KFOFF) == 4 ? 0 : (off >> 32);
+        offHigh = (LONG)(off >> 32);
         offLow = SetFilePointer(pRdrFile->File, (LONG)off, &offHigh, FILE_BEGIN);
         if (    offLow != (LONG)off
-            ||  offHigh != (LONG)(sizeof(KFOFF) == 4 ? 0 : (off >> 32)))
+            ||  offHigh != (LONG)(off >> 32))
         {
             int rc = GetLastError();
@@ -1133 +1134 @@
         return rc;
     }
-    if (sizeof(KFOFF) == 4)
-        cb = High ? 0x7fffffff : Low;
-    else
-        cb = ((KFOFF)High << 32) | Low;
+    cb = ((KFOFF)High << 32) | Low;
 
 #else