Merge branch 'hotfix/v3.0.1'

hnboy · Nov 29, 2018 · 0b6780c · 0b6780c
2 parents 5b20c80 + 5223981
commit 0b6780c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 48 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,34 +1,34 @@
-version: 3.0.0-build{build}
+version: 3.0.1-build{build}
 skip_non_tags: true
 os: Visual Studio 2015
 clone_depth: 1
 
 environment:
-  bit7z_version: 3.0.0
+  bit7z_version: 3.0.1
   msvc_dir: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
 
   matrix:
   # MSVC x86
   - name: msvc2015_x86
     arch: x86
-    qt_dir: C:\Qt\5.11.1\msvc2015\bin
+    qt_dir: C:\Qt\5.11\msvc2015\bin
 
   # MSVC x86 MT
   - name: msvc2015_mt_x86
     arch: x86
     mt: TRUE
-    qt_dir: C:\Qt\5.11.1\msvc2015\bin
+    qt_dir: C:\Qt\5.11\msvc2015\bin
 
   # MSVC x64
   - name: msvc2015_x64
     arch: x64
-    qt_dir: C:\Qt\5.11.1\msvc2015_64\bin
+    qt_dir: C:\Qt\5.11\msvc2015_64\bin
 
   # MSVC x64 MT
   - name: msvc2015_mt_x64
     arch: x64
     mt: TRUE
-    qt_dir: C:\Qt\5.11.1\msvc2015_64\bin
+    qt_dir: C:\Qt\5.11\msvc2015_64\bin
 
 init:
     - set PATH=%PATH%;%msvc_dir%;%qt_dir%

diff --git a/bit7z.pro b/bit7z.pro
@@ -1,4 +1,4 @@
-#VERSION  = 3.0
+#VERSION  = 3.0.1
 TEMPLATE = lib
 CONFIG  += staticlib
 CONFIG  -= app_bundle

diff --git a/src/memupdatecallback.cpp b/src/memupdatecallback.cpp
@@ -110,10 +110,10 @@ HRESULT MemUpdateCallback::GetProperty( UInt32 /*index*/, PROPID propID, PROPVAR
             prop = false;
             break;
         case kpidSize:
-            prop = ( sizeof( byte_t ) * mBuffer.size() );
+            prop = static_cast< uint64_t >( sizeof( byte_t ) * mBuffer.size() );
             break;
         case kpidAttrib:
-            prop = FILE_ATTRIBUTE_NORMAL;
+            prop = static_cast< uint32_t >( FILE_ATTRIBUTE_NORMAL );
             break;
         case kpidCTime:
             prop = ft;
@@ -127,27 +127,6 @@ HRESULT MemUpdateCallback::GetProperty( UInt32 /*index*/, PROPID propID, PROPVAR
     }
 
     *value = prop;
-    /*NWindows::NCOM::CPropVariant prop;
-
-       if ( propID == kpidIsAnti ) {
-        prop = false;
-        prop.Detach( value );
-        return S_OK;
-       }
-
-       const FSItem dirItem = mDirItems[index];
-
-       switch ( propID ) {
-        case kpidPath  : prop = dirItem.relativePath().c_str(); break;
-        case kpidIsDir : prop = dirItem.isDir(); break;
-        case kpidSize  : prop = dirItem.size(); break;
-        case kpidAttrib: prop = dirItem.attributes(); break;
-        case kpidCTime : prop = dirItem.creationTime(); break;
-        case kpidATime : prop = dirItem.lastAccessTime(); break;
-        case kpidMTime : prop = dirItem.lastWriteTime(); break;
-       }
-
-       prop.Detach( value );*/
     return S_OK;
 }
 
@@ -161,29 +140,11 @@ HRESULT MemUpdateCallback::Finilize() {
 
 HRESULT MemUpdateCallback::GetStream( UInt32 /*index*/, ISequentialInStream** inStream ) {
     RINOK( Finilize() );
-    /*const FSItem dirItem = mDirItems[index];
-
-       if ( dirItem.isDir() )
-        return S_OK;*/
 
     auto* inStreamSpec = new CBufInStream;
     CMyComPtr< ISequentialInStream > inStreamLoc( inStreamSpec );
     inStreamSpec->Init( &mBuffer[0], mBuffer.size() );
 
-
-    //    wstring path = dirItem.fullPath();
-
-    //    if ( !inStreamSpec->Open( path.c_str() ) ) {
-    //        DWORD sysError = ::GetLastError();
-    //        mFailedCodes.push_back( sysError );
-    //        mFailedFiles.push_back( path );
-    //        // if (systemError == ERROR_SHARING_VIOLATION)
-    //        mErrorMessage = L"WARNING: Can't open file";
-    //        // PrintString(NError::MyFormatMessageW(systemError));
-    //        return S_FALSE;
-    //        // return sysError;
-    //    }
-
     *inStream = inStreamLoc.Detach();
     return S_OK;
 }