4.45 beta

2025-12-07 05:15:01 -06:00 · 2007-04-17 00:00:00 +00:00
parent d9666cf046
commit a145bfc7cf
458 changed files with 13144 additions and 18608 deletions
--- a/CPP/7zip/Bundles/SFXCon/Main.cpp
+++ b/CPP/7zip/Bundles/SFXCon/Main.cpp
@@ -66,7 +66,7 @@ enum EEnum
  kNonRecursed,
 };
 }
-
+/* 
 static const char kRecursedIDChar = 'R';
 static const wchar_t *kRecursedPostCharSet = L"0-";

@@ -83,7 +83,7 @@ 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
-
+*/
 static const CSwitchForm kSwitchForms[kNumSwitches] = 
  {
    { L"?",  NSwitchType::kSimple, false },
@@ -120,12 +120,12 @@ static const NRecursedType::EEnum kCommandRecursedDefault[kNumCommandForms] =
  NRecursedType::kRecursed
 };

-static const bool kTestExtractRecursedDefault = true;
-static const bool kAddRecursedDefault = false;
+// static const bool kTestExtractRecursedDefault = true;
+// static const bool kAddRecursedDefault = false;

 static const int kMaxCmdLineSize = 1000;
 static const wchar_t *kUniversalWildcard = L"*";
-static const int kMinNonSwitchWords = 1;
+// static const int kMinNonSwitchWords = 1;
 static const int kCommandIndex = 0;

 static const char *kHelpString = 
@@ -146,13 +146,13 @@ static const char *kHelpString =
 // exception messages

 static const char *kUserErrorMessage  = "Incorrect command line"; // NExitCode::kUserError
-static const char *kIncorrectListFile = "Incorrect wildcard in listfile";
+// static const char *kIncorrectListFile = "Incorrect wildcard in listfile";
 static const char *kIncorrectWildCardInCommandLine  = "Incorrect wildcard in command line";

 // static const CSysString kFileIsNotArchiveMessageBefore = "File \"";
 // static const CSysString kFileIsNotArchiveMessageAfter = "\" is not archive";

-static const char *kProcessArchiveMessage = " archive: ";
+// static const char *kProcessArchiveMessage = " archive: ";

 static const char *kCantFindSFX = " cannot find sfx";

