Changeset 1400 for trunk/dll/init.c

Timestamp:

Mar 8, 2009, 6:50:25 PM (16 years ago)

Author:

Gregg Young

Message:

Remainder of changes to rename commafmt.h/c (Ticket 28, 82); Additional strings moved to PCSZs in init.c (Ticket 6); Added WriteDetailsSwitches used it and LoadDetailsSwitches to consolidate inline code (Ticket 343, 344)

File:

• trunk/dll/init.c (modified) (10 diffs)

trunk/dll/init.c

@@ -74 +74 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   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
 
 ***********************************************************************/
@@ -228 +229 @@
 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;
@@ -237 +249 @@
 HMODULE FM3DllHandle;
 CHAR *FM3Folder;
-CHAR *FNT_6HELVETICA;
-CHAR *FNT_8HELVETICA;
-CHAR *FNT_8HELVETICABOLD;
-CHAR *FNT_10SYSTEMMONOTEXT;
-CHAR *FNT_10SYSTEMPROPORT;
-CHAR *FNT_2SYSTEMVIO;
-CHAR *FNT_4SYSTEMVIO;
-CHAR *FNT_10SYSTEMVIO;
-CHAR *FNT_8TIMESNEWROMAN;
+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;
 CHAR HomePath[CCHMAXPATH];
 CHAR *LONGNAME;
@@ -254 +266 @@
 PCSZ PCSZ_DOSQUERYPATHINFO;
 PCSZ PCSZ_DOSSEARCHPATH;
+PCSZ PCSZ_POSTMSG;
 PCSZ PCSZ_WINCREATEWINDOW;
 PCSZ PCSZ_WINLOADACCELTABLE;
@@ -288 +301 @@
 PCSZ PCSZ_DOTCOMMENTS;
 PCSZ PCSZ_PATH;
+PCSZ PCSZ_LIBPATH;
+CHAR *pLibPathStrict;
+PCSZ PCSZ_WPURLDEFAULTSETTINGS;
 CHAR *Settings;
 CHAR SwapperDat[CCHMAXPATH];
-CHAR *WC_ARCCONTAINER;
-CHAR *WC_ARCSTATUS;
-CHAR *WC_AUTOVIEW;
-CHAR *WC_BUBBLE;
-CHAR *WC_COLLECTOR;
-CHAR *WC_COLSTATUS;
-CHAR *WC_DATABAR;
-CHAR *WC_DIRCONTAINER;
-CHAR *WC_DIRSTATUS;
-CHAR *WC_DRIVEBACK;
-CHAR *WC_DRIVEBUTTONS;
-CHAR *WC_ERRORWND;
-CHAR *WC_INIEDITOR;
-CHAR *WC_LED;
-CHAR *WC_MAINWND2;
-CHAR *WC_MINITIME;
-CHAR *WC_MLEEDITOR;
-CHAR *WC_NEWVIEW;
-CHAR *WC_OBJECTWINDOW;
-CHAR *WC_SEEALL;
-CHAR *WC_SEESTATUS;
-CHAR *WC_STATUS;
-CHAR *WC_TOOLBACK;
-CHAR *WC_TOOLBUTTONS;
-CHAR *WC_TREECONTAINER;
-CHAR *WC_TREEOPENBUTTON;
-CHAR *WC_TREESTATUS;
-CHAR *WC_VIEWSTATUS;
+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;
 CHAR profile[CCHMAXPATH];
 ULONGLONG ullTmpSpaceNeeded;
@@ -496 +512 @@
     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";
@@ -510 +537 @@
     PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
     PCSZ_DOSSEARCHPATH    = "DosSearchPath";
+    PCSZ_POSTMSG          = "PostMsg";
     PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
     PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
@@ -544 +572 @@
     PCSZ_DOTCOMMENTS   =  ".COMMENTS";
     PCSZ_PATH     =  "PATH";
+    PCSZ_LIBPATH       =  "LIBPATH";
+    pLibPathStrict = "SET LIBPATHSTRICT=TRUE";
+    PCSZ_WPURLDEFAULTSETTINGS = "WPURLDEFAULTSETTINGS";
     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     WC_BUBBLE          =  "WC_BUBBLE";
@@ -1409 +1440 @@
     ULONG ulAppType;
 
-    FullPath = searchapath(PCSZ_PATH, "LVMGUI.CMD");
+    FullPath = searchapath(PCSZ_PATH, PCSZ_LVMGUICMD);
     if (*FullPath)
       fLVMGui = TRUE;
-    if (!DosQueryAppType("DFSOS2.EXE", &ulAppType))
+    if (!DosQueryAppType(PCSZ_DFSOS2EXE, &ulAppType))
       fDFSee = TRUE;
-    if (!DosQueryAppType("MINILVM.EXE", &ulAppType))
+    if (!DosQueryAppType(PCSZ_MINILVMEXE, &ulAppType))
       fMiniLVM = TRUE;
-    if (!DosQueryAppType("FDISK.EXE", &ulAppType))
+    if (!DosQueryAppType(PCSZ_FDISKPMEXE, &ulAppType))
       fFDisk = TRUE;
-    if (!DosQueryAppType("LVM.EXE", &ulAppType))
+    if (!DosQueryAppType(PCSZ_LVMEXE, &ulAppType))
       fLVM = TRUE;
 
@@ -1791 +1822 @@
   PrfQueryProfileData(fmprof, FM3Str, "TrashCan", &fTrashCan, &size);
 
-  LoadDetailsSwitches("DirCnr", &dsDirCnrDefault);
+  LoadDetailsSwitches(PCSZ_DIRCNR, &dsDirCnrDefault);
 
   /* load pointers and icons we use */