Changeset 1398 for trunk/dll/srchpath.c

Timestamp:

Feb 21, 2009, 6:43:00 PM (16 years ago)

Author:

Gregg Young

Message:

Move embeded strings to PCSZ variables or string table; Eliminate Error2 functions Runtime_Error with NULL format string returns "No data" error. Change declares from PSZ to PCSZ in functions where the variable isn't changed. Added btm as an executable file type in several additional places. Use fProtectOnly to prevent attempt to execute Dos and Win programs on "Protect only" installs in several additional places.

File:

• trunk/dll/srchpath.c (modified) (8 diffs)

trunk/dll/srchpath.c

@@ -30 +30 @@
 #include "systemf.h"                    // runemf2
 #include "notebook.h"                   // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 
 static PSZ pszSrcFile = __FILE__;
@@ -40 +41 @@
 //== Search PATH plus 2 default install dirs ==
 
-INT RunFM2Util(CHAR *appname, CHAR *filename)
+INT RunFM2Util(PCSZ appname, CHAR *filename)
 {
     CHAR fbuf[CCHMAXPATH];
@@ -47 +48 @@
 
     rc = DosSearchPath(SEARCH_IGNORENETERRS |SEARCH_ENVIRONMENT |
-                       SEARCH_CUR_DIRECTORY,"PATH",
+                       SEARCH_CUR_DIRECTORY, PCSZ_PATH,
                        appname, (PBYTE)fbuf, CCHMAXPATH - 1);
       if (rc != 0) {
         if (rc != 2){
         Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DosSearchPath", appname);
+                  PCSZ_DOSSEARCHPATH, appname);
         return ret;
         }
@@ -60 +61 @@
             if (rc != 0 && rc != 2){
               Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        "DosSearchPath", appname);
+                        PCSZ_DOSSEARCHPATH, appname);
               return ret;
             }
@@ -104 +105 @@
  */
 
-CHAR *searchapath(CHAR *pathvar, CHAR *filename)
+CHAR *searchapath(PCSZ pathvar, PCSZ filename)
 {
   static CHAR fbuf[CCHMAXPATH];
@@ -113 +114 @@
     FILESTATUS3 fsa;
 
-    if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsa, (ULONG) sizeof(fsa)))
-      return filename;
+    strcpy(fbuf, filename);
+    if (!DosQueryPathInfo(fbuf, FIL_STANDARD, &fsa, (ULONG) sizeof(fsa)))
+      return fbuf;
     *fbuf = 0;
     return fbuf;
@@ -126 +128 @@
 }
 
-CHAR *searchpath(CHAR * filename)
+CHAR *searchpath(PCSZ filename)
 {
   CHAR *found;
@@ -132 +134 @@
   if (!filename)
     return "";
-  found = searchapath("PATH", filename);
+  found = searchapath(PCSZ_PATH, filename);
   if (!*found) {
     found = searchapath("DPATH", filename);