Changeset 1402 for trunk/dll/init.c


Ignore:
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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/init.c

    r1400 r1402  
    7575  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
    7676  08 Mar 09 GKY Additional strings move to PCSZs in init.c
     77  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
     78  14 Mar 09 GKY PCSZ strings moved to compile time initialization
     79  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring replaces check for
     80                saved drive containers.
    7781
    7882***********************************************************************/
    … …  
    173177// Data definitions
    174178static PSZ pszSrcFile = __FILE__;
    175 static CHAR *WC_MAINWND;
    176179unsigned __MaxThreads = {48};
    177180
    … …  
    195198BOOL fReminimize;
    196199BOOL fWantFirstTimeInit;
    197 BOOL fDrivetoSkip[26];
     200//BOOL fDrivetoSkip[26];
    198201HPOINTER hptrApp;
    199202HPOINTER hptrArc;
    … …  
    215218
    216219#pragma data_seg(GLOBAL2)
    217 PCSZ PCSZ_ARCHIVERBB2;
    218 PCSZ PCSZ_ASSOCDAT;
    219 PCSZ PCSZ_CMDLINESDAT;
    220 PCSZ PCSZ_CMDMINIDAT;
    221 PCSZ PCSZ_COMMANDSDAT;
    222 PCSZ PCSZ_FILTERSDAT;
    223 PCSZ PCSZ_GREPMASKDAT;
    224 PCSZ PCSZ_PATTERNSDAT;
    225 PCSZ PCSZ_RESOURCEDAT;
    226 PCSZ PCSZ_QUICKTLSDAT;
    227 PCSZ PCSZ_FM3TOOLSDAT;
    228 PCSZ PCSZ_USERDIRSDAT;
    229 PCSZ PCSZ_FM2PLAYEXE;
    230 PCSZ PCSZ_FM2PLAYTEMP;
    231 PCSZ PCSZ_LVMGUICMD;
    232 PCSZ PCSZ_DFSOS2EXE;
    233 PCSZ PCSZ_MINILVMEXE;
    234 PCSZ PCSZ_FDISKPMEXE;
    235 PCSZ PCSZ_LVMEXE;
    236 PCSZ PCSZ_ARCCNR;
    237 PCSZ PCSZ_COLLECTOR;
    238 PCSZ PCSZ_DIRCNR;
    239 PCSZ PCSZ_DIRSIZES;
    240 PCSZ PCSZ_TOOLBAR;
    241 PCSZ PCSZ_TREECNR;
    242 CHAR *CBSIFS;
    243 CHAR *DRF_FM2ARCHIVE;
    244 CHAR *DRMDRFFM2ARC;
    245 CHAR *DRMDRFOS2FILE;
    246 CHAR *DRM_FM2ARCMEMBER;
    247 CHAR *DRM_OS2FILE;
    248 CHAR *FM2Str;
     220PCSZ PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
     221PCSZ PCSZ_ASSOCDAT    = "ASSOC.DAT";
     222PCSZ PCSZ_CMDLINESDAT = "CMDLINES.DAT";
     223PCSZ PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
     224PCSZ PCSZ_COMMANDSDAT = "COMMANDS.DAT";
     225PCSZ PCSZ_FILTERSDAT  = "FILTERS.DAT";
     226PCSZ PCSZ_GREPMASKDAT = "GREPMASK.DAT";
     227PCSZ PCSZ_PATTERNSDAT = "PATTERNS.DAT";
     228PCSZ PCSZ_RESOURCEDAT = "RESOURCE.DAT";
     229PCSZ PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
     230PCSZ PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
     231PCSZ PCSZ_USERDIRSDAT = "USERDIRS.DAT";
     232PCSZ PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
     233PCSZ PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
     234PCSZ PCSZ_LVMGUICMD   = "LVMGUI.CMD";
     235PCSZ PCSZ_DFSOS2EXE   = "DFSOS2.EXE";
     236PCSZ PCSZ_MINILVMEXE  = "MINILVM.EXE";
     237PCSZ PCSZ_FDISKPMEXE  = "FDISKPM.EXE";
     238PCSZ PCSZ_LVMEXE      = "LVM.EXE";
     239PCSZ PCSZ_ARCCNR      = "ArcCnr";
     240PCSZ PCSZ_COLLECTOR   = "Collector";
     241PCSZ PCSZ_DIRCNR      = "DirCnr";
     242PCSZ PCSZ_DIRSIZES    = "DirSizes";
     243PCSZ PCSZ_TOOLBAR     = "ToolBar";
     244PCSZ PCSZ_TREECNR     = "TreeCnr";
     245PCSZ PCSZ_SHUTDOWNSTATE    =  "FM2Shutdown";
     246PCSZ PCSZ_FM2TEMPTEXT      =  "FM/2_Temp";
     247PCSZ DRF_FM2ARCHIVE   = "DRF_FM2ARCHIVE";
     248PCSZ DRMDRFFM2ARC     = "<DRM_FM2ARCMEMBER,DRF_FM2ARCHIVE>";
     249PCSZ DRMDRFOS2FILE    = "<DRM_OS2FILE,DRF_UNKNOWN>";
     250PCSZ DRM_FM2ARCMEMBER = "DRM_FM2ARCMEMBER";
     251PCSZ DRM_OS2FILE      = "DRM_OS2FILE";
     252PCSZ FM2Str           = "FM/2";
    249253HMODULE FM3DllHandle;
    250 CHAR *FM3Folder;
    251 PCSZ FNT_6HELVETICA;
    252 PCSZ FNT_8HELVETICA;
    253 PCSZ FNT_8HELVETICABOLD;
    254 PCSZ FNT_10SYSTEMMONOTEXT;
    255 PCSZ FNT_10SYSTEMPROPORT;
    256 PCSZ FNT_2SYSTEMVIO;
    257 PCSZ FNT_4SYSTEMVIO;
    258 PCSZ FNT_10SYSTEMVIO;
    259 PCSZ FNT_8TIMESNEWROMAN;
     254PCSZ FM3Folder        = "<FM3_Folder>";
     255PCSZ FNT_6HELVETICA       =  "6.Helvetica";
     256PCSZ FNT_8HELVETICA       =  "8.Helvetica";
     257PCSZ FNT_8HELVETICABOLD   =  "8.Helvetica.Bold";
     258PCSZ FNT_10SYSTEMMONOTEXT =  "10.System Monospaced";
     259PCSZ FNT_10SYSTEMPROPORT  =  "10.System Proportional";
     260PCSZ FNT_2SYSTEMVIO       =  "2.System VIO";
     261PCSZ FNT_4SYSTEMVIO       =  "4.System VIO";
     262PCSZ FNT_10SYSTEMVIO      =  "10.System VIO";
     263PCSZ FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
    260264CHAR HomePath[CCHMAXPATH];
    261 CHAR *LONGNAME;
    262 CHAR *NullStr;
    263 PCSZ PCSZ_DOSCREATEMUTEXSEM;
    264 PCSZ PCSZ_DOSDUPHANDLE;
    265 PCSZ PCSZ_DOSGETINFOBLOCKS;
    266 PCSZ PCSZ_DOSQUERYPATHINFO;
    267 PCSZ PCSZ_DOSSEARCHPATH;
    268 PCSZ PCSZ_POSTMSG;
    269 PCSZ PCSZ_WINCREATEWINDOW;
    270 PCSZ PCSZ_WINLOADACCELTABLE;
    271 PCSZ PCSZ_WINSETACCELTABLE;
    272 PCSZ PCSZ_INIQUERYPRFTEXT;
    273 PCSZ PCSZ_PRFQUERYPROFILEDATA;
    274 PCSZ PCSZ_PRFQUERYPROFILESIZE;
    275 PCSZ PCSZ_PRFQUERYPROFILESTRING;
    276 PCSZ PCSZ_FILLDIRQCURERRTEXT;
    277 PCSZ PCSZ_NODATA;
    278 PCSZ PCSZ_STARDOTEXE;
    279 PCSZ PCSZ_STARDOTINI;
    280 PCSZ PCSZ_STARDOTLST;
    281 PCSZ PCSZ_STARDOTPMD;
    282 PCSZ PCSZ_STARDOTTXT;
    283 PCSZ PCSZ_DOTEXE;
    284 PCSZ PCSZ_DOTCOM;
    285 PCSZ PCSZ_DOTCMD;
    286 PCSZ PCSZ_DOTBTM;
    287 PCSZ PCSZ_DOTBAT;
    288 PCSZ PCSZ_DOTLST;
    289 PCSZ PCSZ_DOTTLS;
    290 PCSZ PCSZ_DOTHLP;
    291 PCSZ PCSZ_DOTINF;
    292 PCSZ PCSZ_DOTMP3;
    293 PCSZ PCSZ_DOTOGG;
    294 PCSZ PCSZ_DOTFLAC;
    295 PCSZ PCSZ_DOTJPEG;
    296 PCSZ PCSZ_DOTJPG;
    297 PCSZ PCSZ_DOTICO;
    298 PCSZ PCSZ_DOTPTR;
    299 PCSZ PCSZ_DOTBB2;
    300 PCSZ PCSZ_DOTBMP;
    301 PCSZ PCSZ_DOTCOMMENTS;
    302 PCSZ PCSZ_PATH;
    303 PCSZ PCSZ_LIBPATH;
    304 CHAR *pLibPathStrict;
    305 PCSZ PCSZ_WPURLDEFAULTSETTINGS;
    306 CHAR *Settings;
     265PCSZ LONGNAME             = ".LONGNAME";
     266CHAR *NullStr             = "";
     267PCSZ PCSZ_CM_ALLOCRECORD  = "CM_ALLOCRECORD";
     268PCSZ PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
     269PCSZ PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
     270PCSZ PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
     271PCSZ PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
     272PCSZ PCSZ_DOSSEARCHPATH    = "DosSearchPath";
     273PCSZ PCSZ_DRGACCESSDRAGINFO = "DrgAccessDraginfo";
     274PCSZ PCSZ_POSTMSG          = "PostMsg";
     275PCSZ PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
     276PCSZ PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
     277PCSZ PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
     278PCSZ PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
     279PCSZ PCSZ_PRFOPENPROFILEFAILED = "PrfOpenProfile failed for %s";
     280PCSZ PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
     281PCSZ PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
     282PCSZ PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
     283PCSZ PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
     284PCSZ PCSZ_NODATA  =  "No Data";
     285PCSZ PCSZ_STARDOTEXE    =  "*.EXE";
     286PCSZ PCSZ_STARDOTINI    =  "*.INI";
     287PCSZ PCSZ_STARDOTLST    =  "*.LST";
     288PCSZ PCSZ_STARDOTPMD    =  "*.PMD";
     289PCSZ PCSZ_STARDOTTXT    =  "*.TXT";
     290PCSZ PCSZ_DOTEXE   =  ".EXE";
     291PCSZ PCSZ_DOTCOM   =  ".COM";
     292PCSZ PCSZ_DOTCMD   =  ".CMD";
     293PCSZ PCSZ_DOTBTM   =  ".BTM";
     294PCSZ PCSZ_DOTBAT   =  ".BAT";
     295PCSZ PCSZ_DOTLST   =  ".LST";
     296PCSZ PCSZ_DOTTLS   =  ".TLS";
     297PCSZ PCSZ_DOTHLP   =  ".HLP";
     298PCSZ PCSZ_DOTINF   =  ".INF";
     299PCSZ PCSZ_DOTMP3   =  ".MP3";
     300PCSZ PCSZ_DOTOGG   =  ".OGG";
     301PCSZ PCSZ_DOTFLAC  =  ".FLAC";
     302PCSZ PCSZ_DOTJPEG  =  ".JPEG";
     303PCSZ PCSZ_DOTJPG   =  ".JPG";
     304PCSZ PCSZ_DOTICO   =  ".ICO";
     305PCSZ PCSZ_DOTPTR   =  ".PTR";
     306PCSZ PCSZ_DOTBB2   =  ".BB2";
     307PCSZ PCSZ_DOTBMP   =  ".BMP";
     308PCSZ PCSZ_DOTCOMMENTS   =  ".COMMENTS";
     309PCSZ PCSZ_PATH     =  "PATH";
     310PCSZ PCSZ_LIBPATH       =  "LIBPATH";
     311CHAR *pLibPathStrict = "SET LIBPATHSTRICT=TRUE";
     312PCSZ PCSZ_WPURLDEFAULTSETTINGS = "WPURLDEFAULTSETTINGS";
     313PCSZ Settings      = "SETTINGS";
     314PCSZ Details       = "DETAILS";
     315PCSZ PCSZ_TREE     = "TREE";
     316PCSZ PCSZ_ICON     = "ICON";
    307317CHAR SwapperDat[CCHMAXPATH];
    308 PCSZ WC_ARCCONTAINER;
    309 PCSZ WC_ARCSTATUS;
    310 PCSZ WC_AUTOVIEW;
    311 PCSZ WC_BUBBLE;
    312 PCSZ WC_COLLECTOR;
    313 PCSZ WC_COLSTATUS;
    314 PCSZ WC_DATABAR;
    315 PCSZ WC_DIRCONTAINER;
    316 PCSZ WC_DIRSTATUS;
    317 PCSZ WC_DRIVEBACK;
    318 PCSZ WC_DRIVEBUTTONS;
    319 PCSZ WC_ERRORWND;
    320 PCSZ WC_INIEDITOR;
    321 PCSZ WC_LED;
    322 PCSZ WC_MAINWND2;
    323 PCSZ WC_MINITIME;
    324 PCSZ WC_MLEEDITOR;
    325 PCSZ WC_NEWVIEW;
    326 PCSZ WC_OBJECTWINDOW;
    327 PCSZ WC_SEEALL;
    328 PCSZ WC_SEESTATUS;
    329 PCSZ WC_STATUS;
    330 PCSZ WC_TOOLBACK;
    331 PCSZ WC_TOOLBUTTONS;
    332 PCSZ WC_TREECONTAINER;
    333 PCSZ WC_TREEOPENBUTTON;
    334 PCSZ WC_TREESTATUS;
    335 PCSZ WC_VIEWSTATUS;
     318PCSZ WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
     319PCSZ WC_BUBBLE          =  "WC_BUBBLE";
     320PCSZ WC_TOOLBUTTONS     =  "WC_TOOLBUTTONS";
     321PCSZ WC_DRIVEBUTTONS    =  "WC_DRIVEBUTTONS";
     322PCSZ WC_DIRCONTAINER    =  "WC_DIRCONTAINER";
     323PCSZ WC_DIRSTATUS       =  "WC_DIRSTATUS";
     324PCSZ WC_TREECONTAINER   =  "WC_TREECONTAINER";
     325PCSZ WC_TREEOPENBUTTON  =  "WC_TREEOPENBUTTON";
     326PCSZ WC_TREESTATUS      =  "WC_TREESTATUS";
     327PCSZ WC_MAINWND         =  "WC_MAINWND";
     328PCSZ WC_MAINWND2        =  "WC_MAINWND2";
     329PCSZ WC_AUTOVIEW        =  "WC_AUTOVIEW";
     330PCSZ WC_LED             =  "WC_LED";
     331PCSZ WC_COLLECTOR       =  "WC_COLLECTOR";
     332PCSZ WC_COLSTATUS       =  "WC_COLSTATUS";
     333PCSZ WC_STATUS          =  "WC_STATUS";
     334PCSZ WC_TOOLBACK        =  "WC_TOOLBACK";
     335PCSZ WC_DRIVEBACK       =  "WC_DRIVEBACK";
     336PCSZ WC_ARCCONTAINER    =  "WC_ARCCONTAINER";
     337PCSZ WC_ARCSTATUS       =  "WC_ARCSTATUS";
     338PCSZ WC_MLEEDITOR       =  "WC_MLEEDITOR";
     339PCSZ WC_INIEDITOR       =  "WC_INIEDITOR";
     340PCSZ WC_SEEALL          =  "WC_SEEALL";
     341PCSZ WC_NEWVIEW         =  "WC_NEWVIEW";
     342PCSZ WC_SEESTATUS       =  "WC_SEESTATUS";
     343PCSZ WC_VIEWSTATUS      =  "WC_VIEWSTATUS";
     344PCSZ WC_ERRORWND        =  "WC_ERRORWND";
     345PCSZ WC_MINITIME        =  "WC_MINITIME";
     346PCSZ WC_DATABAR         =  "WC_DATABAR";
    336347CHAR profile[CCHMAXPATH];
    337348ULONGLONG ullTmpSpaceNeeded;
    … …  
    468479
    469480    DosError(FERR_DISABLEHARDERR);
    470     /* strings here to prevent multiple occurences in DLL */
    471     FM2Str = "FM/2";
    472     FM3Str = "FM/3";
    473     NullStr = "";
    474     Default = "DEFAULT";
    475     Settings = "SETTINGS";
    476     WPProgram = "WPProgram";
    477     FM3Folder = "<FM3_Folder>";
    478     FM3Tools = "<FM3_Tools>";
    479     DRM_OS2FILE = "DRM_OS2FILE";
    480     DRM_FM2ARCMEMBER = "DRM_FM2ARCMEMBER";
    481     DRF_FM2ARCHIVE = "DRF_FM2ARCHIVE";
    482     DRMDRFLIST = "<DRM_OS2FILE,DRF_UNKNOWN>,"
    483       "<DRM_DISCARD,DRF_UNKNOWN>," "<DRM_PRINT,DRF_UNKNOWN>";
    484     DRMDRFOS2FILE = "<DRM_OS2FILE,DRF_UNKNOWN>";
    485     DRMDRFFM2ARC = "<DRM_FM2ARCMEMBER,DRF_FM2ARCHIVE>";
    486     DRM_FM2INIRECORD = "DRM_FM2INIRECORD";
    487     DRF_FM2INI = "DRF_FM2INI";
    488     SUBJECT = ".SUBJECT";
    489     LONGNAME = ".LONGNAME";
    490     HPFS = "HPFS";
    491     JFS = "JFS";
    492     CDFS = "CDFS";
    493     ISOFS = "ISOFS";
    494     FAT32 = "FAT32";
    495     HPFS386 = "HPFS386";
    496     CBSIFS = "CBSIFS";
    497     NDFS32 = "NDFS32";
    498     RAMFS = "RAMFS";
    499     NTFS = "NTFS";
    500     PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
    501     PCSZ_ASSOCDAT    = "ASSOC.DAT";
    502     PCSZ_CMDLINESDAT = "CMDLINES.DAT";
    503     PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
    504     PCSZ_COMMANDSDAT = "COMMANDS.DAT";
    505     PCSZ_FILTERSDAT  = "FILTERS.DAT";
    506     PCSZ_GREPMASKDAT = "GREPMASK.DAT";
    507     PCSZ_PATTERNSDAT = "PATTERNS.DAT";
    508     PCSZ_RESOURCEDAT = "RESOURCE.DAT";
    509     PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
    510     PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
    511     PCSZ_USERDIRSDAT = "USERDIRS.DAT";
    512     PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
    513     PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
    514     PCSZ_LVMGUICMD   = "LVMGUI.CMD";
    515     PCSZ_DFSOS2EXE   = "DFSOS2.EXE";
    516     PCSZ_MINILVMEXE  = "MINILVM.EXE";
    517     PCSZ_FDISKPMEXE  = "FDISKPM.EXE";
    518     PCSZ_LVMEXE      = "LVM.EXE";
    519     PCSZ_ARCCNR      = "ArcCnr";
    520     PCSZ_COLLECTOR   = "Collector";
    521     PCSZ_DIRCNR      = "DirCnr";
    522     PCSZ_DIRSIZES    = "DirSizes";
    523     PCSZ_TOOLBAR     = "ToolBar";
    524     PCSZ_TREECNR     = "TreeCnr";
    525     FNT_6HELVETICA       =  "6.Helvetica";
    526     FNT_8HELVETICA       =  "8.Helvetica";
    527     FNT_8HELVETICABOLD   =  "8.Helvetica.Bold";
    528     FNT_10SYSTEMMONOTEXT =  "10.System Monospaced";
    529     FNT_10SYSTEMPROPORT  =  "10.System Proportional";
    530     FNT_2SYSTEMVIO       =  "2.System VIO";
    531     FNT_4SYSTEMVIO       =  "4.System VIO";
    532     FNT_10SYSTEMVIO      =  "10.System VIO";
    533     FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
    534     PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
    535     PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
    536     PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
    537     PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
    538     PCSZ_DOSSEARCHPATH    = "DosSearchPath";
    539     PCSZ_POSTMSG          = "PostMsg";
    540     PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
    541     PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
    542     PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
    543     PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
    544     PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
    545     PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
    546     PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
    547     PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
    548     PCSZ_NODATA  =  "No Data";
    549     PCSZ_STARDOTEXE    =  "*.EXE";
    550     PCSZ_STARDOTINI    =  "*.INI";
    551     PCSZ_STARDOTLST    =  "*.LST";
    552     PCSZ_STARDOTPMD    =  "*.PMD";
    553     PCSZ_STARDOTTXT    =  "*.TXT";
    554     PCSZ_DOTEXE   =  ".EXE";
    555     PCSZ_DOTCOM   =  ".COM";
    556     PCSZ_DOTCMD   =  ".CMD";
    557     PCSZ_DOTBTM   =  ".BTM";
    558     PCSZ_DOTBAT   =  ".BAT";
    559     PCSZ_DOTLST   =  ".LST";
    560     PCSZ_DOTTLS   =  ".TLS";
    561     PCSZ_DOTHLP   =  ".HLP";
    562     PCSZ_DOTINF   =  ".INF";
    563     PCSZ_DOTMP3   =  ".MP3";
    564     PCSZ_DOTOGG   =  ".OGG";
    565     PCSZ_DOTFLAC  =  ".FLAC";
    566     PCSZ_DOTJPEG  =  ".JPEG";
    567     PCSZ_DOTJPG   =  ".JPG";
    568     PCSZ_DOTICO   =  ".ICO";
    569     PCSZ_DOTPTR   =  ".PTR";
    570     PCSZ_DOTBB2   =  ".BB2";
    571     PCSZ_DOTBMP   =  ".BMP";
    572     PCSZ_DOTCOMMENTS   =  ".COMMENTS";
    573     PCSZ_PATH     =  "PATH";
    574     PCSZ_LIBPATH       =  "LIBPATH";
    575     pLibPathStrict = "SET LIBPATHSTRICT=TRUE";
    576     PCSZ_WPURLDEFAULTSETTINGS = "WPURLDEFAULTSETTINGS";
    577     WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
    578     WC_BUBBLE          =  "WC_BUBBLE";
    579     WC_TOOLBUTTONS     =  "WC_TOOLBUTTONS";
    580     WC_DRIVEBUTTONS    =  "WC_DRIVEBUTTONS";
    581     WC_DIRCONTAINER    =  "WC_DIRCONTAINER";
    582     WC_DIRSTATUS       =  "WC_DIRSTATUS";
    583     WC_TREECONTAINER   =  "WC_TREECONTAINER";
    584     WC_TREEOPENBUTTON  =  "WC_TREEOPENBUTTON";
    585     WC_TREESTATUS      =  "WC_TREESTATUS";
    586     WC_MAINWND         =  "WC_MAINWND";
    587     WC_MAINWND2        =  "WC_MAINWND2";
    588     WC_AUTOVIEW        =  "WC_AUTOVIEW";
    589     WC_LED             =  "WC_LED";
    590     WC_COLLECTOR       =  "WC_COLLECTOR";
    591     WC_COLSTATUS       =  "WC_COLSTATUS";
    592     WC_STATUS          =  "WC_STATUS";
    593     WC_TOOLBACK        =  "WC_TOOLBACK";
    594     WC_DRIVEBACK       =  "WC_DRIVEBACK";
    595     WC_ARCCONTAINER    =  "WC_ARCCONTAINER";
    596     WC_ARCSTATUS       =  "WC_ARCSTATUS";
    597     WC_MLEEDITOR       =  "WC_MLEEDITOR";
    598     WC_INIEDITOR       =  "WC_INIEDITOR";
    599     WC_SEEALL          =  "WC_SEEALL";
    600     WC_NEWVIEW         =  "WC_NEWVIEW";
    601     WC_SEESTATUS       =  "WC_SEESTATUS";
    602     WC_VIEWSTATUS      =  "WC_VIEWSTATUS";
    603     WC_ERRORWND        =  "WC_ERRORWND";
    604     WC_MINITIME        =  "WC_MINITIME";
    605     WC_DATABAR         =  "WC_DATABAR";
    606 
    607     /* end of strings */
    608481    memset(&RGBBLACK, 0, sizeof(RGB2));
    609482    RGBGREY.bRed = RGBGREY.bGreen = RGBGREY.bBlue = (BYTE)204;
    610483    RGBGREY.fcOptions = 0;
    611484    FM3UL = *(ULONG *)FM3Str;
    612     DEBUG_STRING = "Debug -- please report to author";
    613485    break;
    614486  case 1:
    … …  
    763635    RGBGREY.fcOptions = 0;
    764636    FM3UL = *(ULONG *)FM3Str;
    765     DEBUG_STRING = "Debug -- please report to author";
    766637    break;
    767638  case 1:
    … …  
    835706        }
    836707        else
    837           unlinkf("%s", s);
     708          unlinkf(s);
    838709      }
    839710      while (!DosFindNext(search_handle,
    … …  
    862733      if (!(ffb.attrFile & FILE_DIRECTORY)) {
    863734        strcpy(enddir, ffb.achName);
    864         unlinkf("%s", s);
     735        unlinkf(s);
    865736      }
    866737    }
    … …  
    11681039    if (!fmprof) {
    11691040      Win_Error(NULLHANDLE, NULLHANDLE, pszSrcFile, __LINE__,
    1170                 "PrfOpenProfile");
     1041                PCSZ_PRFOPENPROFILEFAILED, inipath);
    11711042      return FALSE;
    11721043    }
    … …  
    12281099  if (WinQueryClassInfo(hab, WC_CONTAINER, &clinfo))
    12291100    PFNWPCnr = clinfo.pfnWindowProc;
    1230   // saymsg(MB_ENTER,HWND_DESKTOP,"Container flags:","%08lx",clinfo.flClassStyle);
    12311101  if (WinQueryClassInfo(hab, WC_FRAME, &clinfo))
    12321102    PFNWPFrame = clinfo.pfnWindowProc;
    1233   // saymsg(MB_ENTER,HWND_DESKTOP,"Frame flags:","%08lx",clinfo.flClassStyle);
    12341103  if (WinQueryClassInfo(hab, WC_BUTTON, &clinfo))
    12351104    PFNWPButton = clinfo.pfnWindowProc;
    1236   // saymsg(MB_ENTER,HWND_DESKTOP,"Button flags:","%08lx",clinfo.flClassStyle);
    12371105  if (WinQueryClassInfo(hab, WC_STATIC, &clinfo))
    12381106    PFNWPStatic = clinfo.pfnWindowProc;
    1239   // saymsg(MB_ENTER,HWND_DESKTOP,"Static flags:","%08lx",clinfo.flClassStyle);
    12401107  if (WinQueryClassInfo(hab, WC_MLE, &clinfo))
    12411108    PFNWPMLE = clinfo.pfnWindowProc;
    1242   // saymsg(MB_ENTER,HWND_DESKTOP,"MLE flags:","%08lx",clinfo.flClassStyle);
    12431109  if (!PFNWPCnr || !PFNWPFrame || !PFNWPButton || !PFNWPStatic || !PFNWPMLE) {
    12441110    Runtime_Error(pszSrcFile, __LINE__, "WinQueryClassInfo");
    … …  
    16671533  size = sizeof(BOOL);
    16681534  PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
    1669   size = sizeof(BOOL);
     1535  /*size = sizeof(BOOL);   Replaced by UM_SHOWME check 3/14/09 GKY
    16701536  PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
    16711537  if (fSaveState && (fSwitchTreeOnFocus || fSwitchTree) &&
    … …  
    16781544      strcpy(szKey, "FM/4 Dir1");
    16791545    else
    1680       sprintf(szKey, "%s.DirCnrDir.0", GetPString(IDS_SHUTDOWNSTATE));
     1546      sprintf(szKey, "%s.DirCnrDir.0", PCSZ_SHUTDOWNSTATE);
    16811547    size = sizeof(szDir);
    16821548    if (PrfQueryProfileData(fmprof, appname, szKey, szDir, &size)) {
    … …  
    16841550      fDrivetoSkip[drvNum] = TRUE;
    16851551    }
    1686   }
     1552  } */
    16871553  size = sizeof(BOOL);
    16881554  PrfQueryProfileData(fmprof, appname, "SyncUpdates", &fSyncUpdates, &size);
Note: See TracChangeset for help on using the changeset viewer.