Changeset 9556 for trunk/src

Timestamp:

Dec 28, 2002, 2:40:10 PM (23 years ago)

Author:

sandervl

Message:

Change BEGINLIBPATH before loading any dlls

File:

• trunk/src/peldr/pe.cpp (modified) (3 diffs)

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.35 2002-12-20 11:38:55 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.36 2002-12-28 13:40:10 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
 char szExeErrorMsg[]    = "%s isn't an executable";
 char szInteralErrorMsg[]= "Internal Error while loading %s";
+char szInteralErrorMsg1[]= "Internal Error";
 char szNoKernel32Msg[]  = "Can't load/find kernel32.dll (rc=%d, module %s)";
 char szDosInfoBlocks[]  = "DosInfoBlocks failed!";
@@ -98 +99 @@
  BOOL   fQuote = FALSE, fVioConsole, fIsNEExe, fEndOfCmdLine = FALSE;
  int    nrTries = 1;
+
+  if(DosGetInfoBlocks(&ptib, &ppib) == 0) 
+  {
+      char *pszTemp;
+
+      fullpath[0] = 0;
+      DosQueryModuleName(ppib->pib_hmte, sizeof(fullpath), fullpath);
+
+      strupr(fullpath);
+#ifdef COMMAND_LINE_VERSION
+      pszTemp = strstr(fullpath, "PEC.EXE");
+#else
+      pszTemp = strstr(fullpath, "PE.EXE");
+#endif
+      if(pszTemp == NULL) {
+          pszErrorMsg = szInteralErrorMsg1;
+          goto failerror;
+      }
+      pszTemp--; //to go trailing backslash
+      *pszTemp = 0;
+      strcat(fullpath, ";%BeginLIBPATH%");
+      DosSetExtLIBPATH(fullpath, BEGIN_LIBPATH);
+  }
 
   if(argc >= 2) {