Changeset 893 for trunk/dll

Timestamp:

Dec 29, 2007, 12:16:41 AM (18 years ago)

Author:

Gregg Young

Message:

Remark out quoting code in runemf; Cleanup of dialog update for mailrun; Enlarge VIEWDATA color array to include new mailrun colors which of course fixed the memfree crashes.

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (1 diff)
• newview.c (modified) (4 diffs)
• systemf.c (modified) (4 diffs)

trunk/dll/fm3dlg.h

@@ -669 +669 @@
 #define CFGV_USENEWVIEWER                                                               25336
 #define CFGV_GUESSTYPE                                                                  25337
-#define CFGV_PDFVIEWER                                                                  25338
-#define CFGV_PDFVIEWERDIR                                                               25339
 #define CFGV_VIEWCHILD                                                                  25340
 #define CFGV_CHECKMM                                                                    25341
-#define CFGV_PDFVIEWERWPSDEFAULT                                                        25342
 
 #define CFGH_FRAME                                                                      25344
-#define CFGH_HTTPVIEWER                                                                 25345
 #define CFGH_HTTPRUN                                                                    25346
 #define CFGH_FTPRUN                                                                     25347
 #define CFGH_RUNFTPWORKDIR                                                              25348
 #define CFGH_RUNHTTPWORKDIR                                                             25349
-#define CFGH_VIEWHTTPWORKDIR                                                            25350
 #define CFGH_RUNMAILWORKDIR                                                             25351
 #define CFGH_MAILRUN                                                                    25352
-#define CFGH_USEWPSDEFAULTVIEWER                                                        25353
 #define CFGH_HTTPRUNWPSDEFAULT                                                          25354
 #define CFGH_FTPRUNWPSDEFAULT                                                           25355
-#define CFGH_LIBPATHSTRICTHTTPVIEWER                                                    25356
 #define CFGH_LIBPATHSTRICTHTTPRUN                                                       25357
 #define CFGH_LIBPATHSTRICTFTPRUN                                                        25358

trunk/dll/newview.c

@@ -111 +111 @@
   HPS hps;
   FATTRS fattrs;
-  LONG colors[12];
+  LONG colors[14];
 }
 VIEWDATA;
@@ -162 +162 @@
     pp++;
   *pp = 0;
-  printf("%s", t); fflush(stdout);
   strip_lead_char(t, "<");
   strip_trail_char(t, ">");
@@ -285 +284 @@
                 }
               }
-              else if (!strncmp(urld->url, "@", 1)) {
-                memmove(urld->url, urld->url + 6, strlen(urld->url) + 1);
-                if (*urld->url) {
+              else if (strchr(urld->url, '@')) {
                   WinDismissDlg(hwnd, 3);
                   break;
-                }
               }
             }
@@ -2270 +2266 @@
       RECTL Rectl;
       POINTS pts;
-      //CHAR *mailstring;
 
       WinQueryWindowRect(hwnd, &Rectl);

trunk/dll/systemf.c

@@ -636 +636 @@
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
-  char szTempPgm[CCHMAXPATH], tempcom[2048], temparg[2048], buf[10] = " &|<>";
-  char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
-  UINT offsetquote;
+  //char szTempPgm[CCHMAXPATH], tempcom[2048], temparg[2048], buf[10] = " &|<>";
+  //char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
+  //UINT offsetquote;
 
   typedef struct {
@@ -685 +685 @@
            parguments);
   va_end(parguments);
-  offsetexe = strstr(strlwr(pszPgm), ".exe");
+  /*offsetexe = strstr(strlwr(pszPgm), ".exe");
   offsetcmd = strstr(strlwr(pszPgm), ".cmd");
   offsetcom = strstr(strlwr(pszPgm), ".com");
@@ -701 +701 @@
     offset = offsetbat;
   else {
-    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_NOTDIRECTEXETEXT));
-    return -1;
+    offset = pszPgm;
   }
   offsetquote = strcspn(pszPgm, buf);
@@ -718 +717 @@
     //printf("%s\n %s\n%s %s\n %d %d",
     //       pszPgm, szTempPgm, tempcom, temparg, offset, offsetquote); fflush(stdout);
-  }
+  } */
   if (pszEnvironment) {
     p = &pszEnvironment[strlen(pszEnvironment)] + 1;