Changeset 896

Timestamp:

Dec 31, 2007, 12:29:13 AM (18 years ago)

Author:

Gregg Young

Message:

Add LIBPATHSTRICT option for mailto

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (1 diff)
• fm3dll.h (modified) (3 diffs)
• fm3res.dlg (modified) (1 diff)
• init.c (modified) (1 diff)
• newview.c (modified) (3 diffs)
• notebook.c (modified) (2 diffs)

trunk/dll/fm3dlg.h

@@ -684 +684 @@
 #define CFGH_LIBPATHSTRICTFTPRUN                                                        25358
 #define CFGH_FIND                                                                       25359
+#define CFGH_LIBPATHSTRICTMAILRUN                                                       25360
 
 #define CFGS_FRAME                                                                                      25360

trunk/dll/fm3dll.h

@@ -67 +67 @@
   17 Dec 07 GKY Add variables for using WPURLDEFAULTSETTINGS as the fall back for ftphttprun
   29 Dec 07 GKY Add remove_first_occurence_of_character
+  30 Dec 07 GKY Change TestDates to TestFDates can compare by filename or FDATE/FTIME data
+  30 Dec 07 GKY Add TestCDates to compare CNRITEMs by CDATE/CTIME data
 
 ***********************************************************************/
@@ -684 +686 @@
 /* valid.c */
 INT CheckDrive(CHAR Drive, CHAR * FileSystem, ULONG * type);
-int TestDates(char *file1, char *file2);
+int TestFDates(char *file1, char *file2, FDATE *datevar1, FTIME *timevar1,
+               FDATE *datevar2, FTIME *timevar2);
+int TestCDates(CDATE *datevar1, CTIME *timevar1, CDATE *datevar2, CTIME *timevar2);
 BOOL IsNewer(char *file1, char *file2);
 BOOL IsRoot(CHAR * filename);
@@ -1412 +1416 @@
   fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM,
   fSubjectLengthMax, fNoLargeFileSupport,
-  fHttpRunWPSDefault, fFtpRunWPSDefault,
+  fHttpRunWPSDefault, fFtpRunWPSDefault, fLibPathStrictMailRun,
   fLibPathStrictHttpRun, fLibPathStrictFtpRun;
 DATADEF BOOL detailsladate, detailslatime, detailscrdate, detailscrtime,

trunk/dll/fm3res.dlg

@@ -1966 +1966 @@
         AUTOCHECKBOX    "Use LIBPATHSTRICT for run ftp",
                         CFGH_LIBPATHSTRICTFTPRUN, 162, 110, 156, 10
+        AUTOCHECKBOX    "Use LIBPATHSTRICT for mailto",
+                        CFGH_LIBPATHSTRICTMAILRUN, 162, 98, 156, 10
         LTEXT           "Run http:", -1, 2, 86, 68, 8
         ENTRYFIELD      "", CFGH_HTTPRUN, 72, 86, 196, 8, ES_MARGIN
         LTEXT           "Run http dir:", -1, 2, 74, 68, 8, NOT WS_GROUP
         ENTRYFIELD      "", CFGH_RUNHTTPWORKDIR, 72, 74, 196, 8, ES_MARGIN
-        LTEXT           "Run mail:", -1, 2, 62, 68, 8, NOT WS_GROUP
+        LTEXT           "Mailto:", -1, 2, 62, 68, 8, NOT WS_GROUP
         ENTRYFIELD      "", CFGH_MAILRUN, 72, 62, 196, 8, ES_MARGIN
-        LTEXT           "Run mail dir:", -1, 2, 50, 68, 8, NOT WS_GROUP
+        LTEXT           "Mailto dir:", -1, 2, 50, 68, 8, NOT WS_GROUP
         ENTRYFIELD      "", CFGH_RUNMAILWORKDIR, 72, 50, 196, 8, ES_MARGIN
         LTEXT           "Run ftp:", -1, 2, 38, 68, 8, NOT WS_GROUP

trunk/dll/init.c

@@ -1215 +1215 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "LibPathStrictFtpRun", &fLibPathStrictFtpRun,
+                      &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "LibPathStrictMailRun", &fLibPathStrictMailRun,
                       &size);
   size = sizeof(BOOL);

trunk/dll/newview.c

@@ -2399 +2399 @@
                     runemf2(SEPARATE | WINDOWED,
                             hwnd, pszSrcFile, __LINE__,
-                            httprundir, NULL, "%s %s", httprun, urld->url);
+                            httprundir,
+                            fLibPathStrictHttpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
+                            "%s %s", httprun, urld->url);
                 }
                 free(urld);
@@ -2423 +2425 @@
                     runemf2(SEPARATE | WINDOWED,
                             hwnd, pszSrcFile, __LINE__,
-                            ftprundir, NULL, "%s %s", ftprun, urld->url);
+                            ftprundir,
+                            fLibPathStrictFtpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
+                            "%s %s", ftprun, urld->url);
                 }
               case 3:
@@ -2429 +2433 @@
                   runemf2(SEPARATE | WINDOWED,
                           hwnd, pszSrcFile, __LINE__,
-                          mailrundir, NULL, "%s %s", mailrun, urld->url);
+                          mailrundir,
+                          fLibPathStrictMailRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
+                          "%s %s", mailrun, urld->url);
                 }
                 free(urld);

trunk/dll/notebook.c

@@ -543 +543 @@
     WinCheckButton(hwnd, CFGH_LIBPATHSTRICTHTTPRUN, fLibPathStrictHttpRun);
     WinCheckButton(hwnd, CFGH_LIBPATHSTRICTFTPRUN, fLibPathStrictFtpRun);
+    WinCheckButton(hwnd, CFGH_LIBPATHSTRICTMAILRUN, fLibPathStrictMailRun);
     return 0;
 
@@ -698 +699 @@
       PrfWriteProfileData(fmprof, appname, "LibPathStrictFtpRun",
                           &fLibPathStrictFtpRun, sizeof(BOOL));
+      fLibPathStrictMailRun = WinQueryButtonCheckstate(hwnd, CFGH_LIBPATHSTRICTMAILRUN);
+      PrfWriteProfileData(fmprof, appname, "LibPathStrictMailRun",
+                          &fLibPathStrictMailRun, sizeof(BOOL));
       break;
     }