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

Timestamp:

Aug 30, 2000, 6:11:33 AM (25 years ago)

Author:

bird

Message:

Corrected more JAVA problems. (now working)
In that case an new function was imported. This wasn't present in SMP Warp 3
kernels, so a not requied, EPT_NOT_REQ, flag was introduced. (But, the
new function turned out to be unneeded.)

File:

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

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

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.10.4.10 2000-08-29 22:52:36 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.10.4.11 2000-08-30 04:11:31 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -19 +19 @@
 #define INCL_OS2KRNL_TCB
 #define INCL_OS2KRNL_SEM
+#define INCL_OS2KRNL_SEC
 
 /*******************************************************************************
@@ -295 +296 @@
                         if (isLdrStateExecPgm() && fTkExecPgm)
                         {
-                            rc = AddArgsToFront(2, u1.pach, achTkExecPgmFilename);
+                            rc = AddArgsToFront(2, ldrpFileNameBuf, achTkExecPgmFilename);
                             if (rc == NO_ERROR)
                             {
-                                rc = SetExecName(u1.pach);
+                                rc = SetExecName(ldrpFileNameBuf);
                                 if (rc != NO_ERROR)
                                     kprintf(("myldrOpen-%d: pe.exe - failed to set pe.exe as execname. rc=%d\n", cNesting));
@@ -358 +359 @@
                 if (isLdrStateExecPgm() && fTkExecPgm)
                 {
-                    cchName = strlen(ldrpFileNameBuf);
+                    /* Ooops we had to get the file name from the MFT. ldrpFileNameBuf is allways uppercased... */
+                    /* MFT seems to hold uppercased filenames! ARG! But (by pure luck?) achTkExecPgmArguments is
+                     * not uppercased (yet). Nothing could be simpler!
+                     */
+                    #if 1
+                    psz3 = achTkExecPgmArguments;
+                    #elif 0
+                    psz3 = SecPathFromSFN(*phFile);
+                    if (psz3 == NULL)
+                        psz3 = ldrpFileNameBuf;
+                    #else
+                    psz3 = ldrpFileNameBuf;
+                    #endif
+                    cchName = strlen(psz3);
                     pszName = (char*)rmalloc(cchName + 2);
                     if (pszName == NULL)
@@ -365 +379 @@
                         goto cleanup;
                     }
-                    memcpy(pszName, ldrpFileNameBuf, cchName+1);
+                    memcpy(pszName, psz3, cchName+1);
 
                     psz = pszName + strlen(pszName) - 1;
@@ -380 +394 @@
                         if (psz - pszName == 2)
                         {
-                            memmove(psz + 1, psz, cchName - 2);
+                            memmove(psz + 1, psz, cchName - 1);
                             *psz++ = '\\';
                         }
                     }
-                    *psz = ' ';              //assume fully qualified path...
+                    /* check if no path */
+                    if (psz == pszName)
+                        memmove(pszName + 1, pszName, cchName + 1);
+                    *psz = ' ';
                 }
 
@@ -437 +454 @@
                         /*
                          * Add the class directory (as the last classpath entry) and the class name.
+                         * (Note. I may happen that there is no directory, but that don't matter
+                         *        a space is allways preceding the class name.)
                          */
                         *psz++ = ';';
@@ -669 +688 @@
             kprintf(("myldrOpen-%d: Found REXX script\n", cNesting));
             ldrClose(*phFile);
-            strcpy(u1.pach, "KRX.EXE");
-            rc = ldrOpen(phFile, u1.pach, pfl);
+            psz = "KRX.EXE";
+            rc = ldrOpen(phFile, psz, pfl);
             if (rc != NO_ERROR)
-                rc = OpenPATH(phFile, u1.pach, pfl);
+                rc = OpenPATH(phFile, psz, pfl);
 
             /** @sketch
@@ -683 +702 @@
              if (rc == NO_ERROR && isLdrStateExecPgm())
              {
-                 rc = AddArgsToFront(2, u1.pach, achTkExecPgmFilename);
+                 rc = AddArgsToFront(2, ldrpFileNameBuf, achTkExecPgmFilename);
                  if (rc != NO_ERROR)
                  {
@@ -689 +708 @@
                      goto cleanup_noerror;
                  }
-                 rc = SetExecName(u1.pach);
+                 rc = SetExecName(ldrpFileNameBuf);
                  if (rc != NO_ERROR)
                      kprintf(("myldrOpen-%d: SetExecName failed with rc=%d\n", cNesting));