react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXCon/SfxCon.cpp

@@ -3,9 +3,9 @@
 #include "StdAfx.h"
 
 #include "../../../../C/CpuArch.h"
-#include "../../../../C/DllSecur.h"
 
 #include "../../../Common/MyWindows.h"
+
 #include "../../../Common/MyInitGuid.h"
 
 #include "../../../Common/CommandLineParser.h"
@@ -13,10 +13,8 @@
 
 #ifdef _WIN32
 #include "../../../Windows/DLL.h"
-#else
-#include "../../../Common/StringConvert.h"
-#endif
 #include "../../../Windows/FileDir.h"
+#endif
 #include "../../../Windows/FileName.h"
 
 #include "../../UI/Common/ExitCode.h"
@@ -28,6 +26,7 @@
 
 #include "../../MyVersion.h"
 
+#include "../../../../C/DllSecur.h"
 
 using namespace NWindows;
 using namespace NFile;
@@ -35,12 +34,8 @@ using namespace NDir;
 using namespace NCommandLineParser;
 
 #ifdef _WIN32
-extern
-HINSTANCE g_hInstance;
-HINSTANCE g_hInstance = NULL;
+HINSTANCE g_hInstance = 0;
 #endif
-extern
-int g_CodePage;
 int g_CodePage = -1;
 extern CStdOutStream *g_StdStream;
 
@@ -87,20 +82,14 @@ static const char kImmediateNameID = '!';
 static const char kSomeCludePostStringMinSize = 2; // at least <@|!><N>ame must be
 static const char kSomeCludeAfterRecursedPostStringMinSize = 2; // at least <@|!><N>ame must be
 */
-
-#define SWFRM_3(t, mu, mi) t, mu, mi, NULL
-#define SWFRM_1(t)     SWFRM_3(t, false, 0)
-#define SWFRM_SIMPLE   SWFRM_1(NSwitchType::kSimple)
-#define SWFRM_STRING_SINGL(mi) SWFRM_3(NSwitchType::kString, false, mi)
-
 static const CSwitchForm kSwitchForms[kNumSwitches] =
 {
-  { "?",  SWFRM_SIMPLE },
-  { "H",  SWFRM_SIMPLE },
-  { "BD", SWFRM_SIMPLE },
-  { "Y",  SWFRM_SIMPLE },
-  { "P",  SWFRM_STRING_SINGL(1) },
-  { "O",  SWFRM_STRING_SINGL(1) },
+  { "?",  NSwitchType::kSimple },
+  { "H",  NSwitchType::kSimple },
+  { "BD", NSwitchType::kSimple },
+  { "Y",  NSwitchType::kSimple },
+  { "P",  NSwitchType::kString, false, 1 },
+  { "O",  NSwitchType::kString, false, 1 },
 };
 
 static const int kNumCommandForms = 3;
@@ -114,6 +103,7 @@ static const NRecursedType::EEnum kCommandRecursedDefault[kNumCommandForms] =
 // static const bool kAddRecursedDefault = false;
 
 static const char * const kUniversalWildcard = "*";
+static const int kCommandIndex = 0;
 
 static const char * const kHelpString =
     "\nUsage: 7zSFX [<command>] [<switches>...] [<file_name>...]\n"
@@ -162,7 +152,7 @@ struct CArchiveCommand
   NRecursedType::EEnum DefaultRecursedType() const;
 };
 
-static bool ParseArchiveCommand(const UString &commandString, CArchiveCommand &command)
+bool ParseArchiveCommand(const UString &commandString, CArchiveCommand &command)
 {
   UString s = commandString;
   s.MakeLower_Ascii();
@@ -182,19 +172,17 @@ NRecursedType::EEnum CArchiveCommand::DefaultRecursedType() const
   return kCommandRecursedDefault[CommandType];
 }
 
-static void PrintHelp(void)
+void PrintHelp(void)
 {
   g_StdOut << kHelpString;
 }
 
-Z7_ATTR_NORETURN
 static void ShowMessageAndThrowException(const char *message, NExitCode::EEnum code)
 {
   g_StdOut << message << endl;
   throw code;
 }
 
-Z7_ATTR_NORETURN
 static void PrintHelpAndExit() // yyy
 {
   PrintHelp();
@@ -211,7 +199,7 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
   if (!IsWildcardFilePathLegal(name))
     return false;
   */
-  const bool isWildcard = DoesNameContainWildcard(name);
+  bool isWildcard = DoesNameContainWildcard(name);
   bool recursed = false;
 
   switch (type)
@@ -226,14 +214,11 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
       recursed = false;
       break;
   }
