react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/EnumDirItems.h

@@ -1,12 +1,16 @@
 // EnumDirItems.h
 
-#ifndef ZIP7_INC_ENUM_DIR_ITEMS_H
-#define ZIP7_INC_ENUM_DIR_ITEMS_H
+#ifndef __ENUM_DIR_ITEMS_H
+#define __ENUM_DIR_ITEMS_H
 
 #include "../../../Common/Wildcard.h"
 
+#include "../../../Windows/FileFind.h"
+
 #include "DirItem.h"
 
+void AddDirFileInfo(int phyParent, int logParent, int secureIndex,
+    const NWindows::NFile::NFind::CFileInfo &fi, CObjectVector<CDirItem> &dirItems);
 
 HRESULT EnumerateItems(
     const NWildcard::CCensor &censor,

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/ExitCode.h

@@ -1,7 +1,7 @@
 // ExitCode.h
 
-#ifndef ZIP7_INC_EXIT_CODE_H
-#define ZIP7_INC_EXIT_CODE_H
+#ifndef __EXIT_CODE_H
+#define __EXIT_CODE_H
 
 namespace NExitCode {
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/Extract.cpp

@@ -2,16 +2,15 @@
 
 #include "StdAfx.h"
 
+#include "../../../../C/Sort.h"
+
 #include "../../../Common/StringConvert.h"
 
 #include "../../../Windows/FileDir.h"
-#include "../../../Windows/FileName.h"
-#include "../../../Windows/ErrorMsg.h"
 #include "../../../Windows/PropVariant.h"
 #include "../../../Windows/PropVariantConv.h"
 
 #include "../Common/ExtractingFilePath.h"
-#include "../Common/HashCalc.h"
 
 #include "Extract.h"
 #include "SetProperties.h"
@@ -20,19 +19,6 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
 
-
-static void SetErrorMessage(const char *message,
-    const FString &path, HRESULT errorCode,
-    UString &s)
-{
-  s = message;
-  s += " : ";
-  s += NError::MyFormatMessage(errorCode);
-  s += " : ";
-  s += fs2us(path);
-}
-
-
 static HRESULT DecompressArchive(
     CCodecs *codecs,
     const CArchiveLink &arcLink,
@@ -41,7 +27,6 @@ static HRESULT DecompressArchive(
     const CExtractOptions &options,
     bool calcCrc,
     IExtractCallbackUI *callback,
-    IFolderArchiveExtractCallback *callbackFAE,
     CArchiveExtractCallback *ecs,
     UString &errorMessage,
     UInt64 &stdInProcessed)
@@ -62,7 +47,7 @@ static HRESULT DecompressArchive(
     // So it extracts different archives to one folder.
     // We will use top level archive name
     const CArc &arc0 = arcLink.Arcs[0];
-    if (arc0.FormatIndex >= 0 && StringsAreEqualNoCase_Ascii(codecs->Formats[(unsigned)arc0.FormatIndex].Name, "pe"))
+    if (StringsAreEqualNoCase_Ascii(codecs->Formats[arc0.FormatIndex].Name, "pe"))
       replaceName = arc0.DefaultName;
   }
 
@@ -88,25 +73,20 @@ static HRESULT DecompressArchive(
     }
   }
 
-  const bool allFilesAreAllowed = wildcardCensor.AreAllAllowed();
+  bool allFilesAreAllowed = wildcardCensor.AreAllAllowed();
 
   if (!options.StdInMode)
   {
     UInt32 numItems;
-    RINOK(archive->GetNumberOfItems(&numItems))
+    RINOK(archive->GetNumberOfItems(&numItems));
     
     CReadArcItem item;
 
     for (UInt32 i = 0; i < numItems; i++)
     {
-      if (elimIsPossible
-          || !allFilesAreAllowed
-          || options.ExcludeDirItems
-          || options.ExcludeFileItems)
+      if (elimIsPossible || !allFilesAreAllowed)
       {
-        RINOK(arc.GetItem(i, item))
-        if (item.IsDir ? options.ExcludeDirItems : options.ExcludeFileItems)
-          continue;
+        RINOK(arc.GetItem(i, item));
       }
       else
       {
@@ -114,7 +94,7 @@ static HRESULT DecompressArchive(
         item.IsAltStream = false;
         if (!options.NtOptions.AltStreams.Val && arc.Ask_AltStream)
         {
-          RINOK(Archive_IsItem_AltStream(arc.Archive, i, item.IsAltStream))
+          RINOK(Archive_IsItem_AltStream(arc.Archive, i, item.IsAltStream));
         }
         #endif
       }
@@ -184,8 +164,11 @@ static HRESULT DecompressArchive(
   */
   else if (!CreateComplexDir(outDir))
   {
-    const HRESULT res = GetLastError_noZero_HRESULT();
-    SetErrorMessage("Cannot create output directory", outDir, res, errorMessage);
+    HRESULT res = ::GetLastError();
+    if (res == S_OK)
+      res = E_FAIL;
+    errorMessage = "Can not create output directory: ";
+    errorMessage += fs2us(outDir);
     return res;
   }
 
@@ -193,14 +176,12 @@ static HRESULT DecompressArchive(
       options.NtOptions,
       options.StdInMode ? &wildcardCensor : NULL,
       &arc,
-      callbackFAE,
+      callback,
       options.StdOutMode, options.TestMode,
       outDir,
       removePathParts, false,
       packSize);
 
-  ecs->Is_elimPrefix_Mode = elimIsPossible;
-
   
   #ifdef SUPPORT_LINKS
   
@@ -208,14 +189,14 @@ static HRESULT DecompressArchive(
       !options.TestMode &&
       options.NtOptions.HardLinks.Val)
   {
-    RINOK(ecs->PrepareHardLinks(&realIndices))
+    RINOK(ecs->PrepareHardLinks(&realIndices));
   }
     
   #endif
 
   
   HRESULT result;
-  const Int32 testMode = (options.TestMode && !calcCrc) ? 1: 0;
+  Int32 testMode = (options.TestMode && !calcCrc) ? 1: 0;
 
   CArchiveExtractCallback_Closer ecsCloser(ecs);
 
@@ -227,15 +208,9 @@ static HRESULT DecompressArchive(
       ConvertPropVariantToUInt64(prop, stdInProcessed);
   }
   else
-  {
-    // v23.02: we reset completed value that could be set by Open() operation
-    IArchiveExtractCallback *aec = ecs;
-    const UInt64 val = 0;
-    RINOK(aec->SetCompleted(&val))
-    result = archive->Extract(realIndices.ConstData(), realIndices.Size(), testMode, aec);
-  }
+    result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
   
-  const HRESULT res2 = ecsCloser.Close();
+  HRESULT res2 = ecsCloser.Close();
   if (result == S_OK)
     result = res2;
 
@@ -246,18 +221,17 @@ static HRESULT DecompressArchive(
    Sorted list for file paths was sorted with case insensitive compare function.
    But FindInSorted function did binary search via case sensitive compare function */
 
-int Find_FileName_InSortedVector(const UStringVector &fileNames, const UString &name);
-int Find_FileName_InSortedVector(const UStringVector &fileNames, const UString &name)
+int Find_FileName_InSortedVector(const UStringVector &fileName, const UString &name)
 {
-  unsigned left = 0, right = fileNames.Size();
+  unsigned left = 0, right = fileName.Size();
   while (left != right)
   {
-    const unsigned mid = (unsigned)(((size_t)left + (size_t)right) / 2);
-    const UString &midVal = fileNames[mid];
-    const int comp = CompareFileNames(name, midVal);
-    if (comp == 0)
-      return (int)mid;
-    if (comp < 0)
+    unsigned mid = (left + right) / 2;
+    const UString &midValue = fileName[mid];
+    int compare = CompareFileNames(name, midValue);
+    if (compare == 0)
+      return mid;
+    if (compare < 0)
       right = mid;
     else
       left = mid + 1;
@@ -265,10 +239,7 @@ int Find_FileName_InSortedVector(const UStringVector &fileNames, const UString &
   return -1;
 }
 
-
-
 HRESULT Extract(
-    // DECL_EXTERNAL_CODECS_LOC_VARS
     CCodecs *codecs,
     const CObjectVector<COpenType> &types,
     const CIntVector &excludedFormats,
@@ -277,8 +248,7 @@ HRESULT Extract(
     const CExtractOptions &options,
     IOpenCallbackUI *openCallback,
     IExtractCallbackUI *extractCallback,
-    IFolderArchiveExtractCallback *faeCallback,
-    #ifndef Z7_SFX
+    #ifndef _SFX
     IHashCalc *hash,
     #endif
     UString &errorMessage,
@@ -298,19 +268,11 @@ HRESULT Extract(
     fi.Size = 0;
     if (!options.StdInMode)
     {
-      const FString arcPath = us2fs(arcPaths[i]);
-      if (!fi.Find_FollowLink(arcPath))
-      {
-        const HRESULT errorCode = GetLastError_noZero_HRESULT();
-        SetErrorMessage("Cannot find archive file", arcPath, errorCode, errorMessage);
-        return errorCode;
-      }
+      const FString &arcPath = us2fs(arcPaths[i]);
+      if (!fi.Find(arcPath))
+        throw "there is no such archive";
       if (fi.IsDir())
-      {
-        HRESULT errorCode = E_FAIL;
-        SetErrorMessage("The item is a directory", arcPath, errorCode, errorMessage);
-        return errorCode;
-      }
+        throw "can't decompress folder";
     }
     arcSizes.Add(fi.Size);
     totalPackSize += fi.Size;
@@ -322,22 +284,17 @@ HRESULT Extract(
 
   CArchiveExtractCallback *ecs = new CArchiveExtractCallback;
   CMyComPtr<IArchiveExtractCallback> ec(ecs);
-  
-  const bool multi = (numArcs > 1);
-  
-  ecs->InitForMulti(multi,
-      options.PathMode,
-      options.OverwriteMode,
-      options.ZoneMode,
+  bool multi = (numArcs > 1);
+  ecs->InitForMulti(multi, options.PathMode, options.OverwriteMode,
       false // keepEmptyDirParts
       );
-  #ifndef Z7_SFX
+  #ifndef _SFX
   ecs->SetHashMethods(hash);
   #endif
 
   if (multi)
   {
-    RINOK(faeCallback->SetTotal(totalPackSize))
+    RINOK(extractCallback->SetTotal(totalPackSize));
   }
 
   UInt64 totalPackProcessed = 0;
@@ -348,40 +305,31 @@ HRESULT Extract(
     if (skipArcs[i])
       continue;
 
-    ecs->InitBeforeNewArchive();
-
     const UString &arcPath = arcPaths[i];
     NFind::CFileInfo fi;
     if (options.StdInMode)
     {
-      // do we need ctime and mtime?
-      // fi.ClearBase();
-      // fi.Size = 0; // (UInt64)(Int64)-1;
-      if (!fi.SetAs_StdInFile())
-        return GetLastError_noZero_HRESULT();
+      fi.Size = 0;
+      fi.Attrib = 0;
     }
     else
     {
-      if (!fi.Find_FollowLink(us2fs(arcPath)) || fi.IsDir())
-      {
-        const HRESULT errorCode = GetLastError_noZero_HRESULT();
-        SetErrorMessage("Cannot find archive file", us2fs(arcPath), errorCode, errorMessage);
-        return errorCode;
-      }
+      if (!fi.Find(us2fs(arcPath)) || fi.IsDir())
+        throw "there is no such archive";
     }
 
     /*
-    #ifndef Z7_NO_CRYPTO
+    #ifndef _NO_CRYPTO
     openCallback->Open_Clear_PasswordWasAsked_Flag();
     #endif
     */
 
-    RINOK(extractCallback->BeforeOpen(arcPath, options.TestMode))
+    RINOK(extractCallback->BeforeOpen(arcPath, options.TestMode));
     CArchiveLink arcLink;
 
     CObjectVector<COpenType> types2 = types;
     /*
-    #ifndef Z7_SFX
+    #ifndef _SFX
     if (types.IsEmpty())
     {
       int pos = arcPath.ReverseFind(L'.');
@@ -389,7 +337,7 @@ HRESULT Extract(
       {
         UString s = arcPath.Ptr(pos + 1);
         int index = codecs->FindFormatForExtension(s);
-        if (index >= 0 && s.IsEqualTo("001"))
+        if (index >= 0 && s == L"001")
         {
           s = arcPath.Left(pos);
           pos = s.ReverseFind(L'.');
@@ -409,7 +357,7 @@ HRESULT Extract(
     */
 
     COpenOptions op;
-    #ifndef Z7_SFX
+    #ifndef _SFX
     op.props = &options.Properties;
     #endif
     op.codecs = codecs;
@@ -425,54 +373,19 @@ HRESULT Extract(
       return result;
 
     // arcLink.Set_ErrorsText();
-    RINOK(extractCallback->OpenResult(codecs, arcLink, arcPath, result))
+    RINOK(extractCallback->OpenResult(codecs, arcLink, arcPath, result));
 
     if (result != S_OK)
     {
       thereAreNotOpenArcs = true;
       if (!options.StdInMode)
-        totalPackProcessed += fi.Size;
-      continue;
-    }
-
-   #if defined(_WIN32) && !defined(UNDER_CE) && !defined(Z7_SFX)
-    if (options.ZoneMode != NExtract::NZoneIdMode::kNone
-        && !options.StdInMode)
-    {
-      ReadZoneFile_Of_BaseFile(us2fs(arcPath), ecs->ZoneBuf);
-    }
-   #endif
-    
-
-    if (arcLink.Arcs.Size() != 0)
-    {
-      if (arcLink.GetArc()->IsHashHandler(op))
       {
-        if (!options.TestMode)
-        {
-          /* real Extracting to files is possible.
-             But user can think that hash archive contains real files.
-             So we block extracting here. */
-          // v23.00 : we don't break process.
-          RINOK(extractCallback->OpenResult(codecs, arcLink, arcPath, E_NOTIMPL))
-          thereAreNotOpenArcs = true;
-          if (!options.StdInMode)
-            totalPackProcessed += fi.Size;
-          continue;
-          // return E_NOTIMPL; // before v23
-        }
-        FString dirPrefix = us2fs(options.HashDir);
-        if (dirPrefix.IsEmpty())
-        {
-          if (!NFile::NDir::GetOnlyDirPrefix(us2fs(arcPath), dirPrefix))
-          {
-            // return GetLastError_noZero_HRESULT();
-          }
-        }
-        if (!dirPrefix.IsEmpty())
-          NName::NormalizeDirPathPrefix(dirPrefix);
-        ecs->DirPathPrefix_for_HashFiles = dirPrefix;
+        NFind::CFileInfo fi2;
+        if (fi2.Find(us2fs(arcPath)))
+          if (!fi2.IsDir())
+            totalPackProcessed += fi2.Size;
       }
+      continue;
     }
 
     if (!options.StdInMode)
@@ -484,7 +397,7 @@ HRESULT Extract(
       // numArcs = arcPaths.Size();
       if (arcLink.VolumePaths.Size() != 0)
       {
-        Int64 correctionSize = (Int64)arcLink.VolumesSize;
+        Int64 correctionSize = arcLink.VolumesSize;
         FOR_VECTOR (v, arcLink.VolumePaths)
         {
           int index = Find_FileName_InSortedVector(arcPathsFull, arcLink.VolumePaths[v]);
@@ -502,8 +415,8 @@ HRESULT Extract(
           Int64 newPackSize = (Int64)totalPackSize + correctionSize;
           if (newPackSize < 0)
             newPackSize = 0;
-          totalPackSize = (UInt64)newPackSize;
-          RINOK(faeCallback->SetTotal(totalPackSize))
+          totalPackSize = newPackSize;
+          RINOK(extractCallback->SetTotal(totalPackSize));
         }
       }
     }
@@ -511,29 +424,24 @@ HRESULT Extract(
     /*
     // Now openCallback and extractCallback use same object. So we don't need to send password.
 
-    #ifndef Z7_NO_CRYPTO
+    #ifndef _NO_CRYPTO
     bool passwordIsDefined;
     UString password;
-    RINOK(openCallback->Open_GetPasswordIfAny(passwordIsDefined, password))
+    RINOK(openCallback->Open_GetPasswordIfAny(passwordIsDefined, password));
     if (passwordIsDefined)
     {
-      RINOK(extractCallback->SetPassword(password))
+      RINOK(extractCallback->SetPassword(password));
     }
     #endif
     */
 
     CArc &arc = arcLink.Arcs.Back();
-    arc.MTime.Def = !options.StdInMode
-        #ifdef _WIN32
-        && !fi.IsDevice
-        #endif
-        ;
-    if (arc.MTime.Def)
-      arc.MTime.Set_From_FiTime(fi.MTime);
+    arc.MTimeDefined = (!options.StdInMode && !fi.IsDevice);
+    arc.MTime = fi.MTime;
 
     UInt64 packProcessed;
-    const bool calcCrc =
-        #ifndef Z7_SFX
+    bool calcCrc =
+        #ifndef _SFX
           (hash != NULL);
         #else
           false;
@@ -546,8 +454,7 @@ HRESULT Extract(
         wildcardCensor,
         options,
         calcCrc,
-        extractCallback, faeCallback, ecs,
-        errorMessage, packProcessed))
+        extractCallback, ecs, errorMessage, packProcessed));
 
     if (!options.StdInMode)
       packProcessed = fi.Size + arcLink.VolumesSize;
@@ -560,8 +467,8 @@ HRESULT Extract(
 
   if (multi || thereAreNotOpenArcs)
   {
-    RINOK(faeCallback->SetTotal(totalPackSize))
-    RINOK(faeCallback->SetCompleted(&totalPackProcessed))
+    RINOK(extractCallback->SetTotal(totalPackSize));
+    RINOK(extractCallback->SetCompleted(&totalPackProcessed));
   }
 
   st.NumFolders = ecs->NumFolders;

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/Extract.h

@@ -1,7 +1,7 @@
 // Extract.h
 
-#ifndef ZIP7_INC_EXTRACT_H
-#define ZIP7_INC_EXTRACT_H
+#ifndef __EXTRACT_H
+#define __EXTRACT_H
 
 #include "../../../Windows/FileFind.h"
 
@@ -17,29 +17,20 @@
 struct CExtractOptionsBase
 {
   CBoolPair ElimDup;
-
-  bool ExcludeDirItems;
-  bool ExcludeFileItems;
-
+  
   bool PathMode_Force;
   bool OverwriteMode_Force;
   NExtract::NPathMode::EEnum PathMode;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
-  NExtract::NZoneIdMode::EEnum ZoneMode;
-
-  CExtractNtOptions NtOptions;
   
   FString OutputDir;
-  UString HashDir;
+  CExtractNtOptions NtOptions;
 
   CExtractOptionsBase():
-      ExcludeDirItems(false),
-      ExcludeFileItems(false),
       PathMode_Force(false),
       OverwriteMode_Force(false),
       PathMode(NExtract::NPathMode::kFullPaths),
-      OverwriteMode(NExtract::NOverwriteMode::kAsk),
-      ZoneMode(NExtract::NZoneIdMode::kNone)
+      OverwriteMode(NExtract::NOverwriteMode::kAsk)
       {}
 };
 
@@ -53,21 +44,19 @@ struct CExtractOptions: public CExtractOptionsBase
   // bool ShowDialog;
   // bool PasswordEnabled;
   // UString Password;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   CObjectVector<CProperty> Properties;
   #endif
 
-  /*
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   CCodecs *Codecs;
   #endif
-  */
 
   CExtractOptions():
+      TestMode(false),
       StdInMode(false),
       StdOutMode(false),
-      YesToAll(false),
-      TestMode(false)
+      YesToAll(false)
       {}
 };
 
@@ -88,7 +77,6 @@ struct CDecompressStat
 };
 
 HRESULT Extract(
-    // DECL_EXTERNAL_CODECS_LOC_VARS
     CCodecs *codecs,
     const CObjectVector<COpenType> &types,
     const CIntVector &excludedFormats,
@@ -97,8 +85,7 @@ HRESULT Extract(
     const CExtractOptions &options,
     IOpenCallbackUI *openCallback,
     IExtractCallbackUI *extractCallback,
-    IFolderArchiveExtractCallback *faeCallback,
-    #ifndef Z7_SFX
+    #ifndef _SFX
     IHashCalc *hash,
     #endif
     UString &errorMessage,

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/ExtractMode.h

@@ -1,7 +1,7 @@
 // ExtractMode.h
 
-#ifndef ZIP7_INC_EXTRACT_MODE_H
-#define ZIP7_INC_EXTRACT_MODE_H
+#ifndef __EXTRACT_MODE_H
+#define __EXTRACT_MODE_H
 
 namespace NExtract {
   
@@ -29,16 +29,6 @@ namespace NOverwriteMode
   };
 }
 
-namespace NZoneIdMode
-{
-  enum EEnum
-  {
-    kNone,
-    kAll,
-    kOffice
-  };
-}
-
 }
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp

@@ -8,8 +8,6 @@
 
 #include "ExtractingFilePath.h"
 
-extern
-bool g_PathTrailReplaceMode;
 bool g_PathTrailReplaceMode =
     #ifdef _WIN32
       true
@@ -19,7 +17,6 @@ bool g_PathTrailReplaceMode =
     ;
 
 
-#ifdef _WIN32
 static void ReplaceIncorrectChars(UString &s)
 {
   {
@@ -34,19 +31,7 @@ static void ReplaceIncorrectChars(UString &s)
           ||
           #endif
           c == WCHAR_PATH_SEPARATOR)
-      {
-       #if WCHAR_PATH_SEPARATOR != L'/'
-        // 22.00 : WSL replacement for backslash
-        if (c == WCHAR_PATH_SEPARATOR)
-          c = WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT;
-        else
-       #endif
-          c = '_';
-        s.ReplaceOneCharAtPos(i,
-          c
-          // (wchar_t)(0xf000 + c) // 21.02 debug: WSL encoding for unsupported characters
-          );
-      }
+        s.ReplaceOneCharAtPos(i, '_');
     }
   }
   
@@ -87,7 +72,8 @@ static void ReplaceIncorrectChars(UString &s)
     }
   }
 }
-#endif
+
+#ifdef _WIN32
 
 /* WinXP-64 doesn't support ':', '\\' and '/' symbols in name of alt stream.
    But colon in postfix ":$DATA" is allowed.
@@ -112,8 +98,6 @@ void Correct_AltStream_Name(UString &s)
     s = '_';
 }
 
-#ifdef _WIN32
-
 static const unsigned g_ReservedWithNum_Index = 4;
 
 static const char * const g_ReservedNames[] =
@@ -124,7 +108,7 @@ static const char * const g_ReservedNames[] =
 
 static bool IsSupportedName(const UString &name)
 {
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(g_ReservedNames); i++)
+  for (unsigned i = 0; i < ARRAY_SIZE(g_ReservedNames); i++)
   {
     const char *reservedName = g_ReservedNames[i];
     unsigned len = MyStringLen(reservedName);
@@ -165,7 +149,7 @@ static void Correct_PathPart(UString &s)
   if (s.IsEmpty())
     return;
 
-  if (s[0] == '.' && (s[1] == 0 || (s[1] == '.' && s[2] == 0)))
+  if (s[0] == '.' && (s[1] == 0 || s[1] == '.' && s[2] == 0))
     s.Empty();
   #ifdef _WIN32
   else
@@ -208,7 +192,7 @@ void Correct_FsPath(bool absIsAllowed, bool keepAndReplaceEmptyPrefixes, UString
       if (parts.Size() > 1 && parts[1].IsEmpty())
       {
         i = 2;
-        if (parts.Size() > 2 && parts[2].IsEqualTo("?"))
+        if (parts.Size() > 2 && parts[2] == L"?")
         {
           i = 3;
           if (parts.Size() > 3 && NWindows::NFile::NName::IsDrivePath2(parts[3]))

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h

@@ -1,13 +1,13 @@
 // ExtractingFilePath.h
 
-#ifndef ZIP7_INC_EXTRACTING_FILE_PATH_H
-#define ZIP7_INC_EXTRACTING_FILE_PATH_H
+#ifndef __EXTRACTING_FILE_PATH_H
+#define __EXTRACTING_FILE_PATH_H
 
 #include "../../../Common/MyString.h"
 
-// #ifdef _WIN32
+#ifdef _WIN32
 void Correct_AltStream_Name(UString &s);
-// #endif
+#endif
 
 // replaces unsuported characters, and replaces "." , ".." and "" to "[]"
 UString Get_Correct_FsFile_Name(const UString &name);