[ros-diffs] [akhaldi] 55436: * Merge r55430 from trunk.

Author: akhaldi
Date: Sun Feb  5 17:50:42 2012
New Revision: 55436

URL: http://svn.reactos.org/svn/reactos?rev=55436&view=rev
Log:
* Merge r55430 from trunk.

Modified:
    branches/ros-branch-0_3_14/   (props changed)
    branches/ros-branch-0_3_14/lib/sdk/crt/stdio/file.c

Propchange: branches/ros-branch-0_3_14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb  5 17:50:42 2012
@@ -11,4 +11,4 @@
 /branches/shell32_new-bringup:51893-53652,53661,53700
 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:55012,55173,55432
+/trunk/reactos:55012,55173,55430,55432

Modified: branches/ros-branch-0_3_14/lib/sdk/crt/stdio/file.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/lib/sdk/crt/st...
==============================================================================
--- branches/ros-branch-0_3_14/lib/sdk/crt/stdio/file.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_14/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun Feb  5 17:50:42 2012
@@ -966,7 +966,7 @@
             free(__pioinfo[i]);

for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++)
-            free(fstream[i/FD_BLOCK_SIZE]);
+            free(fstream[i]);

file_cs.DebugInfo->Spare[0] = 0;
     DeleteCriticalSection(&file_cs);