4.59 beta

CPP/7zip/Archive/BZip2/BZip2Handler.cpp

@@ -21,9 +21,9 @@ namespace NBZip2 {
 
 static const CMethodId kMethodId_BZip2 = 0x040202;
 
-STATPROPSTG kProps[] = 
+STATPROPSTG kProps[] =
 {
-  { NULL, kpidPackedSize, VT_UI8}
+  { NULL, kpidPackSize, VT_UI8}
 };
 
 IMP_IInArchive_Props
@@ -40,13 +40,13 @@ STDMETHODIMP CHandler::GetProperty(UInt32 /* index */, PROPID propID,  PROPVARIA
   NWindows::NCOM::CPropVariant prop;
   switch(propID)
   {
-    case kpidPackedSize: prop = _item.PackSize; break;
+    case kpidPackSize: prop = _item.PackSize; break;
   }
   prop.Detach(value);
   return S_OK;
 }
 
-STDMETHODIMP CHandler::Open(IInStream *stream, 
+STDMETHODIMP CHandler::Open(IInStream *stream,
     const UInt64 * /* maxCheckStartPosition */,
     IArchiveOpenCallback * /* openArchiveCallback */)
 {

CPP/7zip/Archive/BZip2/BZip2Handler.h

@@ -15,7 +15,7 @@
 namespace NArchive {
 namespace NBZip2 {
 
-class CHandler: 
+class CHandler:
   public IInArchive,
   public IOutArchive,
   public ISetProperties,
@@ -35,11 +35,11 @@ class CHandler:
 
   DECL_EXTERNAL_CODECS_VARS
 
-  void InitMethodProperties() 
-  { 
+  void InitMethodProperties()
+  {
     _level = 5;
-    _dicSize = 
-    _numPasses = 0xFFFFFFFF; 
+    _dicSize =
+    _numPasses = 0xFFFFFFFF;
     #ifdef COMPRESS_MT
     _numThreads = NWindows::NSystem::GetNumberOfProcessors();;
     #endif

CPP/7zip/Archive/BZip2/BZip2HandlerOut.cpp

@@ -55,7 +55,7 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
   {
     {
       NCOM::CPropVariant prop;
-      RINOK(updateCallback->GetProperty(0, kpidIsFolder, &prop));
+      RINOK(updateCallback->GetProperty(0, kpidIsDir, &prop));
       if (prop.vt == VT_BOOL)
       {
         if (prop.boolVal != VARIANT_FALSE)
@@ -79,21 +79,21 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
   
     UInt32 dicSize = _dicSize;
     if (dicSize == 0xFFFFFFFF)
-      dicSize = (_level >= 5 ? kDicSizeX5 : 
-                (_level >= 3 ? kDicSizeX3 : 
+      dicSize = (_level >= 5 ? kDicSizeX5 :
+                (_level >= 3 ? kDicSizeX3 :
                                kDicSizeX1));
 
     UInt32 numPasses = _numPasses;
     if (numPasses == 0xFFFFFFFF)
-      numPasses = (_level >= 9 ? kNumPassesX9 : 
-                  (_level >= 7 ? kNumPassesX7 : 
+      numPasses = (_level >= 9 ? kNumPassesX9 :
+                  (_level >= 7 ? kNumPassesX7 :
                                  kNumPassesX1));
 
     return UpdateArchive(
         EXTERNAL_CODECS_VARS
-        size, outStream, 0, dicSize, numPasses, 
+        size, outStream, 0, dicSize, numPasses,
         #ifdef COMPRESS_MT
-        _numThreads, 
+        _numThreads,
         #endif
         updateCallback);
   }
@@ -151,6 +151,6 @@ STDMETHODIMP CHandler::SetProperties(const wchar_t **names, const PROPVARIANT *v
     return E_INVALIDARG;
   }
   return S_OK;
-}  
+}
 
 }}

CPP/7zip/Archive/BZip2/BZip2Update.cpp

@@ -47,15 +47,15 @@ HRESULT UpdateArchive(
   encoder.QueryInterface(IID_ICompressSetCoderProperties, &setCoderProperties);
   if (setCoderProperties)
   {
-    NWindows::NCOM::CPropVariant properties[] = 
+    NWindows::NCOM::CPropVariant properties[] =
     {
-      dictionary, 
+      dictionary,
       numPasses
       #ifdef COMPRESS_MT
       , numThreads
       #endif
     };
-    PROPID propIDs[] = 
+    PROPID propIDs[] =
     {
       NCoderPropID::kDictionarySize,
       NCoderPropID::kNumPasses

CPP/7zip/Archive/BZip2/StdAfx.cpp

@@ -1,3 +0,0 @@
-// StdAfx.cpp
-
-#include "StdAfx.h"