1 files changed, 19 insertions, 16 deletions

diff --git a/CPP/7zip/Archive/Cab/CabItem.h b/CPP/7zip/Archive/Cab/CabItem.h
index b7e07d1..8f24ed7 100644
--- a/CPP/7zip/Archive/Cab/CabItem.h
+++ b/CPP/7zip/Archive/Cab/CabItem.h
@@ -28,14 +28,17 @@ struct CItem
   UInt32 Offset;
   UInt32 Size;
   UInt32 Time;
-  UInt32 FolderIndex;
+  unsigned FolderIndex;
   UInt16 Flags;
   UInt16 Attributes;
   
   UInt64 GetEndOffset() const { return (UInt64)Offset + Size; }
-  UInt32 GetWinAttrib() const { return (UInt32)Attributes & ~(UInt32)NHeader::kFileNameIsUtf8_Mask; }
+  /* v26.03: we show all items as files, as original cab extracting software does.
+     Also we disable FILE_ATTRIBUTE_DIRECTORY in GetWinAttrib(), because some client
+     software of 7zip still can parse FILE_ATTRIBUTE_DIRECTORY flag from returned Attributes. */
+  UInt32 GetWinAttrib() const { return (UInt32)Attributes & ~((UInt32)NHeader::kFileNameIsUtf8_Mask | (UInt32)FILE_ATTRIBUTE_DIRECTORY); }
   bool IsNameUTF() const { return (Attributes & NHeader::kFileNameIsUtf8_Mask) != 0; }
-  bool IsDir() const { return (Attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; }
+  // bool IsDir() const { return (Attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; }
 
   bool ContinuedFromPrev() const
   {
@@ -43,21 +46,21 @@ struct CItem
       FolderIndex == NHeader::NFolderIndex::kContinuedFromPrev ||
       FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext;
   }
-  
-  bool ContinuedToNext() const
-  {
-    return
-      FolderIndex == NHeader::NFolderIndex::kContinuedToNext ||
-      FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext;
-  }
-
+  // in:  (numFolders > 0) is expected
+  // out: (returned_value >= 0) is expected
   int GetFolderIndex(unsigned numFolders) const
   {
-    if (ContinuedFromPrev())
-      return 0;
-    if (ContinuedToNext())
-      return (int)numFolders - 1;
-    return (int)FolderIndex;
+    const unsigned folderIndex = FolderIndex;
+    switch (folderIndex)
+    {
+      case NHeader::NFolderIndex::kContinuedFromPrev:
+      case NHeader::NFolderIndex::kContinuedPrevAndNext:
+        return 0;
+      case NHeader::NFolderIndex::kContinuedToNext:
+        return (int)numFolders - 1;
+      default:
+        return (int)folderIndex;
+    }
   }
 };