Changeset 3398 for trunk/src

Timestamp:

Apr 16, 2000, 6:27:38 AM (25 years ago)

Author:

bird

Message:

Added argument pszAltPath to method findDll. This argument may hold
an alternative executable search path. Intented for LoadLibraryEx flag
LOAD_WITH_ALTERED_SEARCH_PATH.

Location:

trunk/src/kernel32

Files:

• winimagebase.cpp (modified) (4 diffs)
• winimagebase.h (modified) (1 diff)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.15 2000-04-16 04:19:57 bird Exp $ */
+/* $Id: winimagebase.cpp,v 1.16 2000-04-16 04:27:37 bird Exp $ */
 
 /*
@@ -166 +166 @@
  * @param     cchFullname   Size of the buffer pointer to by pszFullname.
  *                          (A length of at least CCHMAXPATH is recommended.)
- * @parm      pszAltPath    Pointer to alternate first path. If this is NULL
- *                          (which is it by default) the executable path
- *                          is used. If this is specified, this path is used
- *                          instead. This is intented used to implement the
- *                          LoadLibraryEx flag LOAD_WITH_ALTERED_SEARCH_PATH.
+ * @parm      pszAltPath    Pointer to alternate first executable path. This
+ *                          will include a filename or at least a backslash at
+ *                          the end.
+ *                          If this is NULL (which is it by default) the
+ *                          executable path is used. If this is specified,
+ *                          this path is used instead. This is intented used
+ *                          to implement the LoadLibraryEx flag
+ *                          LOAD_WITH_ALTERED_SEARCH_PATH.
  *
  * @status    Completely implemented.
@@ -258 +261 @@
         {
             case FINDDLL_EXECUTABLEDIR:
-                if (!pszAltPath)
+                if (pszAltPath)
+                    pszPath = strcpy(plv->szPath, pszAltPath);
+                else
                 {
                     /* ASSUMES: getFullPath allways returns a fully qualified
@@ -265 +270 @@
                      */
                     pszPath = strcpy(plv->szPath, WinExe->getFullPath());
-                    psz = strrchr(plv->szPath, '\\');
-                    dassert(psz, ("KERNEL32:Win32ImageBase::findDll(%s, 0x%08x, %d): "
-                            "WinExe->getFullPath returned a path not fully qualified: %s",
-                            pszFileName, pszFullName, cchFullName, pszPath));
-                    if (psz)
-                        *psz = '\0';
-                    else
-                        continue;
                 }
+                psz = strrchr(plv->szPath, '\\');
+                dassert(psz, ("KERNEL32:Win32ImageBase::findDll(%s, 0x%08x, %d): "
+                        "WinExe->getFullPath returned a path not fully qualified: %s",
+                        pszFileName, pszFullName, cchFullName, pszPath));
+                if (psz)
+                    *psz = '\0';
                 else
-                    pszPath = pszAltPath;
+                    continue;
                 break;
 

trunk/src/kernel32/winimagebase.h

@@ -1 @@
-/* $Id: winimagebase.h,v 1.4 2000-04-16 04:19:58 bird Exp $ */
+/* $Id: winimagebase.h,v 1.5 2000-04-16 04:27:38 bird Exp $ */
 
 /*