Changeset 1402

Timestamp:

Mar 14, 2009, 6:17:59 PM (16 years ago)

Author:

Gregg Young

Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (9 diffs)
• avl.c (modified) (3 diffs)
• collect.c (modified) (4 diffs)
• comp.c (modified) (7 diffs)
• copyf.c (modified) (19 diffs)
• copyf.h (modified) (2 diffs)
• defview.c (modified) (6 diffs)
• defview.h (modified) (2 diffs)
• dircnrs.c (modified) (7 diffs)
• dirsize.c (modified) (2 diffs)
• draglist.c (modified) (2 diffs)
• draglist.h (modified) (2 diffs)
• droplist.c (modified) (7 diffs)
• eas.c (modified) (2 diffs)
• errutil.c (modified) (6 diffs)
• errutil.h (modified) (3 diffs)
• filldir.c (modified) (8 diffs)
• filldir.h (modified) (2 diffs)
• fm2cmd.c (modified) (1 diff)
• fm3res.rc (modified) (13 diffs)
• fm3str.h (modified) (3 diffs)
• getnames.c (modified) (2 diffs)
• grep.c (modified) (5 diffs)
• info.c (modified) (4 diffs)
• inis.c (modified) (9 diffs)
• inis.h (modified) (2 diffs)
• init.c (modified) (13 diffs)
• init.h (modified) (6 diffs)
• killproc.c (modified) (2 diffs)
• mainwnd.c (modified) (24 diffs)
• mainwnd.h (modified) (2 diffs)
• menu.c (modified) (3 diffs)
• misc.c (modified) (3 diffs)
• mkdir.c (modified) (1 diff)
• mle.c (modified) (2 diffs)
• newview.c (modified) (1 diff)
• notebook.c (modified) (2 diffs)
• objcnr.c (modified) (2 diffs)
• pathutil.c (modified) (4 diffs)
• presparm.c (modified) (1 diff)
• remap.c (modified) (2 diffs)
• rename.c (modified) (2 diffs)
• saveclip.c (modified) (3 diffs)
• seeall.c (modified) (8 diffs)
• shadow.c (modified) (2 diffs)
• shadow.h (modified) (2 diffs)
• subj.c (modified) (2 diffs)
• subj.h (modified) (2 diffs)
• sysinfo.c (modified) (2 diffs)
• systemf.c (modified) (1 diff)
• tools.c (modified) (2 diffs)
• treecnr.c (modified) (6 diffs)
• undel.c (modified) (3 diffs)
• update.c (modified) (5 diffs)
• valid.c (modified) (2 diffs)
• valid.h (modified) (2 diffs)
• viewer.c (modified) (4 diffs)
• walkem.c (modified) (1 diff)
• worker.c (modified) (7 diffs)

trunk/dll/arccnrs.c

@@ -74 +74 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -615 +616 @@
     if (highest > 50) {
       saymsg(MB_ENTER | MB_ICONEXCLAMATION, HWND_DESKTOP,
-             GetPString(IDS_SHAMETEXT), "%s", GetPString(IDS_BUNGEDUPTEXT));
+             GetPString(IDS_SHAMETEXT), GetPString(IDS_BUNGEDUPTEXT));
     }
     if (info->fnpos == -1)
@@ -807 +808 @@
                              MPFROMLONG(1L));
             if (!pai) {
-              Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+              Runtime_Error(pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
               break;
             }
@@ -1417 +1418 @@
           len = DrgQueryStrName(pdt->hstrSelectedRMF, CCHMAXPATH, filename);
           filename[len] = 0;
-          if (!strnicmp(filename, "OS2FILE,", 8)) {
-            // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"RMF = \"%s\"",filename);
-          }
-          else {
+          if (strnicmp(filename, "OS2FILE,", 8)) {
             *filename = 0;
-            len =
-              DrgQueryStrName(pdt->hstrRenderToName, CCHMAXPATH, filename);
+            len = DrgQueryStrName(pdt->hstrRenderToName, CCHMAXPATH, filename);
             filename[len] = 0;
             if (len && *filename) {
@@ -1432 +1429 @@
               }
             }
-            else {
-              // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"No render-to name given.");
-            }
           }
         }
@@ -1459 +1453 @@
         membername[len] = 0;
         if (*membername && len && filename) {
-          unlinkf("%s", filename);
+          unlinkf(filename);
           strcpy(construct, filename);
           p = strrchr(filename, '\\');
@@ -1469 +1463 @@
             *p = 0;
           }
-          // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%s %s %s\r[%s]",dcd->info->extract,dcd->arcname,membername,construct);
           runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS | WAIT |
                   (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
@@ -1480 +1473 @@
           if (IsFile(construct) != -1) {
             rename(construct, filename);
-            unlinkf("%s", construct);
+            unlinkf(construct);
             if (IsFile(filename) != -1)
               usRes = DMFL_RENDEROK;
@@ -2678 +2671 @@
       SWP swp;
       CHAR *filename = mp1;
-      printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
+      //printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
       if (IsFile(filename) != 1) {
         free(mp1);

trunk/dll/avl.c

@@ -37 +37 @@
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
   11 Jan 08 GKY Replace "ARCHIVER.BB2" in string file with global set at compile in init.c
+  08 Mar 09 GKY Additional strings move to PCSZs in init.c
 
 ***********************************************************************/
@@ -698 +699 @@
       if (!DrgAccessDraginfo(pDInfo)) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+                  PCSZ_DRGACCESSDRAGINFO);
       }
       else {
@@ -734 +735 @@
       if (!DrgAccessDraginfo(pDInfo)) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+                  PCSZ_DRGACCESSDRAGINFO);
       }
       else {

trunk/dll/collect.c

@@ -662 +662 @@
                          MPFROMLONG(ulMaxFiles));
         if (!pci) {
-          Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                        ulMaxFiles);
+          Runtime_Error(pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
           break;
         }
@@ -2380 +2379 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
             return 0;
           }
@@ -2430 +2429 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
             return (MRFROM2SHORT(DOR_NODROP, 0));       /* Drop not valid */
           }
@@ -2544 +2543 @@
                 if (li->type == DID_ERROR)
                   Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
                 if (!li->type) {
                   FreeListInfo(li);

trunk/dll/comp.c

@@ -63 +63 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  08 Mar 09 GKY Additional strings move to PCSZs in init.c & String Table
 
 ***********************************************************************/
@@ -524 +526 @@
           switch (cmp->action) {
           case IDM_DELETE:
-            if (!unlinkf("%s", pciS->pszFileName)) {
+            if (!unlinkf(pciS->pszFileName)) {
               WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciS),
                          MPFROM2SHORT(FALSE, CRA_SELECTED));
@@ -582 +584 @@
                   MassMkdir(hwndMain, szDirName);
               }
-              rc = docopyf(MOVE, pciS->pszFileName, "%s", szNewName);
+              rc = docopyf(MOVE, pciS->pszFileName, szNewName);
               if (fResetVerify) {
                 DosSetVerify(fVerify);
@@ -683 +685 @@
                   MassMkdir(hwndMain, szDirName);
               }
-              rc = docopyf(COPY, pciS->pszFileName, "%s", szNewName);
+              rc = docopyf(COPY, pciS->pszFileName, szNewName);
               if (fResetVerify) {
                 DosSetVerify(fVerify);
@@ -1487 +1489 @@
                      HWND_DESKTOP,
                      GetPString(IDS_WARNINGTEXT),
-                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+                     GetPString(IDS_LENGTHEXCEEDSMAXPATHTEXT));
             }
             return;
@@ -1810 +1812 @@
                                MPFROMLONG(recsNeeded));
         if (!pcilFirst) {
-          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                    recsNeeded);
+          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
           recsNeeded = 0;
         }
@@ -1820 +1821 @@
                                MPFROMLONG(recsNeeded));
         if (!pcirFirst) {
-          Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                    recsNeeded);
+          Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
           recsNeeded = 0;
           FreeCnrItemList(hwndLeft, pcilFirst);

trunk/dll/copyf.c

@@ -20 +20 @@
   29 Feb 08 GKY Use xfree where appropriate
   19 Jul 08 GKY Modify MakeTempName for use making temp directory names
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -417 +418 @@
       }
       else
-        rc = docopyf(type,, "%s",);     /* copy file */
+       // docopyf changed this won't work rc = docopyf(type,, "%s",);     /* copy file */
       DosError(FERR_DISABLEHARDERR);
     } while (!rc && !DosFindNext());
@@ -429 +430 @@
 #endif
 
