Changeset 461 for trunk/src/kernel32/winimage.cpp

Timestamp:

Aug 10, 1999, 12:10:09 AM (26 years ago)

Author:

phaller

Message:

Fix: fixes and updates for ODINCRT support

File:

• trunk/src/kernel32/winimage.cpp (modified) (6 diffs)

trunk/src/kernel32/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.5 1999-07-07 08:11:10 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.6 1999-08-09 22:10:09 phaller Exp $ */
 
 /*
@@ -11 +11 @@
  *
  */
+
 #define INCL_DOSFILEMGR          /* File Manager values      */
 #define INCL_DOSMODULEMGR
@@ -18 +19 @@
 #define INCL_WIN
 #define INCL_BASE
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>             //Odin32 OS/2 api wrappers
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
+#include <odincrt.h>
+
 #include <iostream.h>
 #include <fstream.h>
@@ -138 +143 @@
     DosFreeResource((PVOID)Win32Table);
 
-  while(winres) {
+  while(winres)
+  {
     res    = winres->next;
-    delete winres;
+    ODIN_delete(winres);
     winres = res;
   }
@@ -301 +307 @@
             continue;
         }
-        if(IsImportSection(win32file, &psh[i])) 
+        if(IsImportSection(win32file, &psh[i]))
         {
           int type = SECTION_IMPORT;
@@ -975 +981 @@
     fout << "**********************************************************************" << endl;
     WinDll = Win32Dll::findModule(pszCurModule);
-    if(WinDll == NULL) {//not found, so load it
+    if(WinDll == NULL)
+     {  //not found, so load it
+        ODIN_FS_BEGIN
         WinDll = new Win32Dll(pszCurModule);
+        ODIN_FS_END
 
         if(WinDll == NULL) {