Changeset 6375 for trunk/src/gdi32

Timestamp:

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

Author:

sandervl

Message:

initterm update

Location:

trunk/src/gdi32

Files:

• dbglocal.cpp (modified) (8 diffs)
• dbglocal.h (modified) (5 diffs)
• gdi32lib.mak (added)
• initgdi32.cpp (added)
• initterm.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)

trunk/src/gdi32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.6 2001-07-14 15:31:38 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.7 2001-07-20 15:35:57 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #ifdef DEBUG
 
-USHORT DbgEnabled[DBG_MAXFILES] = {0};
-USHORT DbgEnabledLvl2[DBG_MAXFILES] = {0};
+USHORT DbgEnabledGDI32[DBG_MAXFILES] = {0};
+USHORT DbgEnabledLvl2GDI32[DBG_MAXFILES] = {0};
 
-char  *DbgFileNames[DBG_MAXFILES] =
+static char  *DbgFileNames[DBG_MAXFILES] =
 {
 "gdi32",
@@ -44 +44 @@
 //******************************************************************************
 //******************************************************************************
-void ParseLogStatus()
+void ParseLogStatusGDI32()
 {
  char *envvar = getenv(DBG_ENVNAME);
@@ -52 +52 @@
 
     for(i=0;i<DBG_MAXFILES;i++) {
-        DbgEnabled[i] = 1;
+        DbgEnabledGDI32[i] = 1;
     }
 
@@ -62 +62 @@
         if(*(dbgvar-1) == '-') {
             for(i=0;i<DBG_MAXFILES;i++) {
-                DbgEnabled[i] = 0;
+                DbgEnabledGDI32[i] = 0;
             }
         }
@@ -70 +70 @@
         if(dbgvar) {
             if(*(dbgvar-1) == '-') {
-                    DbgEnabled[i] = 0;
+                    DbgEnabledGDI32[i] = 0;
             }
             else    
             if(*(dbgvar-1) == '+') {
-                DbgEnabled[i] = 1;
+                DbgEnabledGDI32[i] = 1;
             }
         }
@@ -83 +83 @@
                 if(*(dbgvar-1) == '+') {
                     for(i=0;i<DBG_MAXFILES;i++) {
-                        DbgEnabledLvl2[i] = 1;
+                        DbgEnabledLvl2GDI32[i] = 1;
                     }
                 }
@@ -91 +91 @@
                 if(dbgvar) {
                     if(*(dbgvar-1) == '-') {
-                            DbgEnabledLvl2[i] = 0;
+                            DbgEnabledLvl2GDI32[i] = 0;
                     }
                     else    
                     if(*(dbgvar-1) == '+') {
-                        DbgEnabledLvl2[i] = 1;
+                        DbgEnabledLvl2GDI32[i] = 1;
                     }
                 }

trunk/src/gdi32/dbglocal.h

@@ -1 @@
-/* $Id: dbglocal.h,v 1.6 2001-07-14 15:31:39 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.7 2001-07-20 15:35:57 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #ifdef DEBUG
 //Parses environment variable for selective enabling/disabling of logging
-void ParseLogStatus();
+void ParseLogStatusGDI32();
 
 #define DBG_ENVNAME        "dbg_gdi32"
@@ -42 +42 @@
 #define DBG_MAXFILES        20
 
-extern USHORT DbgEnabled[DBG_MAXFILES];
-extern USHORT DbgEnabledLvl2[DBG_MAXFILES];
+extern USHORT DbgEnabledGDI32[DBG_MAXFILES];
+extern USHORT DbgEnabledLvl2GDI32[DBG_MAXFILES];
 
 #ifdef dprintf
@@ -49 +49 @@
 #endif
 
-#define dprintf(a)      if(DbgEnabled[DBG_LOCALLOG] == 1) WriteLog a
+#define dprintf(a)      if(DbgEnabledGDI32[DBG_LOCALLOG] == 1) WriteLog a
 
 #ifdef dprintf2
@@ -55 +55 @@
 #endif
 
-#define dprintf2(a)     if(DbgEnabledLvl2[DBG_LOCALLOG] == 1) WriteLog a
+#define dprintf2(a)     if(DbgEnabledLvl2GDI32[DBG_LOCALLOG] == 1) WriteLog a
 
 #else
 
-#define ParseLogStatus()
+#define ParseLogStatusGDI32()
 
 #endif //DEBUG

trunk/src/gdi32/initterm.cpp

@@ -39 +39 @@
 #include <initdll.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   */
@@ -86 +62 @@
          ctordtorInit();
 
-         ParseLogStatus();
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         if(InitRegionSpace() == FALSE) {
-                return 0UL;
-         }
-         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab,
-                                   GDI32_MAJORIMAGE_VERSION, GDI32_MINORIMAGE_VERSION,
-                                   IMAGE_SUBSYSTEM_NATIVE);
-         if(dllHandle == 0) 
-                return 0UL;
+         return inittermGdi32(hModule, ulFlag);
 
-         dprintf(("gdi32 init %s %s (%x)", __DATE__, __TIME__, DLLENTRYPOINT_NAME));
+      case 1 :
+         return inittermGdi32(hModule, ulFlag);
 
-         break;
-      case 1 :
-         if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-         }
-         break;
       default  :
          return 0UL;

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.36 2001-07-14 15:31:44 sandervl Exp $
+# $Id: makefile,v 1.37 2001-07-20 15:35:57 sandervl Exp $
 
 #
@@ -31 +31 @@
 $(OBJDIR)\dibsect.obj \
 $(OBJDIR)\initterm.obj \
+$(OBJDIR)\initgdi32.obj \
 $(OBJDIR)\oslibgdi.obj \
 $(OBJDIR)\font.obj \