Changeset 858

Timestamp:

Nov 5, 2007, 6:47:12 PM (18 years ago)

Author:

Steven Levine

Message:

Correct NTFS driver small file read fix - broke for large files - oops

Location:

trunk/dll

Files:

• autoview.c (modified) (3 diffs)
• newview.c (modified) (3 diffs)

trunk/dll/autoview.c

@@ -301 +301 @@
 
             HFILE handle;
-            ULONG olen, ibufflen, action, obufflen, l;
+            ULONG olen, ibufflen, action, obufflen, l;
             CHAR *ibuff, *obuff, *p;
             // 06 Oct 07 SHL Protect against NTFS driver small buffer defect
@@ -319 +319 @@
               ibufflen = AutoviewHeight < 96 ? 512 : 3072;
               // 06 Oct 07 SHL protect against NTFS driver small buffer defect
-              // ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__);
-              ibuff = xmalloc(min(ibufflen + 2, 4096), pszSrcFile, __LINE__);
+              // ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__);   // 05 Nov 07 SHL
+              ibuff = xmalloc(max(ibufflen + 2, 4096), pszSrcFile, __LINE__);
               if (ibuff) {
                 // Depends on CreateHexDump line width
@@ -438 +438 @@
               nm /= 2;
             rc = xDosFindFirst(fullname,
-                               &hdir,
-                               FILE_NORMAL | FILE_DIRECTORY |
-                               FILE_READONLY | FILE_ARCHIVED |
-                               FILE_SYSTEM | FILE_HIDDEN,
-                               &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL);
+                               &hdir,
+                               FILE_NORMAL | FILE_DIRECTORY |
+                               FILE_READONLY | FILE_ARCHIVED |
+                               FILE_SYSTEM | FILE_HIDDEN,
+                               &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL);
             if (!rc && nm) {
               fb = (PBYTE) & ffb;

trunk/dll/newview.c

@@ -1316 +1316 @@
               else {
                 // 06 Oct 07 SHL Protect against 4096 NFTS driver small buffer defect
-                ad->text = xmalloc(min(len + 2, 4096),
+                ad->text = xmalloc(max(len + 2, 4096),  // 05 Nov 07 SHL
                                    pszSrcFile,
                                    __LINE__);
@@ -3822 +3822 @@
   if (ParentIsDesktop(hwndParent, hwndParent))
     FrameFlags |= FCF_TASKLIST;
-// saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"\"%s\"\r\rparent %s desktop",filename,(ParentIsDesktop(hwndParent,hwndParent)) ? "is" : "isn't");
+  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"\"%s\"\r\rparent %s desktop",filename,(ParentIsDesktop(hwndParent,hwndParent)) ? "is" : "isn't");
   hwndFrame = WinCreateStdWindow(hwndParent,
                                  0,
@@ -3847 +3847 @@
     if (!ad) {
       WinDestroyWindow(hwndFrame);
-      hwndFrame = (HWND) 0;
+      hwndFrame = (HWND)0;
     }
     else {