@@ -353,6 +353,19 @@ int Main2(
    v2.Add(archiveName);
    const NWildcard::CCensorNode &wildcardCensorHead = 
      wildcardCensor.Pairs.Front().Head;
+
+    CCodecs *codecs = new CCodecs;
+    CMyComPtr<
+      #ifdef EXTERNAL_CODECS
+      ICompressCodecsInfo
+      #else
+      IUnknown
+      #endif
+      > compressCodecsInfo = codecs;
+    HRESULT result = codecs->Load();
+    if (result != S_OK)
+      throw CSystemException(result);
+
    if(command.CommandType != NCommandType::kList)
    {
      CExtractCallbackConsole *ecs = new CExtractCallbackConsole;
@@ -379,6 +392,7 @@ int Main2(

      UString errorMessage;
      HRESULT result = DecompressArchives(
+          codecs,
          v1, v2,
          wildcardCensorHead, 
          eo, &openCallback, ecs, errorMessage);
@@ -403,6 +417,7 @@ int Main2(
    else
    {
      HRESULT result = ListArchives(
+          codecs,
          v1, v2,
          wildcardCensorHead, 
          true, false, 
--- a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
+++ b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "COMPRESS_BCJ2" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "COMPRESS_BCJ2" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "_SFX" /D "NO_READ_FROM_CODER" /Yu"StdAfx.h" /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_COPY" /D "COMPRESS_PPMD" /D "_SFX" /D "CRYPTO_7ZAES" /D "CRYPTO_AES" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /W3 /Gm /GX /ZI /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "EXTRACT_ONLY" /D "_SFX" /D "NO_READ_FROM_CODER" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -141,14 +141,6 @@ SOURCE=..\..\Archive\Common\CrossThreadProgress.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\Archive\Common\FilterCoder.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Archive\Common\FilterCoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Archive\Common\ItemNameUtils.cpp
 # End Source File
 # Begin Source File
@@ -265,11 +257,7 @@ SOURCE=..\..\Archive\7z\7zItem.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\Archive\7z\7zMethodID.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Archive\7z\7zMethodID.h
+SOURCE=..\..\Archive\7z\7zRegister.cpp
 # End Source File
 # End Group
 # Begin Group "Compress"
@@ -282,12 +270,24 @@ SOURCE=..\..\Archive\7z\7zMethodID.h

 SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
+# End Source File
 # End Group
 # Begin Group "Branch"

 # PROP Default_Filter ""
 # Begin Source File

+SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\Branch\BCJRegister.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\Branch\BranchCoder.cpp
 # End Source File
 # Begin Source File
@@ -310,6 +310,10 @@ SOURCE=..\..\Compress\Branch\x86_2.cpp

 SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp
+# End Source File
 # End Group
 # Begin Group "LZ"

@@ -334,6 +338,10 @@ SOURCE=..\..\Compress\Copy\CopyCoder.cpp

 SOURCE=..\..\Compress\Copy\CopyCoder.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\Copy\CopyRegister.cpp
+# End Source File
 # End Group
 # End Group
 # Begin Group "Crypto"
@@ -350,6 +358,10 @@ SOURCE=..\..\Crypto\7zAES\7zAES.cpp

 SOURCE=..\..\Crypto\7zAES\7zAES.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp
+# End Source File
 # End Group
 # Begin Group "AES"

@@ -411,10 +423,6 @@ SOURCE=..\..\Crypto\Hash\Sha256.h
 # End Source File
 # End Group
 # End Group
-# Begin Group "SDK"
-
-# PROP Default_Filter ""
-# End Group
 # Begin Group "Windows"

 # PROP Default_Filter ""
@@ -488,14 +496,6 @@ SOURCE=..\..\..\Windows\Synchronization.h
 # PROP Default_Filter ""
 # Begin Source File

-SOURCE=..\..\..\Common\Alloc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Alloc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\CommandLineParser.cpp
 # End Source File
 # Begin Source File
@@ -580,6 +580,14 @@ SOURCE=..\..\..\Common\Wildcard.h
 # PROP Default_Filter ""
 # Begin Source File

+SOURCE=..\..\Common\CreateCoder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\CreateCoder.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\FilePathAutoRename.cpp
 # End Source File
 # Begin Source File
@@ -596,6 +604,14 @@ SOURCE=..\..\Common\FileStreams.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\Common\FilterCoder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\FilterCoder.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\InBuffer.cpp
 # End Source File
 # Begin Source File
@@ -691,14 +707,6 @@ SOURCE=..\..\UI\Common\ArchiveOpenCallback.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\UI\Common\ArchiverInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\UI\Common\ArchiverInfo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\UI\Common\DefaultName.cpp
 # End Source File
 # Begin Source File
@@ -731,6 +739,14 @@ SOURCE=..\..\UI\Common\ExtractMode.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\UI\Common\LoadCodecs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\UI\Common\LoadCodecs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\UI\Common\OpenArchive.cpp
 # End Source File
 # Begin Source File
@@ -747,6 +763,45 @@ SOURCE=..\..\UI\Common\PropIDUtils.h
 # End Source File
 # End Group
 # End Group
+# Begin Group "C"
+
+# PROP Default_Filter ""
+# Begin Group "C Branch"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\C\7zCrc.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\7zCrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Alloc.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Alloc.h
+# End Source File
+# End Group
 # Begin Source File

 SOURCE=.\7z.ico
--- a/CPP/7zip/Bundles/SFXCon/makefile
+++ b/CPP/7zip/Bundles/SFXCon/makefile
@@ -1,18 +1,9 @@
 PROG = 7zCon.sfx
 LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
-  -DEXCLUDE_COM \
-  -DNO_REGISTRY \
  -DEXTRACT_ONLY \
+  -DNO_READ_FROM_CODER \
  -D_SFX \
-  -DFORMAT_7Z \
-  -DCOMPRESS_BCJ_X86 \
-  -DCOMPRESS_BCJ2 \
-  -DCOMPRESS_COPY \
-  -DCOMPRESS_LZMA \
-  -DCOMPRESS_PPMD \
-  -DCRYPTO_7ZAES \
-  -DCRYPTO_AES \

 SFX_CONSOLE_OBJS = \
  $O\Main.obj \
@@ -26,7 +17,6 @@ CONSOLE_OBJS = \
  $O\UserInputUtils.obj \

 COMMON_OBJS = \
-  $O\Alloc.obj \
  $O\CommandLineParser.obj \
  $O\CRC.obj \
  $O\IntToString.obj \
@@ -49,9 +39,11 @@ WIN_OBJS = \
  $O\Synchronization.obj

 7ZIP_COMMON_OBJS = \
+  $O\CreateCoder.obj \
  $O\FilePathAutoRename.obj \
  $O\FileStreams.obj \
  $O\InBuffer.obj \
+  $O\FilterCoder.obj \
  $O\LimitedStreams.obj \
  $O\LockedStream.obj \
  $O\OutBuffer.obj \
@@ -63,8 +55,8 @@ WIN_OBJS = \
 UI_COMMON_OBJS = \
  $O\ArchiveExtractCallback.obj \
  $O\ArchiveOpenCallback.obj \
-  $O\ArchiverInfo.obj \
  $O\DefaultName.obj \
+  $O\LoadCodecs.obj \
  $O\Extract.obj \
  $O\ExtractingFilePath.obj \
  $O\OpenArchive.obj \
@@ -74,7 +66,6 @@ AR_COMMON_OBJS = \
  $O\CoderMixer2.obj \
  $O\CoderMixer2MT.obj \
  $O\CrossThreadProgress.obj \
-  $O\FilterCoder.obj \
  $O\ItemNameUtils.obj \
  $O\OutStreamWithCRC.obj \

@@ -86,24 +77,33 @@ AR_COMMON_OBJS = \
  $O\7zHandler.obj \
  $O\7zHeader.obj \
  $O\7zIn.obj \
-  $O\7zMethodID.obj \
+  $O\7zRegister.obj \

 BRANCH_OPT_OBJS = \
  $O\BranchCoder.obj \
  $O\x86.obj \
  $O\x86_2.obj \
+  $O\BCJRegister.obj \
+  $O\BCJ2Register.obj \
+
+COPY_OBJS = \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \

 LZ_OBJS = \
  $O\LZOutWindow.obj \

 LZMA_OPT_OBJS = \
  $O\LZMADecoder.obj \
+  $O\LZMARegister.obj \

 PPMD_OPT_OBJS = \
  $O\PPMDDecoder.obj \
+  $O\PPMDRegister.obj \

 7ZAES_OPT_OBJS = \
  $O\7zAES.obj \
+  $O\7zAESRegister.obj \

 AES_OPT_OBJS = \
  $O\MyAES.obj \
@@ -116,6 +116,14 @@ AES_ORIG_OBJS = \
 CRYPTO_HASH_OBJS = \
  $O\Sha256.obj \

+C_OBJS = \
+  $O\Alloc.obj \
+
+C_BRANCH_OBJS = \
+  $O\BranchX86.obj \
+
+!include "../../Crc2.mak"
+
 OBJS = \
  $O\StdAfx.obj \
  $(SFX_CONSOLE_OBJS) \
@@ -127,14 +135,17 @@ OBJS = \
  $(AR_COMMON_OBJS) \
  $(7Z_OBJS) \
  $(BRANCH_OPT_OBJS) \
+  $(COPY_OBJS) \
  $(LZ_OBJS) \
  $(LZMA_OPT_OBJS) \
  $(PPMD_OPT_OBJS) \
-  $O\CopyCoder.obj \
  $(7ZAES_OPT_OBJS) \
  $(AES_OPT_OBJS) \
  $(AES_ORIG_OBJS) \
  $(CRYPTO_HASH_OBJS) \
+  $(C_OBJS) \
+  $(C_BRANCH_OBJS) \
+  $(CRC_OBJS) \
  $O\resource.res


@@ -160,6 +171,8 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
 	$(COMPL)
 $(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
 	$(COMPL)
+$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
+	$(COMPL)
 $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
 	$(COMPL)
 $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
@@ -167,9 +180,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
 $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 	$(COMPL)

-$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
-	$(COMPL)
-
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL)
 $(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
@@ -178,3 +188,9 @@ $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
 	$(COMPL)
+$(C_OBJS): ../../../../C/$(*B).c
+	$(COMPL_O2)
+$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
+	$(COMPL_O2)
+
+!include "../../Crc.mak"