Changeset 3985 for branches/GRACE/src/win32k/ldr/myldrOpen.cpp

Timestamp:

Aug 11, 2000, 4:23:19 AM (25 years ago)

Author:

bird

Message:

Corrected bugs. (mostly in OpenPATH)

File:

• branches/GRACE/src/win32k/ldr/myldrOpen.cpp (modified) (20 diffs)

branches/GRACE/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.10.4.1 2000-07-16 22:43:36 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.10.4.2 2000-08-11 02:23:19 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -74 +74 @@
 
     /** @sketch
-     * Try open the file (thats why this function is called anyway)
+     * Try open the file (that's why this function is called anyway)
      */
     rc = ldrOpen(phFile, pszFilename, pfl);
@@ -97 +97 @@
         {
             char               *pach;       /* Pointer to the buffer as char. */
+            unsigned long      *pul;        /* Pointer to the buffer as unsigned long. */
             PIMAGE_DOS_HEADER   pMzHdr;     /* Use the buffer as a dosheader. */
             PIMAGE_NT_HEADERS   pNtHdrs;    /* Use the buffer as a NT header. */
@@ -251 +252 @@
                     }
                     else
+                    {
                         kprintf(("myldrOpen-%d: Failed to allocate Pe2Lx object.\n", cNesting));
-
-                     goto cleanup;
+                        rc = ERROR_NOT_ENOUGH_MEMORY;
+                    }
+
+                    goto cleanup;
                 }
 
@@ -312 +316 @@
              * ELF image?
              */
-            if (u1.pach[0] == ELFMAG0 && u1.pach[1] == ELFMAG1 && u1.pach[2] == ELFMAG2 && u1.pach[3] == ELFMAG3)
+            if (*u1.pul == ELFMAGICLSB)
             {
                 if (isELFDisabled())
@@ -332 +336 @@
              * Java image?
              */
-            if (u1.pach[0] == 0xCA && u1.pach[1] == 0xFE && u1.pach[2] == 0xBA && u1.pach[3] == 0xBE)
+            if (*u1.pul == 0xBEBAFECAUL) //CAh FEh BAh BEh
             {
                 if (isJAVADisabled())
@@ -393 +397 @@
                 goto cleanup;
             }
+
         }
         else
@@ -505 +510 @@
                      *  Open the new executable file recursively. (psz)
                      */
-                     if (isLdrStateExecPgm())
-                     {
-                         if (*psz2)
-                            rc = AddArgsToFront(3, psz, psz2, achTkExecPgmFilename);
-                         else
-                            rc = AddArgsToFront(2, psz, achTkExecPgmFilename);
-                         if (rc != NO_ERROR)
-                         {
-                             kprintf(("myldrOpen-%d: AddArgsToFront failed with rc=%d\n", cNesting));
-                             goto cleanup_noerror;
-                         }
-                         rc = SetExecName(psz);
-                         if (rc != NO_ERROR)
-                             kprintf(("myldrOpen-%d: SetExecName failed with rc=%d\n", cNesting));
-                     }
-                     rc = myldrOpen(phFile, psz, pfl);
+                    if (isLdrStateExecPgm())
+                    {
+                        if (*psz2)
+                           rc = AddArgsToFront(3, psz, psz2, achTkExecPgmFilename);
+                        else
+                           rc = AddArgsToFront(2, psz, achTkExecPgmFilename);
+                        if (rc != NO_ERROR)
+                        {
+                            kprintf(("myldrOpen-%d: AddArgsToFront failed with rc=%d\n", cNesting));
+                            goto cleanup_noerror;
+                        }
+                        rc = SetExecName(psz);
+                        if (rc != NO_ERROR)
+                            kprintf(("myldrOpen-%d: SetExecName failed with rc=%d\n", cNesting));
+                    }
+                    ldrClose(*phFile);
+                    rc = myldrOpen(phFile, psz, pfl);
+                    if (rc != NO_ERROR)
+                    {
+                        psz2 = psz + strlen(psz);
+                        if (psz + 4 >= psz2 || strcmp(psz2 - 4, ".EXE") != 0)
+                        {
+                            strcpy(psz2, ".EXE");
+                            rc = myldrOpen(phFile, psz, pfl);
+                            *psz2 = '\0';
+                        }
+                        else
+                            psz2 = NULL;
+
+                        //should we search the PATH??? For a starting, we'll do it.
+                        if (rc != NO_ERROR
+                            && (rc = OpenPATH(phFile, psz, pfl)) != NO_ERROR
+                            && psz2 != NULL)
+                        {
+                            *psz2 = '.';
+                            rc = OpenPATH(phFile, psz, pfl);
+                        }
+                    }
                 }
                 else
@@ -677 +704 @@
     }
 
-    cchOldArgs = iSecondArg = strlen(&achTkExecPgmArguments[0]) + 1;
-    psz = &achTkExecPgmArguments[cchOldArgs];
+    iSecondArg = strlen(&achTkExecPgmArguments[0]) + 1;
+    psz = &achTkExecPgmArguments[iSecondArg];
     while (*psz != '\0')
-        psz = &achTkExecPgmArguments[(cchOldArgs += strlen(psz) + 1)];
+        psz += strlen(psz) + 1;
+    cchOldArgs = psz - &achTkExecPgmArguments[iSecondArg];
 
     va_start(vaarg, cArgs);
