Changeset 4141 for branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Sep 1, 2000, 10:01:37 AM (25 years ago)

Author:

bird

Message:

Found and fixed an optimization bug of VA 3.08. (see remark on openPath2)

File:

• branches/GRACE/src/win32k/pe2lx/pe2lx.cpp (modified) (4 diffs)

branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.18.4.10 2000-08-29 04:08:24 bird Exp $
+/* $Id: pe2lx.cpp,v 1.18.4.11 2000-09-01 08:01:37 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1375 +1375 @@
  *          endloop
  *      endif
- */
-ULONG  Pe2Lx::openPath2(PCHAR pachFilename, USHORT cchFilename, ldrlv_t *pLdrLv, PULONG pful, BOOL fOdin32PathValid)
+ * @remark      cchFilename has to be ULONG due to an optimization bug in VA 3.08.
+ *              (cchFilename should have been USHORT. But, then the compiler would
+ *               treat it as an ULONG.)
+ */
+ULONG  Pe2Lx::openPath2(PCHAR pachFilename, ULONG cchFilename, ldrlv_t *pLdrLv, PULONG pful, BOOL fOdin32PathValid)
 {
     #ifdef RING0
@@ -1538 +1541 @@
             memcpy(pVars->sz, pszPath, cch);
             pVars->sz[cch++] = '\\';
-            memcpy(&pVars->sz[cch], pachFilename, cchFilename);
+            memcpy(&pVars->sz[cch], pachFilename, (size_t)cchFilename);
             if (cchExt != 0)
                 memcpy(&pVars->sz[cch + cchFilename], ".DLL", 5);
@@ -1584 +1587 @@
      */
     rfree(pVars);
-    return ldrOpenPath(pachFilename, cchFilename, pLdrLv, pful);
+    return ldrOpenPath(pachFilename, (USHORT)cchFilename, pLdrLv, pful);
 
     #else