Changeset 2886

Timestamp:

Nov 18, 2006, 4:01:05 PM (19 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/kLdr

Files:

• Makefile.kmk (modified) (1 diff)
• kLdr-os2.c (added)
• kLdrA-os2.asm (modified) (1 diff)
• kLdrDyldFind.c (modified) (1 diff)
• kLdrModLX.c (modified) (1 diff)

trunk/kLdr/Makefile.kmk

@@ -115 +115 @@
 kLdr_SOURCES.os2 = \
         kLdr-os2.def \
+        kLdr-os2.c \
         kLdrHlp-gcc.c \
         kLdrA-os2.asm

trunk/kLdr/kLdrA-os2.asm

@@ -32 +32 @@
 ;
 ..start:
-    mov     eax, 1
-    ret
+extern _DLL_InitTerm
+    jmp _DLL_InitTerm
 
 

trunk/kLdr/kLdrDyldFind.c

@@ -754 +754 @@
          * If not empty path, try open the module using it.
          */
-        cchPath = pszEnd - psz - 1;
+        cchPath = pszEnd - psz;
         if (cchPath > 0)
         {

trunk/kLdr/kLdrModLX.c

@@ -187 +187 @@
     if (rc)
         return rc;
-    if (Hdr.e32_magic[0] != E32MAGIC1 || Hdr.e32_magic[0] != E32MAGIC2)
+    if (    Hdr.e32_magic[0] != E32MAGIC1
+        ||  Hdr.e32_magic[1] != E32MAGIC2)
         return KLDR_ERR_UNKNOWN_FORMAT;