@@ -701 +729 @@
      *    !IMPORTANT! in this move as this have to be re-added in this call!    !IMPORTANT!
      */
-    if (cchOldArgs + 1 + cchNewArgs > CCHARGUMENTS)
+    if (cchOldArgs + cchNewArgs + 1 > CCHARGUMENTS)
     {
         kprintf(("AddArgsToFront: argument buffer is too small to hold the arguments to add, cchOldArgs=%d, cchNewArgs=%d\n",
@@ -708 +736 @@
     }
 
-    if (cchOldArgs > 1)
+    if (cchOldArgs > 0)
     {
         memmove(&achTkExecPgmArguments[cchNewArgs], &achTkExecPgmArguments[iSecondArg],
-                cchOldArgs - iSecondArg + 1);
+                cchOldArgs + 1);
     }
     else
-        achTkExecPgmArguments[cchNewArgs + 1] = '\0';
+        achTkExecPgmArguments[cchNewArgs] = '\0';
 
 
@@ -727 +755 @@
     va_start(vaarg, cArgs);
     psz = va_arg(vaarg, char *);
-    iSecondArg = strlen(psz) + 1;
-    memcpy(&achTkExecPgmArguments[0], psz, iSecondArg);
-
-    psz = &achTkExecPgmArguments[iSecondArg];
-    i = 2;                              /* one in advance to avoid a +1. */
-    while (1)
-    {
+    memcpy(&achTkExecPgmArguments[0], psz, (i = strlen(psz) + 1));
+    psz = &achTkExecPgmArguments[i];
+
+    for (i = 1; i < cArgs; i++)
+    {
+        if (i > 1) *psz++ = ' ';    //Add space if not second argument.
         strcpy(psz, va_arg(vaarg, char *));
         psz += strlen(psz);
-        /* IF more arguments following (new or old) THEN add a space separator ELSE break loop */
-        if (cchOldArgs > 1 || i < cArgs)
-            *psz++ = ' ';
-        else
-            break;
-        i++;
     }
     va_end(vaarg);
+    if (cchOldArgs > 0) *psz++ = ' ';    //Add space if old arguments
 
     #ifdef DEBUG /* assertion */
@@ -817 +839 @@
     APIRET      rc;
     USHORT      TCBFailErr_save;
-    int         cchFilename;            /* Filename length + 1. */
+    int         cchFile;                /* Filename length + 1. */
+    const char *pszFile;                /* Pointer to filename portion. */
     const char *pszPath = ScanEnv(GetEnv(FALSE), "PATH"); /* Current Process environment? */
 
@@ -826 +849 @@
         return ERROR_FILE_NOT_FOUND;
 
-    cchFilename = strlen(pszFilename) + 1;
+    /**@sketch
+     * Skip any paths in the filename.
+     */
+    pszFile = pszFilename + (cchFile = strlen(pszFilename));
+    while (pszFile >= pszFilename && *pszFile != '\\' && *pszFile != '/')
+        pszFile--;
+    cchFile -= pszFile - pszFilename;
+    pszFile++;
 
     /**@sketch
@@ -840 +870 @@
     while (*pszPath != '\0')
     {
-        const char *  pszNext = pszPath;
+        const char *  pszNext;
         int           cchPath;
-        char          chEnd, ch;
+        char          chEnd;
+        register char ch;
 
         /*
@@ -848 +879 @@
          */
         while (*pszPath == ' ') pszPath++; //skip leading spaces.
-        chEnd = *pszPath == '"' ? '"' : ';';
+        if (*pszPath == '"')
+        {
+            chEnd = '"';
+            pszPath++;
+        }
+        else
+            chEnd = ';';
+        pszNext = pszPath;
         while ((ch = *pszNext) != chEnd && ch != '\0')
             pszNext++;
 
+        cchPath = pszNext - pszPath;
         if (chEnd == '"')
         {
-            cchPath = pszNext - (++pszPath); //pszPath points at '"' before incrementing it.
-            if (ch != '\0')
+            /* Skip anything between the " and the ; or string end. */
+            while ((ch = *pszNext) != ';' && ch != '\0')
                 pszNext++;
         }
@@ -861 +900 @@
         {
             /* Trim the string. */
-            cchPath = pszNext - pszPath;
             while (cchPath > 0 && pszPath[cchPath-1] == ' ') //??
                 cchPath--;
@@ -869 +907 @@
          *  No length? No Path! Or path'\'filename too long? => Next
          */
-        if (cchPath > 0 && cchPath + cchFilename + 1 < CCHMAXPATH)
+        if (cchPath > 0 && cchPath + cchFile + 1 < CCHMAXPATH)
         {
             static char     achFilename[CCHMAXPATH];
@@ -880 +918 @@
             else
                 achFilename[cchPath] = '\\';
-            memcpy(&achFilename[cchPath + 1], pszFilename, cchFilename); /* cchFilename = length + 1; hence we copy the terminator too. */
+             memcpy(&achFilename[cchPath + 1], pszFile, cchFile); /* cchFile = length + 1; hence we copy the terminator too. */
 
             /*
@@ -898 +936 @@
 
                 case NO_ERROR:
+                    strcpy(pszFilename, achFilename);
                 default:
                     tcbSetTCBFailErr(tcbGetCur(), TCBFailErr_save);