15.08

CPP/7zip/UI/Common/ArchiveCommandLine.cpp

@@ -1329,5 +1329,5 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
   {
   }
   else
-    throw 9815676711;
+    throw 20150919;
 }

CPP/7zip/UI/Common/ArchiveExtractCallback.cpp

@@ -608,6 +608,10 @@ STDMETHODIMP CArchiveExtractCallback::GetStream(UInt32 index, ISequentialOutStre
   _curSizeDefined = false;
   _index = index;
 
+  _diskFilePath.Empty();
+
+  // _fi.Clear();
+
   #ifdef SUPPORT_LINKS
   // _CopyFile_Path.Empty();
   linkPath.Empty();
@@ -1454,7 +1458,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 opRes)
   }
   
   #ifdef _USE_SECURITY_CODE
-  if (_ntOptions.NtSecurity.Val && _arc->GetRawProps)
+  if (!_stdOutMode && _extractMode && _ntOptions.NtSecurity.Val && _arc->GetRawProps)
   {
     const void *data;
     UInt32 dataSize;
@@ -1497,7 +1501,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 opRes)
   else
     NumFiles++;
 
-  if (_extractMode && _fi.AttribDefined)
+  if (!_stdOutMode && _extractMode && _fi.AttribDefined)
     SetFileAttrib(_diskFilePath, _fi.Attrib);
   
   RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));

CPP/7zip/UI/Common/ArchiveOpenCallback.cpp

@@ -40,12 +40,12 @@ STDMETHODIMP COpenCallbackImp::GetProperty(PROPID propID, PROPVARIANT *value)
   COM_TRY_BEGIN
   NCOM::CPropVariant prop;
   if (_subArchiveMode)
-    switch(propID)
+    switch (propID)
     {
       case kpidName: prop = _subArchiveName; break;
     }
   else
-    switch(propID)
+    switch (propID)
     {
       case kpidName:  prop = _fileInfo.Name; break;
       case kpidIsDir:  prop = _fileInfo.IsDir(); break;

CPP/7zip/UI/Common/ExtractingFilePath.cpp

@@ -18,7 +18,7 @@ static void ReplaceIncorrectChars(UString &s)
           #ifdef _WIN32
           c == ':' || c == '*' || c == '?' || c < 0x20 || c == '<' || c == '>' || c == '|' || c == '"'
           || c == '/'
-          || c == 0x202E // RLO
+          // || c == 0x202E // RLO
           ||
           #endif
           c == WCHAR_PATH_SEPARATOR)
@@ -190,9 +190,7 @@ void Correct_FsPath(bool absIsAllowed, UStringVector &parts, bool isDir)
   {
     UString &s = parts[i];
 
-    #ifdef _WIN32
     Correct_PathPart(s);
-    #endif
 
     if (s.IsEmpty())
     {

CPP/7zip/UI/Common/OpenArchive.cpp

@@ -268,7 +268,7 @@ void CHandler::AddItem(const CParseItem &item)
 }
 
 /*
-static const STATPROPSTG kProps[] =
+static const CStatProp kProps[] =
 {
   { NULL, kpidPath, VT_BSTR},
   { NULL, kpidSize, VT_UI8},

CPP/7zip/UI/Common/Update.cpp

@@ -571,6 +571,7 @@ static HRESULT Compress(
       const CArcItem &ai = arcItems[i];
       bool needRename = false;
       UString dest;
+      
       if (ai.Censored)
       {
         FOR_VECTOR (j, options.RenamePairs)
@@ -581,6 +582,8 @@ static HRESULT Compress(
             needRename = true;
             break;
           }
+          
+          #ifdef SUPPORT_ALT_STREAMS
           if (ai.IsAltStream)
           {
             int colonPos = FindAltStreamColon_in_Path(ai.Name);
@@ -600,8 +603,10 @@ static HRESULT Compress(
               }
             }
           }
+          #endif
         }
       }
+      
       CUpdatePair2 up2;
       up2.SetAs_NoChangeArcItem(ai.IndexInServer);
       if (needRename)

CPP/7zip/UI/Common/UpdateCallback.cpp

@@ -92,7 +92,7 @@ STDMETHODIMP CArchiveUpdateCallback::SetRatioInfo(const UInt64 *inSize, const UI
 
 
 /*
-static const STATPROPSTG kProps[] =
+static const CStatProp kProps[] =
 {
   { NULL, kpidPath, VT_BSTR},
   { NULL, kpidIsDir, VT_BOOL},