From 4677d362982a38c6e2aabb667e33aaa7f921f018 Mon Sep 17 00:00:00 2001
From: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Date: Tue, 9 Jun 2015 16:04:24 +0200
Subject: Update source tree with version 9.38.beta of LZMA SDK.

- Remove unused files.
- Split in .pri files.
- Add HEADERS section.
- Adjust lib7z_facade.

Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h | 91 +++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 17 deletions(-)

(limited to 'src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h')

diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h b/src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h
index 29cc60d93..82203c03a 100644
--- a/src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h
+++ b/src/libs/7zip/win/CPP/7zip/UI/Common/DirItem.h
@@ -3,8 +3,12 @@
 #ifndef __DIR_ITEM_H
 #define __DIR_ITEM_H
 
-#include "Common/MyString.h"
-#include "Common/Types.h"
+#include "../../../Common/MyString.h"
+
+#include "../../../Windows/FileFind.h"
+
+#include "../../Common/UniqBlocks.h"
+
 #include "../../Archive/IArchive.h"
 
 struct CDirItem
@@ -14,11 +18,23 @@ struct CDirItem
   FILETIME ATime;
   FILETIME MTime;
   UString Name;
+
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  // UString ShortName;
+  CByteBuffer ReparseData;
+  CByteBuffer ReparseData2; // fixed (reduced) absolute links
+
+  bool AreReparseData() const { return ReparseData.Size() != 0 || ReparseData2.Size() != 0; }
+  #endif
+
   UInt32 Attrib;
   int PhyParent;
   int LogParent;
-  
-  CDirItem(): PhyParent(-1), LogParent(-1) {}
+  int SecureIndex;
+
+  bool IsAltStream;
+
+  CDirItem(): PhyParent(-1), LogParent(-1), SecureIndex(-1), IsAltStream(false) {}
   bool IsDir() const { return (Attrib & FILE_ATTRIBUTE_DIRECTORY) != 0 ; }
 };
 
@@ -29,24 +45,64 @@ class CDirItems
   CIntVector LogParents;
 
   UString GetPrefixesPath(const CIntVector &parents, int index, const UString &name) const;
+
+  void EnumerateDir(int phyParent, int logParent, const FString &phyPrefix);
+
 public:
   CObjectVector<CDirItem> Items;
 
-  int GetNumFolders() const { return Prefixes.Size(); }
-  UString GetPhyPath(int index) const;
-  UString GetLogPath(int index) const;
+  bool SymLinks;
+
+  bool ScanAltStreams;
+  FStringVector ErrorPaths;
+  CRecordVector<DWORD> ErrorCodes;
+  UInt64 TotalSize;
 
-  int AddPrefix(int phyParent, int logParent, const UString &prefix);
-  void DeleteLastPrefix();
 
-  void EnumerateDirectory(int phyParent, int logParent, const UString &phyPrefix,
-    UStringVector &errorPaths, CRecordVector<DWORD> &errorCodes);
+  #ifndef UNDER_CE
+  void SetLinkInfo(CDirItem &dirItem, const NWindows::NFile::NFind::CFileInfo &fi,
+      const FString &phyPrefix);
+  #endif
 
-  void EnumerateDirItems2(
-    const UString &phyPrefix,
+  void AddError(const FString &path, DWORD errorCode)
+  {
+    ErrorCodes.Add(errorCode);
+    ErrorPaths.Add(path);
+  }
+
+  void AddError(const FString &path)
+  {
+    AddError(path, ::GetLastError());
+  }
+
+  #if defined(_WIN32) && !defined(UNDER_CE)
+
+  CUniqBlocks SecureBlocks;
+  CByteBuffer TempSecureBuf;
+  bool _saclEnabled;
+  bool ReadSecure;
+
+  void AddSecurityItem(const FString &path, int &secureIndex);
+
+  #endif
+
+  CDirItems();
+
+  int GetNumFolders() const { return Prefixes.Size(); }
+  UString GetPhyPath(unsigned index) const;
+  UString GetLogPath(unsigned index) const;
+
+  unsigned AddPrefix(int phyParent, int logParent, const UString &prefix);
+  void DeleteLastPrefix();
+  void EnumerateItems2(
+    const FString &phyPrefix,
     const UString &logPrefix,
-    const UStringVector &filePaths,
-    UStringVector &errorPaths, CRecordVector<DWORD> &errorCodes);
+    const FStringVector &filePaths,
+    FStringVector *requestedPaths);
+
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  void FillFixedReparse();
+  #endif
 
   void ReserveDown();
 };
@@ -57,13 +113,14 @@ struct CArcItem
   FILETIME MTime;
   UString Name;
   bool IsDir;
+  bool IsAltStream;
   bool SizeDefined;
   bool MTimeDefined;
   bool Censored;
   UInt32 IndexInServer;
   int TimeType;
-  
-  CArcItem(): IsDir(false), SizeDefined(false), MTimeDefined(false), Censored(false), TimeType(-1) {}
+
+  CArcItem(): IsDir(false), IsAltStream(false), SizeDefined(false), MTimeDefined(false), Censored(false), TimeType(-1) {}
 };
 
 #endif
-- 
cgit v1.2.3