-
-  NWildcard::CCensorPathProps props;
-  props.Recursive = recursed;
-  wildcardCensor.AddPreItem(include, name, props);
+  wildcardCensor.AddPreItem(include, name, recursed, true);
   return true;
 }
 
-static void AddCommandLineWildcardToCensor(NWildcard::CCensor &wildcardCensor,
+void AddCommandLineWildcardToCensor(NWildcard::CCensor &wildcardCensor,
     const UString &name, bool include, NRecursedType::EEnum type)
 {
   if (!AddNameToCensor(wildcardCensor, name, include, type))
@@ -242,7 +227,7 @@ static void AddCommandLineWildcardToCensor(NWildcard::CCensor &wildcardCensor,
 
 
 #ifndef _WIN32
-static void GetArguments(int numArgs, char *args[], UStringVector &parts)
+static void GetArguments(int numArgs, const char *args[], UStringVector &parts)
 {
   parts.Clear();
   for (int i = 0; i < numArgs; i++)
@@ -253,15 +238,9 @@ static void GetArguments(int numArgs, char *args[], UStringVector &parts)
 }
 #endif
 
-
 int Main2(
   #ifndef _WIN32
-  int numArgs, char *args[]
-  #endif
-);
-int Main2(
-  #ifndef _WIN32
-  int numArgs, char *args[]
+  int numArgs, const char *args[]
   #endif
 )
 {
@@ -274,10 +253,6 @@ int Main2(
   SetFileApisToOEM();
   #endif
   
-  #ifdef ENV_HAVE_LOCALE
-  MY_SetLocale();
-  #endif
-
   g_StdOut << kCopyrightString;
 
   UStringVector commandStrings;
@@ -302,10 +277,7 @@ int Main2(
 
   #else
 
-  if (commandStrings.IsEmpty())
-    return NExitCode::kFatalError;
-
-  const FString arcPath = us2fs(commandStrings.Front());
+  UString arcPath = commandStrings.Front();
 
   #endif
 
@@ -373,18 +345,18 @@ int Main2(
     }
   }
 
-  const bool yesToAll = parser[NKey::kYes].ThereIs;
+  bool yesToAll = parser[NKey::kYes].ThereIs;
 
   // NExtractMode::EEnum extractMode;
   // bool isExtractGroupCommand = command.IsFromExtractGroup(extractMode);
 
-  const bool passwordEnabled = parser[NKey::kPassword].ThereIs;
+  bool passwordEnabled = parser[NKey::kPassword].ThereIs;
 
   UString password;
   if (passwordEnabled)
     password = parser[NKey::kPassword].PostStrings[0];
 
-  if (!NFind::DoesFileExist_FollowLink(arcPath))
+  if (!NFind::DoesFileExist(arcPath))
     throw kCantFindSFX;
   
   FString outputDir;
@@ -406,7 +378,7 @@ int Main2(
 
     CCodecs *codecs = new CCodecs;
     CMyComPtr<
-      #ifdef Z7_EXTERNAL_CODECS
+      #ifdef EXTERNAL_CODECS
       ICompressCodecsInfo
       #else
       IUnknown
@@ -422,9 +394,9 @@ int Main2(
     {
       CExtractCallbackConsole *ecs = new CExtractCallbackConsole;
       CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs;
-      ecs->Init(g_StdStream, &g_StdErr, g_StdStream, false);
+      ecs->Init(g_StdStream, &g_StdErr, g_StdStream);
 
-      #ifndef Z7_NO_CRYPTO
+      #ifndef _NO_CRYPTO
       ecs->PasswordIsDefined = passwordEnabled;
       ecs->Password = password;
       #endif
@@ -433,7 +405,7 @@ int Main2(
       COpenCallbackConsole openCallback;
       openCallback.Init(g_StdStream, g_StdStream);
 
-      #ifndef Z7_NO_CRYPTO
+      #ifndef _NO_CRYPTO
       openCallback.PasswordIsDefined = passwordEnabled;
       openCallback.Password = password;
       #endif
@@ -455,33 +427,22 @@ int Main2(
           codecs, CObjectVector<COpenType>(), CIntVector(),
           v1, v2,
           wildcardCensorHead,
-          eo,
-          ecs, ecs, ecs,
+          eo, ecs, ecs,
           // NULL, // hash
           errorMessage, stat);
-
-      ecs->ClosePercents();
-
       if (!errorMessage.IsEmpty())
       {
-        (*g_StdStream) << endl << "Error: " << errorMessage;
+        (*g_StdStream) << endl << "Error: " << errorMessage;;
         if (result == S_OK)
           result = E_FAIL;
       }
 
-      if (   0 != ecs->NumCantOpenArcs
-          || 0 != ecs->NumArcsWithError
-          || 0 != ecs->NumFileErrors
-          || 0 != ecs->NumOpenArcErrors)
+      if (ecs->NumArcsWithError != 0 || ecs->NumFileErrors != 0)
       {
-        if (ecs->NumCantOpenArcs != 0)
-          (*g_StdStream) << endl << "Can't open as archive" << endl;
         if (ecs->NumArcsWithError != 0)
           (*g_StdStream) << endl << "Archive Errors" << endl;
         if (ecs->NumFileErrors != 0)
           (*g_StdStream) << endl << "Sub items Errors: " << ecs->NumFileErrors << endl;
-        if (ecs->NumOpenArcErrors != 0)
-          (*g_StdStream) << endl << "Open Errors: " << ecs->NumOpenArcErrors << endl;
         return NExitCode::kFatalError;
       }
       if (result != S_OK)
@@ -503,7 +464,7 @@ int Main2(
           wildcardCensorHead,
           true, // enableHeaders
           false, // techMode
-          #ifndef Z7_NO_CRYPTO
+          #ifndef _NO_CRYPTO
           passwordEnabled, password,
           #endif
           numErrors, numWarnings);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXCon/StdAfx.h

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXCon/makefile

@@ -3,11 +3,9 @@ MY_CONSOLE = 1
 MY_FIXED = 1
 
 CFLAGS = $(CFLAGS) \
-  -DZ7_EXTRACT_ONLY \
-  -DZ7_NO_READ_FROM_CODER \
-  -DZ7_SFX \
-  -DZ7_NO_LONG_PATH \
-  -DZ7_NO_LARGE_PAGES \
+  -DEXTRACT_ONLY \
+  -DNO_READ_FROM_CODER \
+  -D_SFX \
 
 CURRENT_OBJS = \
   $O\SfxCon.obj \
@@ -31,8 +29,8 @@ COMMON_OBJS = \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
   $O\StringConvert.obj \
-  $O\UTFConvert.obj \
   $O\Wildcard.obj \
+  $O\UTFConvert.obj \
 
 WIN_OBJS = \
   $O\DLL.obj \
@@ -45,7 +43,6 @@ WIN_OBJS = \
   $O\PropVariantConv.obj \
   $O\Synchronization.obj \
   $O\System.obj \
-  $O\TimeUtils.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -67,9 +64,9 @@ UI_COMMON_OBJS = \
   $O\ArchiveExtractCallback.obj \
   $O\ArchiveOpenCallback.obj \
   $O\DefaultName.obj \
+  $O\LoadCodecs.obj \
   $O\Extract.obj \
   $O\ExtractingFilePath.obj \
-  $O\LoadCodecs.obj \
   $O\OpenArchive.obj \
   $O\PropIDUtils.obj \
 
@@ -82,6 +79,7 @@ AR_COMMON_OBJS = \
   $O\MultiStream.obj \
   $O\OutStreamWithCRC.obj \
 
+
 7Z_OBJS = \
   $O\7zDecode.obj \
   $O\7zExtract.obj \
@@ -112,7 +110,6 @@ CRYPTO_OBJS = \
   $O\MyAes.obj \
 
 C_OBJS = \
-  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bra.obj \
@@ -127,11 +124,11 @@ C_OBJS = \
   $O\MtDec.obj \
   $O\Ppmd7.obj \
   $O\Ppmd7Dec.obj \
+  $O\Sha256.obj \
   $O\Threads.obj \
 
 !include "../../Aes.mak"
 !include "../../Crc.mak"
 !include "../../LzmaDec.mak"
-!include "../../Sha256.mak"
 
 !include "../../7zip.mak"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXCon/resource.rc

@@ -2,8 +2,4 @@
 
 MY_VERSION_INFO_APP("7z Console SFX", "7z.sfx")
 
-101 ICON "7z.ico"
-
-#ifndef UNDER_CE
-1  24  MOVEABLE PURE   "../../UI/Console/Console.manifest"
-#endif
+101 ICON "7z.ico"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp

@@ -15,8 +15,8 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
 
-static LPCSTR const kCantDeleteFile = "Cannot delete output file";
-static LPCSTR const kCantOpenFile = "Cannot open output file";
+static LPCSTR const kCantDeleteFile = "Can not delete output file";
+static LPCSTR const kCantOpenFile = "Can not open output file";
 static LPCSTR const kUnsupportedMethod = "Unsupported Method";
 
 void CExtractCallbackImp::Init(IInArchive *archiveHandler,
@@ -63,7 +63,7 @@ HRESULT CExtractCallbackImp::Open_Finished()
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetTotal(UInt64 size))
+STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 size)
 {
   #ifndef _NO_PROGRESS
   ProgressDialog.Sync.SetProgress(size, 0);
@@ -71,10 +71,10 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetTotal(UInt64 size))
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetCompleted(const UInt64 *completeValue))
+STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *completeValue)
 {
   #ifndef _NO_PROGRESS
-  RINOK(ProgressDialog.Sync.ProcessStopAndPause())
+  RINOK(ProgressDialog.Sync.ProcessStopAndPause());
   if (completeValue != NULL)
     ProgressDialog.Sync.SetPos(*completeValue);
   #endif
@@ -92,8 +92,8 @@ void CExtractCallbackImp::CreateComplexDirectory(const UStringVector &dirPathPar
   }
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
-    ISequentialOutStream **outStream, Int32 askExtractMode))
+STDMETHODIMP CExtractCallbackImp::GetStream(UInt32 index,
+    ISequentialOutStream **outStream, Int32 askExtractMode)
 {
   #ifndef _NO_PROGRESS
   if (ProgressDialog.Sync.GetStopped())
@@ -104,7 +104,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
   UString fullPath;
   {
     NCOM::CPropVariant prop;
-    RINOK(_archiveHandler->GetProperty(index, kpidPath, &prop))
+    RINOK(_archiveHandler->GetProperty(index, kpidPath, &prop));
     if (prop.vt == VT_EMPTY)
       fullPath = _itemDefaultName;
     else
@@ -119,7 +119,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
   if (askExtractMode == NArchive::NExtract::NAskMode::kExtract)
   {
     NCOM::CPropVariant prop;
-    RINOK(_archiveHandler->GetProperty(index, kpidAttrib, &prop))
+    RINOK(_archiveHandler->GetProperty(index, kpidAttrib, &prop));
     if (prop.vt == VT_EMPTY)
       _processedFileInfo.Attributes = _defaultAttributes;
     else
@@ -129,18 +129,18 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
       _processedFileInfo.Attributes = prop.ulVal;
     }
 
-    RINOK(_archiveHandler->GetProperty(index, kpidIsDir, &prop))
+    RINOK(_archiveHandler->GetProperty(index, kpidIsDir, &prop));
     _processedFileInfo.IsDir = VARIANT_BOOLToBool(prop.boolVal);
 
     bool isAnti = false;
     {
       NCOM::CPropVariant propTemp;
-      RINOK(_archiveHandler->GetProperty(index, kpidIsAnti, &propTemp))
+      RINOK(_archiveHandler->GetProperty(index, kpidIsAnti, &propTemp));
       if (propTemp.vt == VT_BOOL)
         isAnti = VARIANT_BOOLToBool(propTemp.boolVal);
     }
 
-    RINOK(_archiveHandler->GetProperty(index, kpidMTime, &prop))
+    RINOK(_archiveHandler->GetProperty(index, kpidMTime, &prop));
     switch (prop.vt)
     {
       case VT_EMPTY: _processedFileInfo.MTime = _defaultMTime; break;
@@ -190,7 +190,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
     {
       _outFileStreamSpec = new COutFileStream;
       CMyComPtr<ISequentialOutStream> outStreamLoc(_outFileStreamSpec);
-      if (!_outFileStreamSpec->Create_ALWAYS(fullProcessedPath))
+      if (!_outFileStreamSpec->Create(fullProcessedPath, true))
       {
         _message = kCantOpenFile;
         return E_FAIL;
@@ -207,13 +207,13 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream(UInt32 index,
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation(Int32 askExtractMode))
+STDMETHODIMP CExtractCallbackImp::PrepareOperation(Int32 askExtractMode)
 {
   _extractMode = (askExtractMode == NArchive::NExtract::NAskMode::kExtract);
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResult))
+STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResult)
 {
   switch (resultEOperationResult)
   {
@@ -237,7 +237,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResul
   if (_outFileStream != NULL)
   {
     _outFileStreamSpec->SetMTime(&_processedFileInfo.MTime);
-    RINOK(_outFileStreamSpec->Close())
+    RINOK(_outFileStreamSpec->Close());
   }
   _outFileStream.Release();
   if (_extractMode)

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.h

@@ -1,7 +1,7 @@
 // ExtractCallbackSfx.h
 
-#ifndef ZIP7_INC_EXTRACT_CALLBACK_SFX_H
-#define ZIP7_INC_EXTRACT_CALLBACK_SFX_H
+#ifndef __EXTRACT_CALLBACK_SFX_H
+#define __EXTRACT_CALLBACK_SFX_H
 
 #include "resource.h"
 
@@ -19,16 +19,19 @@
 #endif
 #include "../../UI/Common/ArchiveOpenCallback.h"
 
-class CExtractCallbackImp Z7_final:
+class CExtractCallbackImp:
   public IArchiveExtractCallback,
   public IOpenCallbackUI,
   public CMyUnknownImp
 {
-  Z7_COM_UNKNOWN_IMP_0
-  Z7_IFACE_COM7_IMP(IProgress)
-  Z7_IFACE_COM7_IMP(IArchiveExtractCallback)
-  Z7_IFACE_IMP(IOpenCallbackUI)
+public:
+  
+  MY_UNKNOWN_IMP
+
+  INTERFACE_IArchiveExtractCallback(;)
+  INTERFACE_IOpenCallbackUI(;)
 
+private:
   CMyComPtr<IInArchive> _archiveHandler;
   FString _directoryPath;
   UString _filePath;
@@ -67,7 +70,7 @@ public:
   #ifndef _NO_PROGRESS
   HRESULT StartProgressDialog(const UString &title, NWindows::CThread &thread)
   {
-    ProgressDialog.Create(title, thread, NULL);
+    ProgressDialog.Create(title, thread, 0);
     {
       ProgressDialog.SetText(LangString(IDS_PROGRESS_EXTRACTING));
     }
@@ -75,7 +78,7 @@ public:
     ProgressDialog.Show(SW_SHOWNORMAL);
     return S_OK;
   }
-  ~CExtractCallbackImp() { ProgressDialog.Destroy(); }
+  virtual ~CExtractCallbackImp() { ProgressDialog.Destroy(); }
   #endif
 
 };

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp

@@ -18,8 +18,8 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
 
-static LPCSTR const kCantFindArchive = "Cannot find archive file";
-static LPCSTR const kCantOpenArchive = "Cannot open the file as archive";
+static LPCSTR const kCantFindArchive = "Can not find archive file";
+static LPCSTR const kCantOpenArchive = "Can not open the file as archive";
 
 struct CThreadExtracting
 {
@@ -64,14 +64,18 @@ struct CThreadExtracting
     
     if (!CreateComplexDir(dirPath))
     {
-      ErrorMessage = MyFormatNew(IDS_CANNOT_CREATE_FOLDER, fs2us(dirPath));
+      ErrorMessage = MyFormatNew(IDS_CANNOT_CREATE_FOLDER,
+        #ifdef LANG
+        0x02000603,
+        #endif
+        fs2us(dirPath));
       Result = E_FAIL;
       return;
     }
 
     ExtractCallbackSpec->Init(ArchiveLink.GetArchive(), dirPath, (UString)"Default", fi.MTime, 0);
 
-    Result = ArchiveLink.GetArchive()->Extract(NULL, (UInt32)(Int32)-1 , BoolToInt(false), ExtractCallback);
+    Result = ArchiveLink.GetArchive()->Extract(0, (UInt32)(Int32)-1 , BoolToInt(false), ExtractCallback);
   }
 
   void Process()
@@ -112,9 +116,7 @@ HRESULT ExtractArchive(CCodecs *codecs, const FString &fileName, const FString &
   {
     t.ExtractCallbackSpec->ProgressDialog.IconID = IDI_ICON;
     NWindows::CThread thread;
-    const WRes wres = thread.Create(CThreadExtracting::MyThreadFunction, &t);
-    if (wres != 0)
-      return HRESULT_FROM_WIN32(wres);
+    RINOK(thread.Create(CThreadExtracting::MyThreadFunction, &t));
     
     UString title;
     LangString(IDS_PROGRESS_EXTRACTING, title);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/ExtractEngine.h

@@ -1,7 +1,7 @@
 // ExtractEngine.h
 
-#ifndef ZIP7_INC_EXTRACT_ENGINE_H
-#define ZIP7_INC_EXTRACT_ENGINE_H
+#ifndef __EXTRACT_ENGINE_H
+#define __EXTRACT_ENGINE_H
 
 #include "../../UI/Common/LoadCodecs.h"