-APIRET docopyf(INT type, CHAR * oldname, CHAR * newname, ...)
+APIRET docopyf(INT type, CHAR *oldname, CHAR *newname)
 {
   /*
@@ -440 +441 @@
    */
 
-  CHAR fullnewname[CCHMAXPATH + 1], longname[CCHMAXPATH],
-    shortname[CCHMAXPATH];
+  CHAR longname[CCHMAXPATH], shortname[CCHMAXPATH];
   CHAR olddisk, newdisk, dir[CCHMAXPATH], *p, *pp;
   APIRET ret = -1, rc;
   FILESTATUS3L st, st2, dummy;
   BOOL diskchange = FALSE, zaplong = FALSE;
-  va_list ap;
-
-  *fullnewname = *shortname = *dir = 0;
-
-  va_start(ap, newname);
-  vsprintf(fullnewname, newname, ap);
-  va_end(ap);
-
-  if (!oldname || !*oldname || !*fullnewname)   /* bad string args */
+
+  *shortname = *dir = 0;
+
+  if (!oldname || !*oldname || !*newname)   /* bad string args */
     return (APIRET) - 1;
 
@@ -461 +456 @@
     return (APIRET) - 2;                /* no source */
 
-  AdjustWildcardName(oldname, fullnewname);
+  AdjustWildcardName(oldname, newname);
   MakeFullName(oldname);
-  MakeFullName(fullnewname);
+  MakeFullName(newname);
   olddisk = toupper(*oldname);          /* source drive */
-  newdisk = toupper(*fullnewname);      /* destination drive */
+  newdisk = toupper(*newname);      /* destination drive */
   if (!(driveflags[toupper(*oldname) - 'A'] & DRIVE_NOLONGNAMES))
     *longname = 0;
@@ -478 +473 @@
   /* If root name changed make sure longname EA goes away */
   p = RootName(oldname);
-  pp = RootName(fullnewname);
+  pp = RootName(newname);
   if (stricmp(p, pp)) {
     zaplong = TRUE;
@@ -493 +488 @@
       hobjsrc = WinQueryObject(oldname);
       if (hobjsrc) {
-        strcpy(dir, fullnewname);
+        strcpy(dir, newname);
         p = strrchr(dir, '\\');
         if (p < dir + 3)
@@ -518 +513 @@
       hobjsrc = WinQueryObject(oldname);
       if (hobjsrc) {
-        strcpy(dir, fullnewname);
+        strcpy(dir, newname);
         p = strrchr(dir, '\\');
         if (p < dir + 3)
@@ -539 +534 @@
     if (olddisk == newdisk) {           /* same drive */
       /* make temporary copy in case move fails */
-      if (IsFile(fullnewname) != -1 && stricmp(oldname, fullnewname)) {
-        strcpy(dir, fullnewname);
+      if (IsFile(newname) != -1 && stricmp(oldname, newname)) {
+        strcpy(dir, newname);
         p = strrchr(dir, '\\');
         if (p)
@@ -546 +541 @@
         strcat(dir, "\\");
         MakeTempName(dir, NULL, 0);
-        if (DosMove(fullnewname, dir))
+        if (DosMove(newname, dir))
           *dir = 0;
       }
       DosError(FERR_DISABLEHARDERR);
-      ret = DosMove(oldname, fullnewname);      /* move it */
+      ret = DosMove(oldname, newname);      /* move it */
       if (ret && *dir) {                /* failed -- clean up */
         DosError(FERR_DISABLEHARDERR);
-        if (!DosMove(dir, fullnewname))
+        if (!DosMove(dir, newname))
           Broadcast((HAB) 0, hwndMain, UM_UPDATERECORD, MPFROMP(dir), MPVOID);
       }
@@ -580 +575 @@
     else {                              /* different drives */
       DosError(FERR_DISABLEHARDERR);
-      ret = DosCopy(oldname, fullnewname, DCPY_EXISTING);       /* <=-NOTE! */
+      ret = DosCopy(oldname, newname, DCPY_EXISTING);       /* <=-NOTE! */
       if (ret == ERROR_DISK_CHANGE) {
         DosError(FERR_ENABLEHARDERR);
-        ret = DosCopy(oldname, fullnewname, DCPY_EXISTING);
+        ret = DosCopy(oldname, newname, DCPY_EXISTING);
         diskchange = TRUE;
       }
       if (ret == ERROR_INVALID_NAME || ret == ERROR_FILENAME_EXCED_RANGE) {
-        if (TruncName(fullnewname, shortname)) {        /* make 8.3 filename */
+        if (TruncName(newname, shortname)) {        /* make 8.3 filename */
           DosError(FERR_DISABLEHARDERR);
           ret = DosCopy(oldname, shortname, DCPY_EXISTING);
           if (!ret) {                   /* success -- write longname ea */
-            WriteLongName(shortname, fullnewname);
-            strcpy(fullnewname, shortname);
+            WriteLongName(shortname, newname);
+            strcpy(newname, shortname);
             /* broadcast fixup msg to windows */
             Broadcast((HAB) 0,
@@ -603 +598 @@
         CHAR fixname[CCHMAXPATH];
 
-        strcpy(fixname, fullnewname);
+        strcpy(fixname, newname);
         p = strrchr(fixname, '\\');
         if (p) {
@@ -611 +606 @@
         strcat(fixname, longname);
         DosError(FERR_DISABLEHARDERR);
-        DosMove(fullnewname, fixname);
-        strcpy(fullnewname, fixname);
+        DosMove(newname, fixname);
+        strcpy(newname, fixname);
         if (zaplong)
           ZapLongName(fixname);
@@ -620 +615 @@
       if (!ret) {                       /* double-check success */
         DosError(FERR_DISABLEHARDERR);
-        rc = DosQueryPathInfo(fullnewname,
+        rc = DosQueryPathInfo(newname,
                               FIL_STANDARDL, &st2, sizeof(FILESTATUS3L));
         if (rc == ERROR_DISK_CHANGE) {
           DosError(FERR_ENABLEHARDERR);
-          rc = DosQueryPathInfo(fullnewname,
+          rc = DosQueryPathInfo(newname,
                                 FIL_STANDARDL, &st2, sizeof(FILESTATUS3L));
         }
@@ -634 +629 @@
           }
           if (!(st2.attrFile & FILE_DIRECTORY)) /* erase file */
-            unlinkf("%s", oldname);
+            unlinkf(oldname);
           else {                        /* remove directory */
             wipeallf("%s\\*", oldname);
@@ -650 +645 @@
   case COPY:
     DosError(FERR_DISABLEHARDERR);
-    ret = DosCopy(oldname, fullnewname, DCPY_EXISTING); /* <=-NOTE! */
+    ret = DosCopy(oldname, newname, DCPY_EXISTING); /* <=-NOTE! */
     if (ret == ERROR_DISK_CHANGE) {
       DosError(FERR_ENABLEHARDERR);
-      ret = DosCopy(oldname, fullnewname, DCPY_EXISTING);
+      ret = DosCopy(oldname, newname, DCPY_EXISTING);
       diskchange = TRUE;
     }
     if (ret == ERROR_INVALID_NAME || ret == ERROR_FILENAME_EXCED_RANGE) {
-      if (TruncName(fullnewname, shortname)) {
+      if (TruncName(newname, shortname)) {
         DosError((diskchange) ? FERR_ENABLEHARDERR : FERR_DISABLEHARDERR);
         ret = DosCopy(oldname, shortname, DCPY_EXISTING);
         if (!ret) {
-          WriteLongName(shortname, fullnewname);
-          strcpy(fullnewname, shortname);
+          WriteLongName(shortname, newname);
+          strcpy(newname, shortname);
           Broadcast((HAB) 0,
                     hwndMain, UM_UPDATERECORD, MPFROMP(shortname), MPVOID);
@@ -672 +667 @@
       CHAR fixname[CCHMAXPATH];
 
-      strcpy(fixname, fullnewname);
+      strcpy(fixname, newname);
       p = strrchr(fixname, '\\');
       if (p) {
@@ -680 +675 @@
       strcat(fixname, longname);
       DosError(FERR_DISABLEHARDERR);
-      DosMove(fullnewname, fixname);
+      DosMove(newname, fixname);
       if (zaplong)
         ZapLongName(fixname);
@@ -901 +896 @@
 #endif
 
-INT unlinkf(CHAR * string, ...)
-{
-  CHAR buffer[CCHMAXPATH];
-  va_list ap;
-
-  va_start(ap, string);
-  vsprintf(buffer, string, ap);
-  va_end(ap);
-
-  if (!strstr(buffer, ArcTempRoot)) {
+INT unlinkf(CHAR *string)
+{
+
+  if (!strstr(string, ArcTempRoot)) {
     DosError(FERR_DISABLEHARDERR);
-    if (DosDelete(buffer)) {
-      make_deleteable(buffer);
+    if (DosDelete(string)) {
+      make_deleteable(string);
       DosError(FERR_DISABLEHARDERR);
-      return DosDelete(buffer);
+      return DosDelete(string);
     }
   }
   else {
     DosError(FERR_DISABLEHARDERR);
-    if (DosForceDelete(buffer)) {
-      make_deleteable(buffer);
+    if (DosForceDelete(string)) {
+      make_deleteable(string);
       DosError(FERR_DISABLEHARDERR);
-      return DosForceDelete(buffer);
+      return DosForceDelete(string);
     }
   }

trunk/dll/copyf.h

@@ -10 +10 @@
 
   05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -20 +21 @@
 char *MakeTempName(char *buffer, char *temproot, int type);
 BOOL WriteLongName(CHAR * filename, CHAR * longname);
-APIRET docopyf(INT type, CHAR * oldname, CHAR * newname, ...);
+APIRET docopyf(INT type, CHAR * oldname, CHAR * newname);
 INT make_deleteable(CHAR * filename);
-INT unlinkf(CHAR * string, ...);
+INT unlinkf(CHAR * string);
 INT wipeallf(CHAR * string, ...);
 

trunk/dll/defview.c

@@ -21 +21 @@
                 less than 10 KiB (It hangs and can't be closed)
   05 Jan 09 GKY Use TestBinary so that text veiwer isn't used for hex files by default
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -61 +62 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *Default;
+PCSZ Default  = "DEFAULT";
 
 BOOL ShowMultimedia(CHAR * filename)
@@ -124 +125 @@
 
   /* attempt to identify the file using MMPM/2 */
-  //printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
   memset( &mmioinfo, '\0', sizeof(MMIOINFO) );
   /*Eliminate non multimedia files*/
   hmmio = pMMIOOpen(filename,
                     &mmioinfo,
-                    MMIO_READ);
-#if 0
-  printf("%s %d %d %d %d %d\n",
-          __FILE__, __LINE__,mmioinfo.ulFlags, mmioinfo.ulErrorRet,
-         mmioinfo.pIOProc, mmioinfo.aulInfo); fflush(stdout);
-#endif
-         if (!hmmio) {
-             p = strrchr(filename, '.'); //Added to save mp3, ogg & flac which fail above test
-          if (!p)
-              p = ".";
-             /* printf("%s %d %s\n",
-              __FILE__, __LINE__, p); fflush(stdout);*/
-          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,
-                    MMIO_READ | MMIO_NOIDENTIFY);
-             if (!hmmio){
-                 DosFreeModule(MMIOModHandle);
-                 //printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
-                 return played;
-             }
-          }
-          else {
-             DosFreeModule(MMIOModHandle);
-                // printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
-                 return played;
-          }
-         }
-         if (!hmmio) {
-                 DosFreeModule(MMIOModHandle);
-                // printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
-                 return played;
-             }
-
+                    MMIO_READ);
+  if (!hmmio) {
+    p = strrchr(filename, '.'); //Added to save mp3, ogg & flac which fail above test
+    if (!p)
+      p = ".";
+    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,
+              MMIO_READ | MMIO_NOIDENTIFY);
+       if (!hmmio){
+           DosFreeModule(MMIOModHandle);
+           return played;
+       }
+    }
+    else {
+       DosFreeModule(MMIOModHandle);
+           return played;
+    }
+  }
+  if (!hmmio) {
+          DosFreeModule(MMIOModHandle);
+          return played;
+  }
   rc1 = pMMIOGetInfo(hmmio, &mmioinfo, 0L);
-  // printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
   memset(&mmFormatInfo, 0, sizeof(MMFORMATINFO));
   mmFormatInfo.ulStructLen = sizeof(MMFORMATINFO);
@@ -173 +161 @@
                          &fccStorageSystem, 0L,
                          MMIO_FORCE_IDENTIFY_FF);
-#if 0
-   printf("%s %d %d %d %d\n %d %d %d %s\n",
-          __FILE__, __LINE__,mmioinfo.ulFlags,
-          mmioinfo.pIOProc, mmioinfo.aulInfo,
-          mmFormatInfo.fccIOProc, mmFormatInfo.fccIOProc,
-          mmFormatInfo.ulIOProcType, mmFormatInfo.szDefaultFormatExt); fflush(stdout);
-#endif
   /* free module handle */
   rc1 = pMMIOClose(hmmio, 0L);
@@ -191 +172 @@
           if (!p)
               p = ".";
-             /* printf("%s %d %s\n",
-              __FILE__, __LINE__, p); fflush(stdout);*/
           if (!stricmp(p, PCSZ_DOTJPG) || !stricmp(p, PCSZ_DOTJPEG))
             OpenObject(filename, Default, hwnd);  //Image fails to display these
@@ -204 +183 @@
           if (!p)
               p = ".";
-             /* printf("%s %d %s\n",
-              __FILE__, __LINE__, p); fflush(stdout);*/
           if (!stricmp(p, PCSZ_DOTOGG) || !stricmp(p, PCSZ_DOTMP3) || !stricmp(p, PCSZ_DOTFLAC))
               OpenObject(filename, Default, hwnd);  //FM2Play fails to play these

trunk/dll/defview.h

@@ -10 +10 @@
 
   Change log
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -43 +44 @@
 
 // Data declarations
-extern CHAR *Default;
+extern PCSZ Default;
 
 #endif // DEFVIEW_H

trunk/dll/dircnrs.c

@@ -60 +60 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -863 +864 @@
         if (hwndMain) {
           if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame && pszTempDir)
-            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
               free(pszTempDir);
         }
         else {
           if (pszTempDir)
-            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
               free(pszTempDir);
         }
@@ -1433 +1434 @@
 
         if (pszTempDir) {
-          if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+          if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
             free(pszTempDir);
         }
@@ -1955 +1956 @@
 
           if (pszTempDir) {
-            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
                             MPFROMLONG(1L)))
               free(pszTempDir);
@@ -2602 +2603 @@
 
       case IDM_OPENICONME:
-        OpenObject(dcd->directory, "ICON", dcd->hwndFrame);
+        OpenObject(dcd->directory, PCSZ_ICON, dcd->hwndFrame);
         break;
       case IDM_OPENDETAILSME:
-        OpenObject(dcd->directory, "DETAILS", dcd->hwndFrame);
+        OpenObject(dcd->directory, Details, dcd->hwndFrame);
         break;
       case IDM_OPENTREEME:
-        OpenObject(dcd->directory, "TREE", dcd->hwndFrame);
+        OpenObject(dcd->directory, PCSZ_TREE, dcd->hwndFrame);
         break;
       case IDM_OPENSETTINGSME:
@@ -2971 +2972 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
               return (MRFROM2SHORT(DOR_NEVERDROP, 0));
           }
@@ -3109 +3110 @@
               if (li->type == DID_ERROR)
                   Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
               if (!li->type) {
                 FreeListInfo(li);

trunk/dll/dirsize.c

@@ -182 +182 @@
                      MPFROMLONG(1));
     if (!pci) {
-      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
       xfree(pffbArray, pszSrcFile, __LINE__);
       return FALSE;
@@ -894 +894 @@
             CHAR s[33];
 
-            strcpy(s, "ICON");
+            strcpy(s, PCSZ_ICON);
             PrfQueryProfileData(fmprof, appname, "DirflWindowAttr",
                                 (PVOID) & flWindowAttr, &size);
             if (flWindowAttr & CV_DETAIL) {
               if (IsRoot(szFileName))
-                strcpy(s, "TREE");
+                strcpy(s, PCSZ_TREE);
               else
-                strcpy(s, "DETAILS");
+                strcpy(s, Details);
             }
             OpenObject(szFileName, s, hwnd);

trunk/dll/draglist.c

@@ -22 +22 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   29 Feb 08 GKY Use xmallocz where appropriate
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -55 +56 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *DRMDRFLIST;
+PCSZ DRMDRFLIST = "<DRM_OS2FILE,DRF_UNKNOWN>," "<DRM_DISCARD,DRF_UNKNOWN>," "<DRM_PRINT,DRF_UNKNOWN>";
 
 /**

trunk/dll/draglist.h

@@ -10 +10 @@
 
   Change log
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -23 +24 @@
 
 // Data declarations
-extern CHAR *DRMDRFLIST;
+extern PCSZ DRMDRFLIST;
 extern HPOINTER hptrDir;
 extern HPOINTER hptrFile;

trunk/dll/droplist.c

@@ -21 +21 @@
   02 Aug 07 SHL Lock in DoFileDrop sanity checks
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -59 +60 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
             return FALSE;
           }
@@ -155 +156 @@
     len = DrgQueryStrName(pDItem->hstrSourceName,
                           buflen - blen, buffer + blen);
-    if(!len) {
-      // DbgMsg(pszSrcFile, __LINE__, "0x%x %d %d", pDItem->hstrSourceName,
-      //           buflen - blen, buffer + blen);
-      // Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-      //         "DrgQueryStrName");
-    }
     buffer[blen + len] = 0;
     {                                   /* be sure we get full pathname of file/directory */
@@ -202 +197 @@
     if (!DrgAccessDraginfo(pDInfo)) {
       Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DrgAccessDraginfo");
+                PCSZ_DRGACCESSDRAGINFO);
     }
     else {
@@ -237 +232 @@
     if (!DrgAccessDraginfo(pDInfo)) {
       Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DrgAccessDraginfo");
+                PCSZ_DRGACCESSDRAGINFO);
     }
     else {
@@ -261 +256 @@
     if (!DrgAccessDraginfo(pDInfo)) {
       Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-              "DrgAccessDraginfo");
+                PCSZ_DRGACCESSDRAGINFO);
       numitems = 0;                     // Oh well
     }
@@ -312 +307 @@
   if (!DrgAccessDraginfo(pDInfo)) {
     Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-            "DrgAccessDraginfo");
+              PCSZ_DRGACCESSDRAGINFO);
     numitems = 0;                       // Avoid death
   }

trunk/dll/eas.c

@@ -1261 +1261 @@
               eaop.fpFEA2List = pfealist;
               eaop.oError = 0;
-              // saymsg(MB_ENTER,HWND_DESKTOP,"Debug1","\"%s\" %ld",pdena->szName,ulEntry);
-              rc =
-                DosQueryFileInfo(handle, FIL_QUERYEASFROMLIST, (PVOID) & eaop,
-                                 (ULONG) sizeof(EAOP2));
+              rc = DosQueryFileInfo(handle, FIL_QUERYEASFROMLIST, (PVOID) & eaop,
+                                    (ULONG) sizeof(EAOP2));
               if (rc) {
                 if (!silentfail) {
@@ -1343 +1341 @@
               eaop.fpFEA2List = pfealist;
               eaop.oError = 0;
-              // saymsg(MB_ENTER,HWND_DESKTOP,"Debug2","\"%s\" %ld",pdena->szName,ulEntry);
               rc = DosQueryPathInfo(filename, FIL_QUERYEASFROMLIST,
                                     (PVOID) & eaop, (ULONG) sizeof(EAOP2));

trunk/dll/errutil.c

@@ -32 +32 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  08 Mar 09 GKY Remove Dos_Error2 (unused) and Runtime_Error2 (no advantage over using Runtime_Error)
 
 ***********************************************************************/
@@ -50 +51 @@
 #include "notebook.h"                   // fErrorBeepOff
 #include "init.h"                       // Data declares
-
-#pragma data_seg(GLOBAL2)
-PSZ DEBUG_STRING;
 
 #pragma data_seg(DATA1)
@@ -192 +190 @@
 
 } // Dos_Error
-
-/*== Dos_Error2: report Dos...() error using passed message id ===
-
-INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner,
-               PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
-{
-  return Dos_Error(mb_type, ulRC, hwndOwner, pszSrcFile, uSrcLineNo,
-                   GetPString(idMsg));
-} // Dos_Error2 */
 
 /**
@@ -328 +317 @@
 } // Runtime_Error
 
-//== Runtime_Error2: report runtime library error using passed message id ===
-
-/*VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
-{
-  Runtime_Error(pszSrcFile, uSrcLineNo, GetPString(idMsg));
-
-} // Runtime_Error2
-
-// fixme to be rename to Misc_Error */
-
 //=== saymsg: report misc error using passed message ===
 
@@ -400 +379 @@
 
 } // Win_Error
-
-/*== Win_Error2: report Win...() error using passed message id ===
-
-VOID Win_Error2(HWND hwndErr, HWND hwndOwner,
-                PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
-{
-  Win_Error(hwndErr, hwndOwner, pszSrcFile, uSrcLineNo, GetPString(idMsg));
-
-} // Win_Error2 */
 
 /**
@@ -437 +407 @@
 } // Win_Error_NoMsgBox
 
-#pragma alloc_text(ERROR,Win_Error,Dos_Error,saymsg,showMsg,GetHiresTimeer)
+#pragma alloc_text(ERROR,Win_Error,Dos_Error,saymsg,showMsg,Runtime_Error,GetMSecTimer)

trunk/dll/errutil.h

@@ -11 +11 @@
   05 Jan 08 SHL Move from fm3dll.h to here
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  08 Mar 09 GKY Remove Dos_Error2 (unused) and Runtime_Error2 (no advantage over using Runtime_Error)
 
 ***********************************************************************/
@@ -24 +25 @@
 INT Dos_Error(ULONG mb_type, ULONG ulRC, HWND hwndOwner,
               PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
-//INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner, PCSZ pszSrcFile,
-//             UINT uSrcLineNo, UINT idMsg);
 ULONG GetMSecTimer(void);
 VOID Runtime_Error(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
@@ -32 +31 @@
 VOID Win_Error(HWND hwndErr, HWND hwndOwner,
                PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
-//VOID Win_Error2(HWND hwndErr, HWND hwndOwner, PCSZ pszSrcFile,
-//              UINT uSrcLineNo, UINT idMsg);
 VOID Win_Error_NoMsgBox(HWND hwndErr, HWND hwndOwner,
                         PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
 
-extern PSZ DEBUG_STRING;
-
 #endif // ERRUTIL_H

trunk/dll/filldir.c

@@ -66 +66 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
-  08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Additional strings move to PCSZs
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -120 +122 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *FM3Tools;
-CHAR *WPProgram;
+PCSZ FM3Tools   = "<FM3_Tools>";
+PCSZ WPProgram  = "WPProgram";
 volatile INT StubbyScanCount;
 volatile INT ProcessDirCount;
@@ -252 +254 @@
                      MPFROM2SHORT(LIT_SORTASCENDING, 0),
                      MPFROMP(StubbyScan->pci->pszFileName));
-        }
-        StubbyScanCount--;
+        }
+        StubbyScanCount--;
        /* if (StubbyScanCount == 0) {
           if (fInitialDriveScan) {
@@ -416 +418 @@
         fclose(fp);
         hptr3 = WinLoadFileIcon(szFileName, FALSE);
-        unlinkf("%s", szFileName);
+        unlinkf(szFileName);
         if (!hptr2)
           hptr2 = hptr3;
@@ -1242 +1244 @@
     while (pci && (INT)pci != -1) {
       if ((pci->attrFile & FILE_DIRECTORY))
-        if (fInitialDriveScan)
+        //if (fInitialDriveScan)
           Stubby(hwndCnr, pci);
-        else {
+        /*else {
           while (StubbyScanCount != 0)
             DosSleep(50);
           Stubby(hwndCnr, pci);
-        }
+        } */
         //Stubby(hwndCnr, pci);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
@@ -1659 +1661 @@
                                 CM_QUERYRECORD,
                                 MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
     StubbyScanCount ++;
     while (pci && (INT)pci != -1) {
@@ -1679 +1681 @@
           if (~flags & DRIVE_INVALID &&
               ~flags & DRIVE_NOPRESCAN &&
-              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE) && !fDrivetoSkip[drvNum])
+              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) //&& !fDrivetoSkip[drvNum])
           {
             if (DRIVE_RAMDISK)
@@ -1708 +1710 @@
                      MPFROMP(pci->pszFileName));
         }
-        fDrivetoSkip[drvNum] = FALSE;
+        //fDrivetoSkip[drvNum] = FALSE;
       }
       pci = pciNext;

trunk/dll/filldir.h

@@ -11 +11 @@
   05 Jan 08 SHL Split from fm3dll.h
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -53 +54 @@
 
 // Data declarations
-extern CHAR *FM3Tools;
-extern CHAR *WPProgram;
+extern PCSZ FM3Tools;
+extern PCSZ WPProgram;
 extern HPOINTER hptrEnv;
 extern HPOINTER hptrHidden;

trunk/dll/fm2cmd.c

@@ -108 +108 @@
     else if (!stricmp(key, GetPString(IDS_HELPCMDTEXT))) {
       saymsg(MB_ENTER, (hwndMain) ? hwndMain : HWND_DESKTOP,
-             GetPString(IDS_FM2CMDHELPHDRTEXT), "%s",
-             GetPString(IDS_FM2CMDHELPTEXT));
+             GetPString(IDS_FM2CMDHELPHDRTEXT), GetPString(IDS_FM2CMDHELPTEXT));
       ret = TRUE;
     }

trunk/dll/fm3res.rc

@@ -46 +46 @@
                 255 where necessary
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  14 Mar 09 GKY Remove unused strings; remove trailing \32s replaced with spaces.
 
 ***********************************************************************/
@@ -2408 +2409 @@
     IDS_NOTPROTECTONLYEXE                 "The file %s is a Dos or Windows executible, however Dos and WinOS2 are not currently activated on this system."
     IDS_INIFAILURETEXT                    "Check INI header failed will attempt to replace with backup if backup fails or not found will open with new ini"
-    IDS_SHUTDOWNSTATE                     "FM2Shutdown"
     IDS_HELPCMDTEXT                       "/HELP"
-    IDS_FM2TEMPTEXT                       "FM/2_Temp"
     IDS_DETACHREQUESTTEXT                 "Detach Request"
     IDS_DIRCNRTOTALHELP                   "This window tells you how many objects\rand how many bytes are in the container.\rYou can drag me (this dir), or drag onto\rme (into this dir)."
@@ -2742 +2741 @@
     IDS_NVNOLINESTEXT                     " No lines to display"
     IDS_WORKINGTEXT                       " Working..."
-    IDS_LINECOLONTEXT                     " Line:\32"
+    IDS_LINECOLONTEXT                     " Line: "
     IDS_SELECTEDPARENTEXT                 " selected)"
     IDS_FOUNDPARENTEXT                    " found)"
-    IDS_OFFSETCOLONTEXT                   " Offset:\32"
+    IDS_OFFSETCOLONTEXT                   " Offset: "
     IDS_UNTITLEDBRKTTEXT                  " <Untitled>"
     IDS_NVLINEJUMPTEXT                    "Enter the number of the line to which you want to jump.\r\rClick Okay when complete, or Cancel to abort."
@@ -2932 +2931 @@
     IDS_INISEARCHPROMPTTEXT               "String to find:"
     IDS_INISEARCHTITLETEXT                "FM/2: Find INI string"
-    IDS_TREEMEMTEXT                       "  Mem:\32"
+    IDS_TREEMEMTEXT                       "  Mem: "
     IDS_CMDWIPEALLHELPTEXT                "Wipe all lines"
     IDS_CMDDELHILITEHELPTEXT              "Delete highlighted line"
@@ -2991 +2990 @@
     IDS_AVVCHK12TEXT                      "Bad extract exe!\r"
     IDS_AVVCHK13TEXT                      "No extract exe given!\r"
-    IDS_DIRBRKTTEXT                       "[Dir]/32"
+    IDS_DIRBRKTTEXT                       "[Dir] "
     IDS_DOESNTEXIST2TEXT                  "(Doesn't exist)"
     IDS_DATAANDBYTESTEXT                  "%s data (%u bytes)"
@@ -3018 +3017 @@
     IDS_SATURDAY                          "Sat"
     IDS_SWAPTITLETEXT                     "Swap:"
-    IDS_MEMTITLETEXT                      "Mem:\32"
-    IDS_PROCSTITLETEXT                    "Procs:\32"
-    IDS_THRDSTITLETEXT                    "Thrds:\32"
-    IDS_TASKSTITLETEXT                    "Tasks:\32"
-    IDS_ELAPSEDTITLETEXT                  "Elapsed:\32"
+    IDS_MEMTITLETEXT                      "Mem: "
+    IDS_PROCSTITLETEXT                    "Procs: "
+    IDS_THRDSTITLETEXT                    "Thrds: "
+    IDS_TASKSTITLETEXT                    "Tasks: "
+    IDS_ELAPSEDTITLETEXT                  "Elapsed: "
     IDS_DAYTEXT                           "day"
     IDS_TREEFILTERTITLETEXT               "FM/2:  Tree filter"
@@ -3078 +3077 @@
     IDS_MOVEDTEXT                         "Moved"
     IDS_COPIEDTEXT                        "Copied"
-    IDS_TOTEXT                            "to\32"
+    IDS_TOTEXT                            "to "
     IDS_FITTINGTEXT                       "Fitting..."
     IDS_COULDNTFITTEXT                    "Couldn't fit..."
@@ -3098 +3097 @@
     IDS_DELPROMPT5TEXT                    "  %u file%s marked Hidden and/or System %s present."
     IDS_DELPROMPT6TEXT                    "  Unhighlight any objects which you do not wish to delete."
-    IDS_PERMANENTLYTEXT                   "permanently\32"
-    IDS_ATEXT                             "a\32"
+    IDS_PERMANENTLYTEXT                   "permanently "
+    IDS_ATEXT                             "a "
     IDS_DELETINGTEXT                      "Deleting ""%s""..."
     IDS_DELETEFAILED1TEXT                 "*Delete of ""%s"" failed:  Error %lu\n"
@@ -3155 +3154 @@
     IDS_FM2LITETEXT                       "FM/2 Lite"
     IDS_CHANGECMDLINELENGTHDEFAULT        "We previously set commandline length to 2048 in error. Do you wish to changed to our intended value of 1024?"
-    IDS_SOURCEISATEXT                     "Source is a %s.\32\32"
+    IDS_SOURCEISATEXT                     "Source is a %s.  "
     IDS_DIRECTORYTEXT                     "directory"
     IDS_SORRYTEXT                         "Sorry"
     IDS_CANTCOMPARETEXT                   "Can't start comparison thread."
-    IDS_CANTACCESSSOURCETEXT              "Warning: Can't access source.\32\32"
-    IDS_TARGETEXISTSISATEXT               "Target exists and is a %s.\32\32"
+    IDS_CANTACCESSSOURCETEXT              "Warning: Can't access source.  "
+    IDS_TARGETEXISTSISATEXT               "Target exists and is a %s.  "
     IDS_CLICKOVERWRITETEXT                "Click Overwrite or enter new target name."
     IDS_ENTERNEWTARGETTEXT                "Enter new target name."
@@ -3180 +3179 @@
     IDS_MASKSFINDTEXT                     "The mask(s) to filter files we look for."
     IDS_TEXTFINDTEXT                      "Text for which we'll search in files."
-    IDS_MINSIZEFINDTEXT                   "A minimum size files must have."
-    IDS_MAXSIZEFINDTEXT                   "A maximum size files must have."
+    IDS_MINSIZEFINDTEXT                   "Minimum size files can be."
+    IDS_MAXSIZEFINDTEXT                   "Maximum size files can be."
     IDS_MAXAGEFINDTEXT                    "Maximum age in days of files."
     IDS_MINAGEFINDTEXT                    "Minimum age in days of files."
@@ -3233 +3232 @@
     IDS_CMALLOCRECERRTEXT                 "Record allocation failed"
     IDS_NOWINDOWTEXT                      "No window"
-    IDS_MAKEARCTITLETEXT                  "FM/2: Makearc\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32"
+    IDS_MAKEARCTITLETEXT                  "FM/2: Makearc                       "
     IDS_MAKEARCUSAGETEXT                  "Usage:\r\rMAKEARC <file or directory to archive>\r"
     IDS_FM3RESERROR1TEXT                  "Unable to load FM3RES.DLL"
@@ -3246 +3245 @@
     IDS_CLEARTARGETTITLETEXT              "Clear Target directory?"
     IDS_CLEARTARGETTEXT                   "Do you want to clear the Target directory (in other words, have no preset Target directory)?"
-    IDS_TARGETDIRTITLETEXT                "Target:\32"
-    IDS_SUGGESTTITLETEXT                  "FM/2 startup suggestion:\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32"
+    IDS_TARGETDIRTITLETEXT                "Target: "
+    IDS_SUGGESTTITLETEXT                  "FM/2 startup suggestion:                    "
     IDS_SUGGEST2TEXT                      " -- this includes one or more drives you had excluded, by the way"
     IDS_NOTEBUBBLE1TEXT                   "~Bubbles"
@@ -3262 +3261 @@
     IDS_PATHTODESKTOP                     "%c:\\DESKTOP"
     IDS_DRIVEINFOTITLETEXT                "FM/2: Drive info ""%c:"""
-    IDS_UNITTEXT                          "%nit"
-    IDS_SECTORSTEXT                       "lu bytes/sector, %lu sector%s/unit"
+    IDS_UNITTEXT                          "unit"
+    IDS_SECTORSTEXT                       "%lu bytes/sector, %lu sector%s/unit"
     IDS_STATSMEANINGLESSTEXT              "Stats not meaningful"
     IDS_EDITREADONLYFILETEXT              "%s is marked Read Only\n You will need to change its name to save.\n Select: yes to continue, no to open in viewer"
     IDS_EDITREADONLYFILETEXT2             "%s is marked Read Only\n You will need to change its name to save."
+    IDS_EDITREADONLYFILETEXT3             "File is readonly and has not been saved"
+    IDS_LENGTHEXCEEDSMAXPATHTEXT          "One or more of your files has a full path name that exceeds the OS/2 maximum"
+    IDS_STATEADDFAILEDTEXT                "\"%s\" state name add failed"
+    IDS_STATEDATASAVEFAILED               "State data save failed"
+    IDS_STATERESERVENAMETEXT              "\"%s\" is a reserved state name"
+    IDS_DRAGDROPDIALOGTEXT                "Drag & Drop Dialog"
 
     // Add strings that need to be combined by GetPString here

trunk/dll/fm3str.h

@@ -29 +29 @@
   04 Feb 09 SHL Switch to STRINGTABLE
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  14 Mar 09 GKY Remove variables that were transferred to PCSZs
 
 ***********************************************************************/
@@ -89 +90 @@
 #define IDS_NOTPROTECTONLYEXE                                 50
 #define IDS_INIFAILURETEXT                                    51
-#define IDS_8HELVTEXT                                         52
-#define IDS_6HELVTEXT                                         53
-#define IDS_SHUTDOWNSTATE                                     55
 #define IDS_HELPCMDTEXT                                       56
-#define IDS_FM2TEMPTEXT                                       57
-#define IDS_8TIMESNEWROMANTEXT                                58
 #define IDS_DETACHREQUESTTEXT                                 59
 #define IDS_DIRCNRTOTALHELP                                   60
@@ -995 +991 @@
 #define IDS_EDITREADONLYFILETEXT                             1006
 #define IDS_EDITREADONLYFILETEXT2                            1007
+#define IDS_EDITREADONLYFILETEXT3                            1008
+#define IDS_LENGTHEXCEEDSMAXPATHTEXT                         1009
+#define IDS_STATEADDFAILEDTEXT                               1010
+#define IDS_STATEDATASAVEFAILED                              1011
+#define IDS_STATERESERVENAMETEXT                             1012
+#define IDS_DRAGDROPDIALOGTEXT                               1013
 
 //The following strings were cut up form the string of the root name (ie IDS_SUGGEST1TEXT)

trunk/dll/getnames.c

@@ -11 +11 @@
   23 Aug 06 SHL Comments
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -389 +390 @@
                  filename,
                  GetPString(IDS_EXISTSERASETEXT), filename) == MBID_YES)
-        unlinkf("%s", filename);
+        unlinkf(filename);
     }
   }

trunk/dll/grep.c

@@ -31 +31 @@
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  08 Mar 09 GKY Additional strings move to String Table
 
 ***********************************************************************/
@@ -603 +604 @@
             // Complain if pathnames exceeds max
             DosFindClose(findHandle);
-            //xfree(pffbArray, pszSrcFile, __LINE__);
             if (!fDone) {
               fDone = TRUE;
@@ -609 +609 @@
                      HWND_DESKTOP,
                      GetPString(IDS_WARNINGTEXT),
-                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+                     GetPString(IDS_LENGTHEXCEEDSMAXPATHTEXT));
             }
             return 1;
@@ -717 +717 @@
   if (!pci) {
     Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
-              "CM_ALLOCRECORD %u failed", grep->toinsert);
+              PCSZ_CM_ALLOCRECORD);
   }
   else {
@@ -1515 +1515 @@
           }
         }
-        // DosSleep(0); //26 Aug 07 GKY 1
       } // while
     }

trunk/dll/info.c

@@ -237 +237 @@
               CommaFmtULL(szUnits, sizeof(szUnits),
                           (ULONGLONG) fsa.cUnitAvail, ' ');
-              sprintf(s,
-                      "%s, %s, %s %s%s",
-                      szMB, szKB, szUnits,
-                      GetPString(IDS_UNITTEXT), &"s"[fsa.cUnitAvail == 1L]);
+              sprintf(s, "%s, %s, %s %s%s",
+                      szMB, szKB, szUnits,
+                      GetPString(IDS_UNITTEXT), &"s"[fsa.cUnitAvail == 1L]);
               WinSetDlgItemText(hwnd, INFO_AVAILABLE, s);
               sprintf(s,
-                      GetPString(IDS_SECTORSTEXT),
-                      fsa.cbSector,
-                      fsa.cSectorUnit, &"s"[fsa.cSectorUnit == 1L]);
+                      GetPString(IDS_SECTORSTEXT),
+                      fsa.cbSector,
+                      fsa.cSectorUnit, &"s"[fsa.cSectorUnit == 1L]);
               WinSetDlgItemText(hwnd, INFO_ALLOCUNITS, s);
 
@@ -275 +274 @@
             else {
               sprintf(FileSystem,
-                      GetPString(IDS_CANTQUERYVOLTEXT),
-                      toupper(*pszFileName));
+                      GetPString(IDS_CANTQUERYVOLTEXT),
+                      toupper(*pszFileName));
               Notify(FileSystem);
               WinDismissDlg(hwnd, 0);
@@ -283 +282 @@
           else {
             sprintf(FileSystem,
-                    GetPString(IDS_CANTQUERYALLOCTEXT),
-                    toupper(*pszFileName));
+                    GetPString(IDS_CANTQUERYALLOCTEXT),
+                    toupper(*pszFileName));
             Notify(FileSystem);
             WinDismissDlg(hwnd, 0);
@@ -292 +291 @@
           FlagMsg(*pszFileName, s);
           sprintf(FileSystem,
-                  GetPString(IDS_DRIVEINACCESSIBLETEXT),
-                  toupper(*pszFileName), s);
+                  GetPString(IDS_DRIVEINACCESSIBLETEXT),
+                  toupper(*pszFileName), s);
           Notify(FileSystem);
           WinDismissDlg(hwnd, 0);

