Changeset 130 for trunk/src/kernel32/windll.cpp

Timestamp:

Jun 20, 1999, 2:46:34 PM (26 years ago)

Author:

sandervl

Message:

Activated Win32 TIB code and fixes some other things (see ChangeLog)

File:

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

trunk/src/kernel32/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.4 1999-06-19 10:54:43 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.5 1999-06-20 12:46:09 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 void _System SetLastError(ULONG ulError);
 
-
 //******************************************************************************
 //******************************************************************************
@@ -50 +49 @@
   UpCase(szModule);
   char *dot = strstr(szModule, ".");
+  while(dot) {
+        char *newdot = strstr(dot+1, ".");
+        if(newdot == NULL)      break;
+        dot = newdot;
+  }
   if(dot)
         *dot = 0;
+  dprintf(("Win32Dll::Win32Dll %s %s", szFileName, szModule));
 }
 //******************************************************************************
@@ -69 +74 @@
   UpCase(szModule);
   char *dot = strstr(szModule, ".");
+  while(dot) {
+        char *newdot = strstr(dot+1, ".");
+        if(newdot == NULL)      break;
+        dot = newdot;
+  }
   if(dot)
         *dot = 0;
 
+  dprintf(("Win32Dll::Win32Dll %s", szModule));
 }
 //******************************************************************************
@@ -85 +96 @@
   UpCase(szModule);
   char *dot = strstr(szModule, ".");
+  while(dot) {
+        char *newdot = strstr(dot+1, ".");
+        if(newdot == NULL)      break;
+        dot = newdot;
+  }
   if(dot)
         *dot = 0;
@@ -95 +111 @@
 {
  Win32Dll *dll = head;
+
+  dprintf(("Win32Dll::~Win32Dll %s", szModule));
 
   //first remove it from the linked list so converted win32 dlls won't
@@ -111 +129 @@
         dll->next = next;
   }
-  if(errorState == NO_ERROR && !fUnloaded) {
-        if(fNativePEImage) {
+  if(errorState == NO_ERROR && !fUnloaded) 
+  {
+        if(!fSystemDll) {
                 detachProcess();
-        }
-        else {
-                if(!fSystemDll) //let OS/2 unload them, unless ordered by FreeLibrary (see ::Release)
-                        DosFreeModule((HMODULE)hinstance);
-        }
+        }       
   }
 }
@@ -185 +200 @@
                       "WNETAP32", "MPR", "OLE32", "ADVAPI32", "COMMDLG", 
                       "WINSPOOL", "SHELL32", "TAPI32", "CAPI32", "VERSION",
-                      "WSOCK32"};
+                      "WSOCK32", "COMCTL32"};
 //******************************************************************************
 BOOL Win32Dll::isSystemDll(char *szFileName)
@@ -249 +264 @@
     }
 
-    //Add to lookkup table, so we don't have to call DosQueryProcAddr
+    //Add to lookup table, so we don't have to call DosQueryProcAddr
     //multiple times for the same api (when imported by other dlls)
     AddNameExport(apiaddr, name, 0);