Changeset 5782 for trunk/src

Timestamp:

May 22, 2001, 4:25:36 PM (24 years ago)

Author:

sandervl

Message:

Check name before adding dependency for module

Location:

trunk/src/kernel32

Files:

• windllbase.cpp (modified) (4 diffs)
• windlllx.cpp (modified) (2 diffs)

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.24 2001-02-14 10:36:45 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.25 2001-05-22 14:25:34 sandervl Exp $ */
 
 /*
@@ -252 +252 @@
         //printDependencies(NULL);
 #endif
+
         dprintf(("Win32DllBase::Release %s referenced == 0", getModuleName()));
 
@@ -414 +415 @@
     }
 
-    dprintf(("attachProcess to dll %s", szModule));
-
     // @@@PH 2000/06/13 lpvReserved, Starcraft STORM.DLL
     // if DLL_PROCESS_ATTACH, lpvReserved is NULL for dynamic loads
@@ -427 +426 @@
         lpvReserved = (LPVOID)0xdeadface; // some arbitrary value
 
+#ifdef DEBUG
+    int time1, time2;
+    dprintf(("attachProcess to dll %s", szModule));
+    time1 = GetTickCount();
+#endif
+
     rc = dllEntryPoint(hinstance, DLL_PROCESS_ATTACH, lpvReserved);
 
-    dprintf(("attachProcess to dll %s DONE", szModule));
+#ifdef DEBUG
+    time2 = GetTickCount();
+    dprintf(("attachProcess to dll %s DONE in %x msec", szModule, time2-time1));
+#endif
 
     if(fSetExceptionHandler) {

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.18 2001-02-24 12:59:44 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.19 2001-05-22 14:25:36 sandervl Exp $ */
 
 /*
@@ -123 +123 @@
         modulename[modsize] = 0;
         windlldep = Win32DllBase::findModule(modulename, TRUE);
-        if(windlldep) {
+        if(windlldep && strcmp(windlldep->getModuleName(), windll->getModuleName())) {
                 dprintf(("RegisterLxDll: Add dependency %s -> %s", windll->getModuleName(), modulename));
                 windll->addDependency(windlldep);
         }
-        else    dprintf(("WARNING: Can't find dll %s referenced by %s", modulename, windll->getModuleName()));
+        else    dprintf(("HARMLESS WARNING: Can't find dll %s referenced by %s", modulename, windll->getModuleName()));
         offset += modsize + 1;
    }