1 files changed, 12 insertions, 10 deletions

diff --git a/7zip/FileManager/FSDrives.h b/7zip/FileManager/FSDrives.h
index 8a835f29..496e8fc1 100755
--- a/7zip/FileManager/FSDrives.h
+++ b/7zip/FileManager/FSDrives.h
@@ -4,6 +4,7 @@
 #define __FSDRIVES_H
 
 #include "Common/String.h"
+#include "Common/Types.h"
 #include "Common/MyCom.h"
 #include "Windows/FileFind.h"
 #include "Windows/PropVariant.h"
@@ -15,9 +16,9 @@ struct CDriveInfo
   UString Name;
   UString FullSystemName;
   bool KnownSizes;
-  UINT64 DriveSize;
-  UINT64 FreeSpace;
-  UINT64 ClusterSize;
+  UInt64 DriveSize;
+  UInt64 FreeSpace;
+  UInt64 ClusterSize;
   UString Type;
   UString VolumeName;
   UString FileSystemName;
@@ -40,25 +41,26 @@ public:
   )
 
   STDMETHOD(LoadItems)();
-  STDMETHOD(GetNumberOfItems)(UINT32 *numItems);  
-  STDMETHOD(GetProperty)(UINT32 itemIndex, PROPID propID, PROPVARIANT *value);
-  STDMETHOD(BindToFolder)(UINT32 index, IFolderFolder **resultFolder);
+  STDMETHOD(GetNumberOfItems)(UInt32 *numItems);  
+  STDMETHOD(GetProperty)(UInt32 itemIndex, PROPID propID, PROPVARIANT *value);
+  STDMETHOD(BindToFolder)(UInt32 index, IFolderFolder **resultFolder);
   STDMETHOD(BindToFolder)(const wchar_t *name, IFolderFolder **resultFolder);
   STDMETHOD(BindToParentFolder)(IFolderFolder **resultFolder);
   STDMETHOD(GetName)(BSTR *name);
 
-  STDMETHOD(GetNumberOfProperties)(UINT32 *numProperties);  
-  STDMETHOD(GetPropertyInfo)(UINT32 index,     
+  STDMETHOD(GetNumberOfProperties)(UInt32 *numProperties);  
+  STDMETHOD(GetPropertyInfo)(UInt32 index,     
       BSTR *name, PROPID *propID, VARTYPE *varType);
   STDMETHOD(GetTypeID)(BSTR *name);
   STDMETHOD(GetPath)(BSTR *path);
-  STDMETHOD(GetSystemIconIndex)(UINT32 index, INT32 *iconIndex);
+  STDMETHOD(GetSystemIconIndex)(UInt32 index, INT32 *iconIndex);
 
 private:
   HRESULT BindToFolderSpec(const wchar_t *name, IFolderFolder **resultFolder);
   CObjectVector<CDriveInfo> _drives;
+  bool _volumeMode;
 public:
-  void Init() {}
+  void Init() { _volumeMode = false;}
 };
 
 #endif