[ros-dev] [ros-diffs] [ekohl] 63326: [NTOSKRNL] xHalIoReadPartitionTable: Only used non-container partition entries have a non-zero partition number.

[Pierre Schweitzer]

Hey Eric,

This fix unfortunately broke trunk. Our four testbots are red.
Have a look here, for instance:
http://build.reactos.org/builders/Linux_AMD64_1%20KVM-Test/builds/6442/steps/test/logs/stdio

Cheers,
Pierre

On 17/05/2014 14:55, ekohl at svn.reactos.org wrote:
> Author: ekohl
> Date: Sat May 17 12:55:06 2014
> New Revision: 63326
>
> URL: http://svn.reactos.org/svn/reactos?rev=63326&view=rev
> Log:
> [NTOSKRNL]
> xHalIoReadPartitionTable: Only used non-container partition entries have a non-zero partition number.
>
> Modified:
>     trunk/reactos/ntoskrnl/fstub/disksup.c
>
> Modified: trunk/reactos/ntoskrnl/fstub/disksup.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?rev=63326&r1=63325&r2=63326&view=diff
> ==============================================================================
> --- trunk/reactos/ntoskrnl/fstub/disksup.c	[iso-8859-1] (original)
> +++ trunk/reactos/ntoskrnl/fstub/disksup.c	[iso-8859-1] Sat May 17 12:55:06 2014
> @@ -1655,8 +1655,7 @@
>                      UInt32x32To64(GET_PARTITION_LENGTH(PartitionDescriptor),
>                                    SectorSize);
>  
> -                /* FIXME: REACTOS HACK */
> -                PartitionInfo->PartitionNumber = i + 1;
> +                PartitionInfo->PartitionNumber = (!IsContainerPartition(PartitionType)) ? i : 0;
>              }
>              else
>              {
> @@ -1667,7 +1666,6 @@
>                  PartitionInfo->PartitionLength.QuadPart = 0;
>                  PartitionInfo->HiddenSectors = 0;
>  
> -                /* FIXME: REACTOS HACK */
>                  PartitionInfo->PartitionNumber = 0;
>              }
>          }
>
>


-- 
Pierre Schweitzer<pierre at reactos.org>
System Administrator
ReactOS Foundation


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3968 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://www.reactos.org/pipermail/ros-dev/attachments/20140517/b3f7100f/attachment.bin>