Changeset 1398

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.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (8 diffs)
• archive.c (modified) (1 diff)
• assoc.c (modified) (2 diffs)
• attribs.c (modified) (1 diff)
• autoview.c (modified) (4 diffs)
• avl.c (modified) (3 diffs)
• avv.c (modified) (5 diffs)
• chklist.c (modified) (1 diff)
• cmdline.c (modified) (3 diffs)
• collect.c (modified) (2 diffs)
• command.c (modified) (2 diffs)
• common.c (modified) (1 diff)
• comp.c (modified) (10 diffs)
• defview.c (modified) (4 diffs)
• dircnrs.c (modified) (2 diffs)
• dirsize.c (modified) (3 diffs)
• droplist.c (modified) (2 diffs)
• eas.c (modified) (2 diffs)
• errutil.c (modified) (5 diffs)
• filldir.c (modified) (2 diffs)
• filter.c (modified) (2 diffs)
• fm3res.rc (modified) (1 diff)
• fm3str.h (modified) (1 diff)
• getnames.c (modified) (3 diffs)
• grep.c (modified) (1 diff)
• grep2.c (modified) (3 diffs)
• info.c (modified) (3 diffs)
• inis.c (modified) (37 diffs)
• init.c (modified) (9 diffs)
• init.h (modified) (2 diffs)
• input.c (modified) (1 diff)
• instant.c (modified) (3 diffs)
• killproc.c (modified) (1 diff)
• mainwnd.c (modified) (10 diffs)
• mainwnd2.c (modified) (1 diff)
• menu.c (modified) (1 diff)
• misc.c (modified) (3 diffs)
• newview.c (modified) (4 diffs)
• notebook.c (modified) (1 diff)
• objcnr.c (modified) (1 diff)
• pathutil.c (modified) (10 diffs)
• pathutil.h (modified) (1 diff)
• printer.c (modified) (4 diffs)
• remap.c (modified) (2 diffs)
• saveclip.c (modified) (13 diffs)
• seeall.c (modified) (3 diffs)
• shadow.c (modified) (4 diffs)
• srchpath.c (modified) (8 diffs)
• srchpath.h (modified) (1 diff)
• subj.c (modified) (2 diffs)
• systemf.c (modified) (4 diffs)
• tools.c (modified) (6 diffs)
• treecnr.c (modified) (12 diffs)
• undel.c (modified) (2 diffs)
• update.c (modified) (1 diff)
• uudecode.c (modified) (1 diff)
• valid.c (modified) (5 diffs)
• viewinf.c (modified) (3 diffs)
• walkem.c (modified) (7 diffs)
• worker.c (modified) (4 diffs)
• wrappers.c (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -339 +339 @@
     pdcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
     if (!pdcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       return ret;
     }
@@ -602 +602 @@
   *pullTotalBytes = 0;
   if (!info || !info->list)
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
   else {
     RemoveArcItems(hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
@@ -655 +655 @@
         if (rc) {
           Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
-                    "DosDupHandle");
+                    PCSZ_DOSDUPHANDLE);
           xfree(arctemp, pszSrcFile, __LINE__);
           return 0;
@@ -665 +665 @@
           if (rc) {
             Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
-                      "DosDupHandle");
+                      PCSZ_DOSDUPHANDLE);
             xfree(arctemp, pszSrcFile, __LINE__);
             return 0;
@@ -1498 +1498 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
     }
@@ -2024 +2024 @@
                 CHAR szTempFile[CCHMAXPATH];
 
-                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+                BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP);
                 fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
@@ -2035 +2035 @@
                   strcat(szTempFile, "@/");
                   strrev(szTempFile);
-                  RunFM2Util("FM2PLAY.EXE", szTempFile);
+                  RunFM2Util(PCSZ_FM2PLAYEXE, szTempFile);
                 }
               }
@@ -2477 +2477 @@
   case UM_SETUP:
     if (!dcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
       return 0;

trunk/dll/archive.c

@@ -192 +192 @@
     arcdata = (DIRCNRDATA *) WinQueryWindowPtr(hwnd, QWL_USER);
     if (!arcdata) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       return 0;
     }

trunk/dll/assoc.c

@@ -164 +164 @@
     free_associations();
   assloaded = TRUE;
-  BldFullPathName(mask, pFM2SaveDirectory, "ASSOC.DAT");
+  BldFullPathName(mask, pFM2SaveDirectory, PCSZ_ASSOCDAT);
   fp = _fsopen(mask, "r", SH_DENYWR);
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
@@ -286 +286 @@
   }
 #endif
-  BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_ASSOCDAT);
   if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg

trunk/dll/attribs.c

@@ -293 +293 @@
         li = INSTDATA(hwnd);
         if (!li) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
           break;
         }

trunk/dll/autoview.c

@@ -69 +69 @@
 
 static BOOL PutComments(HWND hwnd, CHAR * filename, CHAR * comments);
-static BOOL WriteEA(HWND hwnd, CHAR * filename, CHAR * eaname, USHORT type,
+static BOOL WriteEA(HWND hwnd, CHAR * filename, PCSZ eaname, USHORT type,
              CHAR * data);
 
@@ -87 +87 @@
 static CHAR currfile[CCHMAXPATH];
 
-BOOL WriteEA(HWND hwnd, CHAR * filename, CHAR * eaname, USHORT type,
+BOOL WriteEA(HWND hwnd, CHAR * filename, PCSZ eaname, USHORT type,
              CHAR * data)
 {
@@ -255 +255 @@
       comments = NULL;
   }
-  return WriteEA(hwnd, filename, ".COMMENTS", EAT_MVMT, comments);
+  return WriteEA(hwnd, filename, PCSZ_DOTCOMMENTS, EAT_MVMT, comments);
 }
 
@@ -556 +556 @@
           if (pgealist) {
             pgea = &pgealist->list[0];
-            strcpy(pgea->szName, ".COMMENTS");
+            strcpy(pgea->szName, PCSZ_DOTCOMMENTS);
             pgea->cbName = strlen(pgea->szName);
             pgea->oNextEntryOffset = 0L;

trunk/dll/avl.c

@@ -369 +369 @@
   //DosEnterCritSec(); //GKY 11-29-08
   DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-  psz = searchpath(ARCHIVERBB2);
+  psz = searchpath(PCSZ_ARCHIVERBB2);
   if (!psz || !*psz) {
     DosReleaseMutexSem(hmtxFM2Globals);
@@ -781 +781 @@
       load_archivers();
     if (!(ARC_TYPE **) mp2) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;
@@ -861 +861 @@
                    GetPString(IDS_ADCHANGESINMEMTEXT),
                    GetPString(IDS_ADREWRITETEXT), NullStr) == MBID_YES) {
-          PSZ ab2 = searchpath(ARCHIVERBB2);    // Rewrite without prompting
+          PSZ ab2 = searchpath(PCSZ_ARCHIVERBB2);       // Rewrite without prompting
 
           rewrite_archiverbb2(ab2);

trunk/dll/avv.c

@@ -243 +243 @@
            HWND_DESKTOP,
            GetPString(IDS_NOTETEXT), GetPString(IDS_SAVEARCBB2TEXT));
-    archiverbb2 = ARCHIVERBB2;
+    archiverbb2 = (PSZ) PCSZ_ARCHIVERBB2;
   }
   /* Check space on drive*/
@@ -251 +251 @@
   /* save a backup */
   psz = strrchr(archiverbb2, '.');
-  if (psz && !stricmp(psz, ".BB2")) {
+  if (psz && !stricmp(psz, PCSZ_DOTBB2)) {
     strcpy(psz, ".BAK");
     DosDelete(archiverbb2);
     strcpy(sz, archiverbb2);
-    strcpy(psz, ".BB2");
+    strcpy(psz, PCSZ_DOTBB2);
     DosMove(archiverbb2, sz);
     fpOld = fopen(sz, "r");             // OK for file not to exist
@@ -270 +270 @@
     fprintf(fpNew,
             ";\n; %s file written by FM/2 v%d.%02d on %u/%u/%u %u:%02u:%02u\n;\n",
-            ARCHIVERBB2,
+            PCSZ_ARCHIVERBB2,
             VERMAJOR, VERMINOR,
             tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900,
@@ -289 +289 @@
     else {
       // Write default header
-      fputs(ARCHIVERBB2, fpNew);
+      fputs(PCSZ_ARCHIVERBB2, fpNew);
     }
     pat = arcsighead;
@@ -915 +915 @@
           PSZ ab2;
 
-          ab2 = searchpath(ARCHIVERBB2);        // Rewrite without alerting
+          ab2 = searchpath(PCSZ_ARCHIVERBB2);   // Rewrite without alerting
           rewrite_archiverbb2(ab2);
         }

trunk/dll/chklist.c

@@ -483 +483 @@
                     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
                   }
-// else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"DosQueryPathInfo FIL_STANDARDL failed");
                 }
-// else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"DosQueryPathInfo FIL_QUERYFULLNAME failed");
               }
-// else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"lReturn = %lu lSRC = %lu",fdlg.lReturn,fdlg.lSRC);
             }
-// else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"WinFileDlg failed");
           }
         }

trunk/dll/cmdline.c

@@ -97 +97 @@
     else
       MiniLoaded = TRUE;
