Changeset 858 for trunk/dll/newview.c

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

File:

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

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 {