Changeset 1386

Timestamp:

Jan 5, 2009, 9:21:15 PM (17 years ago)

Author:

Gregg Young

Message:

Fix IsBinary so it doesn't think codes like \xda are negative. Which fixes problem with texted opened as hex. Also use test binary in default view code so hex veiwer is used when appropriate. Tickets 326, 338

Location:

trunk/dll

Files:

• defview.c (modified) (1 diff)
• valid.c (modified) (1 diff)

trunk/dll/defview.c

@@ -340 +340 @@
           if (stricmp(p, ".INI") || !StartIniEditor(hwndParent, filename, 4)) {
             if (stricmp(p, ".HLP") || !ViewHelp(filename)) {
-            ViewIt:
-              if (*viewer) {
-                dummy[0] = filename;
-                dummy[1] = NULL;
-                ExecOnList(hwnd,
-                           viewer,
-                           WINDOWED | SEPARATE |
-                           ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
-                           pszSrcFile, __LINE__);
-              }
-              else if (fUseNewViewer) {
-                if (fExternalViewer || strcmp(realappname, FM3Str))
-                  hwndParent = HWND_DESKTOP;
-                StartViewer(hwndParent, 5, filename, hwndFrame);
-              }
-              else
-                StartMLEEditor(hwndParent, 5, filename, hwndFrame);
+            ViewIt:
+              if (TestBinary(filename)) {
+                if (*binview) {
+                  dummy[0] = filename;
+                  dummy[1] = NULL;
+                  ExecOnList(hwnd,
+                             binview,
+                             WINDOWED | SEPARATE |
+                             ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
+                             pszSrcFile, __LINE__);
+                }
+                else if (fUseNewViewer) {
+                  if (fExternalViewer || strcmp(realappname, FM3Str))
+                    hwndParent = HWND_DESKTOP;
+                  StartViewer(hwndParent, 5, filename, hwndFrame);
+                }
+                else
+                  StartMLEEditor(hwndParent, 5, filename, hwndFrame);
+              }
+              else {
+                if (*viewer) {
+                  dummy[0] = filename;
+                  dummy[1] = NULL;
+                  ExecOnList(hwnd,
+                             viewer,
+                             WINDOWED | SEPARATE |
+                             ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
+                             pszSrcFile, __LINE__);
+                }
+                else if (fUseNewViewer) {
+                  if (fExternalViewer || strcmp(realappname, FM3Str))
+                    hwndParent = HWND_DESKTOP;
+                  StartViewer(hwndParent, 5, filename, hwndFrame);
+                }
+                else
+                  StartMLEEditor(hwndParent, 5, filename, hwndFrame);
+              }
             }
           }

trunk/dll/valid.c

@@ -988 +988 @@
   if (str) {
     while (x < len) {
-      if (str[x] < ' ' && str[x] != '\r' && str[x] != '\n' && str[x] != '\t'
-          && str[x] != '\x1b' && str[x] != '\x1a' && str[x] != '\07'
-          && str[x] != '\x0c')
-        return TRUE;
+      if ((UINT) str[x] < ' ' && str[x] != '\r' && str[x] != '\n' && str[x] != '\t'
+          && str[x] != '\x1b' && str[x] != '\x1a' && str[x] != '\x07'
+          && str[x] != '\x0c') {
+        //DbgMsg(pszSrcFile, __LINE__, "IsBinary str %x x %x len %x", str[x], x, len);
+        return TRUE;
+      }
       x++;
     }