Changeset 3854 for trunk/src/kernel32/windllbase.cpp

Timestamp:

Jul 18, 2000, 8:37:30 PM (25 years ago)

Author:

sandervl

Message:

dll unload fix + detach skip fix

File:

• trunk/src/kernel32/windllbase.cpp (modified) (9 diffs)

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.14 2000-06-14 02:27:33 phaller Exp $ */
+/* $Id: windllbase.cpp,v 1.15 2000-07-18 18:37:29 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
                            Win32ImageBase *parent)
                  : Win32ImageBase(hinstance),
-                   referenced(0), fSkipEntryCalls(FALSE), next(NULL), fInserted(FALSE),
+                   referenced(0), fSkipThreadEntryCalls(FALSE), next(NULL), fInserted(FALSE),
                    fAttachedToProcess(FALSE), fUnloaded(FALSE), 
                    nrDynamicLibRef(0), fLoadLibrary(FALSE), fDisableUnload(FALSE)
@@ -101 +101 @@
 { 
   if(nrDynamicLibRef == 0) {
+        //NOTE:
+        //Must be called *after* attachprocess, since attachprocess may also
+        //trigger LoadLibrary calls
+        //Those dlls must not be put in front of this dll in the dynamic
+        //dll list; or else the unload order is wrong:
+        //i.e. RPAP3260 loads PNRS3260 in DLL_PROCESS_ATTACH
+        //     this means that in ExitProcess, PNRS3260 needs to be removed
+        //     first since RPAP3260 depends on it
+
         dlllistmutex.enter();
         loadLibDlls.Push((ULONG)this);
@@ -411 +420 @@
   tlsAttachThread();    //setup TLS (main thread)
 
-  if(fSkipEntryCalls || dllEntryPoint == NULL) {
+  if(dllEntryPoint == NULL) {
         dprintf(("attachProcess not required for dll %s", szModule));
         if(fSetExceptionHandler) {
@@ -458 +467 @@
  BOOL rc;
 
-  if(fSkipEntryCalls || dllEntryPoint == NULL) {
+  if(dllEntryPoint == NULL) {
         tlsDetachThread();      //destroy TLS (main thread)
         fUnloaded = TRUE;
@@ -501 +510 @@
  BOOL               rc;
 
-  if(fSkipEntryCalls || dllEntryPoint == NULL)
+  if(fSkipThreadEntryCalls || dllEntryPoint == NULL)
         return(TRUE);
 
@@ -519 +528 @@
  BOOL               rc;
 
-  if(fSkipEntryCalls || dllEntryPoint == NULL)
+  if(fSkipThreadEntryCalls || dllEntryPoint == NULL)
         return(TRUE);
 
@@ -630 +639 @@
 
   dlllistmutex.leave();
+  dprintf(("Win32DllBase::deleteDynamicLibs end"));
 }
 //******************************************************************************
@@ -800 +810 @@
 //******************************************************************************
 //******************************************************************************
-void Win32DllBase::setThreadLibraryCalls(BOOL fEnable)
-{
-  // if fEnable == true, do call the ATTACH_THREAD, DETACH_THREAD functions
-  // if fEnable == false, do not call the ATTACH_THREAD, DETACH_THREAD functions
-  fSkipEntryCalls = !fEnable;
-}
-
-//******************************************************************************
-//******************************************************************************
 Win32DllBase *Win32DllBase::head = NULL;
 Queue         Win32DllBase::loadLibDlls;