1 files changed, 12 insertions, 6 deletions
diff --git a/CPP/7zip/UI/FileManager/FSDrives.h b/CPP/7zip/UI/FileManager/FSDrives.h
index a0cfd9be..a8e25d7d 100755..100644
--- a/CPP/7zip/UI/FileManager/FSDrives.h
+++ b/CPP/7zip/UI/FileManager/FSDrives.h
@@ -3,8 +3,8 @@
 #ifndef __FS_DRIVES_H
 #define __FS_DRIVES_H
 
-#include "Common/MyCom.h"
-#include "Common/MyString.h"
+#include "../../../Common/MyCom.h"
+#include "../../../Common/MyString.h"
 
 #include "IFolder.h"
 
@@ -12,7 +12,6 @@ struct CDriveInfo
 {
   FString Name;
   FString FullSystemName;
-  bool KnownSizes;
   UInt64 DriveSize;
   UInt64 FreeSpace;
   UInt64 ClusterSize;
@@ -21,7 +20,12 @@ struct CDriveInfo
   UString FileSystemName;
   UINT DriveType;
 
+  bool KnownSize;
+  bool KnownSizes;
+  bool IsPhysicalDrive;
+
   FString GetDeviceFileIoName() const;
+  CDriveInfo(): KnownSize(false), KnownSizes(false), IsPhysicalDrive(false) {}
 };
 
 class CFSDrives:
@@ -32,10 +36,11 @@ class CFSDrives:
 {
   CObjectVector<CDriveInfo> _drives;
   bool _volumeMode;
+  bool _longMode;
 
   HRESULT BindToFolderSpec(CFSTR name, IFolderFolder **resultFolder);
-  UString GetExt(int index) const;
-  HRESULT GetLength(int index, UInt64 &length) const;
+  const wchar_t *GetExt(unsigned index) const;
+  HRESULT GetFileSize(unsigned index, UInt64 &fileSize) const;
 public:
   MY_UNKNOWN_IMP2(IFolderGetSystemIconIndex, IFolderOperations)
 
@@ -44,9 +49,10 @@ public:
 
   STDMETHOD(GetSystemIconIndex)(UInt32 index, Int32 *iconIndex);
 
-  void Init(bool volMode = false)
+  void Init(bool volMode = false, bool longMode = false)
   {
     _volumeMode = volMode;
+    _longMode = longMode;
   }
 };