Changeset 21829 for branches

Timestamp:

Nov 29, 2011, 4:12:32 PM (14 years ago)

Author:

dmik

Message:

Return correct EXITLIST order codes for KERNEL32 and ODINCRT.

This is needed for the correct uninitalization order (which is vital).

Location:

branches/gcc-kmk/src

Files:

• kernel32/initterm.cpp (modified) (1 diff)
• odincrt/initterm.cpp (modified) (2 diffs)

branches/gcc-kmk/src/kernel32/initterm.cpp

@@ -84 +84 @@
 
     if (fInit)
-        return 0; // already initialized
+        return EXITLIST_KERNEL32; // already initialized
 
     rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR,

branches/gcc-kmk/src/odincrt/initterm.cpp

@@ -12 +12 @@
 #define  INCL_DOSERRORS
 #include <os2wrap.h> // Odin32 OS/2 api wrappers
+#include <exitlist.h>
 #include <initdll.h>
 
@@ -38 +39 @@
     APIRET rc = DosGetInfoBlocks(&pTIB, &pPIB);
     if (rc != NO_ERROR)
-        return 0UL;
+        return -1;
     pPIB->pib_ultype = 3;
 #endif
 
 #ifdef WITH_KLIB
-        /* cleanup - hacking is done */
-        DosFreeMem(pvReserved);
+    /* cleanup - hacking is done */
+    DosFreeMem(pvReserved);
 #endif
+
+    return EXITLIST_ODINCRT;
 }