Changeset 917 for trunk/dll/init.c


Ignore:
Timestamp:
Jan 11, 2008, 10:41:56 PM (18 years ago)
Author:
Steven Levine
Message:

Correct/enhance settings notebook navigation, ticket #188 (Steven)
Reopen settings notebook to last selected page unless overridden, ticket #188 (Steven)
More Compare Directory overflow tweaks (Steven)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/init.c

    r907 r917  
    645645    return FALSE;
    646646  }
     647
    647648  /* timer messages are sent from a separate thread -- start it */
    648649  if (!StartTimer()) {
     
    662663    /* figure out where to put INI file... */
    663664    CHAR inipath[CCHMAXPATH];
    664     // PSZ env;
    665665
    666666    DosError(FERR_DISABLEHARDERR);
     
    692692    DosError(FERR_DISABLEHARDERR);
    693693
    694     if (!DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3))) {
     694    rc = DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3));
     695    if (rc) {
     696      if (rc == ERROR_FILE_NOT_FOUND)
     697      fWantFirstTimeInit = TRUE;
     698    }
     699    else {
    695700      fIniExisted = TRUE;
    696701      if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
     
    711716    }
    712717
     718    // 10 Jan 08 SHL fixme to do first time if new ini
     719    // 10 Jan 08 SHL post UM_FIRSTTIME to main window
    713720    if (!fmprof) {
    714721      Win_Error(NULLHANDLE, NULLHANDLE, pszSrcFile, __LINE__,
     
    929936    fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
    930937    fShowTarget = fDrivebarHelp = fCheckMM = TRUE;
    931 #if 0 // 06 Oct 07 SHL fixme to be gone after wrapper testing finished
    932     fNoLargeFileSupport = TRUE;
    933 #endif
    934938  ulCnrType = CCS_EXTENDSEL;
    935939  FilesToGet = FILESTOGET_MIN;
     
    953957
    954958  DosQueryCtryInfo(sizeof(CtryInfo), &Country,
    955                    &CtryInfo, &ulInfoLen);
     959                   &CtryInfo, &ulInfoLen);
    956960  *ThousandsSeparator = CtryInfo.szThousandsSeparator[0];
    957961  }
     
    11671171  size = sizeof(extractpath);
    11681172  PrfQueryProfileData(fmprof, appname, "ExtractPath", extractpath, &size);
    1169   //if (!IsValidDir(extractpath))
    1170   //  *extractpath = 0;
    11711173  size = sizeof(printer);
    11721174  PrfQueryProfileData(fmprof, appname, "Printer", printer, &size);
     
    11901192  size = sizeof(ftprun);
    11911193  PrfQueryProfileData(fmprof, appname, "FTPRun", ftprun, &size);
    1192   if (!*ftprun){
     1194  if (!*ftprun)
    11931195    fFtpRunWPSDefault = TRUE;
    1194   }
    11951196  size = sizeof(BOOL);
    11961197  PrfQueryProfileData(fmprof, appname, "HttpRunWPSDefault", &fHttpRunWPSDefault, &size);
    11971198  size = sizeof(httprun);
    11981199  PrfQueryProfileData(fmprof, appname, "HTTPRun", httprun, &size);
    1199   if (!*httprun){
     1200  if (!*httprun)
    12001201    fHttpRunWPSDefault = TRUE;
    1201   }
    12021202  size = sizeof(mailrun);
    12031203  PrfQueryProfileData(fmprof, appname, "MailRun", mailrun, &size);
     
    12101210  size = sizeof(lasttoolbox);
    12111211  PrfQueryProfileData(fmprof, FM3Str, "LastToolBox", lasttoolbox,
    1212                       &size);
     1212                      &size);
    12131213  size = sizeof(BOOL);
    12141214  PrfQueryProfileData(fmprof, appname, "LibPathStrictHttpRun", &fLibPathStrictHttpRun,
    1215                       &size);
     1215                      &size);
    12161216  size = sizeof(BOOL);
    12171217  PrfQueryProfileData(fmprof, appname, "LibPathStrictFtpRun", &fLibPathStrictFtpRun,
    1218                       &size);
     1218                      &size);
    12191219  size = sizeof(BOOL);
    12201220  PrfQueryProfileData(fmprof, appname, "LibPathStrictMailRun", &fLibPathStrictMailRun,
    1221                       &size);
     1221                      &size);
    12221222  size = sizeof(BOOL);
    12231223  PrfQueryProfileData(fmprof, appname, "NoMailtoMailRun", &fNoMailtoMailRun,
     
    13081308  size = sizeof(BOOL);
    13091309  PrfQueryProfileData(fmprof, appname, "SubjectLengthMax", &fSubjectLengthMax,
    1310                       &size);
     1310                      &size);
    13111311  if (fSubjectLengthMax)
    13121312    SubjectDisplayWidth = 0;
    13131313  else {
    13141314    PrfQueryProfileData(fmprof, appname, "SubjectDisplayWidth",
    1315                         &SubjectDisplayWidth, &size);
     1315                        &SubjectDisplayWidth, &size);
    13161316    if (SubjectDisplayWidth < 50)
    13171317      SubjectDisplayWidth = 0;
Note: See TracChangeset for help on using the changeset viewer.