trunk/dll/inis.c

@@ -33 +33 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  14 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -86 +88 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *DRF_FM2INI;
-CHAR *DRM_FM2INIRECORD;
+PCSZ DRF_FM2INI  = "DRF_FM2INI";
+PCSZ DRM_FM2INIRECORD  = "DRM_FM2INIRECORD";
 RGB2 RGBBLACK;
 
@@ -197 +199 @@
           if (hiniFrom == NULLHANDLE) {
             Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "PrfOpenProfile failed for %s", inirec->filename1);
+                      PCSZ_PRFOPENPROFILEFAILED, inirec->filename1);
           }
         }
@@ -207 +209 @@
             if (hiniTo == NULLHANDLE) {
               Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        "PrfOpenProfile failed for %s", inirec->filename2);
+                        PCSZ_PRFOPENPROFILEFAILED, inirec->filename2);
             }
           }
@@ -410 +412 @@
         if (orig == NULLHANDLE) {
           Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    "PrfOpenProfile failed for %s", prfp->pszUserName);
+                    PCSZ_PRFOPENPROFILEFAILED, prfp->pszUserName);
         }
         else {
@@ -416 +418 @@
           if (new == NULLHANDLE) {
             Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "PrfOpenProfile failed for %s", prfp->pszSysName);
+                      PCSZ_PRFOPENPROFILEFAILED, prfp->pszSysName);
           }
           else {
@@ -1692 +1694 @@
       if (!DrgAccessDraginfo(pDInfo)) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+                  PCSZ_DRGACCESSDRAGINFO);
       }
       else {
@@ -1731 +1733 @@
       if (!DrgAccessDraginfo(pDInfo)) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+                  PCSZ_DRGACCESSDRAGINFO);
         return 0;
       }