-    BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+    BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? PCSZ_CMDLINESDAT : PCSZ_CMDMINIDAT);
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
@@ -150 +150 @@
   if (!pszCmdLine)
     return;
-  BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+  BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? PCSZ_CMDLINESDAT : PCSZ_CMDMINIDAT);
   if (CheckDriveSpaceAvail(pszCmdLine, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
@@ -443 +443 @@
         p = strchr(executable, '.');
         if (p) {
-          if (!stricmp(p, ".BAT") || !stricmp(p, ".CMD")) {
+          if (!stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTCMD) ||
+              !stricmp(p, PCSZ_DOTBTM)) {
             WinSetDlgItemText(hwnd,
                               EXEC_WARNING2,

trunk/dll/collect.c

@@ -1577 +1577 @@
 #     endif
       if (!dcd)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
@@ -2996 +2996 @@
     dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
     if (!dcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
       hwndFrame = (HWND) 0;

trunk/dll/command.c

@@ -352 +352 @@
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (pszCmdLine) {
-    BldFullPathName(pszCmdLine, pFM2SaveDirectory, "COMMANDS.DAT");
+    BldFullPathName(pszCmdLine, pFM2SaveDirectory, PCSZ_COMMANDSDAT);
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
@@ -416 +416 @@
     return;
   info = cmdhead;
-  BldFullPathName(s, pFM2SaveDirectory, "COMMANDS.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_COMMANDSDAT);
   if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg

trunk/dll/common.c

@@ -207 +207 @@
 
   if (!hwnd || !class || !ids) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }

trunk/dll/comp.c

@@ -449 +449 @@
 
   if (!cmp) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }
@@ -789 +789 @@
 
   if (!cmp) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }
@@ -1420 +1420 @@
 
   if (!str || !*str) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }
@@ -1551 +1551 @@
 
   if (!cmp) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
 #   ifdef FORTIFY
     // 10 May 08 SHL fixme to suppress W111
@@ -2202 +2202 @@
     cmp = (COMPARE *)mp2;
     if (!cmp) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
     }
@@ -2334 +2334 @@
       cmp = INSTDATA(hwnd);
       if (!cmp)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         cmp->dcd.size = sizeof(DIRCNRDATA);
@@ -2999 +2999 @@
         CHAR fullname[CCHMAXPATH];
 
-        strcpy(fullname, "*.PMD");
+        strcpy(fullname, PCSZ_STARDOTPMD);
         if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
             *fullname && !strchr(fullname, '*') && !strchr(fullname, '?')) {
@@ -3015 +3015 @@
         CHAR fullname[CCHMAXPATH];
 
-        strcpy(fullname, "*.PMD");
+        strcpy(fullname, PCSZ_STARDOTPMD);
         if (export_filename(HWND_DESKTOP, fullname, 1) && *fullname &&
             !strchr(fullname, '*') && !strchr(fullname, '?')) {
@@ -3195 +3195 @@
       cmp = INSTDATA(hwnd);
       if (!cmp)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         COMPARE *forthread;
@@ -3276 +3276 @@
       cmp = INSTDATA(hwnd);
       if (!cmp)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         CHAR **listl;

trunk/dll/defview.c

@@ -141 +141 @@
              /* printf("%s %d %s\n",
               __FILE__, __LINE__, p); fflush(stdout);*/
-          if (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC") ||
-               !stricmp(p, ".JPG") || !stricmp(p, ".JPEG")){
+          if (!stricmp(p, PCSZ_DOTOGG) || !stricmp(p, PCSZ_DOTMP3) || !stricmp(p, PCSZ_DOTFLAC) ||
+               !stricmp(p, PCSZ_DOTJPG) || !stricmp(p, PCSZ_DOTJPEG)){
              hmmio = pMMIOOpen(filename,
                     &mmioinfo,
@@ -193 +193 @@
              /* printf("%s %d %s\n",
               __FILE__, __LINE__, p); fflush(stdout);*/
-          if (!stricmp(p, ".JPG") || !stricmp(p, ".JPEG"))
+          if (!stricmp(p, PCSZ_DOTJPG) || !stricmp(p, PCSZ_DOTJPEG))
             OpenObject(filename, Default, hwnd);  //Image fails to display these
           else       // is an image that can be translated
@@ -206 +206 @@
              /* printf("%s %d %s\n",
               __FILE__, __LINE__, p); fflush(stdout);*/
-          if (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC"))
+          if (!stricmp(p, PCSZ_DOTOGG) || !stricmp(p, PCSZ_DOTMP3) || !stricmp(p, PCSZ_DOTFLAC))
               OpenObject(filename, Default, hwnd);  //FM2Play fails to play these
           else
-            RunFM2Util("FM2PLAY.EXE", filename);
+            RunFM2Util(PCSZ_FM2PLAYEXE, filename);
           played = TRUE;
     }
@@ -340 +340 @@
             p = ".";
           if (stricmp(p, ".INI") || !StartIniEditor(hwndParent, filename, 4)) {
-            if (stricmp(p, ".HLP") || !ViewHelp(filename)) {
+            if (stricmp(p, PCSZ_DOTHLP) || !ViewHelp(filename)) {
             ViewIt:
               if (TestBinary(filename)) {

trunk/dll/dircnrs.c

@@ -1168 +1168 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       if (dcd->hwndRestore)
@@ -3048 +3048 @@
             }
             else if (!*dcd->directory) {
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
               break;
             }

trunk/dll/dirsize.c

@@ -444 +444 @@
 
   if (!dirsize) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }
@@ -939 +939 @@
       pState = INSTDATA(hwnd);
       if (!pState)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
 
@@ -1013 +1013 @@
       pState = INSTDATA(hwnd);
       if (!pState)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (pState->working) {

trunk/dll/droplist.c

@@ -172 +172 @@
       else
        Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DosQueryPathInfo");
+                 PCSZ_DOSQUERYPATHINFO);
     }
 
@@ -180 +180 @@
     else {
         Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DosQueryPathInfo");
+                  PCSZ_DOSQUERYPATHINFO);
         *buffer = 0;
     }

trunk/dll/eas.c

@@ -849 +849 @@
 
         if (!eap->head || !*eap->filename)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else {
           switch (*(USHORT *) eap->current->value) {
@@ -873 +873 @@
               WinQueryDlgItemText(hwnd, control, 32767, (PCH) s);
               if (!*s)
-                Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+                Runtime_Error(pszSrcFile, __LINE__, NULL);
               else {
                 PFEA2LIST pfealist;

trunk/dll/errutil.c

@@ -49 +49 @@
 #include "fm3str.h"
 #include "notebook.h"                   // fErrorBeepOff
+#include "init.h"                       // Data declares
 
 #pragma data_seg(GLOBAL2)
@@ -295 +296 @@
 
 //== Runtime_Error: report runtime library error using passed message string ===
+//If pszFmt is NULL a No Data error message is returned GKY 20 Feb 09 (Replaces Runtime_Error2)
 
 VOID Runtime_Error(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...)
@@ -302 +304 @@
 
   // Format caller's message
+  if (!pszFmt)
+    pszFmt = PCSZ_NODATA;
   va_start(va, pszFmt);
   szMsg[sizeof(szMsg) - 1] = 0;
@@ -326 +330 @@
 //== Runtime_Error2: report runtime library error using passed message id ===
 
-VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
+/*VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
 {
   Runtime_Error(pszSrcFile, uSrcLineNo, GetPString(idMsg));
@@ -332 +336 @@
 } // Runtime_Error2
 
-// fixme to be rename to Misc_Error
+// fixme to be rename to Misc_Error */
 
 //=== saymsg: report misc error using passed message ===

trunk/dll/filldir.c

@@ -336 +336 @@
     cmp = *(ULONG *) cmps;
 
-    if (cmp == *(ULONG *) ".EXE" || cmp == *(ULONG *) ".CMD" ||
-        cmp == *(ULONG *) ".BAT" || cmp == *(ULONG *) ".COM")
+    if (cmp == *(ULONG *) PCSZ_DOTEXE || cmp == *(ULONG *) PCSZ_DOTCMD ||
+        cmp == *(ULONG *) PCSZ_DOTBAT || cmp == *(ULONG *) PCSZ_DOTCOM ||
+        cmp == *(ULONG *) PCSZ_DOTBTM)
       hptr = hptrApp;
     else if (cmp == *(ULONG *) ".ZIP" || cmp == *(ULONG *) ".LZH" ||
@@ -343 +344 @@
              cmp == *(ULONG *) ".ZOO" || cmp == *(ULONG *) ".RAR" ||
              cmp == *(ULONG *) ".TAR" || cmp == *(ULONG *) ".TGZ" ||
-             cmp == *(ULONG *) ".GZ" || cmp == *(ULONG *) ".Z" ||
+             cmp == *(ULONG *) ".GZ"  || cmp == *(ULONG *) ".Z"   ||
              cmp == *(ULONG *) ".CAB" || cmp == *(ULONG *) ".BZ2")
       hptr = hptrArc;
-    else if (cmp == *(ULONG *) ".BMP" || cmp == *(ULONG *) ".ICO" ||
-             cmp == *(ULONG *) ".PTR" || cmp == *(ULONG *) ".GIF" ||
+    else if (cmp == *(ULONG *) PCSZ_DOTBMP  ||
+             cmp == *(ULONG *) PCSZ_DOTICO  ||
+             cmp == *(ULONG *) PCSZ_DOTPTR  ||
+             cmp == *(ULONG *) PCSZ_DOTJPEG ||
+             cmp == *(ULONG *) PCSZ_DOTJPG  ||
+             cmp == *(ULONG *) ".GIF" ||
              cmp == *(ULONG *) ".TIF" || cmp == *(ULONG *) ".PCX" ||
              cmp == *(ULONG *) ".TGA" || cmp == *(ULONG *) ".XBM" ||
-             cmp == *(ULONG *) ".JPEG" || cmp == *(ULONG *) ".JPG" ||
              cmp == *(ULONG *) ".PNG" || cmp == *(ULONG *) ".PSD" ||
              cmp == *(ULONG *) ".LGO" || cmp == *(ULONG *) ".EPS" ||

trunk/dll/filter.c

@@ -151 +151 @@
 
   loadedmasks = TRUE;
-  BldFullPathName(s, pFM2SaveDirectory, "FILTERS.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_FILTERSDAT);
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -190 +190 @@
     return;
   if (maskhead) {
-    BldFullPathName(s, pFM2SaveDirectory, "FILTERS.DAT");
+    BldFullPathName(s, pFM2SaveDirectory, PCSZ_FILTERSDAT);
     if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg

trunk/dll/fm3res.rc

@@ -2623 +2623 @@
     IDS_ASKABOUTUNDELETEHELPTEXT          "\r\rWould you like help on UNDELETE?"
     IDS_UNDELETETITLETEXT                 "FM/2: Undelete files drive %c:"
-    IDS_NODATATEXT                        "No data."
     IDS_COULDNTSTARTTHREADTEXT            "Could not start thread."
     IDS_UNDELETEHELPTITLETEXT             "Undelete:"

trunk/dll/fm3str.h

@@ -321 +321 @@
 #define IDS_ASKABOUTUNDELETEHELPTEXT                          288
 #define IDS_UNDELETETITLETEXT                                 289
-#define IDS_NODATATEXT                                        290
 #define IDS_COULDNTSTARTTHREADTEXT                            291
 #define IDS_UNDELETEHELPTITLETEXT                             292

trunk/dll/getnames.c

@@ -25 +25 @@
 #include "notebook.h"                   // Data declaration(s)
 #include "info.h"                       // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)
 #include "fm3dlg.h"
@@ -263 +264 @@
     }
     if (!loadit || loadit == TRUE)
-      strcat(fdlg.szFullFile, "*.TXT");
+      strcat(fdlg.szFullFile, PCSZ_STARDOTTXT);
     else
       strcat(fdlg.szFullFile, "*");
@@ -356 +357 @@
       }
     }
-    strcat(fdlg.szFullFile, "*.TXT");
+    strcat(fdlg.szFullFile, PCSZ_STARDOTTXT);
   }
   else

trunk/dll/grep.c

@@ -288 +288 @@
 
   if (!arg) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }

trunk/dll/grep2.c

@@ -302 +302 @@
     WinEnableWindow(WinWindowFromID(hwnd, GREP_NOSIZEDUPES), FALSE);
 
-    BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
+    BldFullPathName(s, pFM2SaveDirectory, PCSZ_GREPMASKDAT);
     fp = _fsopen(s, "r", SH_DENYWR);
     if (fp) {
@@ -808 +808 @@
       hwndCollect = WinQueryWindowULong(hwnd, QWL_USER);
       if (!hwndCollect)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         // 07 Feb 08 SHL - fixme to malloc and free in thread
@@ -983 +983 @@
                                             MPVOID, MPVOID);
         if (sSelect > 0) {
-          BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
+          BldFullPathName(s, pFM2SaveDirectory, PCSZ_GREPMASKDAT);
           if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
             break; //already gave error msg

trunk/dll/info.c

@@ -392 +392 @@
 
   if (!pis) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     if (msg != WM_DESTROY)
       return WinDefWindowProc(hwnd, msg, mp1, mp2);
@@ -464 +464 @@
     if (pis->lasthwndMenu) {
       p = strrchr(pis->pfs->szFileName, '.');
-      if (!p || (stricmp(p, ".ICO") && stricmp(p, ".PTR")))
+      if (!p || (stricmp(p, PCSZ_DOTICO) && stricmp(p, PCSZ_DOTPTR)))
         WinSendMsg(pis->lasthwndMenu,
                    MM_DELETEITEM,
@@ -598 +598 @@
         pfs = WinQueryWindowPtr(hwnd, QWL_USER);
         if (!pfs) {
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
           WinDismissDlg(hwnd, 1);
         }

trunk/dll/inis.c

@@ -501 +501 @@
   if (!PrfQueryProfileSize(hini, NULL, NULL, (PULONG) & ulSize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              PCSZ_PRFQUERYPROFILESIZE);
   else if (!ulSize)
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
   else {
     pData = xmalloc(ulSize, pszSrcFile, __LINE__);
@@ -535 +535 @@
   if (!PrfQueryProfileSize(hini, pAppName, pKeyName, (PULONG) & ulKeySize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              PCSZ_PRFQUERYPROFILESIZE);
   else {
     pKeyData = xmalloc(ulKeySize + 1L, pszSrcFile, __LINE__);
@@ -542 +542 @@
           (hini, pAppName, pKeyName, pKeyData, (PULONG) & ulKeySize))
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfQueryProfileData");
+                  PCSZ_PRFQUERYPROFILEDATA);
       else {
         HexDump(hwndList, pKeyData, ulKeySize);
@@ -571 +571 @@
   if (!PrfQueryProfileSize(hini, pAppName, NULL, (PULONG) & ulSize))
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "PrfQueryProfileSize");
+              PCSZ_PRFQUERYPROFILESIZE);
   else {
     if (!ulSize)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     pData = xmalloc(ulSize + 1L, pszSrcFile, __LINE__);
     if (pData) {
       if (!PrfQueryProfileString(hini, pAppName, NULL, "\0", pData, ulSize)) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfQueryProfileString");
+                  PCSZ_PRFQUERYPROFILESTRING);
         free(pData);
       }
@@ -694 +694 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         CHAR s[8193], app[1024];
@@ -781 +781 @@
                                             MPVOID);
         if (sSelect < 0)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else {
           *s = 0;
@@ -817 +817 @@
           WinQueryWindowText(hwndMLE, 8192, s);
           if (!*s)
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
           else {
             fp = xfopen(filename, "w", pszSrcFile, __LINE__);
@@ -1411 +1411 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         CHAR s[CCHMAXPATH], applname[CCHMAXPATH];
@@ -1461 +1461 @@
         inidata = INSTDATA(hwnd);
         if (!inidata) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
           break;
         }
@@ -1934 +1934 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (hwndStatus) {
         if (*inidata->ininame) {
@@ -1990 +1990 @@
     inidata = INSTDATA(hwnd);
     if (!inidata)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else if (mp1) {
       SHORT sSelect;
@@ -2043 +2043 @@
     inidata = INSTDATA(hwnd);
     if (!inidata)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else
       inidata->dontclose = TRUE;
@@ -2085 +2085 @@
     inidata = INSTDATA(hwnd);
     if (!inidata)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       if (mp1) {
@@ -2143 +2143 @@
         inidata = INSTDATA(hwnd);
         if (!inidata)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else if (inidata->hwndCurrent)
           BoxWindow(inidata->hwndCurrent, (HPS) 0, CLR_RED);
@@ -2159 +2159 @@
         inidata = INSTDATA(hwnd);
         if (!inidata)
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else {
           if (inidata->hwndCurrent)
@@ -2180 +2180 @@
           inidata = INSTDATA(hwnd);
           if (!inidata || !inidata->hini) {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
             break;
           }
@@ -2260 +2260 @@
     inidata = INSTDATA(hwnd);
     if (!inidata)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       PRFPROFILE prfp;
@@ -2308 +2308 @@
           inidata = INSTDATA(hwnd);
           if (!inidata)
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
           else {
             SHORT cmd = inidata->hwndCurrent &&
@@ -2328 +2328 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (inidata->hwndCurrent) {
         STRINGINPARMS sip;
@@ -2381 +2381 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         SHORT numitems = (SHORT)WinSendDlgItemMsg(hwnd,
@@ -2401 +2401 @@
       inidata = INSTDATA(hwnd);
       if (!inidata || !*inidata->ininame)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (mp2) {
         INIREC *inirec = xmallocz(sizeof(INIREC), pszSrcFile, __LINE__);
@@ -2424 +2424 @@
       inidata = INSTDATA(hwnd);
       if (!inidata || !*inidata->ininame)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (mp2) {
         INIREC *inirec = xmalloc(sizeof(INIREC), pszSrcFile, __LINE__);
@@ -2449 +2449 @@
       inidata = INSTDATA(hwnd);
       if (!inidata) {
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
         break;
       }
@@ -2495 +2495 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (*inidata->ininame) {
         // 09 Jan 08 SHL fixme to complain
@@ -2556 +2556 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (WinDlgBox(HWND_DESKTOP,
@@ -2572 +2572 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (WinDlgBox(HWND_DESKTOP,
@@ -2588 +2588 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         inidata->currid++;
@@ -2600 +2600 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         inidata->currid--;
@@ -2612 +2612 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         inidata->confirm = (inidata->confirm) ? FALSE : TRUE;
@@ -2624 +2624 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         inidata->edit = (SHORT1FROMMP(mp1) == INI_EDITENTRY);
@@ -2635 +2635 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         CHAR filename[CCHMAXPATH + 81], *p;
@@ -2686 +2686 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (inidata->hini && *inidata->ininame)
@@ -2701 +2701 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (inidata->hini && *inidata->ininame)
@@ -2716 +2716 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
@@ -2726 +2726 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else if (*inidata->applname && *inidata->keyname) {
 
@@ -2762 +2762 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       // 09 Jan 08 SHL fixme to complain?
       else if (*inidata->applname) {
@@ -2836 +2836 @@
       inidata = INSTDATA(hwnd);
       if (!inidata)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         dontclose = inidata->dontclose;

trunk/dll/init.c

@@ -214 +214 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *ARCHIVERBB2;
+PCSZ PCSZ_ARCHIVERBB2;
+PCSZ PCSZ_ASSOCDAT;
+PCSZ PCSZ_CMDLINESDAT;
+PCSZ PCSZ_CMDMINIDAT;
+PCSZ PCSZ_COMMANDSDAT;
+PCSZ PCSZ_FILTERSDAT;
+PCSZ PCSZ_GREPMASKDAT;
+PCSZ PCSZ_PATTERNSDAT;
+PCSZ PCSZ_RESOURCEDAT;
+PCSZ PCSZ_QUICKTLSDAT;
+PCSZ PCSZ_FM3TOOLSDAT;
+PCSZ PCSZ_USERDIRSDAT;
+PCSZ PCSZ_FM2PLAYEXE;
+PCSZ PCSZ_FM2PLAYTEMP;
 CHAR *CBSIFS;
 CHAR *DRF_FM2ARCHIVE;
@@ -236 +249 @@
 CHAR *LONGNAME;
 CHAR *NullStr;
+PCSZ PCSZ_DOSCREATEMUTEXSEM;
+PCSZ PCSZ_DOSDUPHANDLE;
+PCSZ PCSZ_DOSGETINFOBLOCKS;
+PCSZ PCSZ_DOSQUERYPATHINFO;
+PCSZ PCSZ_DOSSEARCHPATH;
 PCSZ PCSZ_WINCREATEWINDOW;
+PCSZ PCSZ_WINLOADACCELTABLE;
+PCSZ PCSZ_WINSETACCELTABLE;
 PCSZ PCSZ_INIQUERYPRFTEXT;
+PCSZ PCSZ_PRFQUERYPROFILEDATA;
+PCSZ PCSZ_PRFQUERYPROFILESIZE;
+PCSZ PCSZ_PRFQUERYPROFILESTRING;
 PCSZ PCSZ_FILLDIRQCURERRTEXT;
+PCSZ PCSZ_NODATA;
 PCSZ PCSZ_STARDOTEXE;
 PCSZ PCSZ_STARDOTINI;
 PCSZ PCSZ_STARDOTLST;
+PCSZ PCSZ_STARDOTPMD;
+PCSZ PCSZ_STARDOTTXT;
+PCSZ PCSZ_DOTEXE;
+PCSZ PCSZ_DOTCOM;
+PCSZ PCSZ_DOTCMD;
+PCSZ PCSZ_DOTBTM;
+PCSZ PCSZ_DOTBAT;
+PCSZ PCSZ_DOTLST;
+PCSZ PCSZ_DOTTLS;
+PCSZ PCSZ_DOTHLP;
+PCSZ PCSZ_DOTINF;
+PCSZ PCSZ_DOTMP3;
+PCSZ PCSZ_DOTOGG;
+PCSZ PCSZ_DOTFLAC;
+PCSZ PCSZ_DOTJPEG;
+PCSZ PCSZ_DOTJPG;
+PCSZ PCSZ_DOTICO;
+PCSZ PCSZ_DOTPTR;
+PCSZ PCSZ_DOTBB2;
+PCSZ PCSZ_DOTBMP;
+PCSZ PCSZ_DOTCOMMENTS;
+PCSZ PCSZ_PATH;
 CHAR *Settings;
 CHAR SwapperDat[CCHMAXPATH];
@@ -436 +482 @@
     RAMFS = "RAMFS";
     NTFS = "NTFS";
-    ARCHIVERBB2 = "ARCHIVER.BB2";
+    PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
+    PCSZ_ASSOCDAT    = "ASSOC.DAT";
+    PCSZ_CMDLINESDAT = "CMDLINES.DAT";
+    PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
+    PCSZ_COMMANDSDAT = "COMMANDS.DAT";
+    PCSZ_FILTERSDAT  = "FILTERS.DAT";
+    PCSZ_GREPMASKDAT = "GREPMASK.DAT";
+    PCSZ_PATTERNSDAT = "PATTERNS.DAT";
+    PCSZ_RESOURCEDAT = "RESOURCE.DAT";
+    PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
+    PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
+    PCSZ_USERDIRSDAT = "USERDIRS.DAT";
+    PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
+    PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
     FNT_6HELVETICA       =  "6.Helvetica";
     FNT_8HELVETICA       =  "8.Helvetica";
@@ -446 +505 @@
     FNT_10SYSTEMVIO      =  "10.System VIO";
     FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
-    PCSZ_WINCREATEWINDOW = "WinCreateWindow";
+    PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
+    PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
+    PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
+    PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
+    PCSZ_DOSSEARCHPATH    = "DosSearchPath";
+    PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
+    PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
+    PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
     PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
+    PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
+    PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
+    PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
     PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
+    PCSZ_NODATA  =  "No Data";
     PCSZ_STARDOTEXE    =  "*.EXE";
     PCSZ_STARDOTINI    =  "*.INI";
     PCSZ_STARDOTLST    =  "*.LST";
+    PCSZ_STARDOTPMD    =  "*.PMD";
+    PCSZ_STARDOTTXT    =  "*.TXT";
+    PCSZ_DOTEXE   =  ".EXE";
+    PCSZ_DOTCOM   =  ".COM";
+    PCSZ_DOTCMD   =  ".CMD";
+    PCSZ_DOTBTM   =  ".BTM";
+    PCSZ_DOTBAT   =  ".BAT";
+    PCSZ_DOTLST   =  ".LST";
+    PCSZ_DOTTLS   =  ".TLS";
+    PCSZ_DOTHLP   =  ".HLP";
+    PCSZ_DOTINF   =  ".INF";
+    PCSZ_DOTMP3   =  ".MP3";
+    PCSZ_DOTOGG   =  ".OGG";
+    PCSZ_DOTFLAC  =  ".FLAC";
+    PCSZ_DOTJPEG  =  ".JPEG";
+    PCSZ_DOTJPG   =  ".JPG";
+    PCSZ_DOTICO   =  ".ICO";
+    PCSZ_DOTPTR   =  ".PTR";
+    PCSZ_DOTBB2   =  ".BB2";
+    PCSZ_DOTBMP   =  ".BMP";
+    PCSZ_DOTCOMMENTS   =  ".COMMENTS";
+    PCSZ_PATH     =  "PATH";
     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     WC_BUBBLE          =  "WC_BUBBLE";
@@ -543 +635 @@
     RAMFS = "RAMFS";
     NTFS = "NTFS";
-    ARCHIVERBB2 = "ARCHIVER.BB2";
+    PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
+    PCSZ_ASSOCDAT    = "ASSOC.DAT";
+    PCSZ_CMDLINESDAT = "CMDLINES.DAT";
+    PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
+    PCSZ_COMMANDSDAT = "COMMANDS.DAT";
+    PCSZ_FILTERSDAT  = "FILTERS.DAT";
+    PCSZ_GREPMASKDAT = "GREPMASK.DAT";
+    PCSZ_PATTERNSDAT = "PATTERNS.DAT";
+    PCSZ_RESOURCEDAT = "RESOURCE.DAT";
+    PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
+    PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
+    PCSZ_USERDIRSDAT = "USERDIRS.DAT";
+    PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
+    PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
     FNT_6HELVETICA       =  "6.Helvetica";
     FNT_8HELVETICA       =  "8.Helvetica";
@@ -553 +658 @@
     FNT_10SYSTEMVIO      =  "10.System VIO";
     FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
+    PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
+    PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
+    PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
+    PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
+    PCSZ_DOSSEARCHPATH    = "DosSearchPath";
     PCSZ_WINCREATEWINDOW = "WinCreateWindow";
+    PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
+    PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
     PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
+    PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
+    PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
+    PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
     PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
+    PCSZ_NODATA  =  "No Data";
     PCSZ_STARDOTEXE    =  "*.EXE";
     PCSZ_STARDOTINI    =  "*.INI";
     PCSZ_STARDOTLST    =  "*.LST";
+    PCSZ_STARDOTPMD    =  "*.PMD";
+    PCSZ_STARDOTTXT    =  "*.TXT";
+    PCSZ_DOTEXE   =  ".EXE";
+    PCSZ_DOTCOM   =  ".COM";
+    PCSZ_DOTCMD   =  ".CMD";
+    PCSZ_DOTBTM   =  ".BTM";
+    PCSZ_DOTBAT   =  ".BAT";
+    PCSZ_DOTLST   =  ".LST";
+    PCSZ_DOTTLS   =  ".TLS";
+    PCSZ_DOTHLP   =  ".HLP";
+    PCSZ_DOTINF   =  ".INF";
+    PCSZ_DOTMP3   =  ".MP3";
+    PCSZ_DOTOGG   =  ".OGG";
+    PCSZ_DOTFLAC  =  ".FLAC";
+    PCSZ_DOTJPEG  =  ".JPEG";
+    PCSZ_DOTJPG   =  ".JPG";
+    PCSZ_DOTICO   =  ".ICO";
+    PCSZ_DOTPTR   =  ".PTR";
+    PCSZ_DOTBB2   =  ".BB2";
+    PCSZ_DOTBMP   =  ".BMP";
+    PCSZ_DOTCOMMENTS   =  ".COMMENTS";
+    PCSZ_PATH     =  "PATH";
     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     WC_BUBBLE          =  "WC_BUBBLE";
@@ -700 +838 @@
     DosFindClose(search_handle);
   }
-  BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+  BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP);
   DosForceDelete(szTempFile);
   if (pTmpDir) {
@@ -1209 +1347 @@
   if (DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "DosCreateMutexSem");
+              PCSZ_DOSCREATEMUTEXSEM);
   if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "DosCreateMutexSem");
+              PCSZ_DOSCREATEMUTEXSEM);
 
   /*
@@ -1271 +1409 @@
     ULONG ulAppType;
 
-    FullPath = searchapath("PATH", "LVMGUI.CMD");
+    FullPath = searchapath(PCSZ_PATH, "LVMGUI.CMD");
     if (*FullPath)
       fLVMGui = TRUE;

trunk/dll/init.h

@@ -27 +27 @@
 
 // Data declarations
-extern CHAR *ARCHIVERBB2;
+extern PCSZ PCSZ_ARCHIVERBB2;
+extern PCSZ PCSZ_ASSOCDAT;
+extern PCSZ PCSZ_CMDLINESDAT;
+extern PCSZ PCSZ_CMDMINIDAT;
+extern PCSZ PCSZ_COMMANDSDAT;
+extern PCSZ PCSZ_FILTERSDAT;
+extern PCSZ PCSZ_GREPMASKDAT;
+extern PCSZ PCSZ_PATTERNSDAT;
+extern PCSZ PCSZ_RESOURCEDAT;
+extern PCSZ PCSZ_QUICKTLSDAT;
+extern PCSZ PCSZ_FM3TOOLSDAT;
+extern PCSZ PCSZ_USERDIRSDAT;
+extern PCSZ PCSZ_FM2PLAYEXE;
+extern PCSZ PCSZ_FM2PLAYTEMP;
 extern CHAR *CBSIFS;
 extern CHAR *DRMDRFFM2ARC;
@@ -58 +71 @@
 extern CHAR *FNT_10SYSTEMVIO;
 extern CHAR *FNT_8TIMESNEWROMAN;
+extern PCSZ PCSZ_DOSCREATEMUTEXSEM;
+extern PCSZ PCSZ_DOSDUPHANDLE;
+extern PCSZ PCSZ_DOSGETINFOBLOCKS;
+extern PCSZ PCSZ_DOSQUERYPATHINFO;
+extern PCSZ PCSZ_DOSSEARCHPATH;
 extern PCSZ PCSZ_WINCREATEWINDOW;
+extern PCSZ PCSZ_WINLOADACCELTABLE;
+extern PCSZ PCSZ_WINSETACCELTABLE;
 extern PCSZ PCSZ_INIQUERYPRFTEXT;
+extern PCSZ PCSZ_PRFQUERYPROFILEDATA;
+extern PCSZ PCSZ_PRFQUERYPROFILESIZE;
+extern PCSZ PCSZ_PRFQUERYPROFILESTRING;
 extern PCSZ PCSZ_FILLDIRQCURERRTEXT;
+extern PCSZ PCSZ_NODATA;
 extern PCSZ PCSZ_STARDOTEXE;
 extern PCSZ PCSZ_STARDOTINI;
 extern PCSZ PCSZ_STARDOTLST;
+extern PCSZ PCSZ_STARDOTPMD;
+extern PCSZ PCSZ_STARDOTTXT;
+extern PCSZ PCSZ_DOTEXE;
+extern PCSZ PCSZ_DOTCOM;
+extern PCSZ PCSZ_DOTCMD;
+extern PCSZ PCSZ_DOTBTM;
+extern PCSZ PCSZ_DOTBAT;
+extern PCSZ PCSZ_DOTLST;
+extern PCSZ PCSZ_DOTTLS;
+extern PCSZ PCSZ_DOTHLP;
+extern PCSZ PCSZ_DOTINF;
+extern PCSZ PCSZ_DOTMP3;
+extern PCSZ PCSZ_DOTOGG;
+extern PCSZ PCSZ_DOTFLAC;
+extern PCSZ PCSZ_DOTJPEG;
+extern PCSZ PCSZ_DOTJPG;
+extern PCSZ PCSZ_DOTICO;
+extern PCSZ PCSZ_DOTPTR;
+extern PCSZ PCSZ_DOTBB2;
+extern PCSZ PCSZ_DOTBMP;
+extern PCSZ PCSZ_DOTCOMMENTS;
+extern PCSZ PCSZ_PATH;
 extern CHAR *WC_ARCCONTAINER;
 extern CHAR *WC_ARCSTATUS;

trunk/dll/input.c

@@ -42 +42 @@
   case WM_INITDLG:
     if (!mp2) {
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;

trunk/dll/instant.c

@@ -60 +60 @@
     }
     if (!mp2) {
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;
@@ -112 +112 @@
             (LONG) WinSendMsg(hwndMLE, MLM_QUERYTEXTLENGTH, MPVOID, MPVOID);
           if (!tlen)
-            Runtime_Error(pszSrcFile, __LINE__, "no data");
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
           else {
             WinSendMsg(hwndMLE, MLM_SETIMPORTEXPORT,
@@ -129 +129 @@
             }
             if (!*bat)
-              Runtime_Error(pszSrcFile, __LINE__, "no data");
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
             else {
               sprintf(s, "%s%sFMTMP%d.CMD", path,

trunk/dll/killproc.c

@@ -270 +270 @@
     rc = DosDupHandle(fileno(stdout), &newstdout);
     if (rc)
-      Dos_Error(MB_CANCEL, rc, hwnd, __FILE__, __LINE__, "DosDupHandle");
+      Dos_Error(MB_CANCEL, rc, hwnd, __FILE__, __LINE__, PCSZ_DOSDUPHANDLE);
     oldstdout = fileno(stdout);
     DosDupHandle(fileno(fp), &oldstdout);

trunk/dll/mainwnd.c

@@ -704 +704 @@
                 haccelDriveList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_DRIVELIST);
                 if (haccelDriveList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
             }
             if (haccelDriveList != NULLHANDLE) {
               if (!WinSetAccelTable(hab, haccelDriveList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
               // else
                 // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
@@ -717 +717 @@
                 haccelSetupList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_SETUPLIST);
                 if (haccelSetupList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
             }
             if (haccelSetupList != NULLHANDLE) {
               if (!WinSetAccelTable(hab, haccelSetupList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
               // else
                 // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_SETUPLIST %x %x", hwndFrame, haccelSetupList);
@@ -730 +730 @@
                 haccelCmdList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_CMDLIST);
                 if (haccelCmdList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
             }
             if (haccelCmdList != NULLHANDLE) {
               if (!WinSetAccelTable(hab, haccelCmdList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
               // else
                 // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_CMDLIST %x %x", hwndFrame, haccelCmdList);
@@ -743 +743 @@
                 haccelUserList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_USERLIST);
                 if (haccelUserList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
             }
             if (haccelUserList != NULLHANDLE) {
               if (!WinSetAccelTable(hab, haccelUserList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
               // else
                 // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_USERLIST %x %x", hwndFrame, haccelUserList);
@@ -756 +756 @@
                 haccelButtonList = WinLoadAccelTable(hab, FM3ModHandle, MAIN_BUTTONLIST);
                 if (haccelButtonList == NULLHANDLE)
-                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+                  Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
             }
             if (haccelButtonList != NULLHANDLE) {
               if (!WinSetAccelTable(hab, haccelButtonList, hwndFrame))
-                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+                Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
               // else
                 // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_BUTTONLIST %x %x", hwndFrame, haccelButtonList);
@@ -778 +778 @@
           if (haccelSaved != NULLHANDLE) {
             if (!WinSetAccelTable(hab, haccelSaved, hwndFrame))
-              Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+              Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
             // else
               // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable SAVED %x %x", hwndFrame, haccelSaved);
@@ -2941 +2941 @@
 
   if (!pszStateName || !*pszStateName) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return -1;
   }
@@ -4847 +4847 @@
             }
             else if (!size)
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
             else {
               PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
@@ -5498 +5498 @@
                                     UM_CONTAINERHWND, MPVOID, MPVOID);
         if (!hwndCnr) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
           break;
         }
@@ -6427 +6427 @@
             }
             else if (SHORT1FROMMP(mp1) == MAIN_BUTTONLIST) {
-              strcat(path, ".TLS");
+              strcat(path, PCSZ_DOTTLS);
               load_tools(path);
               PrfWriteProfileString(fmprof,

trunk/dll/mainwnd2.c

@@ -701 +701 @@
                                   UM_CONTAINERHWND, MPVOID, MPVOID);
       if (!hwndCnr) {
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
         break;
       }

trunk/dll/menu.c

@@ -88 +88 @@
   // fixme to complain?
   if (!hwndMenu) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return ret;
   }

trunk/dll/misc.c

@@ -142 +142 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                PCSZ_DOSGETINFOBLOCKS);
       yes = FALSE;
     }
@@ -177 +177 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                PCSZ_DOSGETINFOBLOCKS);
     }
     else {
@@ -206 +206 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                PCSZ_DOSGETINFOBLOCKS);
     }
     else

trunk/dll/newview.c

@@ -375 +375 @@
         }
       }
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       break;
 
@@ -1254 +1254 @@
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!ad)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         if (!DosRequestMutexSem(ad->ScanSem, SEM_INDEFINITE_WAIT)) {
@@ -1864 +1864 @@
   case UM_SETUP:
     if (!ad)
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       CHAR s[CCHMAXPATH + 8];
@@ -1879 +1879 @@
       if (rc)
         Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
-                  "DosCreateMutexSem");
+                  PCSZ_DOSCREATEMUTEXSEM);
       else {
         PFNWP oldproc;

trunk/dll/notebook.c

@@ -3677 +3677 @@
       haccelCfg = WinLoadAccelTable(hab, FM3ModHandle, CFG_FRAME);
       if (haccelCfg == NULLHANDLE)
-        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinLoadAccelTable");
+        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINLOADACCELTABLE);
     }
     if (haccelCfg != NULLHANDLE) {
       if (!WinSetAccelTable(hab, haccelCfg, hwndNotebook))
-        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, "WinSetAccelTable");
+        Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
       // else
         // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);

trunk/dll/objcnr.c

@@ -232 +232 @@
 #  endif
   if (!dirsize) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return;
   }

trunk/dll/pathutil.c

@@ -37 +37 @@
 #include "wrappers.h"                   // xmalloc
 #include "fortify.h"
+#include "stristr.h"                    //stristr
 
 static PSZ pszSrcFile = __FILE__;
@@ -51 +52 @@
  */
 
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+PSZ BldFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName)
 {
   UINT c = pszPathName ? strlen(pszPathName) : 0;
@@ -70 +71 @@
  */
 
-PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+PSZ BldQuotedFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName)
 {
   UINT c = pszPathName ? strlen(pszPathName) : 0;
@@ -146 +147 @@
   strcpy(szCmdLine, pszCmdLine_);
   if (szCmdLine[0] != '\0') {
-    offsetexe = strstr(strlwr(pszCmdLine_), ".exe");
-    offsetcmd = strstr(strlwr(pszCmdLine_), ".cmd");
-    offsetcom = strstr(strlwr(pszCmdLine_), ".com");
-    offsetbtm = strstr(strlwr(pszCmdLine_), ".btm");
-    offsetbat = strstr(strlwr(pszCmdLine_), ".bat");
+    offsetexe = stristr(pszCmdLine_, PCSZ_DOTEXE);
+    offsetcmd = stristr(pszCmdLine_, PCSZ_DOTCMD);
+    offsetcom = stristr(pszCmdLine_, PCSZ_DOTCOM);
+    offsetbtm = stristr(pszCmdLine_, PCSZ_DOTBTM);
+    offsetbat = stristr(pszCmdLine_, PCSZ_DOTBAT);
     if (offsetexe)
       offset = offsetexe;
@@ -184 +185 @@
                pszCmdLine_);
       if (!offsetexe && !offsetcom) {
-        FullPath = searchapath("PATH", szCmdLine);
+        FullPath = searchapath(PCSZ_PATH, szCmdLine);
         if (*FullPath)
           ret = 0;
@@ -224 +225 @@
         ret = DosQueryAppType(szCmdLine, &ulAppType); // exe automatically appended
         if (!ret)
-          strcat(szCmdLine, ".exe");
+          strcat(szCmdLine, PCSZ_DOTEXE);
         else {
-          strcat(szCmdLine, ".com");
+          strcat(szCmdLine, PCSZ_DOTCOM);
           ret = DosQueryAppType(szCmdLine, &ulAppType);
           if (ret) {
             offset = strrchr(szCmdLine, '.' );
             *offset = 0;
-            strcat(szCmdLine, ".cmd");
-            FullPath = searchapath("PATH", szCmdLine);
+            strcat(szCmdLine, PCSZ_DOTCMD);
+            FullPath = searchapath(PCSZ_PATH, szCmdLine);
             if (*FullPath)
               ret = 0;
             else {
               *offset = 0;
-              strcat(szCmdLine, ".bat");
-              FullPath = searchapath("PATH", szCmdLine);
+              strcat(szCmdLine, PCSZ_DOTBAT);
+              FullPath = searchapath(PCSZ_PATH, szCmdLine);
               if (*FullPath)
                 ret = 0;
               else {
                 *offset = 0;
-                strcat(szCmdLine, ".bmt");
-                FullPath = searchapath("PATH", szCmdLine);
+                strcat(szCmdLine, PCSZ_DOTBTM);
+                FullPath = searchapath(PCSZ_PATH, szCmdLine);
                 if (*FullPath)
                   ret = 0;
@@ -262 +263 @@
             ret = DosQueryAppType(szCmdLine, &ulAppType);
             if (!ret) {
-              strcat(szCmdLine, ".exe");
+              strcat(szCmdLine, PCSZ_DOTEXE);
               break;
             }
             else {
-              strcat(szCmdLine, ".com");
+              strcat(szCmdLine, PCSZ_DOTCOM);
               ret = DosQueryAppType(szCmdLine, &ulAppType);
               if (ret) {
                 offset = strrchr(szCmdLine, '.' );
                 *offset = 0;
-                strcat(szCmdLine, ".cmd");
-                FullPath = searchapath("PATH", szCmdLine);
+                strcat(szCmdLine, PCSZ_DOTCMD);
+                FullPath = searchapath(PCSZ_PATH, szCmdLine);
                 if (*FullPath) {
                   ret = 0;
@@ -279 +280 @@
                 else {
                   *offset = 0;
-                  strcat(szCmdLine, ".bat");
-                  FullPath = searchapath("PATH", szCmdLine);
+                  strcat(szCmdLine, PCSZ_DOTBAT);
+                  FullPath = searchapath(PCSZ_PATH, szCmdLine);
                   if (*FullPath) {
                     ret = 0;
@@ -287 +288 @@
                   else {
                     *offset = 0;
-                    strcat(szCmdLine, ".bmt");
-                    FullPath = searchapath("PATH", szCmdLine);
+                    strcat(szCmdLine, PCSZ_DOTBTM);
+                    FullPath = searchapath(PCSZ_PATH, szCmdLine);
                     if (*FullPath) {
                       ret = 0;
@@ -349 +350 @@
              GetPString(IDS_QUOTESINARGSTEXT),
              pszCmdLine_);
-    FullPath = searchapath("PATH", szCmdLine);
+    FullPath = searchapath(PCSZ_PATH, szCmdLine);
     BldQuotedFileName(pszNewCmdLine, szCmdLine);
     //printf("%d %s ", ret, szCmdLine); fflush(stdout);

trunk/dll/pathutil.h

@@ -22 +22 @@
 #endif
 
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
-PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
+PSZ BldFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);
+PSZ BldQuotedFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);
 PSZ BldQuotedFileName(PSZ pszQuotedFileName, PCSZ pszFileName);
 PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_);

trunk/dll/printer.c

@@ -31 +31 @@
 #include "notebook.h"                   // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -142 +143 @@
     if (DosCreateMutexSem(NULL, &PrintSem, 0, FALSE)) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosCreateMutexSem");
+                PCSZ_DOSCREATEMUTEXSEM);
       goto Abort;
     }
@@ -425 +426 @@
     li = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!li)
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       INT x;
@@ -473 +474 @@
       li = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!li)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         prnformat = WinQueryButtonCheckstate(hwnd, PRN_FORMAT);

trunk/dll/remap.c

@@ -88 +88 @@
 
   loadedres = TRUE;
-  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_RESOURCEDAT);
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -126 +126 @@
   if (!loadedres)
     return;
-  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_RESOURCEDAT);
   if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg

trunk/dll/saveclip.c

@@ -245 +245 @@
   case WM_INITDLG:
     if (!mp2) {
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
     }
@@ -281 +281 @@
         CHAR s[CCHMAXPATH + 14];
 
-        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(s, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         fp = _fsopen(s, "r", SH_DENYWR);
         if (fp) {
@@ -308 +308 @@
                                        LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       if (sMax > 0) {
-        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
@@ -327 +327 @@
       }
       else if (!sMax) {
-        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         unlinkf("%s", szBuffer);
       }
@@ -382 +382 @@
         if (export_filename(hwnd, savename, 1) && *savename) {
           if (!strchr(savename, '.'))
-            strcat(savename, ".LST");
+            strcat(savename, PCSZ_DOTLST);
           WinSetDlgItemText(hwnd, SAV_FILENAME, savename);
         }
@@ -457 +457 @@
         if (stricmp(savename, "PRN") &&
             strnicmp(savename, "\\DEV\\LPT", 8) && !strchr(savename, '.'))
-          strcat(savename, ".LST");
+          strcat(savename, PCSZ_DOTLST);
         PrfWriteProfileString(fmprof, appname, "SaveToListName", savename);
         pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -471 +471 @@
         }
         if (!pci || (INT) pci == -1)
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else {
           fp = _fsopen(savename, "w+", SH_DENYWR);
@@ -605 +605 @@
   case WM_INITDLG:
     if (!mp2) {
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
     }
@@ -641 +641 @@
         CHAR s[CCHMAXPATH + 14];
 
-        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(s, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         fp = _fsopen(s, "r", SH_DENYWR);
         if (fp) {
@@ -669 +669 @@
                                        LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       if (sMax > 0) {
-        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
@@ -688 +688 @@
       }
       else if (!sMax) {
-        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
         unlinkf("%s", szBuffer);
       }
@@ -743 +743 @@
         if (export_filename(hwnd, savename, 1) && *savename) {
           if (!strchr(savename, '.'))
-            strcat(savename, ".LST");
+            strcat(savename, PCSZ_DOTLST);
           WinSetDlgItemText(hwnd, SAV_FILENAME, savename);
         }
@@ -820 +820 @@
         if (stricmp(savename, "PRN") &&
             strnicmp(savename, "\\DEV\\LPT", 8) && !strchr(savename, '.'))
-          strcat(savename, ".LST");
+          strcat(savename, PCSZ_DOTLST);
         PrfWriteProfileString(fmprof, appname, "SaveToListName", savename);
         if (!list || !list[0])
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
         else {
           fp = _fsopen(savename, "r+", SH_DENYWR);

trunk/dll/seeall.c

@@ -3129 +3129 @@
       list = BuildAList(hwnd);
       if (!list)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WinSetWindowText(pAD->hwndStatus, GetPString(IDS_DRAGGINGFILESTEXT));
@@ -3932 +3932 @@
   case WM_COMMAND:
     if (!pAD) {
-      Runtime_Error(pszSrcFile, __LINE__, "no data");
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       return 0;
     }
@@ -4251 +4251 @@
 
             if (!list)
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
             else {
               switch (SHORT1FROMMP(mp1)) {

trunk/dll/shadow.c

@@ -38 +38 @@
 #include "wrappers.h"                   // xmalloc
 #include "fortify.h"
+#include "init.h"                       // Data declaration(s)
 
 #pragma data_seg(DATA1)
@@ -91 +92 @@
     return obj;
   BldFullPathName(s, path, objtitle);
-  // sprintf(s, "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
   p = strrchr(objtitle, '.');
   if (p) {
-    if (!stricmp(p, ".ICO"))
+    if (!stricmp(p, PCSZ_DOTICO))
       p = type[1];
-    else if (!stricmp(p, ".BMP"))
+    else if (!stricmp(p, PCSZ_DOTBMP))
       p = type[2];
     else
@@ -154 +154 @@
 
       BldFullPathName(temp, path, objtitle);
-      // sprintf(temp,
-      //              "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
       p = strrchr(temp, '.');
       if (p) {
         *p = 0;
-        strcat(p, ".ICO");
+        strcat(p, PCSZ_DOTICO);
         if (IsFile(temp) == 1)
           sprintf(&s[strlen(s)], ";ICONFILE=%s", temp);
@@ -229 +227 @@
         p = strrchr(list[x], '.');
         if (p) {
-          if (!stricmp(p, ".BAT") || !stricmp(p, ".CMD"))
+          if (!stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTCMD) ||
+              !stricmp(p, PCSZ_DOTBTM))
             apt |= FAPPTYP_BOUND;
         }

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);

trunk/dll/srchpath.h

@@ -17 +17 @@
 #define SRCHPATH_H
 
-INT RunFM2Util(CHAR *appname, CHAR *filename);
-CHAR *searchapath(CHAR * path, CHAR * filename);
-CHAR *searchpath(CHAR * filename);
+INT RunFM2Util(PCSZ appname, CHAR *filename);
+CHAR *searchapath(PCSZ path, PCSZ filename);
+CHAR *searchpath(PCSZ filename);
 
 

trunk/dll/subj.c

@@ -29 +29 @@
 #include "info.h"                       // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -94 +95 @@
       else if (rc) {
         Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
-                  "DosQueryPathInfo");
+                  PCSZ_DOSQUERYPATHINFO);
         return 2;                       // Error
       }

trunk/dll/systemf.c

@@ -110 +110 @@
 
   if (!command || !*command) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return -1;
   }
@@ -739 +739 @@
     strcpy(pszPgm, p);
     if (!*pszPgm) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       return -1;
     }
@@ -929 +929 @@
         char temp[CCHMAXPATH + 1];
 
-        if (!stricmp(p, ".BAT")) {
-          strcpy(temp, pszPgm);
-          strcpy(pszPgm, pszArgs);
-          strcpy(pszArgs, "/C ");
-          strcat(pszArgs, temp);
-          strcat(pszArgs, " ");
-          strcat(pszArgs, pszPgm);
-          strcpy(pszPgm, GetCmdSpec(TRUE));             // DOS
-        }
-        else if (!stricmp(p, ".CMD") || !stricmp(p, ".BTM")) {
+        if (!stricmp(p, PCSZ_DOTBAT)) {
+          if (!fProtectOnly) {
+            strcpy(temp, pszPgm);
+            strcpy(pszPgm, pszArgs);
+            strcpy(pszArgs, "/C ");
+            strcat(pszArgs, temp);
+            strcat(pszArgs, " ");
+            strcat(pszArgs, pszPgm);
+            strcpy(pszPgm, GetCmdSpec(TRUE));             // DOS
+          }
+          else
+            saymsg(MB_OK,
+                   HWND_DESKTOP,
+                   NullStr,
+                   GetPString(IDS_NOTPROTECTONLYEXE),
+                   pszPgm);
+        }
+        else if (!stricmp(p, PCSZ_DOTCMD) || !stricmp(p, PCSZ_DOTBTM)) {
           // Assume 4OS2 is BTM
           strcpy(temp, pszPgm);
@@ -1286 +1294 @@
           strcpy(parameters, p);
 
-        if (p && (!stricmp(p, ".BAT") || !stricmp(p, ".CMD"))) {
+        if (p && (!stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTCMD) ||
+                  !stricmp(p, PCSZ_DOTBTM))) {
           char *temp;
 
           temp = xmalloc(CCHMAXPATH * 2,pszSrcFile,__LINE__);
           if (temp) {
-            if (!stricmp(p, ".BAT")) {
-              strcpy(temp, executable);
-              strcpy(executable, parameters);
-              strcpy(parameters, "/C ");
-              strcat(parameters, temp);
-              strcat(parameters, " ");
-              strcat(parameters, executable);
-              strcpy(executable, GetCmdSpec(TRUE));
-            }
-            else if (!stricmp(p, ".CMD")) {
+            if (!stricmp(p, PCSZ_DOTBAT)) {
+              if (!fProtectOnly) {
+                strcpy(temp, executable);
+                strcpy(executable, parameters);
+                strcpy(parameters, "/C ");
+                strcat(parameters, temp);
+                strcat(parameters, " ");
+                strcat(parameters, executable);
+                strcpy(executable, GetCmdSpec(TRUE));
+              }
+              else
+                saymsg(MB_OK,
+                       HWND_DESKTOP,
+                       NullStr,
+                       GetPString(IDS_NOTPROTECTONLYEXE),
+                       filename);
+            }
+            else if (!stricmp(p, PCSZ_DOTCMD) || !stricmp(p, PCSZ_DOTBTM)) {
               strcpy(temp, executable);
               strcpy(executable, parameters);

trunk/dll/tools.c

@@ -90 +90 @@
     return;
   }
-  BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_QUICKTLSDAT);
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -120 +120 @@
   if (!quicktool[0])
     return;
-  BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_QUICKTLSDAT);
   if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
@@ -148 +148 @@
     fname = searchpath(filename);
   if (!fname || !*fname)
-    fname = "FM3TOOLS.DAT";
+    fname = (PSZ) PCSZ_FM3TOOLSDAT;
   if (fname && *fname) {
     filename = fname;
@@ -228 +228 @@
   }
 
-  if (stristr(filename, "FM3TOOLS.DAT"))
+  if (stristr(filename, PCSZ_FM3TOOLSDAT))
     filename = "FM3TOOLS.TLS";
   if (toolhead && filename && *filename) {
@@ -988 +988 @@
     WinSetDlgItemText(hwnd,
                       SVBTN_CURRENT,
-                      (*lasttoolbar) ? lasttoolbar : "FM3TOOLS.DAT");
+                      (*lasttoolbar) ? lasttoolbar : PCSZ_FM3TOOLSDAT);
     break;
 
@@ -1053 +1053 @@
         if (*lasttoolbar) {
           if (!strchr(lasttoolbar, '.'))
-            strcat(lasttoolbar, ".TLS");
+            strcat(lasttoolbar, PCSZ_DOTTLS);
         }
         if (saving && *lasttoolbar)

trunk/dll/treecnr.c

@@ -671 +671 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       BOOL tempsusp = dcd->suspendview;
@@ -686 +686 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd || !mp1)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       INT numentries = 0;
@@ -704 +704 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
 #     ifdef FORTIFY
@@ -718 +718 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     // Bypass if not running integrated (i.e if vtree)
     else if (hwndStatus &&
@@ -806 +806 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
@@ -861 +861 @@
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!dcd)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WORKER *wk;
@@ -905 +905 @@
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
       if (!dcd)
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
         WORKER *wk;
@@ -1257 +1257 @@
 
     if (!dcd) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
       return 0;
@@ -1363 +1363 @@
                                   MPFROMLONG(CMA_FIRST), MPFROMP(&pqr));
       if (!pci || (INT) pci == -1)
-        break; //Probable B3 click on white space Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        break; //Probable B3 click on white space
       else {
         memset(&nr, 0, sizeof(nr));
@@ -1530 +1530 @@
 
           if (!pcd) {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
             break;
           }
@@ -1536 +1536 @@
             pci = (PCNRITEM) pcd->pRecord;
             if (!pci || (INT) pci == -1) {
-              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+              Runtime_Error(pszSrcFile, __LINE__, NULL);
               break;
             }
@@ -2301 +2301 @@
   case UM_COMMAND:
     if (!mp1)
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
       if (!dcd) {
-        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
         FreeListInfo((LISTINFO *) mp1);
       }

trunk/dll/undel.c

@@ -194 +194 @@
     listdone = TRUE;
     if (!mp2 || !*(CHAR *)mp2) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;
@@ -308 +308 @@
           WinQueryDlgItemText(hwnd, UNDEL_DRIVELIST, 3, s);
           if (!isalpha(*s)) {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error(pszSrcFile, __LINE__, NULL);
           }
           else {

trunk/dll/update.c

@@ -342 +342 @@
     dcd = INSTDATA(hwndCnr);
   if (!dcd) {
-    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return ret;
   }

trunk/dll/uudecode.c

@@ -388 +388 @@
         }
         if (!list || !list[0]) {
-          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+          Runtime_Error(pszSrcFile, __LINE__, NULL);
           break;
         }

trunk/dll/valid.c

@@ -613 +613 @@
       return FALSE;
     if (apptype == 0x000b && (!p ||
-        (stricmp(p, ".EXE") &&
-         stricmp(p, ".COM") &&
-         stricmp(p, ".CMD") &&
-         stricmp(p, ".BAT") &&
-         stricmp(p, ".BTM"))))
+        (stricmp(p, PCSZ_DOTEXE) &&
+         stricmp(p, PCSZ_DOTCOM) &&
+         stricmp(p, PCSZ_DOTCMD) &&
+         stricmp(p, PCSZ_DOTBAT) &&
+         stricmp(p, PCSZ_DOTBTM))))
       return FALSE;
     if (!fProtectOnly) {
@@ -631 +631 @@
                       FAPPTYP_32BIT |
                       FAPPTYP_WINDOWSPROT31)))) ||
-          (p && (!stricmp(p, ".CMD") || !stricmp(p, ".BAT") || !stricmp(p, ".BTM"))))
+          (p && (!stricmp(p, PCSZ_DOTCMD) || !stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTBTM))))
         return TRUE;
     }
@@ -641 +641 @@
                          FAPPTYP_BOUND |
                          FAPPTYP_32BIT)))) ||
-             (p && (!stricmp(p, ".CMD") || !stricmp(p, ".BTM"))))
+             (p && (!stricmp(p, PCSZ_DOTCMD) || !stricmp(p, PCSZ_DOTBTM))))
       return TRUE;
     if (fProtectOnly && (apptype &
@@ -648 +648 @@
                           FAPPTYP_WINDOWSPROT |
                           FAPPTYP_WINDOWSPROT31)) &&
-        (p && (!stricmp(p, ".EXE") || !stricmp(p, ".COM"))))
+        (p && (!stricmp(p, PCSZ_DOTEXE) || !stricmp(p, PCSZ_DOTCOM) ||
+               !stricmp(p, PCSZ_DOTBAT))))
       saymsg(MB_OK,
              HWND_DESKTOP,
@@ -1066 +1067 @@
                                (PVOID) objectpath, sizeof(objectpath))) {
       Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "PrfQueryProfileString");
+                PCSZ_PRFQUERYPROFILESTRING);
       *objectpath = 0;
     }

trunk/dll/viewinf.c

@@ -99 +99 @@
                GetPString(IDS_ENVPATHERRORTEXT),
                (dummy->help) ? "HELP" : "BOOKSHELF",
-               (dummy->help) ? ".HLP" : ".INF");
+               (dummy->help) ? PCSZ_DOTHLP : PCSZ_DOTINF);
         goto NoEnv;
       }
@@ -194 +194 @@
                 if (!PrfQueryProfileData(fmprof, FM3Str, key, holdenv, &size)) {
                   Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                            "PrfQueryProfileData");
+                            PCSZ_PRFQUERYPROFILEDATA);
                   free(holdenv);
                 }
@@ -259 +259 @@
         WinSetPresParam(WinWindowFromID(hwnd, VINF_LISTBOX),
                         PP_FONTNAMESIZE,
-                        strlen("10.System Monospaced") + 1,
-                        "10.System Monospaced");
+                        strlen(FNT_10SYSTEMMONOTEXT) + 1,
+                        FNT_10SYSTEMMONOTEXT);
       }
       WinSetWindowText(hwnd, GetPString(IDS_VIEWHELPFILESTEXT));

trunk/dll/walkem.c

@@ -146 +146 @@
 
   if (!name || !*name) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
     return -1;
   }
@@ -208 +208 @@
       // Get error info back
       PrfQueryProfileSize(fmprof, FM3Str, pszLastSetups, &ulDataBytes);
-      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "PrfQueryProfileSize");
+      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_PRFQUERYPROFILESIZE);
     }
     else
@@ -216 +216 @@
 
   if (ulDataBytes == 0) {
-    Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileSize reported 0 bytes");
+    Runtime_Error(pszSrcFile, __LINE__, PCSZ_PRFQUERYPROFILESIZE);
     return;
   }
@@ -225 +225 @@
   l = ulDataBytes;
   if (!PrfQueryProfileData(fmprof, FM3Str, pszLastSetups, pszBuf, &l)) {
-    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "PrfQueryProfileData");
+    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_PRFQUERYPROFILEDATA);
     free(pszBuf);
     return;
@@ -380 +380 @@
   loadedudirs = TRUE;
   fUdirsChanged = FALSE;
-  BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT");
+  BldFullPathName(s, pFM2SaveDirectory, PCSZ_USERDIRSDAT);
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -426 +426 @@
     fUdirsChanged = FALSE;
     if (udirhead) {
-      BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT");
+      BldFullPathName(s, pFM2SaveDirectory, PCSZ_USERDIRSDAT);
       if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
         return; //already gave error msg
@@ -745 +745 @@
     *lastdir = 0;
     if (!mp2) {
-      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;

trunk/dll/worker.c

@@ -1127 +1127 @@
           case IDM_MCIPLAY:
             {
-              register INT x;
-              register ULONG total;
+              INT x, MaxFM2playStrLen = 24;
+              ULONG total;
               CHAR fbuf[CCHMAXPATH];
 
               if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
                                 SEARCH_CUR_DIRECTORY,
-                                "PATH", "FM2PLAY.EXE", (PBYTE)fbuf, CCHMAXPATH - 1))
-                total += strlen("..\\FM2UTILS\\FM2PLAY.EXE ");
+                                PCSZ_PATH, PCSZ_FM2PLAYEXE, (PBYTE)fbuf, CCHMAXPATH - 1))
+                total += MaxFM2playStrLen;
               else
                 total = strlen(fbuf);
