- Remove incorrect bit masking from IsRecognizedPartition & IsContainerPartition. CID 1341188.

svn path=/trunk/; revision=73634
This commit is contained in:
Thomas Faber 2017-01-30 13:33:46 +00:00
parent c8ec5e1a66
commit 2a53c5f4b0

View file

@ -592,18 +592,18 @@ typedef struct {
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\
((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ ((t)==PARTITION_FAT_12)||\
((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ ((t)==PARTITION_FAT_16)||\
((t&~PARTITION_NTFT)==PARTITION_IFS)||\ ((t)==PARTITION_IFS)||\
((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ ((t)==PARTITION_HUGE)||\
((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ ((t)==PARTITION_FAT32)||\
((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ ((t)==PARTITION_FAT32_XINT13)||\
((t&~PARTITION_NTFT)==PARTITION_XINT13)||\ ((t)==PARTITION_XINT13)||\
((t&~PARTITION_NTFT)==PARTITION_LINUX)||\ ((t)==PARTITION_LINUX)||\
((t&~PARTITION_NTFT)==PARTITION_OLD_LINUX)||\ ((t)==PARTITION_OLD_LINUX)||\
((t&~PARTITION_NTFT)==PARTITION_FREEBSD)||\ ((t)==PARTITION_FREEBSD)||\
((t&~PARTITION_NTFT)==PARTITION_OPENBSD)||\ ((t)==PARTITION_OPENBSD)||\
((t&~PARTITION_NTFT)==PARTITION_NETBSD)) ((t)==PARTITION_NETBSD))
#else #else
#define IsRecognizedPartition(t)\ #define IsRecognizedPartition(t)\
(((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\
@ -613,19 +613,19 @@ typedef struct {
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\
((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ ((t)==PARTITION_FAT_12)||\
((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ ((t)==PARTITION_FAT_16)||\
((t&~PARTITION_NTFT)==PARTITION_IFS)||\ ((t)==PARTITION_IFS)||\
((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ ((t)==PARTITION_HUGE)||\
((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ ((t)==PARTITION_FAT32)||\
((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ ((t)==PARTITION_FAT32_XINT13)||\
((t&~PARTITION_NTFT)==PARTITION_XINT13)) ((t)==PARTITION_XINT13))
#endif #endif
#define IsContainerPartition(t)\ #define IsContainerPartition(t)\
(((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\
((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ ((t)==PARTITION_EXTENDED)||\
((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) ((t)==PARTITION_XINT13_EXTENDED))
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)