@@ -2098 +2100 @@
       if (inidata->hini == NULLHANDLE) {
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "PrfOpenProfile failed for %s", inidata->ininame);
+                  PCSZ_PRFOPENPROFILEFAILED, inidata->ininame);
       }
       else {

trunk/dll/inis.h

@@ -10 +10 @@
 
   Change log
+  14 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -22 +23 @@
 
 // Data declarations
-extern CHAR *DRF_FM2INI;
-extern CHAR *DRM_FM2INIRECORD;
+extern PCSZ DRF_FM2INI;
+extern PCSZ DRM_FM2INIRECORD;
 extern RGB2 RGBBLACK;
 extern HELPINIT hini;

trunk/dll/init.c

@@ -75 +75 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  14 Mar 09 GKY PCSZ strings moved to compile time initialization
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring replaces check for
+                saved drive containers.
 
 ***********************************************************************/
@@ -173 +177 @@
 // Data definitions
 static PSZ pszSrcFile = __FILE__;
-static CHAR *WC_MAINWND;
 unsigned __MaxThreads = {48};
 
@@ -195 +198 @@
 BOOL fReminimize;
 BOOL fWantFirstTimeInit;
-BOOL fDrivetoSkip[26];
+//BOOL fDrivetoSkip[26];
 HPOINTER hptrApp;
 HPOINTER hptrArc;
@@ -215 +218 @@
 
 #pragma data_seg(GLOBAL2)
-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;
-PCSZ PCSZ_LVMGUICMD;
-PCSZ PCSZ_DFSOS2EXE;
-PCSZ PCSZ_MINILVMEXE;
-PCSZ PCSZ_FDISKPMEXE;
-PCSZ PCSZ_LVMEXE;
-PCSZ PCSZ_ARCCNR;
-PCSZ PCSZ_COLLECTOR;
-PCSZ PCSZ_DIRCNR;
-PCSZ PCSZ_DIRSIZES;
-PCSZ PCSZ_TOOLBAR;
-PCSZ PCSZ_TREECNR;
-CHAR *CBSIFS;
-CHAR *DRF_FM2ARCHIVE;
-CHAR *DRMDRFFM2ARC;
-CHAR *DRMDRFOS2FILE;
-CHAR *DRM_FM2ARCMEMBER;
-CHAR *DRM_OS2FILE;
-CHAR *FM2Str;
+PCSZ PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
+PCSZ PCSZ_ASSOCDAT    = "ASSOC.DAT";
+PCSZ PCSZ_CMDLINESDAT = "CMDLINES.DAT";
+PCSZ PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
+PCSZ PCSZ_COMMANDSDAT = "COMMANDS.DAT";
+PCSZ PCSZ_FILTERSDAT  = "FILTERS.DAT";
+PCSZ PCSZ_GREPMASKDAT = "GREPMASK.DAT";
+PCSZ PCSZ_PATTERNSDAT = "PATTERNS.DAT";
+PCSZ PCSZ_RESOURCEDAT = "RESOURCE.DAT";
+PCSZ PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
+PCSZ PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
+PCSZ PCSZ_USERDIRSDAT = "USERDIRS.DAT";
+PCSZ PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
+PCSZ PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
+PCSZ PCSZ_LVMGUICMD   = "LVMGUI.CMD";
+PCSZ PCSZ_DFSOS2EXE   = "DFSOS2.EXE";
+PCSZ PCSZ_MINILVMEXE  = "MINILVM.EXE";
+PCSZ PCSZ_FDISKPMEXE  = "FDISKPM.EXE";
+PCSZ PCSZ_LVMEXE      = "LVM.EXE";
+PCSZ PCSZ_ARCCNR      = "ArcCnr";
+PCSZ PCSZ_COLLECTOR   = "Collector";
+PCSZ PCSZ_DIRCNR      = "DirCnr";
+PCSZ PCSZ_DIRSIZES    = "DirSizes";
+PCSZ PCSZ_TOOLBAR     = "ToolBar";
+PCSZ PCSZ_TREECNR     = "TreeCnr";
+PCSZ PCSZ_SHUTDOWNSTATE    =  "FM2Shutdown";
+PCSZ PCSZ_FM2TEMPTEXT      =  "FM/2_Temp";
+PCSZ DRF_FM2ARCHIVE   = "DRF_FM2ARCHIVE";
+PCSZ DRMDRFFM2ARC     = "<DRM_FM2ARCMEMBER,DRF_FM2ARCHIVE>";
+PCSZ DRMDRFOS2FILE    = "<DRM_OS2FILE,DRF_UNKNOWN>";
+PCSZ DRM_FM2ARCMEMBER = "DRM_FM2ARCMEMBER";
+PCSZ DRM_OS2FILE      = "DRM_OS2FILE";
+PCSZ FM2Str           = "FM/2";
 HMODULE FM3DllHandle;
-CHAR *FM3Folder;
-PCSZ FNT_6HELVETICA;
-PCSZ FNT_8HELVETICA;
-PCSZ FNT_8HELVETICABOLD;
-PCSZ FNT_10SYSTEMMONOTEXT;
-PCSZ FNT_10SYSTEMPROPORT;
-PCSZ FNT_2SYSTEMVIO;
-PCSZ FNT_4SYSTEMVIO;
-PCSZ FNT_10SYSTEMVIO;
-PCSZ FNT_8TIMESNEWROMAN;
+PCSZ FM3Folder        = "<FM3_Folder>";
+PCSZ FNT_6HELVETICA       =  "6.Helvetica";
+PCSZ FNT_8HELVETICA       =  "8.Helvetica";
+PCSZ FNT_8HELVETICABOLD   =  "8.Helvetica.Bold";
+PCSZ FNT_10SYSTEMMONOTEXT =  "10.System Monospaced";
+PCSZ FNT_10SYSTEMPROPORT  =  "10.System Proportional";
+PCSZ FNT_2SYSTEMVIO       =  "2.System VIO";
+PCSZ FNT_4SYSTEMVIO       =  "4.System VIO";
+PCSZ FNT_10SYSTEMVIO      =  "10.System VIO";
+PCSZ FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
 CHAR HomePath[CCHMAXPATH];
-CHAR *LONGNAME;
-CHAR *NullStr;
-PCSZ PCSZ_DOSCREATEMUTEXSEM;
-PCSZ PCSZ_DOSDUPHANDLE;
-PCSZ PCSZ_DOSGETINFOBLOCKS;
-PCSZ PCSZ_DOSQUERYPATHINFO;
-PCSZ PCSZ_DOSSEARCHPATH;
-PCSZ PCSZ_POSTMSG;
-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;
-PCSZ PCSZ_LIBPATH;
-CHAR *pLibPathStrict;
-PCSZ PCSZ_WPURLDEFAULTSETTINGS;
-CHAR *Settings;
+PCSZ LONGNAME             = ".LONGNAME";
+CHAR *NullStr             = "";
+PCSZ PCSZ_CM_ALLOCRECORD  = "CM_ALLOCRECORD";
+PCSZ PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
+PCSZ PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
+PCSZ PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
+PCSZ PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
+PCSZ PCSZ_DOSSEARCHPATH    = "DosSearchPath";
+PCSZ PCSZ_DRGACCESSDRAGINFO = "DrgAccessDraginfo";
+PCSZ PCSZ_POSTMSG          = "PostMsg";
+PCSZ PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
+PCSZ PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
+PCSZ PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
+PCSZ PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
+PCSZ PCSZ_PRFOPENPROFILEFAILED = "PrfOpenProfile failed for %s";
+PCSZ PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
+PCSZ PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
+PCSZ PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
+PCSZ PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
+PCSZ PCSZ_NODATA  =  "No Data";
+PCSZ PCSZ_STARDOTEXE    =  "*.EXE";
+PCSZ PCSZ_STARDOTINI    =  "*.INI";
+PCSZ PCSZ_STARDOTLST    =  "*.LST";
+PCSZ PCSZ_STARDOTPMD    =  "*.PMD";
+PCSZ PCSZ_STARDOTTXT    =  "*.TXT";
+PCSZ PCSZ_DOTEXE   =  ".EXE";
+PCSZ PCSZ_DOTCOM   =  ".COM";
+PCSZ PCSZ_DOTCMD   =  ".CMD";
+PCSZ PCSZ_DOTBTM   =  ".BTM";
+PCSZ PCSZ_DOTBAT   =  ".BAT";
+PCSZ PCSZ_DOTLST   =  ".LST";
+PCSZ PCSZ_DOTTLS   =  ".TLS";
+PCSZ PCSZ_DOTHLP   =  ".HLP";
+PCSZ PCSZ_DOTINF   =  ".INF";
+PCSZ PCSZ_DOTMP3   =  ".MP3";
+PCSZ PCSZ_DOTOGG   =  ".OGG";
+PCSZ PCSZ_DOTFLAC  =  ".FLAC";
+PCSZ PCSZ_DOTJPEG  =  ".JPEG";
+PCSZ PCSZ_DOTJPG   =  ".JPG";
+PCSZ PCSZ_DOTICO   =  ".ICO";
+PCSZ PCSZ_DOTPTR   =  ".PTR";
+PCSZ PCSZ_DOTBB2   =  ".BB2";
+PCSZ PCSZ_DOTBMP   =  ".BMP";
+PCSZ PCSZ_DOTCOMMENTS   =  ".COMMENTS";
+PCSZ PCSZ_PATH     =  "PATH";
+PCSZ PCSZ_LIBPATH       =  "LIBPATH";
+CHAR *pLibPathStrict = "SET LIBPATHSTRICT=TRUE";
+PCSZ PCSZ_WPURLDEFAULTSETTINGS = "WPURLDEFAULTSETTINGS";
+PCSZ Settings      = "SETTINGS";
+PCSZ Details       = "DETAILS";
+PCSZ PCSZ_TREE     = "TREE";
+PCSZ PCSZ_ICON     = "ICON";
 CHAR SwapperDat[CCHMAXPATH];
-PCSZ WC_ARCCONTAINER;
-PCSZ WC_ARCSTATUS;
-PCSZ WC_AUTOVIEW;
-PCSZ WC_BUBBLE;
-PCSZ WC_COLLECTOR;
-PCSZ WC_COLSTATUS;
-PCSZ WC_DATABAR;
-PCSZ WC_DIRCONTAINER;
-PCSZ WC_DIRSTATUS;
-PCSZ WC_DRIVEBACK;
-PCSZ WC_DRIVEBUTTONS;
-PCSZ WC_ERRORWND;
-PCSZ WC_INIEDITOR;
-PCSZ WC_LED;
-PCSZ WC_MAINWND2;
-PCSZ WC_MINITIME;
-PCSZ WC_MLEEDITOR;
-PCSZ WC_NEWVIEW;
-PCSZ WC_OBJECTWINDOW;
-PCSZ WC_SEEALL;
-PCSZ WC_SEESTATUS;
-PCSZ WC_STATUS;
-PCSZ WC_TOOLBACK;
-PCSZ WC_TOOLBUTTONS;
-PCSZ WC_TREECONTAINER;
-PCSZ WC_TREEOPENBUTTON;
-PCSZ WC_TREESTATUS;
-PCSZ WC_VIEWSTATUS;
+PCSZ WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
+PCSZ WC_BUBBLE          =  "WC_BUBBLE";
+PCSZ WC_TOOLBUTTONS     =  "WC_TOOLBUTTONS";
+PCSZ WC_DRIVEBUTTONS    =  "WC_DRIVEBUTTONS";
+PCSZ WC_DIRCONTAINER    =  "WC_DIRCONTAINER";
+PCSZ WC_DIRSTATUS       =  "WC_DIRSTATUS";
+PCSZ WC_TREECONTAINER   =  "WC_TREECONTAINER";
+PCSZ WC_TREEOPENBUTTON  =  "WC_TREEOPENBUTTON";
+PCSZ WC_TREESTATUS      =  "WC_TREESTATUS";
+PCSZ WC_MAINWND         =  "WC_MAINWND";
+PCSZ WC_MAINWND2        =  "WC_MAINWND2";
+PCSZ WC_AUTOVIEW        =  "WC_AUTOVIEW";
+PCSZ WC_LED             =  "WC_LED";
+PCSZ WC_COLLECTOR       =  "WC_COLLECTOR";
+PCSZ WC_COLSTATUS       =  "WC_COLSTATUS";
+PCSZ WC_STATUS          =  "WC_STATUS";
+PCSZ WC_TOOLBACK        =  "WC_TOOLBACK";
+PCSZ WC_DRIVEBACK       =  "WC_DRIVEBACK";
+PCSZ WC_ARCCONTAINER    =  "WC_ARCCONTAINER";
+PCSZ WC_ARCSTATUS       =  "WC_ARCSTATUS";
+PCSZ WC_MLEEDITOR       =  "WC_MLEEDITOR";
+PCSZ WC_INIEDITOR       =  "WC_INIEDITOR";
+PCSZ WC_SEEALL          =  "WC_SEEALL";
+PCSZ WC_NEWVIEW         =  "WC_NEWVIEW";
+PCSZ WC_SEESTATUS       =  "WC_SEESTATUS";
+PCSZ WC_VIEWSTATUS      =  "WC_VIEWSTATUS";
+PCSZ WC_ERRORWND        =  "WC_ERRORWND";
+PCSZ WC_MINITIME        =  "WC_MINITIME";
+PCSZ WC_DATABAR         =  "WC_DATABAR";
 CHAR profile[CCHMAXPATH];
 ULONGLONG ullTmpSpaceNeeded;
@@ -468 +479 @@
 
     DosError(FERR_DISABLEHARDERR);
-    /* strings here to prevent multiple occurences in DLL */
-    FM2Str = "FM/2";
-    FM3Str = "FM/3";
-    NullStr = "";
-    Default = "DEFAULT";
-    Settings = "SETTINGS";
-    WPProgram = "WPProgram";
-    FM3Folder = "<FM3_Folder>";
-    FM3Tools = "<FM3_Tools>";
-    DRM_OS2FILE = "DRM_OS2FILE";
-    DRM_FM2ARCMEMBER = "DRM_FM2ARCMEMBER";
-    DRF_FM2ARCHIVE = "DRF_FM2ARCHIVE";
-    DRMDRFLIST = "<DRM_OS2FILE,DRF_UNKNOWN>,"
-      "<DRM_DISCARD,DRF_UNKNOWN>," "<DRM_PRINT,DRF_UNKNOWN>";
-    DRMDRFOS2FILE = "<DRM_OS2FILE,DRF_UNKNOWN>";
-    DRMDRFFM2ARC = "<DRM_FM2ARCMEMBER,DRF_FM2ARCHIVE>";
-    DRM_FM2INIRECORD = "DRM_FM2INIRECORD";
-    DRF_FM2INI = "DRF_FM2INI";
-    SUBJECT = ".SUBJECT";
-    LONGNAME = ".LONGNAME";
-    HPFS = "HPFS";
-    JFS = "JFS";
-    CDFS = "CDFS";
-    ISOFS = "ISOFS";
-    FAT32 = "FAT32";
-    HPFS386 = "HPFS386";
-    CBSIFS = "CBSIFS";
-    NDFS32 = "NDFS32";
-    RAMFS = "RAMFS";
-    NTFS = "NTFS";
-    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.$$$";
-    PCSZ_LVMGUICMD   = "LVMGUI.CMD";
-    PCSZ_DFSOS2EXE   = "DFSOS2.EXE";
-    PCSZ_MINILVMEXE  = "MINILVM.EXE";
-    PCSZ_FDISKPMEXE  = "FDISKPM.EXE";
-    PCSZ_LVMEXE      = "LVM.EXE";
-    PCSZ_ARCCNR      = "ArcCnr";
-    PCSZ_COLLECTOR   = "Collector";
-    PCSZ_DIRCNR      = "DirCnr";
-    PCSZ_DIRSIZES    = "DirSizes";
-    PCSZ_TOOLBAR     = "ToolBar";
-    PCSZ_TREECNR     = "TreeCnr";
-    FNT_6HELVETICA       =  "6.Helvetica";
-    FNT_8HELVETICA       =  "8.Helvetica";
-    FNT_8HELVETICABOLD   =  "8.Helvetica.Bold";
-    FNT_10SYSTEMMONOTEXT =  "10.System Monospaced";
-    FNT_10SYSTEMPROPORT  =  "10.System Proportional";
-    FNT_2SYSTEMVIO       =  "2.System VIO";
-    FNT_4SYSTEMVIO       =  "4.System VIO";
-    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_POSTMSG          = "PostMsg";
-    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";
-    PCSZ_LIBPATH       =  "LIBPATH";
-    pLibPathStrict = "SET LIBPATHSTRICT=TRUE";
-    PCSZ_WPURLDEFAULTSETTINGS = "WPURLDEFAULTSETTINGS";
-    WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
-    WC_BUBBLE          =  "WC_BUBBLE";
-    WC_TOOLBUTTONS     =  "WC_TOOLBUTTONS";
-    WC_DRIVEBUTTONS    =  "WC_DRIVEBUTTONS";
-    WC_DIRCONTAINER    =  "WC_DIRCONTAINER";
-    WC_DIRSTATUS       =  "WC_DIRSTATUS";
-    WC_TREECONTAINER   =  "WC_TREECONTAINER";
-    WC_TREEOPENBUTTON  =  "WC_TREEOPENBUTTON";
-    WC_TREESTATUS      =  "WC_TREESTATUS";
-    WC_MAINWND         =  "WC_MAINWND";
-    WC_MAINWND2        =  "WC_MAINWND2";
-    WC_AUTOVIEW        =  "WC_AUTOVIEW";
-    WC_LED             =  "WC_LED";
-    WC_COLLECTOR       =  "WC_COLLECTOR";
-    WC_COLSTATUS       =  "WC_COLSTATUS";
-    WC_STATUS          =  "WC_STATUS";
-    WC_TOOLBACK        =  "WC_TOOLBACK";
-    WC_DRIVEBACK       =  "WC_DRIVEBACK";
-    WC_ARCCONTAINER    =  "WC_ARCCONTAINER";
-    WC_ARCSTATUS       =  "WC_ARCSTATUS";
-    WC_MLEEDITOR       =  "WC_MLEEDITOR";
-    WC_INIEDITOR       =  "WC_INIEDITOR";
-    WC_SEEALL          =  "WC_SEEALL";
-    WC_NEWVIEW         =  "WC_NEWVIEW";
-    WC_SEESTATUS       =  "WC_SEESTATUS";
-    WC_VIEWSTATUS      =  "WC_VIEWSTATUS";
-    WC_ERRORWND        =  "WC_ERRORWND";
-    WC_MINITIME        =  "WC_MINITIME";
-    WC_DATABAR         =  "WC_DATABAR";
-
-    /* end of strings */
     memset(&RGBBLACK, 0, sizeof(RGB2));
     RGBGREY.bRed = RGBGREY.bGreen = RGBGREY.bBlue = (BYTE)204;
     RGBGREY.fcOptions = 0;
     FM3UL = *(ULONG *)FM3Str;
-    DEBUG_STRING = "Debug -- please report to author";
     break;
   case 1:
@@ -763 +635 @@
     RGBGREY.fcOptions = 0;
     FM3UL = *(ULONG *)FM3Str;
-    DEBUG_STRING = "Debug -- please report to author";
     break;
   case 1:
@@ -835 +706 @@
         }
         else
