Changeset 6375 for trunk/src/wsock32

Timestamp:

Jul 20, 2001, 5:42:38 PM (24 years ago)

Author:

sandervl

Message:

initterm update

Location:

trunk/src/wsock32

Files:

• dbglocal.cpp (modified) (5 diffs)
• dbglocal.h (modified) (4 diffs)
• initterm.cpp (modified) (2 diffs)
• initwsock32.cpp (added)
• makefile (modified) (2 diffs)
• wsock32lib.mak (added)

trunk/src/wsock32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.4 2000-03-24 19:28:05 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.5 2001-07-20 15:41:04 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #ifdef DEBUG
 
-USHORT DbgEnabled[DBG_MAXFILES];
-char  *DbgFileNames[DBG_MAXFILES] =
+USHORT DbgEnabledWSOCK32[DBG_MAXFILES] = {0};
+USHORT DbgEnabledLvl2WSOCK32[DBG_MAXFILES] = {0};
+
+static char  *DbgFileNames[DBG_MAXFILES] =
 {
 "initterm",
@@ -29 +31 @@
 //******************************************************************************
 //******************************************************************************
-void ParseLogStatus()
+void ParseLogStatusWSOCK32()
 {
  char *envvar = getenv(DBG_ENVNAME);
+ char *envvar2= getenv(DBG_ENVNAME_LVL2);
  char *dbgvar;
  int   i;
 
     for(i=0;i<DBG_MAXFILES;i++) {
-        DbgEnabled[i] = 1;
+        DbgEnabledWSOCK32[i] = 1;
     }
 
@@ -46 +49 @@
         if(*(dbgvar-1) == '-') {
             for(i=0;i<DBG_MAXFILES;i++) {
-                DbgEnabled[i] = 0;
+                DbgEnabledWSOCK32[i] = 0;
             }
         }
@@ -54 +57 @@
         if(dbgvar) {
             if(*(dbgvar-1) == '-') {
-                    DbgEnabled[i] = 0;
+                    DbgEnabledWSOCK32[i] = 0;
             }
             else    
             if(*(dbgvar-1) == '+') {
-                DbgEnabled[i] = 1;
+                DbgEnabledWSOCK32[i] = 1;
             }
+        }
+    }
+    if(envvar2) {
+        dbgvar = strstr(envvar2, "dll");
+        if(dbgvar) {
+                if(*(dbgvar-1) == '+') {
+                    for(i=0;i<DBG_MAXFILES;i++) {
+                        DbgEnabledLvl2WSOCK32[i] = 1;
+                    }
+                }
+        }
+        for(i=0;i<DBG_MAXFILES;i++) {
+                dbgvar = strstr(envvar2, DbgFileNames[i]);
+                if(dbgvar) {
+                    if(*(dbgvar-1) == '-') {
+                            DbgEnabledLvl2WSOCK32[i] = 0;
+                    }
+                    else    
+                    if(*(dbgvar-1) == '+') {
+                        DbgEnabledLvl2WSOCK32[i] = 1;
+                    }
+                }
         }
     }

trunk/src/wsock32/dbglocal.h

@@ -1 @@
-/* $Id: dbglocal.h,v 1.4 2000-03-24 19:28:05 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.5 2001-07-20 15:41:04 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #ifdef DEBUG
 //Parses environment variable for selective enabling/disabling of logging
-void ParseLogStatus();
+void ParseLogStatusWSOCK32();
 
 #define DBG_ENVNAME        "dbg_wsock32"
+#define DBG_ENVNAME_LVL2   "dbg_wsock32_lvl2"
 
 #define DBG_initterm       0
@@ -28 +29 @@
 #define DBG_MAXFILES       7
 
-extern USHORT DbgEnabled[DBG_MAXFILES];
+extern USHORT DbgEnabledWSOCK32[DBG_MAXFILES];
+extern USHORT DbgEnabledLvl2WSOCK32[DBG_MAXFILES];
 
 #ifdef dprintf
@@ -34 +36 @@
 #endif
 
-#define dprintf(a)      if(DbgEnabled[DBG_LOCALLOG] == 1) WriteLog a
+#define dprintf(a)      if(DbgEnabledWSOCK32[DBG_LOCALLOG] == 1) WriteLog a
+
+#ifdef dprintf2
+#undef dprintf2
+#endif
+
+#define dprintf2(a)     if(DbgEnabledLvl2WSOCK32[DBG_LOCALLOG] == 1) WriteLog a
 
 #else
 
-#define ParseLogStatus()
+#define ParseLogStatusWSOCK32()
 
 #endif //DEBUG

trunk/src/wsock32/initterm.cpp

@@ -39 +39 @@
 #include "dbglocal.h"
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
-}
-static HMODULE dllHandle = 0;
-
-//******************************************************************************
-//******************************************************************************
-BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{
-   switch (fdwReason)
-   {
-   case DLL_PROCESS_ATTACH:
-        return TRUE;
-
-   case DLL_THREAD_ATTACH:
-   case DLL_THREAD_DETACH:
-        return TRUE;
-
-   case DLL_PROCESS_DETACH:
-        ctordtorTerm();
-        return TRUE;
-   }
-   return FALSE;
-}
 /****************************************************************************/
 /* _DLL_InitTerm is the function that gets called by the operating system   */
@@ -87 +62 @@
          ctordtorInit();
 
-         ParseLogStatus();
-
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0) 
-                return 0UL;
+         return inittermWsock32(hModule, ulFlag);
 
+      case 1 :
+         inittermWsock32(hModule, ulFlag);
+         ctordtorTerm();
          break;
-      case 1 :
-         if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-         }
-         break;
+
       default  :
          return 0UL;

trunk/src/wsock32/makefile

@@ -1 @@
-# $Id: makefile,v 1.30 2001-07-07 10:44:09 achimha Exp $
+# $Id: makefile,v 1.31 2001-07-20 15:41:05 sandervl Exp $
 
 #
@@ -30 +30 @@
 $(OBJDIR)\wsock32rsrc.obj \
 $(OBJDIR)\initterm.obj \
+$(OBJDIR)\initwsock32.obj \
 $(OBJDIR)\asyncapi.obj \
 $(OBJDIR)\asyncthread.obj \