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

Timestamp:

Aug 22, 1999, 5:11:35 PM (26 years ago)

Author:

sandervl

Message:

Exception handler changes

File:

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

trunk/src/kernel32/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.11 1999-08-22 11:11:11 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.12 1999-08-22 15:11:35 sandervl Exp $ */
 
 /*
@@ -123 +123 @@
 BOOL Win32Dll::init(ULONG reservedMem)
 {
+ char   modname[CCHMAXPATH];
  char  *syspath;
  FILE  *dllfile;
@@ -130 +131 @@
   if(fSystemDll == FALSE && fNativePEImage == TRUE) 
   {//might be win32 dll, so check this
+        strupr(szFileName);
+        if(!strstr(szFileName, ".DLL")) {
+                strcat(szFileName,".DLL");
+        }
         dllfile = fopen(szFileName, "r");
         if(dllfile == NULL) {//search in libpath for dll
                 syspath = getenv("WIN32LIBPATH");
                 if(syspath) {
-                        strcpy(szModule, syspath);
-                        if(szModule[strlen(szModule)-1] != '\\') {
-                                strcat(szModule, "\\");
+                        strcpy(modname, syspath);
+                        if(modname[strlen(modname)-1] != '\\') {
+                                strcat(modname, "\\");
                         }
-                        strcat(szModule, szFileName);
-                        szFileName = szModule;
+                        strcat(modname, szFileName);
+                        strcpy(szFileName, modname);
                 }
         }
@@ -278 +283 @@
   tlsAttachThread();    //setup TLS (main thread)
 
-  if(fSystemDll || fSkipEntryCalls) {
+  if(fSystemDll || fSkipEntryCalls || dllEntryPoint == NULL) {
         dprintf(("attachProcess not required for dll %s", szModule));
         return(TRUE);
@@ -305 +310 @@
  BOOL rc;
 
-  if(fSystemDll || fSkipEntryCalls) {
+  if(fSystemDll || fSkipEntryCalls || dllEntryPoint == NULL) {
         tlsDetachThread();      //destroy TLS (main thread)
         return(TRUE);
@@ -334 +339 @@
  BOOL               rc;
 
-  if(fSystemDll || fSkipEntryCalls)
+  if(fSystemDll || fSkipEntryCalls || dllEntryPoint == NULL)
         return(TRUE);
 
@@ -354 +359 @@
  BOOL               rc;
 
-  if(fSystemDll || fSkipEntryCalls)
+  if(fSystemDll || fSkipEntryCalls || dllEntryPoint == NULL)
         return(TRUE);