@@ -1145 +1145 @@
                 CHAR szTempFile[CCHMAXPATH];
 
-                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+                BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP);
                 fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
@@ -1156 +1156 @@
                   strcat(szTempFile, "@/");
                   strrev(szTempFile);
-                  RunFM2Util("FM2PLAY.EXE", szTempFile);
+                  RunFM2Util(PCSZ_FM2PLAYEXE, szTempFile);
                 }
               }
@@ -1182 +1182 @@
                 if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
                                   SEARCH_CUR_DIRECTORY,
-                                  "PATH", "FM2PLAY.EXE", (PBYTE)fbuf, CCHMAXPATH - 1))
+                                  PCSZ_PATH, PCSZ_FM2PLAYEXE, (PBYTE)fbuf, CCHMAXPATH - 1))
                   strcpy(szBuffer, "UTILS\\FM2PLAY.EXE");
                 else
-                  strcpy(szBuffer, "FM2PLAY.EXE");
+                  strcpy(szBuffer, PCSZ_FM2PLAYEXE);
               }
               p = &szBuffer[strlen(szBuffer)];

trunk/dll/wrappers.c

@@ -339 +339 @@
               UINT uiLineNumber)
 {
-  FILE *fp = _fsopen((PSZ) pszFileName, (PSZ) pszMode, fSharemode);
+  FILE *fp = _fsopen(pszFileName, pszMode, fSharemode);
 
   if (!fp)