-          unlinkf("%s", s);
+          unlinkf(s);
       }
       while (!DosFindNext(search_handle,
@@ -862 +733 @@
       if (!(ffb.attrFile & FILE_DIRECTORY)) {
         strcpy(enddir, ffb.achName);
-        unlinkf("%s", s);
+        unlinkf(s);
       }
     }
@@ -1168 +1039 @@
     if (!fmprof) {
       Win_Error(NULLHANDLE, NULLHANDLE, pszSrcFile, __LINE__,
-                "PrfOpenProfile");
+                PCSZ_PRFOPENPROFILEFAILED, inipath);
       return FALSE;
     }
@@ -1228 +1099 @@
   if (WinQueryClassInfo(hab, WC_CONTAINER, &clinfo))
     PFNWPCnr = clinfo.pfnWindowProc;
-  // saymsg(MB_ENTER,HWND_DESKTOP,"Container flags:","%08lx",clinfo.flClassStyle);
   if (WinQueryClassInfo(hab, WC_FRAME, &clinfo))
     PFNWPFrame = clinfo.pfnWindowProc;
-  // saymsg(MB_ENTER,HWND_DESKTOP,"Frame flags:","%08lx",clinfo.flClassStyle);
   if (WinQueryClassInfo(hab, WC_BUTTON, &clinfo))
     PFNWPButton = clinfo.pfnWindowProc;
