Changeset 2877

Timestamp:

Nov 12, 2006, 1:39:49 PM (19 years ago)

Author:

bird

Message:

Module interpreter for modules loaded by the native loader. (untested)

Location:

trunk/kLdr

Files:

• Makefile.kmk (modified) (1 diff)
• kLdr-win.def (modified) (1 diff)
• kLdr.h (modified) (1 diff)
• kLdrInternal.h (modified) (1 diff)
• kLdrMod.c (modified) (1 diff)
• kLdrModNative.c (added)
• kLdrModPE.c (modified) (3 diffs)

trunk/kLdr/Makefile.kmk

@@ -111 +111 @@
         kLdrMod.c \
         kLdrModLX.c \
-        kLdrModPE.c
+        kLdrModPE.c \
+        kLdrModNative.c
 kLdr_SOURCES.os2 = \
         kLdr-os2.def \

trunk/kLdr/kLdr-win.def

@@ -49 +49 @@
     kLdrModOpenFromRdr
     kLdrModOpenNative
+    kLdrModOpenNativeByHandle
     kLdrModClose
     kLdrModQuerySymbol

trunk/kLdr/kLdr.h

@@ -675 +675 @@
 int     kLdrModOpenFromRdr(PKLDRRDR pRdr, PPKLDRMOD ppMod);
 int     kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod);
+int     kLdrModOpenNativeByHandle(uintptr_t uHandle, PPKLDRMOD ppMod);
 int     kLdrModClose(PKLDRMOD pMod);
 

trunk/kLdr/kLdrInternal.h

@@ -415 +415 @@
  * @{ */
 extern KLDRMODOPS       g_kLdrModPEOps;
+extern KLDRMODOPS       g_kLdrModNativeOps;
 /** @} */
 

trunk/kLdr/kLdrMod.c

@@ -208 +208 @@
 
 /**
- * Open a executable image using the native loader (if any).
- *
- * @returns 0 on success and *ppMod pointing to a module instance.
- *          On failure, a non-zero OS specific error code is returned.
- * @param   pszFilename     The filename to open.
- * @param   ppMod           Where to store the module handle.
- */
-int kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod)
-{
-#ifdef __OS2__
-
-    //DosLoadModule()
-#elif defined(__WIN__)
-
-#else
-# error "Port me"
-#endif
-    return -1;
-}
-
-
-
-/**
  * Closes an open module.
  *

trunk/kLdr/kLdrModPE.c

@@ -40 +40 @@
 /** @def KLDRMODPE_STRICT
  * Define KLDRMODPE_STRICT to enabled strict checks in KLDRMODPE. */
-#define KLDRMOD_STRICT 1
+#define KLDRMODPE_STRICT 1
 
 /** @def KLDRMODPE_ASSERT
@@ -523 +523 @@
     PKLDRMODPE pModPE = (PKLDRMODPE)pMod->pvData;
     int rc = 0;
-    KLDRMODPE_ASSERT(pModPE->fMapped);
+    KLDRMODPE_ASSERT(pModPE->pvMapping);
 
     if (pMod->pRdr)
@@ -741 +741 @@
             {
 #ifdef KLDRMODPE_STRICT /* Make sure the linker and we both did our job right. */
-                for (i = 0; i < pExpDir->NumberOfNames; i++)
+                for (i = 0; i < (int32_t)pExpDir->NumberOfNames; i++)
 
                 {