Changeset 1398 for trunk/dll/init.c


Ignore:
Timestamp:
Feb 21, 2009, 6:43:00 PM (16 years ago)
Author:
Gregg Young
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/init.c

    r1395 r1398  
    214214
    215215#pragma data_seg(GLOBAL2)
    216 CHAR *ARCHIVERBB2;
     216PCSZ PCSZ_ARCHIVERBB2;
     217PCSZ PCSZ_ASSOCDAT;
     218PCSZ PCSZ_CMDLINESDAT;
     219PCSZ PCSZ_CMDMINIDAT;
     220PCSZ PCSZ_COMMANDSDAT;
     221PCSZ PCSZ_FILTERSDAT;
     222PCSZ PCSZ_GREPMASKDAT;
     223PCSZ PCSZ_PATTERNSDAT;
     224PCSZ PCSZ_RESOURCEDAT;
     225PCSZ PCSZ_QUICKTLSDAT;
     226PCSZ PCSZ_FM3TOOLSDAT;
     227PCSZ PCSZ_USERDIRSDAT;
     228PCSZ PCSZ_FM2PLAYEXE;
     229PCSZ PCSZ_FM2PLAYTEMP;
    217230CHAR *CBSIFS;
    218231CHAR *DRF_FM2ARCHIVE;
    … …  
    236249CHAR *LONGNAME;
    237250CHAR *NullStr;
     251PCSZ PCSZ_DOSCREATEMUTEXSEM;
     252PCSZ PCSZ_DOSDUPHANDLE;
     253PCSZ PCSZ_DOSGETINFOBLOCKS;
     254PCSZ PCSZ_DOSQUERYPATHINFO;
     255PCSZ PCSZ_DOSSEARCHPATH;
    238256PCSZ PCSZ_WINCREATEWINDOW;
     257PCSZ PCSZ_WINLOADACCELTABLE;
     258PCSZ PCSZ_WINSETACCELTABLE;
    239259PCSZ PCSZ_INIQUERYPRFTEXT;
     260PCSZ PCSZ_PRFQUERYPROFILEDATA;
     261PCSZ PCSZ_PRFQUERYPROFILESIZE;
     262PCSZ PCSZ_PRFQUERYPROFILESTRING;
    240263PCSZ PCSZ_FILLDIRQCURERRTEXT;
     264PCSZ PCSZ_NODATA;
    241265PCSZ PCSZ_STARDOTEXE;
    242266PCSZ PCSZ_STARDOTINI;
    243267PCSZ PCSZ_STARDOTLST;
     268PCSZ PCSZ_STARDOTPMD;
     269PCSZ PCSZ_STARDOTTXT;
     270PCSZ PCSZ_DOTEXE;
     271PCSZ PCSZ_DOTCOM;
     272PCSZ PCSZ_DOTCMD;
     273PCSZ PCSZ_DOTBTM;
     274PCSZ PCSZ_DOTBAT;
     275PCSZ PCSZ_DOTLST;
     276PCSZ PCSZ_DOTTLS;
     277PCSZ PCSZ_DOTHLP;
     278PCSZ PCSZ_DOTINF;
     279PCSZ PCSZ_DOTMP3;
     280PCSZ PCSZ_DOTOGG;
     281PCSZ PCSZ_DOTFLAC;
     282PCSZ PCSZ_DOTJPEG;
     283PCSZ PCSZ_DOTJPG;
     284PCSZ PCSZ_DOTICO;
     285PCSZ PCSZ_DOTPTR;
     286PCSZ PCSZ_DOTBB2;
     287PCSZ PCSZ_DOTBMP;
     288PCSZ PCSZ_DOTCOMMENTS;
     289PCSZ PCSZ_PATH;
    244290CHAR *Settings;
    245291CHAR SwapperDat[CCHMAXPATH];
    … …  
    436482    RAMFS = "RAMFS";
    437483    NTFS = "NTFS";
    438     ARCHIVERBB2 = "ARCHIVER.BB2";
     484    PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
     485    PCSZ_ASSOCDAT    = "ASSOC.DAT";
     486    PCSZ_CMDLINESDAT = "CMDLINES.DAT";
     487    PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
     488    PCSZ_COMMANDSDAT = "COMMANDS.DAT";
     489    PCSZ_FILTERSDAT  = "FILTERS.DAT";
     490    PCSZ_GREPMASKDAT = "GREPMASK.DAT";
     491    PCSZ_PATTERNSDAT = "PATTERNS.DAT";
     492    PCSZ_RESOURCEDAT = "RESOURCE.DAT";
     493    PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
     494    PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
     495    PCSZ_USERDIRSDAT = "USERDIRS.DAT";
     496    PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
     497    PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
    439498    FNT_6HELVETICA       =  "6.Helvetica";
    440499    FNT_8HELVETICA       =  "8.Helvetica";
    … …  
    446505    FNT_10SYSTEMVIO      =  "10.System VIO";
    447506    FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
    448     PCSZ_WINCREATEWINDOW = "WinCreateWindow";
     507    PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
     508    PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
     509    PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
     510    PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
     511    PCSZ_DOSSEARCHPATH    = "DosSearchPath";
     512    PCSZ_WINCREATEWINDOW  = "WinCreateWindow";
     513    PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
     514    PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
    449515    PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
     516    PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
     517    PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
     518    PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
    450519    PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
     520    PCSZ_NODATA  =  "No Data";
    451521    PCSZ_STARDOTEXE    =  "*.EXE";
    452522    PCSZ_STARDOTINI    =  "*.INI";
    453523    PCSZ_STARDOTLST    =  "*.LST";
     524    PCSZ_STARDOTPMD    =  "*.PMD";
     525    PCSZ_STARDOTTXT    =  "*.TXT";
     526    PCSZ_DOTEXE   =  ".EXE";
     527    PCSZ_DOTCOM   =  ".COM";
     528    PCSZ_DOTCMD   =  ".CMD";
     529    PCSZ_DOTBTM   =  ".BTM";
     530    PCSZ_DOTBAT   =  ".BAT";
     531    PCSZ_DOTLST   =  ".LST";
     532    PCSZ_DOTTLS   =  ".TLS";
     533    PCSZ_DOTHLP   =  ".HLP";
     534    PCSZ_DOTINF   =  ".INF";
     535    PCSZ_DOTMP3   =  ".MP3";
     536    PCSZ_DOTOGG   =  ".OGG";
     537    PCSZ_DOTFLAC  =  ".FLAC";
     538    PCSZ_DOTJPEG  =  ".JPEG";
     539    PCSZ_DOTJPG   =  ".JPG";
     540    PCSZ_DOTICO   =  ".ICO";
     541    PCSZ_DOTPTR   =  ".PTR";
     542    PCSZ_DOTBB2   =  ".BB2";
     543    PCSZ_DOTBMP   =  ".BMP";
     544    PCSZ_DOTCOMMENTS   =  ".COMMENTS";
     545    PCSZ_PATH     =  "PATH";
    454546    WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
    455547    WC_BUBBLE          =  "WC_BUBBLE";
    … …  
    543635    RAMFS = "RAMFS";
    544636    NTFS = "NTFS";
    545     ARCHIVERBB2 = "ARCHIVER.BB2";
     637    PCSZ_ARCHIVERBB2 = "ARCHIVER.BB2";
     638    PCSZ_ASSOCDAT    = "ASSOC.DAT";
     639    PCSZ_CMDLINESDAT = "CMDLINES.DAT";
     640    PCSZ_CMDMINIDAT  = "CMDMINI.DAT";
     641    PCSZ_COMMANDSDAT = "COMMANDS.DAT";
     642    PCSZ_FILTERSDAT  = "FILTERS.DAT";
     643    PCSZ_GREPMASKDAT = "GREPMASK.DAT";
     644    PCSZ_PATTERNSDAT = "PATTERNS.DAT";
     645    PCSZ_RESOURCEDAT = "RESOURCE.DAT";
     646    PCSZ_QUICKTLSDAT = "QUICKTLS.DAT";
     647    PCSZ_FM3TOOLSDAT = "FM3TOOLS.DAT";
     648    PCSZ_USERDIRSDAT = "USERDIRS.DAT";
     649    PCSZ_FM2PLAYEXE  = "FM2PLAY.EXE";
     650    PCSZ_FM2PLAYTEMP = "$FM2PLAY.$$$";
    546651    FNT_6HELVETICA       =  "6.Helvetica";
    547652    FNT_8HELVETICA       =  "8.Helvetica";
    … …  
    553658    FNT_10SYSTEMVIO      =  "10.System VIO";
    554659    FNT_8TIMESNEWROMAN   =  "8.Times New Roman";
     660    PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
     661    PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
     662    PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
     663    PCSZ_DOSQUERYPATHINFO = "DosQueryPathInfo";
     664    PCSZ_DOSSEARCHPATH    = "DosSearchPath";
    555665    PCSZ_WINCREATEWINDOW = "WinCreateWindow";
     666    PCSZ_WINLOADACCELTABLE  = "WinLoadAccelTable";
     667    PCSZ_WINSETACCELTABLE  =  "WinSetAccelTable";
    556668    PCSZ_INIQUERYPRFTEXT =  "PrfQueryProfile";
     669    PCSZ_PRFQUERYPROFILEDATA = "PrfQueryProfileData";
     670    PCSZ_PRFQUERYPROFILESIZE = "PrfQueryProfileSize";
     671    PCSZ_PRFQUERYPROFILESTRING = "PrfQueryProfileString";
    557672    PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
     673    PCSZ_NODATA  =  "No Data";
    558674    PCSZ_STARDOTEXE    =  "*.EXE";
    559675    PCSZ_STARDOTINI    =  "*.INI";
    560676    PCSZ_STARDOTLST    =  "*.LST";
     677    PCSZ_STARDOTPMD    =  "*.PMD";
     678    PCSZ_STARDOTTXT    =  "*.TXT";
     679    PCSZ_DOTEXE   =  ".EXE";
     680    PCSZ_DOTCOM   =  ".COM";
     681    PCSZ_DOTCMD   =  ".CMD";
     682    PCSZ_DOTBTM   =  ".BTM";
     683    PCSZ_DOTBAT   =  ".BAT";
     684    PCSZ_DOTLST   =  ".LST";
     685    PCSZ_DOTTLS   =  ".TLS";
     686    PCSZ_DOTHLP   =  ".HLP";
     687    PCSZ_DOTINF   =  ".INF";
     688    PCSZ_DOTMP3   =  ".MP3";
     689    PCSZ_DOTOGG   =  ".OGG";
     690    PCSZ_DOTFLAC  =  ".FLAC";
     691    PCSZ_DOTJPEG  =  ".JPEG";
     692    PCSZ_DOTJPG   =  ".JPG";
     693    PCSZ_DOTICO   =  ".ICO";
     694    PCSZ_DOTPTR   =  ".PTR";
     695    PCSZ_DOTBB2   =  ".BB2";
     696    PCSZ_DOTBMP   =  ".BMP";
     697    PCSZ_DOTCOMMENTS   =  ".COMMENTS";
     698    PCSZ_PATH     =  "PATH";
    561699    WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
    562700    WC_BUBBLE          =  "WC_BUBBLE";
    … …  
    700838    DosFindClose(search_handle);
    701839  }
    702   BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
     840  BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP);
    703841  DosForceDelete(szTempFile);
    704842  if (pTmpDir) {
    … …  
    12091347  if (DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE))
    12101348    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
    1211               "DosCreateMutexSem");
     1349              PCSZ_DOSCREATEMUTEXSEM);
    12121350  if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
    12131351    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
    1214               "DosCreateMutexSem");
     1352              PCSZ_DOSCREATEMUTEXSEM);
    12151353
    12161354  /*
    … …  
    12711409    ULONG ulAppType;
    12721410
    1273     FullPath = searchapath("PATH", "LVMGUI.CMD");
     1411    FullPath = searchapath(PCSZ_PATH, "LVMGUI.CMD");
    12741412    if (*FullPath)
    12751413      fLVMGui = TRUE;
Note: See TracChangeset for help on using the changeset viewer.