-  // saymsg(MB_ENTER,HWND_DESKTOP,"Button flags:","%08lx",clinfo.flClassStyle);
   if (WinQueryClassInfo(hab, WC_STATIC, &clinfo))
     PFNWPStatic = clinfo.pfnWindowProc;
-  // saymsg(MB_ENTER,HWND_DESKTOP,"Static flags:","%08lx",clinfo.flClassStyle);
   if (WinQueryClassInfo(hab, WC_MLE, &clinfo))
     PFNWPMLE = clinfo.pfnWindowProc;
-  // saymsg(MB_ENTER,HWND_DESKTOP,"MLE flags:","%08lx",clinfo.flClassStyle);
   if (!PFNWPCnr || !PFNWPFrame || !PFNWPButton || !PFNWPStatic || !PFNWPMLE) {
     Runtime_Error(pszSrcFile, __LINE__, "WinQueryClassInfo");
@@ -1667 +1533 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
-  size = sizeof(BOOL);
+  /*size = sizeof(BOOL);   Replaced by UM_SHOWME check 3/14/09 GKY
   PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
   if (fSaveState && (fSwitchTreeOnFocus || fSwitchTree) &&
@@ -1678 +1544 @@
       strcpy(szKey, "FM/4 Dir1");
     else
-      sprintf(szKey, "%s.DirCnrDir.0", GetPString(IDS_SHUTDOWNSTATE));
+      sprintf(szKey, "%s.DirCnrDir.0", PCSZ_SHUTDOWNSTATE);
     size = sizeof(szDir);
     if (PrfQueryProfileData(fmprof, appname, szKey, szDir, &size)) {
@@ -1684 +1550 @@
       fDrivetoSkip[drvNum] = TRUE;
     }
-  }
+  } */
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "SyncUpdates", &fSyncUpdates, &size);

trunk/dll/init.h

@@ -53 +53 @@
 extern PCSZ PCSZ_TOOLBAR;
 extern PCSZ PCSZ_TREECNR;
-extern CHAR *CBSIFS;
-extern CHAR *DRMDRFFM2ARC;
-extern CHAR *DRF_FM2ARCHIVE;
-extern CHAR *DRMDRFOS2FILE;
-extern CHAR *DRM_FM2ARCMEMBER;
-extern CHAR *DRM_OS2FILE;
-extern CHAR *FM2Str;
-extern CHAR *FM3Folder;
+extern PCSZ PCSZ_SHUTDOWNSTATE;
+extern PCSZ PCSZ_FM2TEMPTEXT;
+extern PCSZ DRMDRFFM2ARC;
+extern PCSZ DRF_FM2ARCHIVE;
+extern PCSZ DRMDRFOS2FILE;
+extern PCSZ DRM_FM2ARCMEMBER;
+extern PCSZ DRM_OS2FILE;
+extern PCSZ FM2Str;
+extern PCSZ FM3Folder;
 extern CHAR HomePath[CCHMAXPATH];
-extern CHAR *LONGNAME;
+extern PCSZ LONGNAME;
 extern CHAR *NullStr;
 extern ULONG OS2ver[2];
 extern PFNWP PFNWPCnr;
 extern PFNWP PFNWPMLE;
-extern CHAR *Settings;
+extern PCSZ Settings;
+extern PCSZ Details;
+extern PCSZ PCSZ_TREE;
+extern PCSZ PCSZ_ICON;
 extern CHAR SwapperDat[CCHMAXPATH];
 extern CHAR ThousandsSeparator[2];
@@ -83 +87 @@
 extern PCSZ FNT_10SYSTEMVIO;
 extern PCSZ FNT_8TIMESNEWROMAN;
+extern PCSZ PCSZ_CM_ALLOCRECORD;
 extern PCSZ PCSZ_DOSCREATEMUTEXSEM;
 extern PCSZ PCSZ_DOSDUPHANDLE;
@@ -88 +93 @@
 extern PCSZ PCSZ_DOSQUERYPATHINFO;
 extern PCSZ PCSZ_DOSSEARCHPATH;
+extern PCSZ PCSZ_DRGACCESSDRAGINFO;
 extern PCSZ PCSZ_POSTMSG;
 extern PCSZ PCSZ_WINCREATEWINDOW;
@@ -93 +99 @@
 extern PCSZ PCSZ_WINSETACCELTABLE;
 extern PCSZ PCSZ_INIQUERYPRFTEXT;
+extern PCSZ PCSZ_PRFOPENPROFILEFAILED;
 extern PCSZ PCSZ_PRFQUERYPROFILEDATA;
 extern PCSZ PCSZ_PRFQUERYPROFILESIZE;
@@ -139 +146 @@
 extern PCSZ WC_INIEDITOR;
 extern PCSZ WC_LED;
+extern PCSZ WC_MAINWND;
 extern PCSZ WC_MAINWND2;
 extern PCSZ WC_MINITIME;
@@ -161 +169 @@
 extern BOOL fReminimize;
 extern BOOL fWantFirstTimeInit;
-extern BOOL fDrivetoSkip[26];
+// extern BOOL fDrivetoSkip[26];
 extern HPOINTER hptrApp;
 extern HPOINTER hptrArc;

trunk/dll/killproc.c

@@ -20 +20 @@
   16 JUL 08 GKY Use TMP directory for temp files
   10 Dec 08 SHL Integrate exception handler support
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -259 +260 @@
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
   BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#");
-  unlinkf("%s", s);
+  unlinkf(s);
   fp = fopen(s, "w");
   if (!fp) {

trunk/dll/mainwnd.c

@@ -81 +81 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
-  08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Additional strings move to PCSZs & String Table
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
 
@@ -207 +207 @@
 #pragma data_seg(GLOBAL2)
 HMODULE FM3ModHandle;
-CHAR *FM3Str;
+PCSZ FM3Str  = "FM/3";
 RGB2 RGBGREY;
 
@@ -427 +427 @@
       henum = WinBeginEnumWindows(hwndMain);
       while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE) {
-         //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
-        if (hwndC != exclude && hwndC != hwndTree) {
+         if (hwndC != exclude && hwndC != hwndTree) {
           id = WinQueryWindowUShort(hwndC, QWS_ID);
           if (id) {
@@ -446 +445 @@
                                UM_CONTAINERDIR, MPFROMP(ret), MPVOID)) {
                   MakeValidDir(ret);
-                  //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
                   WinEndEnumWindows(henum);
                   return hwndC;
@@ -698 +696 @@
           if (haccelSaved == NULLHANDLE)
             Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryAccelTable");
-          // else
-            // DbgMsg(pszSrcFile, __LINE__, "WinQueryAccelTable SAVED %x", haccelSaved);
         }
         if (haccelSaved != NULLHANDLE) {
@@ -712 +708 @@
               if (!WinSetAccelTable(hab, haccelDriveList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
             }
             break;
@@ -725 +719 @@
               if (!WinSetAccelTable(hab, haccelSetupList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_SETUPLIST %x %x", hwndFrame, haccelSetupList);
             }
             break;
@@ -738 +730 @@
               if (!WinSetAccelTable(hab, haccelCmdList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_CMDLIST %x %x", hwndFrame, haccelCmdList);
             }
             break;
@@ -751 +741 @@
               if (!WinSetAccelTable(hab, haccelUserList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_USERLIST %x %x", hwndFrame, haccelUserList);
             }
             break;
@@ -764 +752 @@
               if (!WinSetAccelTable(hab, haccelButtonList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_BUTTONLIST %x %x", hwndFrame, haccelButtonList);
             }
             break;
@@ -782 +768 @@
             if (!WinSetAccelTable(hab, haccelSaved, hwndFrame))
               Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-            // else
-              // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable SAVED %x %x", hwndFrame, haccelSaved);
           }
           break;
@@ -865 +849 @@
   case WM_BEGINDRAG:
     id = WinQueryWindowUShort(hwnd, QWS_ID);
-    // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%u %s %u",id,(id == CBID_EDIT) ? "TRUE" : "FALSE",WinQueryWindowUShort(WinQueryWindow(hwnd,QW_PARENT),QWS_ID) == MAIN_USERLIST);
     if (id == CBID_EDIT &&
-        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
+        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
         MAIN_USERLIST) {
 
@@ -875 +858 @@
       WinQueryWindowText(hwnd, CCHMAXPATH, path);
       bstrip(path);
-      // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Dragging: %s",path);
       if (*path && !IsRoot(path))
         DragOne(hwnd, (HWND) 0, path, FALSE);
@@ -2097 +2079 @@
           if (li->type == DID_ERROR)
                   Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
           if (!li->type) {
             FreeListInfo(li);
@@ -2952 +2934 @@
   }
 
-  fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
+  fIsShutDownState = strcmp(pszStateName, PCSZ_SHUTDOWNSTATE) == 0;
   sprintf(szPrefix, "%s.", pszStateName);
 
@@ -3131 +3113 @@
 
   // If restoring shutdown state bypass no-prescan drives
-  fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
+  fIsShutDownState = strcmp(pszStateName, PCSZ_SHUTDOWNSTATE) == 0;
   // Delete saved state if internally saved state
-  fDeleteState = strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
+  fDeleteState = strcmp(pszStateName, PCSZ_FM2TEMPTEXT) == 0;
 
   //size = (ULONG)0;
@@ -3223 +3205 @@
           if (fIsShutDownState &&
               driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+            sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+            WriteDetailsSwitches(szKey, NULL);
             continue;
           }
           if (fDeleteState)
             PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          localdcd.ds.detailslongname = dsDirCnrDefault.detailslongname;  // Set default
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, x);
-          size = sizeof(BOOL);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) &localdcd.ds.detailslongname,
-                                  &size))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-
           sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
           LoadDetailsSwitches(szKey, &localdcd.ds);
@@ -3267 +3238 @@
                 RestorePresParams(hwndPPSave, PCSZ_DIRCNR);
               }
-              sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+              //sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
               RestorePresParams(hwndCnr, szKey);
               dcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
@@ -4605 +4576 @@
       // Complain if attempting to use reserved name
       if (stricmp(szStateName, GetPString(IDS_STATETEXT)) == 0 ||
-          stricmp(szStateName, GetPString(IDS_FM2TEMPTEXT)) == 0)
+          stricmp(szStateName, PCSZ_FM2TEMPTEXT) == 0)
       {
         saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                GetPString(IDS_WARNINGTEXT),
-               "\"%s\" is a reserved state name", szStateName);
+               GetPString(IDS_STATERESERVENAMETEXT), szStateName);
       }
       // Ignore request if blank
       else if (*szStateName) {
         BOOL fAbortOperation = FALSE;
-        if (!fNoSaveState && fSaveState && stricmp(szStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0)
+        if (!fNoSaveState && fSaveState && stricmp(szStateName, PCSZ_SHUTDOWNSTATE) == 0)
          {
           if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
@@ -4635 +4606 @@
                 saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                        GetPString(IDS_WARNINGTEXT),
-                       "\"%s\" state name add failed", szStateName);      // 15 Apr 07 SHL failed
+                       GetPString(IDS_STATEADDFAILEDTEXT), szStateName);      // 15 Apr 07 SHL failed
                 WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
               }
