Changeset 1325 for trunk/src/kernel32/windllpe2lx.cpp

Timestamp:

Oct 17, 1999, 3:49:09 AM (26 years ago)

Author:

bird

Message:

No exception throwing. Constructors is moved into an init method.
TLS is now implemented, but not tested.

File:

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

trunk/src/kernel32/windllpe2lx.cpp

@@ -1 @@
-/* $Id: windllpe2lx.cpp,v 1.2 1999-10-14 01:37:55 bird Exp $ */
+/* $Id: windllpe2lx.cpp,v 1.3 1999-10-17 01:49:08 bird Exp $ */
 
 /*
@@ -88 +88 @@
 
         /* Try create pe2lx dll object. */
-        try
+        pWinMod = new Win32Pe2LxDll(hinstance, (ulPe2LxVersion & 0x80000000UL) == 0x80000000UL);
+        if (pWinMod == NULL)
         {
-            pWinMod = new Win32Pe2LxDll(hinstance, (ulPe2LxVersion & 0x80000000UL) == 0x80000000UL);
-            if (pWinMod == NULL)
-                throw ((ULONG)ERROR_NOT_ENOUGH_MEMORY);
-
-            /* @@@PH 1998/03/17 Console devices initialization */
-            iConsoleDevicesRegister();
-
-            /* Add reference and attach dll to process. */
-            pWinMod->AddRef();
-            pWinMod->attachProcess();
+            eprintf(("RegisterPe2LxDll: new returned a NULL-pointer\n"));
+            return 0;
         }
-        catch(ULONG ul)
+        if (!pWinMod->init())
         {
-            eprintf(("RegisterPe2LxDLL: Failed to create module object, ul=%d\n", ul));
-            DebugInt3();
-            return 0;  /* fail dll load */
+            eprintf(("RegisterPe2LxDll: init-method failed.\n"));
+            delete pWinMod;
+            return 0;
         }
+
+        /* @@@PH 1998/03/17 Console devices initialization */
+        iConsoleDevicesRegister();
+
+        /* Add reference and attach dll to process. */
+        pWinMod->AddRef();
+        pWinMod->attachProcess();
     }
     else
@@ -112 +112 @@
         if (pWinMod != NULL && !fFreeLibrary)
             return 0;   /* don't unload (OS/2 dll unload bug) - see OS2.bugs in root dir. */
-
-        #if 0 /* Runtime environment could already be gone, so don't do this */
-            dprintf(("KERNEL32: Dll Removed by FreeLibrary or ExitProcess\n"));
-        #endif
     }
 
@@ -130 +126 @@
  * @author    Sander van Leeuwen, knut st. osmundsen
  */
-Win32Pe2LxDll::Win32Pe2LxDll(HINSTANCE hinstance, BOOL fWin32k) throw(ULONG)
+Win32Pe2LxDll::Win32Pe2LxDll(HINSTANCE hinstance, BOOL fWin32k)
     : Win32ImageBase(hinstance),
     Win32DllBase(hinstance, NULL),
@@ -136 +132 @@
 {
     dprintf(("Win32Pe2LxDll::Win32Pe2LxDll %s", szModule));
-    /* set entry point. */
-    dllEntryPoint = (WIN32DLLENTRY)entryPoint;
 }
 
@@ -151 +145 @@
 }
 
+
+/**
+ * Init object.
+ * Must be called immedeately after objecte construction.
+ * @returns   Success indicator. (TRUE == success)
+ * @sketch    call init method of the parten class.
+ *            set dllEntryPoint
+ * @status    completely implemented.
+ * @author    knut st. osmundsen
+ */
+BOOL Win32Pe2LxDll::init()
+{
+    if (Win32Pe2LxImage::init())
+    {
+        /* set entry point. */
+        dllEntryPoint = (WIN32DLLENTRY)entryPoint;
+    }
+    else
+        return FALSE;
+    return TRUE;
+}
 
 /**