Changeset 2883 for trunk/kLdr/kLdrModNative.c

Timestamp:

Nov 18, 2006, 12:21:33 PM (19 years ago)

Author:

bird

Message:

cleanup.

File:

• trunk/kLdr/kLdrModNative.c (modified) (16 diffs)

trunk/kLdr/kLdrModNative.c

@@ -33 +33 @@
 #include "kLdrInternal.h"
 #ifdef __OS2__
+# define INCL_BASE
 # include <os2.h>
 
+# ifndef LIBPATHSTRICT
+#  define LIBPATHSTRICT 3
+# endif
+  extern APIRET DosQueryHeaderInfo(HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbBuffer, ULONG ulSubFunction);
+# define QHINF_EXEINFO       1 /* NE exeinfo. */
+# define QHINF_READRSRCTBL   2 /* Reads from the resource table. */
+# define QHINF_READFILE      3 /* Reads from the executable file. */
+# define QHINF_LIBPATHLENGTH 4 /* Gets the libpath length. */
+# define QHINF_LIBPATH       5 /* Gets the entire libpath. */
+# define QHINF_FIXENTRY      6 /* NE only */
+# define QHINF_STE           7 /* NE only */
+# define QHINF_MAPSEL        8 /* NE only */
+
 #elif defined(__WIN__)
-//# include "kLdrModPE.h"
 # undef IMAGE_NT_SIGNATURE
 # undef IMAGE_DOS_SIGNATURE
@@ -42 +55 @@
 # ifndef IMAGE_SCN_TYPE_NOLOAD
 #  define IMAGE_SCN_TYPE_NOLOAD 0x00000002
-#endif
-
+# endif
 
 /*#elif defined(__NT__)
@@ -162 +174 @@
     HMODULE hmod;
 
-    rc = DosLoadModule(NULL, 0, pszFilename, &hmod);
+    rc = DosLoadModule(NULL, 0, (PCSZ)pszFilename, &hmod);
     if (rc)
         return rc;
@@ -213 +225 @@
 
     /* get the filename. */
-    rc = DosQueryModuleName(hmod, sizeof(szFilename), szFilename);
+    rc = DosQueryModuleName((HMODULE)uHandle, sizeof(szFilename), szFilename);
     if (rc)
     {
@@ -308 +320 @@
      */
 #ifdef __OS2__
-    pModNative->hmod = hmod;
+    pModNative->hmod = (HMODULE)uHandle;
 
     /* just fake a segment for now. */
@@ -514 +526 @@
         rc = DosQueryProcAddr(pModNative->hmod,
                               pszSymbol ? 0 : iSymbol,
-                              pszSymbol,
+                              (PCSZ)pszSymbol,
                               &pfn);
         if (rc)
@@ -525 +537 @@
         rc = DosQueryProcType(pModNative->hmod,
                               pszSymbol ? 0 : iSymbol,
-                              pszSymbol,
+                              (PCSZ)pszSymbol,
                               &ulProcType);
         if (rc)
@@ -567 +579 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return ERROR_NOT_SUPPORTED;
 
@@ -653 +666 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return ERROR_NOT_SUPPORTED;
 
@@ -675 +689 @@
                                       const IMAGE_IMPORT_DESCRIPTOR *);
     pszImportName = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pImpDesc->Name, const char *);
-    cchImportName = strlen(pszImportName);
+    cchImportName = kLdrHlpStrLen(pszImportName);
     if (cchImportName < cchName)
     {
@@ -704 +718 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return -1;
 
@@ -743 +758 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return ERROR_NOT_SUPPORTED;
 
@@ -765 +781 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return ERROR_NOT_SUPPORTED;
 
@@ -789 +806 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return ERROR_NOT_SUPPORTED;
 
@@ -820 +838 @@
             case IMAGE_DEBUG_TYPE_UNKNOWN:
             case IMAGE_DEBUG_TYPE_FPO:
-            case IMAGE_DEBUG_TYPE_COFF: //stabs dialect??
+            case IMAGE_DEBUG_TYPE_COFF: /*stabs dialect??*/
             case IMAGE_DEBUG_TYPE_MISC:
             case IMAGE_DEBUG_TYPE_EXCEPTION:
@@ -863 +881 @@
 
     /** @todo implement export enumeration on OS/2. */
+    (void)pModNative;
     return KLDR_ERR_NO_DEBUG_INFO;