@@ -4643 +4614 @@
                      hwnd,
                      GetPString(IDS_WARNINGTEXT),
-                     "State data save failed");
+                     GetPString(IDS_STATEDATASAVEFAILED));
               WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
             }
@@ -5732 +5703 @@
     /* start remaining child windows */
     if (!fNoSaveState && fSaveState) {
-      PCSZ pszStatename = GetPString(IDS_SHUTDOWNSTATE);
+      PCSZ pszStatename = PCSZ_SHUTDOWNSTATE;
       PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPVOID);
       if (!add_setup(pszStatename))
@@ -5887 +5858 @@
                           "MainWindowPos", WinQueryWindow(hwnd, QW_PARENT));
         if (!fNoSaveState && fSaveState)
-          SaveDirCnrState(hwnd, GetPString(IDS_SHUTDOWNSTATE));
+          SaveDirCnrState(hwnd, PCSZ_SHUTDOWNSTATE);
       }
     }
@@ -6344 +6315 @@
     {
       // Try to restore saved shutdown state
-      char *pszDefaultStateName = xstrdup(GetPString(IDS_SHUTDOWNSTATE),
-                                          pszSrcFile, __LINE__);
+      char *pszDefaultStateName = xstrdup(PCSZ_SHUTDOWNSTATE, pszSrcFile, __LINE__);
       if (pszDefaultStateName) {
         if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))

trunk/dll/mainwnd.h

@@ -11 +11 @@
   05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
   04 Feb 09 SHL Convert args to const to match GetPString mods
+  08 Mar 09 GKY Additional strings move to PCSZs & String Table
 
 ***********************************************************************/
@@ -50 +51 @@
 extern ULONG DriveLines;
 extern HMODULE FM3ModHandle;
-extern CHAR *FM3Str;
+extern PCSZ FM3Str;
 extern HWND MainPopupMenu;
 extern HWND MainObjectHwnd;

trunk/dll/menu.c

@@ -55 +55 @@
       *p = 0;
       p++;
-      // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"\"%s\"\r\r%d",tokens[x - 1],x);
       if (!*p)
         break;
@@ -94 +93 @@
     filename = "FM3MENU.DAT";
   fp = _fsopen(filename, "r", SH_DENYWR);
-  if (!fp) {
-    // else saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Couldn't open %s",filename);
-  }
-  else {
+  if (fp)  {
     while (!feof(fp)) {
       if (!xfgets_bstripcr(s, sizeof(s), fp, pszSrcFile, __LINE__))
@@ -133 +129 @@
         }
       }
-      else {
-        // fixme to complain?
-        // saymsg(MB_ENTER, HWND_DESKTOP, GetPString(IDS_DEBUG_STRING), "Tokenization failed");
-      }
     }
     fclose(fp);

trunk/dll/misc.c

@@ -57 +57 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -939 +940 @@
                 fResetVerify = TRUE;
               }
-              if (docopyf(MOVE, szData, "%s", testname))
+              if (docopyf(MOVE, szData, testname))
                 Runtime_Error(pszSrcFile, __LINE__, "docopyf");
               else {
@@ -1403 +1404 @@
   eos = &s[strlen(s)];
   strcpy(eos, "DetailsLongname");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailslongname, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailslongname : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsSubject");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailssubject, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailssubject : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsEA");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailsea, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailsea : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsSize");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailssize, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailssize : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsIcon");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailsicon, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailsicon : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsAttr");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailsattr, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailsattr : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsCRDate");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailscrdate, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailscrdate : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsCRTime");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailscrtime, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailscrtime : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsLWDate");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailslwdate, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailslwdate : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsLWTime");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailslwtime, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailslwtime : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsLADate");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailsladate, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailsladate : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "DetailsLATime");
-  PrfWriteProfileData(fmprof, appname, s, &pds->detailslatime, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->detailslatime : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "SubjectInLeftPane");
-  PrfWriteProfileData(fmprof, appname, s, &pds->fSubjectInLeftPane, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->fSubjectInLeftPane : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "SubjectLengthMax");
-  PrfWriteProfileData(fmprof, appname, s, &pds->fSubjectLengthMax, sizeof(BOOL));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->fSubjectLengthMax : NULL,
+                      pds ? sizeof(BOOL) : 0);
   strcpy(eos, "SubjectDisplayWidth");
-  PrfWriteProfileData(fmprof, appname, s, &pds->SubjectDisplayWidth, sizeof(ULONG));
+  PrfWriteProfileData(fmprof, appname, s, pds ? &pds->SubjectDisplayWidth : NULL,
+                      pds ? sizeof(ULONG) : 0);
 }
 

trunk/dll/mkdir.c

@@ -245 +245 @@
                  hwnd,
                  GetPString(IDS_CLEARTARGETTITLETEXT),
-                 "%s", GetPString(IDS_CLEARTARGETTEXT)) == MBID_YES) {
+                 GetPString(IDS_CLEARTARGETTEXT)) == MBID_YES) {
         *targetdir = 0;
         PrfWriteProfileString(fmprof, appname, "Targetdir", NULL);

trunk/dll/mle.c

@@ -892 +892 @@
   APIRET rc;
 
-  // saymsg(MB_ENTER,h,DEBUG_STRING,"len = %ld",MLEgetlen(h));
   if (!MLEgetlen(h))                    /* nothing to save; forget it */
     return TRUE;
@@ -984 +983 @@
         }
         strcat(buffer, "\n");
-        // buffer = translate_out(buffer,4095,h,filename);
         if (fwrite(buffer, 1, strlen(buffer), fp) < 1) {
           saymsg(MB_ENTER,

trunk/dll/newview.c

@@ -4066 +4066 @@
   if (ParentIsDesktop(hwndParent, hwndParent))
     FrameFlags |= FCF_TASKLIST;
-  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"\"%s\"\r\rparent %s desktop",filename,(ParentIsDesktop(hwndParent,hwndParent)) ? "is" : "isn't");
   hwndFrame = WinCreateStdWindow(hwndParent,
                                  0,

trunk/dll/notebook.c

@@ -1919 +1919 @@
         if (hwndMain && !strcmp(realappname, FM3Str)) {
           // Save state and restore to refresh windows with new settings
-          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+          if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
             PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
 //          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
-            PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ)GetPString(IDS_FM2TEMPTEXT), MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPVOID);
           }
         }
@@ -3530 +3530 @@
     if (hwndMain) {
       // Save state and restore to refresh windows with new settings
-      if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+      if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
         // Tell window procedure to close container windows
         PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
         // Restore saved state
-        PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ)GetPString(IDS_FM2TEMPTEXT), MPVOID);
+        PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPVOID);
       }
     }

trunk/dll/objcnr.c

@@ -23 +23 @@
   29 Feb 08 GKY Use xfree where appropriate
   10 Dec 08 SHL Integrate exception handler support
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -121 +122 @@
                       MPFROMLONG(1));
     if (!pciP) {
-      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
       free(pffbArray);
       return;

trunk/dll/pathutil.c

@@ -192 +192 @@
         ret = DosQueryAppType(szCmdLine, &ulAppType);
       BldQuotedFileName(pszNewCmdLine, szCmdLine);
-      //printf("%d A", ret); fflush(stdout);
       if (ret) {
         ret = saymsg(MB_YESNO,
@@ -252 +251 @@
           }
         }
-        //printf("%d", ret); fflush(stdout);
       }
       else {
@@ -300 +298 @@
                 break;
             }
-            //printf("%d %s\n", ret, szCmdLine); fflush(stdout);
           }
           strcpy(szCmdLine, pszCmdLine_);
@@ -352 +349 @@
     FullPath = searchapath(PCSZ_PATH, szCmdLine);
     BldQuotedFileName(pszNewCmdLine, szCmdLine);
-    //printf("%d %s ", ret, szCmdLine); fflush(stdout);
     if (!*FullPath) {
       ret = saymsg(MB_YESNO,

trunk/dll/presparm.c

@@ -365 +365 @@
                                  sizeof(AttrValue),
                                  &AttrValue, 0);
-    //printf("%s %x\n", AttrValue, source); fflush(stdout);
-    //printf("%x\n", AttrValue); fflush(stdout);
     if (cbRetLen)
       WinSetPresParam(target, AttrName[x], cbRetLen, (PVOID) AttrValue);

trunk/dll/remap.c

@@ -452 +452 @@
             saymsg(MB_CANCEL | MB_ICONEXCLAMATION, hwnd,
                    GetPString(IDS_ERRORTEXT),
-                   "%s", GetPString(IDS_CANTSTARTNETUSETEXT));
+                   GetPString(IDS_CANTSTARTNETUSETEXT));
           if (!mp2 || (ULONG) mp2 == 1041 || info->failedonce)
             free(info);
@@ -750 +750 @@
              HWND_DESKTOP,
              GetPString(IDS_NOTICETITLETEXT),
-             "%s", GetPString(IDS_REMAPNOTICETEXT));
+             GetPString(IDS_REMAPNOTICETEXT));
     }
     free_resources();

trunk/dll/rename.c

@@ -17 +17 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -256 +257 @@
               fResetVerify = TRUE;
             }
-            rc = docopyf(MOVE, mv->target, "%s", fullname);
+            rc = docopyf(MOVE, mv->target, fullname);
             if (fResetVerify) {
               DosSetVerify(fVerify);

trunk/dll/saveclip.c

@@ -29 +29 @@
   07 Feb 09 GKY Move repeated strings to PCSZs.
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -329 +330 @@
       else if (!sMax) {
         BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
-        unlinkf("%s", szBuffer);
+        unlinkf(szBuffer);
       }
     }
@@ -690 +691 @@
       else if (!sMax) {
         BldFullPathName(szBuffer, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
-        unlinkf("%s", szBuffer);
+        unlinkf(szBuffer);
       }
     }

trunk/dll/seeall.c

@@ -47 +47 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -283 +284 @@
                  hwnd,
                  GetPString(IDS_ERRORTEXT),
-                 "%s", GetPString(IDS_CHECKONETEXT));
+                 GetPString(IDS_CHECKONETEXT));
         else
           WinDismissDlg(hwnd, flags);
@@ -611 +612 @@
                  hwndFrame,
                  GetPString(IDS_ERRORTEXT),
-                 "%s", GetPString(IDS_NOTWRITENOTARGETTEXT));
+                 GetPString(IDS_NOTWRITENOTARGETTEXT));
           goto RetryPath;
         }
@@ -759 +760 @@
               }
             }
-            rc = docopyf(type, list[x], "%s", newname);
+            rc = docopyf(type, list[x], newname);
             if (fResetVerify) {
               DosSetVerify(fVerify);
@@ -814 +815 @@
                             hwndFrame,
                             GetPString(IDS_DISKFULLTEXT),
-                            "%s", GetPString(IDS_ANOTHERDISKTEXT));
+                            GetPString(IDS_ANOTHERDISKTEXT));
                 if (rc == MBID_RETRY)
                   goto Retry;
@@ -936 +937 @@
             switch (SHORT1FROMMP(mp1)) {
             case IDM_OPENSETTINGS:
-              s = Settings;
+              s = (PSZ) Settings;
               break;
             default:
-              s = Default;
+              s = (PSZ) Default;
               break;
             }
