From 0a0e6a9f07c1127888d7c5c533b61e79caad3dd1 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 11 Nov 2019 21:18:13 +0100 Subject: [PATCH] [SDK] Properly define IsFTPartition so that it doesn't match Unix partition type CORE-16499 --- sdk/include/psdk/ntdddisk.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/ntdddisk.h b/sdk/include/psdk/ntdddisk.h index 13b8e0e9995..7c7cc1dd600 100644 --- a/sdk/include/psdk/ntdddisk.h +++ b/sdk/include/psdk/ntdddisk.h @@ -239,8 +239,13 @@ extern "C" { #endif #define IsFTPartition( PartitionType ) \ - (((PartitionType) & PARTITION_NTFT) && \ - IsRecognizedPartition(PartitionType)) + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) + #define IsContainerPartition(PartitionType) \ (((PartitionType) == PARTITION_EXTENDED) || \