Changeset 4523 for trunk/src/kernel32/winimagebase.cpp

Timestamp:

Oct 23, 2000, 3:42:47 PM (25 years ago)

Author:

sandervl

Message:

Vio fix for high memory + fixes&updates for dll name lookup with extension

File:

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

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.29 2000-10-10 17:14:07 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.30 2000-10-23 13:42:44 sandervl Exp $ */
 
 /*
@@ -64 +64 @@
     name = strrchr(szFileName, '\\')+1;
     strcpy(szModule, name);
-
-    char *dot = strrchr(szModule, '.');
-    if(dot)
-        *dot = 0;
   }
   else {
@@ -154 +150 @@
  char  *imagepath;
 
-  strcpy(szFullName, szFileName);
-  strupr(szFullName);
-  if(!strchr(szFullName, (int)'.')) {
-        strcat(szFullName,".DLL");
-  }
-
-  //search order:
-  //1) exe dir
-  //2) current dir
-  //3) windows system dir (kernel32 path)
-  //4) windows dir
-  //5) path
-  if(WinExe) {
-    strcpy(modname, WinExe->getFullPath());
-    //remove file name from full path
-    imagepath = modname + strlen(modname) - 1;
-    while(*imagepath != '\\') imagepath--;
-    imagepath[1] = 0;
-    strcat(modname, szFullName);
-    dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-  }
-  if(dllfile == NULL) {
-    strcpy(modname, szFullName);
-    dllfile = OSLibDosOpen(szFullName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-    if(dllfile == NULL) {
+    strcpy(szFullName, szFileName);
+    strupr(szFullName);
+    if(!strchr(szFullName, (int)'.')) {
+        strcat(szFullName, DLL_EXTENSION);
+    }
+
+    //search order:
+    //1) exe dir
+    //2) current dir
+    //3) windows system dir (kernel32 path)
+    //4) windows dir
+    //5) path
+    if(WinExe) {
+        strcpy(modname, WinExe->getFullPath());
+        //remove file name from full path
+        imagepath = modname + strlen(modname) - 1;
+        while(*imagepath != '\\')
+            imagepath--;
+        imagepath[1] = 0;
+        strcat(modname, szFullName);
+        dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+    }
+    if(dllfile == NULL)
+    {
+        strcpy(modname, szFullName);
+        dllfile = OSLibDosOpen(szFullName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+        if(dllfile == NULL)
+        {
             strcpy(modname, InternalGetSystemDirectoryA());
-        strcat(modname, "\\");
+            strcat(modname, "\\");
             strcat(modname, szFullName);
-        dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-        if(dllfile == NULL) {
-            strcpy(modname, InternalGetWindowsDirectoryA());
-            strcat(modname, "\\");
+            dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+            if(dllfile == NULL)
+            {
+                strcpy(modname, InternalGetWindowsDirectoryA());
+                strcat(modname, "\\");
                 strcat(modname, szFullName);
-            dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-            if(dllfile == NULL) {
-                if(OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFullName, modname, sizeof(modname)) == 0) {
-                    return FALSE;
+                dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                if(dllfile == NULL) {
+                    if(OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFullName, modname, sizeof(modname)) == 0)
+                        return FALSE;
                 }
             }
         }
     }
-  }
-  strcpy(szFullName, modname);
-  if(dllfile) OSLibDosClose(dllfile);
-  return TRUE;
+    strcpy(szFullName, modname);
+    if(dllfile) OSLibDosClose(dllfile);
+    return TRUE;
 }
 
@@ -254 +253 @@
   rc = DosRead(win32handle, pdoshdr, sizeof(IMAGE_DOS_HEADER), &ulRead);
   if(rc != NO_ERROR || ulRead != sizeof(IMAGE_DOS_HEADER)) {
-    free(pdoshdr);
+        free(pdoshdr);
         DosClose(win32handle);                /* Close the file */
         return ERROR_INVALID_EXE_SIGNATURE_W;
   }
   if(pdoshdr->e_magic != IMAGE_DOS_SIGNATURE) {
-    free(pdoshdr);
+        free(pdoshdr);
         DosClose(win32handle);                /* Close the file */
         return ERROR_INVALID_EXE_SIGNATURE_W;
@@ -294 +293 @@
   }
   if(Characteristics) {
-        *Characteristics = fh.Characteristics;
+        *Characteristics = fh.Characteristics;
   }
   DosClose(win32handle);
@@ -346 +345 @@
  * @remark      Just a clarification:
  *              A module name is the filename of a executable image without
- *              path and without extention.
+ *              path, but *with* extention.
  */
 BOOL Win32ImageBase::matchModName(const char *pszFilename) const
@@ -365 +364 @@
            )
     {
-        if (ch == '.' && pszModNameEnd == NULL)
-            pszModNameEnd = pszModName;
         pszModName--;
     }
     pszModName++;
-   
+
     /** @sketch
      * Compare the names caseinsensitivly.
      */
-    if (pszModNameEnd)
-        return strnicmp(pszModName, szModule, pszModNameEnd - pszModName) == 0;
     return stricmp(pszModName, szModule) == 0;
 }