@@ -1579 +1580 @@
             }
             else {
-              // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Strdup failed.");
               ad->stopflag = 1;
               break;
@@ -2034 +2034 @@
                      HWND_DESKTOP,
                      GetPString(IDS_WARNINGTEXT),
-                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+                     GetPString(IDS_LENGTHEXCEEDSMAXPATHTEXT));
             }
             return;

trunk/dll/shadow.c

@@ -13 +13 @@
   06 Aug 07 SHL Use BldFullPathName
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  08 Mar 09 GKY Additional strings move to PCSZs declare change
 
 ***********************************************************************/
@@ -270 +271 @@
 }
 
-VOID OpenObject(CHAR * filename, CHAR * type, HWND hwnd)
+VOID OpenObject(CHAR *filename, PCSZ type, HWND hwnd)
 {
   HOBJECT hWPSObject;

trunk/dll/shadow.h

@@ -10 +10 @@
 
   Change log
+  08 Mar 09 GKY Additional strings move to PCSZs declare change
 
 ***********************************************************************/
@@ -16 +17 @@
 #define SHADOW_H
 
-VOID MakeShadows(HWND hwnd, CHAR ** list, ULONG Shadows, CHAR * cnr,
-                 CHAR * foldername);
-VOID OpenObject(CHAR * filename, CHAR * type, HWND hwnd);
-BOOL RunSeamless(CHAR * exename, CHAR * args, HWND hwnd);
+VOID MakeShadows(HWND hwnd, CHAR **list, ULONG Shadows, CHAR *cnr,
+                 CHAR *foldername);
+VOID OpenObject(CHAR *filename, PCSZ type, HWND hwnd);
+BOOL RunSeamless(CHAR *exename, CHAR *args, HWND hwnd);
 
 

trunk/dll/subj.c

@@ -14 +14 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -44 +45 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *SUBJECT;
+PCSZ SUBJECT  = ".SUBJECT";
 
 INT Subject(HWND hwnd, CHAR * filename)

trunk/dll/subj.h

@@ -10 +10 @@
 
   Change log
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -19 +20 @@
 
 // Data declarations
-extern CHAR *SUBJECT;
+extern PCSZ SUBJECT;
 
 #endif // SUBJ_H

trunk/dll/sysinfo.c

@@ -16 +16 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   16 JUL 08 GKY Use TMP directory for temp files
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -61 +62 @@
       goto Abort;
     BldFullPathName(szTempFile, pTmpDir, "$RMVIEW.#$#");
-    unlinkf("%s", szTempFile);
+    unlinkf(szTempFile);
     fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
     if (!fp)

trunk/dll/systemf.c

@@ -85 +85 @@
       if (!rc)
         return TRUE;
-      // else saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Failed: %lu/%lx",rc,rc);
-
     }
   }

trunk/dll/tools.c

@@ -23 +23 @@
   01 Sep 08 GKY Save toolbars immediately on change.
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -235 +236 @@
   }
   if (!toolhead) {
-    unlinkf("%s", filename);
+    unlinkf(filename);
     return;
   }

trunk/dll/treecnr.c

@@ -65 +65 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -624 +625 @@
       Fortify_BecomeOwner(mp1);
 #     endif
+      if (StubbyScanCount != 0) { //prevent treeswitch from hanging fm2 during startup GKY 3-14-09
+        DosSleep(50);
+        PostMsg(hwndTree, UM_SHOWME, mp1, MPVOID);
+      }
       dcd = INSTDATA(hwnd);
       if (dcd) {
@@ -1464 +1469 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
             return (MRFROM2SHORT(DOR_NODROP, 0));       /* Drop not valid */
           }
@@ -1593 +1598 @@
               if (li->type == DID_ERROR)
                   Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
               if (!li->type) {
                 FreeListInfo(li);
@@ -2088 +2093 @@
               CHAR s[33];
 
-              strcpy(s, "ICON");
+              strcpy(s, PCSZ_ICON);
               PrfQueryProfileData(fmprof,
                                   appname,
@@ -2095 +2100 @@
               if (flWindowAttr & CV_DETAIL) {
                 if (IsRoot(pci->pszFileName))
-                  strcpy(s, "TREE");
+                  strcpy(s, PCSZ_TREE);
                 else
-                  strcpy(s, "DETAILS");
+                  strcpy(s, Details);
               }
               OpenObject(pci->pszFileName, s, dcd->hwndFrame);

trunk/dll/undel.c

@@ -17 +17 @@
   16 JUL 08 GKY Use TMP directory for temp files
   10 Dec 08 SHL Integrate exception handler support
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -89 +91 @@
     WinSendDlgItemMsg(hwnd, UNDEL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
     BldFullPathName(szTempFile, pTmpDir, "$UDELETE.#$#");
-    unlinkf("%s", szTempFile);
+    unlinkf(szTempFile);
     fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
     if (!fp) {
@@ -141 +143 @@
             strcat(s, GetPString(IDS_ASKABOUTUNDELETEHELPTEXT));
             temp = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
-                          hwnd, GetPString(IDS_ERRORTEXT), "%s", s);
+                          hwnd, GetPString(IDS_ERRORTEXT), s);
             if (temp == MBID_YES)
               runemf2(BACKGROUND | INVISIBLE | SEPARATE | WINDOWED,

trunk/dll/update.c

@@ -19 +19 @@
   02 Aug 07 SHL Sync with CNRITEM mods
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -190 +191 @@
             PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
             if (pci->attrFile & FILE_DIRECTORY) {
-              if (fInitialDriveScan)
+              /*if (fInitialDriveScan)
                 Stubby(hwndCnr, pci);
               else {
                 while (StubbyScanCount != 0)
-                  DosSleep(50);
-                Stubby(hwndCnr, pci);
-              }
+                  DosSleep(50);*/
+              Stubby(hwndCnr, pci);
+              //}
             }
           }
@@ -290 +291 @@
               dcd->ullTotalBytes += ullTotalBytes;
             }
-            if (fInitialDriveScan)
+            /*if (fInitialDriveScan)
               Stubby(hwndCnr, pci);
             else {
               while (StubbyScanCount != 0)
-                DosSleep(50);
-              Stubby(hwndCnr, pci);
-            }
+                DosSleep(50);*/
+            Stubby(hwndCnr, pci);
+            //}
           }
         }
@@ -464 +465 @@
                 repos = TRUE;
                 if (pci->attrFile & FILE_DIRECTORY) {
-                  if (fInitialDriveScan)
+                  /*if (fInitialDriveScan)
                     Stubby(hwndCnr, pci);
                   else {
                     while (StubbyScanCount != 0)
-                      DosSleep(50);
-                    Stubby(hwndCnr, pci);
-                  }
+                      DosSleep(50);*/
+                Stubby(hwndCnr, pci);
+                 // }
                 }
               }
@@ -569 +570 @@
                   }
                   repos = TRUE;
-                  if (fInitialDriveScan)
+                  /*if (fInitialDriveScan)
                     Stubby(hwndCnr, pci);
                   else {
                     while (StubbyScanCount != 0)
-                      DosSleep(50);
-                    Stubby(hwndCnr, pci);
-                  }
+                      DosSleep(50);*/
+                  Stubby(hwndCnr, pci);
+                  //}
                 }
                 else

trunk/dll/valid.c

@@ -34 +34 @@
   05 Jan 09 GKY Fix IsBinary to recognize values above \xc4 (maybe lower) as positive.
                 When these high codes were it text files they showed as hex in new view.
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -66 +67 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *CDFS;
-CHAR *FAT32;
-CHAR *HPFS;
-CHAR *HPFS386;
-CHAR *ISOFS;
-CHAR *JFS;
-CHAR *NDFS32;
-CHAR *NTFS;
-CHAR *RAMFS;
+PCSZ HPFS = "HPFS";
+PCSZ JFS = "JFS";
+PCSZ CDFS = "CDFS";
+PCSZ ISOFS = "ISOFS";
+PCSZ FAT32 = "FAT32";
+PCSZ HPFS386 = "HPFS386";
+PCSZ CBSIFS = "CBSIFS";
+PCSZ NDFS32 = "NDFS32";
+PCSZ RAMFS = "RAMFS";
+PCSZ NTFS = "NTFS";
 BOOL fVerifyOffChecked[26];
 

trunk/dll/valid.h

@@ -11 +11 @@
   05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -43 +44 @@
 
 // Data declarations
-extern CHAR *CDFS;
-extern CHAR *FAT32;
-extern CHAR *HPFS;
-extern CHAR *HPFS386;
-extern CHAR *ISOFS;
-extern CHAR *JFS;
-extern CHAR *NTFS;
-extern CHAR *NDFS32;
-extern CHAR *RAMFS;
+extern PCSZ CDFS;
+extern PCSZ FAT32;
+extern PCSZ HPFS;
+extern PCSZ HPFS386;
+extern PCSZ ISOFS;
+extern PCSZ JFS;
+extern PCSZ NTFS;
+extern PCSZ NDFS32;
+extern PCSZ RAMFS;
+extern PCSZ CBSIFS;
 extern BOOL fVerifyOffChecked[26];
 

trunk/dll/viewer.c

@@ -19 +19 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  08 Mar 09 GKY Additional strings move to String Table
 
 ***********************************************************************/
@@ -795 +796 @@
             if (vw->fileattrreadonly) {
               temp = saymsg(MB_OKCANCEL | MB_ICONEXCLAMATION,
-                            hwnd, NullStr, "File is readonly and has not been saved");
+                            hwnd, NullStr, GetPString(IDS_EDITREADONLYFILETEXT3));
               if (temp == MBID_CANCEL)
                 return 0;
@@ -917 +918 @@
           }
         }
-        //printf("%s %s %d\n ",vw->exportfilename, __FILE__, __LINE__); fflush(stdout);
         if (!MLEexportfile(hwndMLE,
                            vw->exportfilename,
@@ -1248 +1248 @@
           if (vw->fileattrreadonly) {
             temp = saymsg(MB_OKCANCEL | MB_ICONEXCLAMATION,
-                          hwnd, NullStr, "File is readonly and has not been saved");
+                          hwnd, NullStr, GetPString(IDS_EDITREADONLYFILETEXT3));
             if (temp == MBID_CANCEL)
                 return 0;

trunk/dll/walkem.c

@@ -321 +321 @@
                            FM3Str,
                             pszLastSetups, pszBuf, ulBufBytes)) {
-    // Win_Error(pszSrcFile, __LINE__, HWND_DESKTOP, HWND_DESKTOP, "PrfWriteProfileData");
     ERRORID eid = WinGetLastError((HAB)0);
     if ((eid & 0xffff) != PMERR_NOT_IN_IDX)

trunk/dll/worker.c

@@ -39 +39 @@
                 to prevent duplicate directory names in tree following a copy before initial scan.
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -584 +586 @@
                   switch (wk->li->type) {
                   case IDM_OPENICON:
-                    s = "ICON";
+                    s = (PSZ) PCSZ_ICON;
                     break;
                   case IDM_OPENDETAILS:
-                    s = "DETAILS";
+                    s = (PSZ) Details;
                     break;
                   case IDM_OPENTREE:
-                    s = "TREE";
+                    s = (PSZ) PCSZ_TREE;
                     break;
                   case IDM_OPENSETTINGS:
-                    s = Settings;
+                    s = (PSZ) Settings;
                     break;
                   default:
-                    s = Default;
+                    s = (PSZ) Default;
                     break;
                   }
@@ -673 +675 @@
                              wk->hwndFrame,
                              GetPString(IDS_ERRORTEXT),
-                             "%s", GetPString(IDS_NOTWRITENOTARGETTEXT));
+                             GetPString(IDS_NOTWRITENOTARGETTEXT));
                       goto RetryPath;
                     }
@@ -733 +735 @@
                     existed = (IsFile(newname) != -1);
                     isnewer = IsNewer(wk->li->list[x], newname);
-                    /*
-                       {
-                       char temp[CCHMAXPATH * 3];
-                       sprintf(temp,"Target: %s\rSource: %s\rOverold: %lu\rOvernew: %lu\rIsNewer: %lu\rExisted: %lu",newname,wk->li->list[x],overold,overnew,isnewer,existed);
-                       saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,temp);
-                       }
-                     */
                     if (existed && wk->li->type != IDM_RENAME && dontask) {
                       if (!overold && !overnew)
@@ -832 +827 @@
                     if (fRealIdle)
                       priority_idle();
-                    rc = docopyf(type, wk->li->list[x], "%s", newname);
+                    rc = docopyf(type, wk->li->list[x], newname);
                     if (fResetVerify) {
                       DosSetVerify(fVerify);
@@ -888 +883 @@
                                     wk->hwndFrame,
                                     GetPString(IDS_DISKFULLTEXT),
-                                    "%s", GetPString(IDS_ANOTHERDISKTEXT));
+                                    GetPString(IDS_ANOTHERDISKTEXT));
                         if (rc == MBID_RETRY)
                           goto Retry;
@@ -1038 +1033 @@
                         wk->hwndCnr,
                         UM_UPDATERECORDLIST, MPFROMP(files), MPVOID);
-           // DbgMsg(pszSrcFile, __LINE__, "UM_UPDATERECORD %s", *files);
             FreeList(files);
           }