Changeset 529 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Aug 17, 1999, 6:35:30 PM (26 years ago)

Author:

phaller

Message:

Fix: removed ODINCRT remains

File:

• trunk/src/kernel32/wprocess.cpp (modified) (13 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.18 1999-08-11 22:27:56 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.19 1999-08-17 16:35:11 phaller Exp $ */
 
 /*
@@ -14 +14 @@
 #include <stdlib.h>
 #include <string.h>
-#include <odincrt.h>
 #include <odinwrap.h>
 
@@ -43 +42 @@
 extern "C" ULONG QueryExceptionChain();
 
-
-ODINDEBUGCHANNEL(KERNEL32-WPROCESS)
 
 //******************************************************************************
@@ -211 +208 @@
 {
   if(WinExe != NULL) //should never happen
-    ODIN_delete(WinExe);
+    delete WinExe;
 
 
@@ -223 +220 @@
   Win32Exe *winexe;
 
-  ODIN_FS_BEGIN
   winexe = new Win32Exe(0, NameTableId, Win32TableId);
-  ODIN_FS_END
 
   if(winexe) {
@@ -288 +283 @@
    else {
       //converted win32 dll loaded by OS/2 loader
-      ODIN_FS_BEGIN
       winmod = new Win32Dll(hinstance, NameTableId, Win32TableId, pfnDllEntry);
-      ODIN_FS_END
       if(winmod == NULL) {
             eprintf(("Failed to allocate module object!\n"));
@@ -328 +321 @@
 
   if(WinExe) {
-    ODIN_delete(WinExe);
+    delete WinExe;
     WinExe = NULL;
   }
@@ -400 +393 @@
     }
 
-    ODIN_FS_BEGIN
     module = new Win32Dll((char *)lpszLibFile);
-    ODIN_FS_END
     if(module == NULL)
         return(0);
@@ -409 +400 @@
     if(module->getError() != NO_ERROR) {
         dprintf(("LoadLibary %s failed (::init)\n", lpszLibFile));
-        ODIN_delete(module);
+        delete module;
         return(0);
     }
     if(module->attachProcess() == FALSE) {
         dprintf(("LoadLibary %s failed (::attachProcess)\n", lpszLibFile));
-        ODIN_delete(module);
+        delete module;
         return(0);
     }
@@ -425 +416 @@
 
 
-ODINFUNCTION1(HINSTANCE,LoadLibraryA,LPCTSTR,lpszLibFile)
-//HINSTANCE WIN32API LoadLibraryA(LPCTSTR lpszLibFile)
+HINSTANCE WIN32API LoadLibraryA(LPCTSTR lpszLibFile)
 {
   HINSTANCE hDll;
@@ -474 +464 @@
     }
 
-    ODIN_FS_BEGIN
     module = new Win32Dll((char *)lpszLibFile);
-    ODIN_FS_END
-
     if(module == NULL)
         return(0);
@@ -484 +471 @@
     if(module->getError() != NO_ERROR) {
         dprintf(("LoadLibary %s failed (::init)\n", lpszLibFile));
-        ODIN_delete(module);
+        delete module;
         return(0);
     }
@@ -492 +479 @@
     if(module->attachProcess() == FALSE) {
         dprintf(("LoadLibary %s failed (::attachProcess)\n", lpszLibFile));
-        ODIN_delete(module);
+        delete module;
         return(0);
     }