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

Timestamp:

Aug 18, 1999, 7:18:01 PM (26 years ago)

Author:

sandervl

Message:

PE loader changes

File:

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

trunk/src/kernel32/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.9 1999-08-18 12:24:16 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.10 1999-08-18 17:18:00 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include <wprocess.h>
 #include "cio.h"
-#include "os2util.h"
 
 /***********************************
@@ -47 +46 @@
   head = this;
 
-  strcpy(szModule, StripPath(szFileName));
-  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));
 }
@@ -71 +60 @@
   head = this;
 
-  char *name = OS2GetDllName(hinstance);
-  strcpy(szModule, name);
-  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));
 }
@@ -92 +69 @@
   dllEntryPoint = DllEntryPoint;
   fUnloaded     = FALSE;
-
-  char *name = OS2GetDllName(hinstance);
-  strcpy(szModule, name);
-  UpCase(szModule);
-  char *dot = strstr(szModule, ".");
-  while(dot) {
-        char *newdot = strstr(dot+1, ".");
-        if(newdot == NULL)      break;
-        dot = newdot;
-  }
-  if(dot)
-        *dot = 0;
 
   Win32Image::OS2ImageInit(hinstance, NameTableId, Win32TableId);
@@ -208 +173 @@
 
   strcpy(szModule, szFileName);
-  UpCase(szModule);
+  strupr(szModule);
   dot = strstr(szModule, ".");
   if(dot)
@@ -427 +392 @@
  Win32Dll *dll = head;
  char szDllName[CCHMAXPATH];
- char *dot;
+ char *dot, *temp;
 
   dprintf(("findModule %s", dllname));
-  strcpy(szDllName, dllname);
-  UpCase(szDllName);
+
+  strcpy(szDllName, StripPath(dllname));
+  strupr(szDllName);
   dot = strstr(szDllName, ".");
   if(dot)
@@ -476 +442 @@
 //******************************************************************************
 //******************************************************************************
-char *Win32Dll::StripPath(char *path)
-{
-  /* @@@PH what does this function do ? Strip the path from a FQFN name ? */
-  char *pszFilename;
-  
-  pszFilename = strrchr(path, '\\');                 /* find rightmost slash */
-  if (pszFilename != NULL)
-    return (pszFilename++);              /* return pointer to next character */
-  
-  pszFilename = strrchr(path, '/');                  /* find rightmost slash */
-  if (pszFilename != NULL)
-    return (pszFilename++);              /* return pointer to next character */
-  
-  return (path);                                     /* default return value */
-  
-#if 0
-  char *fname = path, *prevname = path-1;
-  
-  while(TRUE)
-  {
-    @@@PH causes endless loop here !
-    fname = strchr(fname, '\\');
-    if(fname == NULL)
-      break;
-    
-    prevname = fname;
-  }
-  return(prevname+1);
-#endif
-}
-/******************************************************************************/
-/******************************************************************************/
 Win32Dll *Win32Dll::head = NULL;