Changeset 5130 for trunk/src/shell32/initterm.cpp

Timestamp:

Feb 14, 2001, 12:41:04 PM (25 years ago)

Author:

sandervl

Message:

initterm call fixes

File:

• trunk/src/shell32/initterm.cpp (modified) (5 diffs)

trunk/src/shell32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.11 2000-08-11 10:56:25 sandervl Exp $ */
-
 /*
  * DLL entry point
@@ -36 +34 @@
 #include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
-
-extern "C" {
-void CDECL _ctordtorInit( void );
-void CDECL _ctordtorTerm( void );
-}
+#include <initdll.h>
 
 extern "C" {
@@ -54 +48 @@
 BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
+ BOOL ret;
+
    switch (fdwReason)
    {
@@ -62 +58 @@
 
    case DLL_PROCESS_DETACH:
-        Shell32LibMain(hinstDLL, fdwReason, fImpLoad);
-        _ctordtorTerm();
-        return TRUE;
+        ret = Shell32LibMain(hinstDLL, fdwReason, fImpLoad);
+        __ctordtorTerm();
+        return ret;
    }
    return FALSE;
@@ -90 +86 @@
    switch (ulFlag) {
       case 0 :
-         _ctordtorInit();
+         __ctordtorInit();
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/