Changeset 850 for trunk/dll/newview.c

Timestamp:

Oct 7, 2007, 4:50:15 AM (18 years ago)

Author:

Steven Levine

Message:

Rework large file support wrappers (ticket #41)
Add code to avoid NTFS driver small file read defect (ticket #159)
Add debug code to try to catch David's drive bar exception
Another attempt to correct newview fast viewer text load failure

File:

• trunk/dll/newview.c (modified) (6 diffs)

trunk/dll/newview.c

@@ -24 +24 @@
   26 Aug 07 GKY Fixed fast viewer text load failure
   28 Aug 07 GKY Reversed horizontal scrollbar behavior to be present for unwrapped text and absent for wrapped text & hex.
-
+  14 Sep 07 SHL Another attempt to correct the fast viewer text load failure
 
 ***********************************************************************/
@@ -1093 +1093 @@
       IncrThreadUsage();
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
-      if (ad) {
-        if (ad->text && ad->textsize && !ad->hex)
-          DosSleep(32);   // 26 Aug 07 GKY Fixes failure to load text file in some cases
-        ad->relining = TRUE;
+      if (ad)
+        Runtime_Error(pszSrcFile, __LINE__, "no data");
+      else {
         if (!DosRequestMutexSem(ad->ScanSem, SEM_INDEFINITE_WAIT)) {
+          ad->relining = TRUE;
           ad->busy++;
           ad->maxx = 0;
@@ -1185 +1185 @@
                     for (x = 0; x < ad->numlines; x++) {
                       if ((LONG) (Rectl.yTop -
-                                  (ad->lMaxHeight * (((x + 1) -
-                                                      ad->topline) + 1))) < 0)
-                        break;
+                                  (ad->lMaxHeight * (((x + 1) -
+                                                      ad->topline) + 1))) < 0)
+                        break;
                       PaintLine(hwnd, ad->hps, x, 1, &Rectl);
                     }
@@ -1236 +1236 @@
           PostMsg(hwnd, UM_SETUP4, MPVOID, MPVOID);
           ad->busy--;
-        }
-      }
+        } // if got sim
+      } // if got VIEWDATA
       WinDestroyMsgQueue(hmq2);
     }
@@ -1314 +1314 @@
               }
               else {
-                ad->text = xmalloc(len + 2, pszSrcFile, __LINE__);
+                // 06 Oct 07 SHL Protect against 4096 NFTS driver small buffer defect
+                ad->text = xmalloc(min(len + 2, 4096),
+                                   pszSrcFile,
+                                   __LINE__);
                 if (ad->text) {
                   *ad->text = 0;
@@ -1871 +1874 @@
 
       if (ad->wrapon || ad->hex) { // GKY reverse case where hscroll bar is presnt
-        if (WinQueryWindow(ad->hhscroll, QW_PARENT) == ad->hwndFrame) {
-          invalidate = TRUE;
-          WinSetOwner(ad->hhscroll, HWND_OBJECT);
-          WinSetParent(ad->hhscroll, HWND_OBJECT, TRUE);
-          ad->maxx = 0;
-          ad->horzscroll = 0;
-        }
+        if (WinQueryWindow(ad->hhscroll, QW_PARENT) == ad->hwndFrame) {
+          invalidate = TRUE;
+          WinSetOwner(ad->hhscroll, HWND_OBJECT);
+          WinSetParent(ad->hhscroll, HWND_OBJECT, TRUE);
+          ad->maxx = 0;
+          ad->horzscroll = 0;
+        }
       }
       else {