9.04 beta

CPP/7zip/Bundles/SFXCon/Main.cpp

@@ -5,26 +5,15 @@
 #include "Common/MyInitGuid.h"
 
 #include "Common/CommandLineParser.h"
-#include "Common/MyCom.h"
 #include "Common/MyException.h"
-#include "Common/StdOutStream.h"
-#include "Common/StringConvert.h"
-#include "Common/Wildcard.h"
 
-#include "Windows/Defs.h"
-#include "Windows/FileName.h"
 #ifdef _WIN32
 #include "Windows/DLL.h"
 #include "Windows/FileDir.h"
 #endif
 
-#include "../../IPassword.h"
-#include "../../ICoder.h"
-
-#include "../../UI/Common/DefaultName.h"
 #include "../../UI/Common/ExitCode.h"
 #include "../../UI/Common/Extract.h"
-#include "../../UI/Common/OpenArchive.h"
 
 #include "../../UI/Console/ExtractCallbackConsole.h"
 #include "../../UI/Console/List.h"
@@ -36,6 +25,7 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NCommandLineParser;
 
+int g_CodePage = -1;
 extern CStdOutStream *g_StdStream;
 
 static const char *kCopyrightString =
@@ -343,10 +333,7 @@ int Main2(
   if(passwordEnabled)
     password = parser[NKey::kPassword].PostStrings[0];
 
-  NFind::CFileInfoW archiveFileInfo;
-  if (!NFind::FindFile(arcPath, archiveFileInfo))
-    throw kCantFindSFX;
-  if (archiveFileInfo.IsDir())
+  if (!NFind::DoesFileExist(arcPath))
     throw kCantFindSFX;
   
   UString outputDir;
@@ -380,14 +367,21 @@ int Main2(
       CExtractCallbackConsole *ecs = new CExtractCallbackConsole;
       CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs;
       ecs->OutStream = g_StdStream;
+
+      #ifndef _NO_CRYPTO
       ecs->PasswordIsDefined = passwordEnabled;
       ecs->Password = password;
+      #endif
+
       ecs->Init();
 
       COpenCallbackConsole openCallback;
       openCallback.OutStream = g_StdStream;
+
+      #ifndef _NO_CRYPTO
       openCallback.PasswordIsDefined = passwordEnabled;
       openCallback.Password = password;
+      #endif
 
       CExtractOptions eo;
       eo.StdOutMode = false;
@@ -429,11 +423,14 @@ int Main2(
       UInt64 numErrors = 0;
       HRESULT result = ListArchives(
           codecs, CIntVector(),
+          false,
           v1, v2,
           wildcardCensorHead,
           true, false,
-          passwordEnabled,
-          password, numErrors);
+          #ifndef _NO_CRYPTO
+          passwordEnabled, password,
+          #endif
+          numErrors);
       if (numErrors > 0)
       {
         g_StdOut << endl << "Errors: " << numErrors;

CPP/7zip/Bundles/SFXCon/SFXCon.dsp

@@ -285,6 +285,14 @@ SOURCE=..\..\Compress\CopyRegister.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compress\Lzma2Decoder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\Lzma2Register.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\LzmaDecoder.cpp
 # End Source File
 # Begin Source File
@@ -477,6 +485,14 @@ SOURCE=..\..\..\Common\StringConvert.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\UTFConvert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\UTFConvert.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
@@ -721,6 +737,15 @@ SOURCE=..\..\..\..\C\Bra86.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\Lzma2Dec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Lzma2Dec.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\LzmaDec.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File

CPP/7zip/Bundles/SFXCon/makefile

@@ -27,6 +27,7 @@ COMMON_OBJS = \
   $O\StringConvert.obj \
   $O\MyVector.obj \
   $O\Wildcard.obj \
+  $O\UTFConvert.obj \
 
 WIN_OBJS = \
   $O\DLL.obj \
@@ -89,6 +90,8 @@ COMPRESS_OBJS = \
   $O\BcjRegister.obj \
   $O\CopyCoder.obj \
   $O\CopyRegister.obj \
+  $O\Lzma2Decoder.obj \
+  $O\Lzma2Register.obj \
   $O\LzmaDecoder.obj \
   $O\LzmaRegister.obj \
   $O\PpmdDecoder.obj \
@@ -100,12 +103,13 @@ CRYPTO_OBJS = \
   $O\MyAes.obj \
 
 C_OBJS = \
+  $O\Aes.obj \
   $O\Alloc.obj \
   $O\Bra86.obj \
+  $O\Lzma2Dec.obj \
   $O\LzmaDec.obj \
-  $O\Threads.obj \
-  $O\Aes.obj \
   $O\Sha256.obj \
+  $O\Threads.obj \
 
 !include "../../Crc2.mak"