Author: akhaldi Date: Tue May 3 22:36:26 2016 New Revision: 71258
URL: http://svn.reactos.org/svn/reactos?rev=71258&view=rev Log: [0.4.1] Merge the fix for enumerating ADS from files with 3+ streams, by Pierre in r71245. CORE-11164
Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c
Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:36:26 2016 @@ -1 +1 @@ -/trunk:71217,71231,71252,71255 +/trunk:71217,71231,71245,71252,71255
Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:36:26 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71252 +/trunk/reactos:71217,71231-71232,71245,71252
Modified: branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/dll/win... ============================================================================== --- branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Tue May 3 22:36:26 2016 @@ -1129,7 +1129,7 @@ /* Select next stream if possible */ if (FindStreamData->CurrentInfo->NextEntryOffset != 0) { - FindStreamData->CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)FindStreamData->FileStreamInfo + + FindStreamData->CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)FindStreamData->CurrentInfo + FindStreamData->CurrentInfo->NextEntryOffset);
/* Return the information */