9.06 beta

2025-12-06 19:14:56 -06:00 · 2009-08-17 00:00:00 +00:00
parent 829409452d
commit c99f3ebdd6
445 changed files with 15246 additions and 8133 deletions
--- a/CPP/7zip/Bundles/Alone/makefile
+++ b/CPP/7zip/Bundles/Alone/makefile
@@ -1,14 +1,15 @@
 PROG = 7za.exe
-LIBS = $(LIBS) user32.lib oleaut32.lib Advapi32.lib
+MY_CONSOLE = 1
 CFLAGS = $(CFLAGS) -I ../../../  \
-  -DWIN_LONG_PATH \
  -DCOMPRESS_MT \
  -DCOMPRESS_BZIP2_MT \
  -DCOMPRESS_MF_MT \
-  -D_7ZIP_LARGE_PAGES \
  -DBREAK_HANDLER \
  -DBENCH_MT \
-  -DSUPPORT_DEVICE_FILE \
+
+!IFNDEF UNDER_CE
+CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -D_7ZIP_LARGE_PAGES -DSUPPORT_DEVICE_FILE
+!ENDIF

 CONSOLE_OBJS = \
  $O\ConsoleClose.obj \
@@ -96,6 +97,7 @@ UI_COMMON_OBJS = \

 AR_OBJS = \
  $O\Bz2Handler.obj \
+  $O\DeflateProps.obj \
  $O\GzHandler.obj \
  $O\LzmaHandler.obj \
  $O\SplitHandler.obj \
--- a/CPP/7zip/Bundles/Alone7z/makefile
+++ b/CPP/7zip/Bundles/Alone7z/makefile
@@ -1,15 +1,15 @@
 PROG = 7zr.exe
-LIBS = $(LIBS) user32.lib oleaut32.lib Advapi32.lib
-
+MY_CONSOLE = 1
 CFLAGS = $(CFLAGS) -I ../../../ \
-  -D_NO_CRYPTO \
-  -DWIN_LONG_PATH \
  -DCOMPRESS_MT \
  -DCOMPRESS_MF_MT \
  -D_NO_CRYPTO \
  -DBREAK_HANDLER \
  -DBENCH_MT \

+!IFNDEF UNDER_CE
+CFLAGS = $(CFLAGS) -DWIN_LONG_PATH
+!ENDIF

 CONSOLE_OBJS = \
  $O\ConsoleClose.obj \
--- a/CPP/7zip/Bundles/Fm/FM.dsp
+++ b/CPP/7zip/Bundles/Fm/FM.dsp
--- a/CPP/7zip/Bundles/Fm/FM.dsw
+++ b/CPP/7zip/Bundles/Fm/FM.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FM"=.\FM.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/CPP/7zip/Bundles/Fm/StdAfx.cpp
+++ b/CPP/7zip/Bundles/Fm/StdAfx.cpp
@@ -0,0 +1,3 @@
+// StdAfx.cpp
+
+#include "StdAfx.h"
--- a/CPP/7zip/Bundles/Fm/StdAfx.h
+++ b/CPP/7zip/Bundles/Fm/StdAfx.h
@@ -0,0 +1,23 @@
+// stdafx.h
+
+#ifndef __STDAFX_H
+#define __STDAFX_H
+
+#define _WIN32_WINNT 0x0400
+
+// it's for Windows NT supporting (MENUITEMINFOW)
+#define WINVER 0x0400
+
+#include <windows.h>
+#include <stdio.h>
+#include <commctrl.h>
+#include <ShlObj.h>
+#include <limits.h>
+#include <tchar.h>
+#include <shlwapi.h>
+
+// #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+
+#include "Common/NewHandler.h"
+
+#endif
--- a/CPP/7zip/Bundles/Fm/makefile
+++ b/CPP/7zip/Bundles/Fm/makefile
@@ -0,0 +1,533 @@
+PROG = 7zFM.exe
+CFLAGS = $(CFLAGS) -I ../../../ \
+  -DLANG \
+  -DNEW_FOLDER_INTERFACE \
+  -DEXTERNAL_CODECS \
+  -DCOMPRESS_MT \
+  -DCOMPRESS_BZIP2_MT \
+  -DCOMPRESS_MF_MT \
+
+!IFDEF UNDER_CE
+LIBS = $(LIBS) ceshell.lib Commctrl.lib
+!ELSE
+LIBS = $(LIBS) comctl32.lib htmlhelp.lib comdlg32.lib Mpr.lib Gdi32.lib
+CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -DSUPPORT_DEVICE_FILE
+!ENDIF
+
+FM_OBJS = \
+  $O\App.obj \
+  $O\BrowseDialog.obj \
+  $O\ClassDefs.obj \
+  $O\EnumFormatEtc.obj \
+  $O\ExtractCallback.obj \
+  $O\FileFolderPluginOpen.obj \
+  $O\FilePlugins.obj \
+  $O\FM.obj \
+  $O\FoldersPage.obj \
+  $O\FormatUtils.obj \
+  $O\FSFolder.obj \
+  $O\FSFolderCopy.obj \
+  $O\HelpUtils.obj \
+  $O\LangUtils.obj \
+  $O\MenuPage.obj \
+  $O\MyLoadMenu.obj \
+  $O\OpenCallback.obj \
+  $O\OptionsDialog.obj \
+  $O\Panel.obj \
+  $O\PanelCopy.obj \
+  $O\PanelCrc.obj \
+  $O\PanelDrag.obj \
+  $O\PanelFolderChange.obj \
+  $O\PanelItemOpen.obj \
+  $O\PanelItems.obj \
+  $O\PanelKey.obj \
+  $O\PanelListNotify.obj \
+  $O\PanelMenu.obj \
+  $O\PanelOperations.obj \
+  $O\PanelSelect.obj \
+  $O\PanelSort.obj \
+  $O\PanelSplitFile.obj \
+  $O\ProgramLocation.obj \
+  $O\PropertyName.obj \
+  $O\RegistryAssociations.obj \
+  $O\RegistryPlugins.obj \
+  $O\RegistryUtils.obj \
+  $O\RootFolder.obj \
+  $O\SplitUtils.obj \
+  $O\StringUtils.obj \
+  $O\SysIconUtils.obj \
+  $O\TextPairs.obj \
+  $O\UpdateCallback100.obj \
+  $O\ViewSettings.obj \
+  $O\AboutDialog.obj \
+  $O\ComboDialog.obj \
+  $O\CopyDialog.obj \
+  $O\EditPage.obj \
+  $O\LangPage.obj \
+  $O\ListViewDialog.obj \
+  $O\MessagesDialog.obj \
+  $O\OverwriteDialog.obj \
+  $O\PasswordDialog.obj \
+  $O\PluginsPage.obj \
+  $O\ProgressDialog2.obj \
+  $O\SettingsPage.obj \
+  $O\SplitDialog.obj \
+  $O\SystemPage.obj \
+
+COMMON_OBJS = \
+  $O\CommandLineParser.obj \
+  $O\CRC.obj \
+  $O\IntToString.obj \
+  $O\Lang.obj \
+  $O\ListFileUtils.obj \
+  $O\MyMap.obj \
+  $O\MyString.obj \
+  $O\MyVector.obj \
+  $O\MyXml.obj \
+  $O\NewHandler.obj \
+  $O\Random.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\TextConfig.obj \
+  $O\UTFConvert.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\Clipboard.obj \
+  $O\DLL.obj \
+  $O\Error.obj \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\Memory.obj \
+  $O\MemoryLock.obj \
+  $O\Menu.obj \
+  $O\Process.obj \
+  $O\PropVariant.obj \
+  $O\PropVariantConversions.obj \
+  $O\PropVariantUtils.obj \
+  $O\Registry.obj \
+  $O\ResourceString.obj \
+  $O\Shell.obj \
+  $O\Synchronization.obj \
+  $O\System.obj \
+  $O\Time.obj \
+  $O\Window.obj \
+
+!IFNDEF UNDER_CE
+
+FM_OBJS = $(FM_OBJS) \
+  $O\FSDrives.obj \
+  $O\NetFolder.obj \
+
+WIN_OBJS = $(WIN_OBJS) \
+  $O\CommonDialog.obj \
+  $O\FileSystem.obj \
+  $O\Net.obj \
+  $O\Security.obj \
+
+!ENDIF
+
+
+WIN_CTRL_OBJS = \
+  $O\ComboBox.obj \
+  $O\Dialog.obj \
+  $O\ListView.obj \
+  $O\PropertyPage.obj \
+  $O\Window2.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\CreateCoder.obj \
+  $O\CWrappers.obj \
+  $O\FilePathAutoRename.obj \
+  $O\FileStreams.obj \
+  $O\FilterCoder.obj \
+  $O\InBuffer.obj \
+  $O\InOutTempBuffer.obj \
+  $O\LimitedStreams.obj \
+  $O\LockedStream.obj \
+  $O\MemBlocks.obj \
+  $O\MethodId.obj \
+  $O\MethodProps.obj \
+  $O\OffsetStream.obj \
+  $O\OutBuffer.obj \
+  $O\OutMemStream.obj \
+  $O\ProgressMt.obj \
+  $O\ProgressUtils.obj \
+  $O\StreamBinder.obj \
+  $O\StreamObjects.obj \
+  $O\StreamUtils.obj \
+  $O\VirtThread.obj \
+
+AR_OBJS = \
+  $O\ArjHandler.obj \
+  $O\Bz2Handler.obj \
+  $O\CpioHandler.obj \
+  $O\DebHandler.obj \
+  $O\DeflateProps.obj \
+  $O\DmgHandler.obj \
+  $O\ElfHandler.obj \
+  $O\FatHandler.obj \
+  $O\FlvHandler.obj \
+  $O\GzHandler.obj \
+  $O\LzhHandler.obj \
+  $O\LzmaHandler.obj \
+  $O\MachoHandler.obj \
+  $O\MbrHandler.obj \
+  $O\MslzHandler.obj \
+  $O\MubHandler.obj \
+  $O\NtfsHandler.obj \
+  $O\PeHandler.obj \
+  $O\RpmHandler.obj \
+  $O\SplitHandler.obj \
+  $O\SwfHandler.obj \
+  $O\VhdHandler.obj \
+  $O\XarHandler.obj \
+  $O\XzHandler.obj \
+  $O\ZHandler.obj \
+
+AR_COMMON_OBJS = \
+  $O\CoderMixer2.obj \
+  $O\CoderMixer2MT.obj \
+  $O\CrossThreadProgress.obj \
+  $O\DummyOutStream.obj \
+  $O\FindSignature.obj \
+  $O\InStreamWithCRC.obj \
+  $O\ItemNameUtils.obj \
+  $O\MultiStream.obj \
+  $O\OutStreamWithCRC.obj \
+  $O\OutStreamWithSha1.obj \
+  $O\HandlerOut.obj \
+  $O\ParseProperties.obj \
+
+UI_COMMON_OBJS = \
+  $O\ArchiveCommandLine.obj \
+  $O\ArchiveExtractCallback.obj \
+  $O\ArchiveName.obj \
+  $O\ArchiveOpenCallback.obj \
+  $O\CompressCall2.obj \
+  $O\DefaultName.obj \
+  $O\EnumDirItems.obj \
+  $O\Extract.obj \
+  $O\ExtractingFilePath.obj \
+  $O\LoadCodecs.obj \
+  $O\OpenArchive.obj \
+  $O\PropIDUtils.obj \
+  $O\SetProperties.obj \
+  $O\SortUtils.obj \
+  $O\TempFiles.obj \
+  $O\Update.obj \
+  $O\UpdateAction.obj \
+  $O\UpdateCallback.obj \
+  $O\UpdatePair.obj \
+  $O\UpdateProduce.obj \
+  $O\WorkDir.obj \
+  $O\ZipRegistry.obj \
+
+AGENT_OBJS = \
+  $O\Agent.obj \
+  $O\AgentOut.obj \
+  $O\AgentProxy.obj \
+  $O\ArchiveFolder.obj \
+  $O\ArchiveFolderOpen.obj \
+  $O\ArchiveFolderOut.obj \
+  $O\UpdateCallbackAgent.obj \
+
+EXPLORER_OBJS = \
+  $O\ContextMenu.obj \
+  $O\MyMessages.obj \
+  $O\RegistryContextMenu.obj \
+
+GUI_OBJS = \
+  $O\BenchmarkDialog.obj \
+  $O\CompressDialog.obj \
+  $O\ExtractDialog.obj \
+  $O\ExtractGUI.obj \
+  $O\UpdateCallbackGUI.obj \
+  $O\UpdateGUI.obj \
+
+
+7Z_OBJS = \
+  $O\7zCompressionMode.obj \
+  $O\7zDecode.obj \
+  $O\7zEncode.obj \
+  $O\7zExtract.obj \
+  $O\7zFolderInStream.obj \
+  $O\7zFolderOutStream.obj \
+  $O\7zHandler.obj \
+  $O\7zHandlerOut.obj \
+  $O\7zHeader.obj \
+  $O\7zIn.obj \
+  $O\7zOut.obj \
+  $O\7zProperties.obj \
+  $O\7zSpecStream.obj \
+  $O\7zUpdate.obj \
+  $O\7zRegister.obj \
+
+CAB_OBJS = \
+  $O\CabBlockInStream.obj \
+  $O\CabHandler.obj \
+  $O\CabHeader.obj \
+  $O\CabIn.obj \
+  $O\CabRegister.obj \
+
+CHM_OBJS = \
+  $O\ChmHandler.obj \
+  $O\ChmHeader.obj \
+  $O\ChmIn.obj \
+  $O\ChmRegister.obj \
+
+COM_OBJS = \
+  $O\ComHandler.obj \
+  $O\ComIn.obj \
+  $O\ComRegister.obj \
+
+HFS_OBJS = \
+  $O\HfsHandler.obj \
+  $O\HfsIn.obj \
+  $O\HfsRegister.obj \
+
+ISO_OBJS = \
+  $O\IsoHandler.obj \
+  $O\IsoHeader.obj \
+  $O\IsoIn.obj \
+  $O\IsoRegister.obj \
+
+NSIS_OBJS = \
+  $O\NsisDecode.obj \
+  $O\NsisHandler.obj \
+  $O\NsisIn.obj \
+  $O\NsisRegister.obj \
+
+RAR_OBJS = \
+  $O\RarHandler.obj \
+  $O\RarHeader.obj \
+  $O\RarIn.obj \
+  $O\RarItem.obj \
+  $O\RarVolumeInStream.obj \
+  $O\RarRegister.obj \
+
+TAR_OBJS = \
+  $O\TarHandler.obj \
+  $O\TarHandlerOut.obj \
+  $O\TarHeader.obj \
+  $O\TarIn.obj \
+  $O\TarOut.obj \
+  $O\TarUpdate.obj \
+  $O\TarRegister.obj \
+
+UDF_OBJS = \
+  $O\UdfHandler.obj \
+  $O\UdfIn.obj \
+  $O\UdfRegister.obj \
+
+WIM_OBJS = \
+  $O\WimHandler.obj \
+  $O\WimIn.obj \
+  $O\WimRegister.obj \
+
+ZIP_OBJS = \
+  $O\ZipAddCommon.obj \
+  $O\ZipHandler.obj \
+  $O\ZipHandlerOut.obj \
+  $O\ZipHeader.obj \
+  $O\ZipIn.obj \
+  $O\ZipItem.obj \
+  $O\ZipOut.obj \
+  $O\ZipUpdate.obj \
+  $O\ZipRegister.obj \
+
+COMPRESS_OBJS = \
+  $O\ArjDecoder1.obj \
+  $O\ArjDecoder2.obj \
+  $O\Bcj2Coder.obj \
+  $O\Bcj2Register.obj \
+  $O\BcjCoder.obj \
+  $O\BcjRegister.obj \
+  $O\BitlDecoder.obj \
+  $O\BranchCoder.obj \
+  $O\BranchMisc.obj \
+  $O\BranchRegister.obj \
+  $O\ByteSwap.obj \
+  $O\BZip2Crc.obj \
+  $O\BZip2Decoder.obj \
+  $O\BZip2Encoder.obj \
+  $O\BZip2Register.obj \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \
+  $O\Deflate64Register.obj \
+  $O\DeflateDecoder.obj \
+  $O\DeflateEncoder.obj \
+  $O\DeflateNsisRegister.obj \
+  $O\DeflateRegister.obj \
+  $O\DeltaFilter.obj \
+  $O\ImplodeDecoder.obj \
+  $O\ImplodeHuffmanDecoder.obj \
+  $O\LzhDecoder.obj \
+  $O\Lzma2Decoder.obj \
+  $O\Lzma2Encoder.obj \
+  $O\Lzma2Register.obj \
+  $O\LzmaDecoder.obj \
+  $O\LzmaEncoder.obj \
+  $O\LzmaRegister.obj \
+  $O\LzOutWindow.obj \
+  $O\Lzx86Converter.obj \
+  $O\LzxDecoder.obj \
+  $O\PpmdDecoder.obj \
+  $O\PpmdEncoder.obj \
+  $O\PpmdRegister.obj \
+  $O\QuantumDecoder.obj \
+  $O\Rar1Decoder.obj \
+  $O\Rar2Decoder.obj \
+  $O\Rar3Decoder.obj \
+  $O\Rar3Vm.obj \
+  $O\RarCodecsRegister.obj \
+  $O\ShrinkDecoder.obj \
+  $O\ZlibDecoder.obj \
+  $O\ZlibEncoder.obj \
+  $O\ZDecoder.obj \
+
+LZMA_BENCH_OBJS = \
+  $O\LzmaBench.obj \
+
+CRYPTO_OBJS = \
+  $O\7zAes.obj \
+  $O\7zAesRegister.obj \
+  $O\HmacSha1.obj \
+  $O\MyAes.obj \
+  $O\Pbkdf2HmacSha1.obj \
+  $O\RandGen.obj \
+  $O\Rar20Crypto.obj \
+  $O\RarAes.obj \
+  $O\Sha1.obj \
+  $O\WzAes.obj \
+  $O\ZipCrypto.obj \
+  $O\ZipStrong.obj \
+
+
+C_OBJS = \
+  $O\7zBuf2.obj \
+  $O\7zStream.obj \
+  $O\Aes.obj \
+  $O\Alloc.obj \
+  $O\Bra.obj \
+  $O\Bra86.obj \
+  $O\BraIA64.obj \
+  $O\BwtSort.obj \
+  $O\Delta.obj \
+  $O\HuffEnc.obj \
+  $O\LzFind.obj \
+  $O\LzFindMt.obj \
+  $O\Lzma2Dec.obj \
+  $O\Lzma2Enc.obj \
+  $O\LzmaDec.obj \
+  $O\LzmaEnc.obj \
+  $O\MtCoder.obj \
+  $O\Sha256.obj \
+  $O\Sort.obj \
+  $O\Threads.obj \
+  $O\Xz.obj \
+  $O\XzCrc64.obj \
+  $O\XzDec.obj \
+  $O\XzEnc.obj \
+  $O\XzIn.obj \
+
+!include "../../Crc2.mak"
+
+OBJS = \
+  $O\StdAfx.obj \
+  $(FM_OBJS)\
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(WIN_CTRL_OBJS) \
+  $(7ZIP_COMMON_OBJS) \
+  $(AR_OBJS) \
+  $(AR_COMMON_OBJS) \
+  $(UI_COMMON_OBJS) \
+  $(AGENT_OBJS) \
+  $(EXPLORER_OBJS) \
+  $(GUI_OBJS) \
+  $(7Z_OBJS) \
+  $(CAB_OBJS) \
+  $(CHM_OBJS) \
+  $(COM_OBJS) \
+  $(HFS_OBJS) \
+  $(ISO_OBJS) \
+  $(NSIS_OBJS) \
+  $(RAR_OBJS) \
+  $(TAR_OBJS) \
+  $(UDF_OBJS) \
+  $(WIM_OBJS) \
+  $(ZIP_OBJS) \
+  $(COMPRESS_OBJS) \
+  $(LZMA_BENCH_OBJS) \
+  $(CRYPTO_OBJS) \
+  $(CRC_OBJS) \
+  $(C_OBJS) \
+  $O\resource.res \
+
+!include "../../../Build.mak"
+
+$(FM_OBJS): ../../UI/FileManager/$(*B).cpp
+	$(COMPL)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+	$(COMPL)
+$(WIN_OBJS): ../../../Windows/$(*B).cpp
+	$(COMPL)
+$(WIN_CTRL_OBJS): ../../../Windows/Control/$(*B).cpp
+	$(COMPL)
+$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
+	$(COMPL)
+
+$(AR_OBJS): ../../Archive/$(*B).cpp
+	$(COMPL)
+$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
+	$(COMPL)
+
+$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
+	$(COMPL)
+$(CAB_OBJS): ../../Archive/Cab/$(*B).cpp
+	$(COMPL)
+$(CHM_OBJS): ../../Archive/Chm/$(*B).cpp
+	$(COMPL)
+$(COM_OBJS): ../../Archive/Com/$(*B).cpp
+	$(COMPL)
+$(HFS_OBJS): ../../Archive/Hfs/$(*B).cpp
+	$(COMPL)
+$(ISO_OBJS): ../../Archive/Iso/$(*B).cpp
+	$(COMPL)
+$(NSIS_OBJS): ../../Archive/Nsis/$(*B).cpp
+	$(COMPL)
+$(RAR_OBJS): ../../Archive/Rar/$(*B).cpp
+	$(COMPL)
+$(TAR_OBJS): ../../Archive/Tar/$(*B).cpp
+	$(COMPL)
+$(UDF_OBJS): ../../Archive/Udf/$(*B).cpp
+	$(COMPL)
+$(WIM_OBJS): ../../Archive/Wim/$(*B).cpp
+	$(COMPL)
+$(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp
+	$(COMPL)
+
+$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
+	$(COMPL_O2)
+$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp
+	$(COMPL)
+
+$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
+	$(COMPL_O2)
+
+$(UI_COMMON_OBJS): ../../UI/Common/$(*B).cpp
+	$(COMPL)
+$(AGENT_OBJS): ../../UI/Agent/$(*B).cpp
+	$(COMPL)
+$(EXPLORER_OBJS): ../../UI/Explorer/$(*B).cpp
+	$(COMPL)
+$(GUI_OBJS): ../../UI/GUI/$(*B).cpp
+	$(COMPL)
+
+$(C_OBJS): ../../../../C/$(*B).c
+	$(COMPL_O2)
+
+!include "../../Crc.mak"
--- a/CPP/7zip/Bundles/Fm/resource.rc
+++ b/CPP/7zip/Bundles/Fm/resource.rc
@@ -0,0 +1,7 @@
+#include "../../UI/FileManager/resource.rc"
+#include "../../UI/GUI/resource2.rc"
+
+STRINGTABLE
+BEGIN
+  100 "7z zip bz2 bzip2 tbz2 tbz rar arj z taz lzh lha cab iso 001 rpm deb cpio tar gz gzip tgz tpz4 wim swm lzma dmg hfs xar vhd fat ntfs xz"
+END
--- a/CPP/7zip/Bundles/Format7z/makefile
+++ b/CPP/7zip/Bundles/Format7z/makefile
@@ -1,6 +1,5 @@
 PROG = 7za.dll
 DEF_FILE = ../../Archive/Archive2.def
-LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DCOMPRESS_MT \
  -DCOMPRESS_MF_MT \
--- a/CPP/7zip/Bundles/Format7zExtract/makefile
+++ b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -1,6 +1,5 @@
 PROG = 7zxa.dll
 DEF_FILE = ../../Archive/Archive2.def
-LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DEXTRACT_ONLY \
  -DCOMPRESS_MT \
@@ -17,9 +16,6 @@ COMMON_OBJS = \
  $O\Wildcard.obj \

 WIN_OBJS = \
-  $O\FileDir.obj \
-  $O\FileFind.obj \
-  $O\FileIO.obj \
  $O\PropVariant.obj \
  $O\Synchronization.obj \
  $O\System.obj \
@@ -28,7 +24,6 @@ WIN_OBJS = \
  $O\CreateCoder.obj \
  $O\CWrappers.obj \
  $O\InBuffer.obj \
-  $O\InOutTempBuffer.obj \
  $O\FilterCoder.obj \
  $O\LimitedStreams.obj \
  $O\LockedStream.obj \
--- a/CPP/7zip/Bundles/Format7zExtractR/makefile
+++ b/CPP/7zip/Bundles/Format7zExtractR/makefile
@@ -1,6 +1,5 @@
 PROG = 7zxr.dll
 DEF_FILE = ../../Archive/Archive2.def
-LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DEXTRACT_ONLY \
  -DCOMPRESS_MT \
@@ -17,9 +16,6 @@ COMMON_OBJS = \
  $O\Wildcard.obj \

 WIN_OBJS = \
-  $O\FileDir.obj \
-  $O\FileFind.obj \
-  $O\FileIO.obj \
  $O\PropVariant.obj \
  $O\Synchronization.obj \
  $O\System.obj \
@@ -28,7 +24,6 @@ WIN_OBJS = \
  $O\CreateCoder.obj \
  $O\CWrappers.obj \
  $O\InBuffer.obj \
-  $O\InOutTempBuffer.obj \
  $O\FilterCoder.obj \
  $O\LimitedStreams.obj \
  $O\LockedStream.obj \
--- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp
+++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
@@ -234,6 +234,10 @@ SOURCE=..\..\..\Common\CRC.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\..\Common\DynamicBuffer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\IntToString.cpp
 # End Source File
 # Begin Source File
@@ -555,6 +559,14 @@ SOURCE=..\..\Compress\ZlibDecoder.cpp

 SOURCE=..\..\Compress\ZlibDecoder.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\ZlibEncoder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\ZlibEncoder.h
+# End Source File
 # End Group
 # Begin Group "7z Compress"

@@ -2179,6 +2191,14 @@ SOURCE=..\..\Archive\DebHandler.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\Archive\DeflateProps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Archive\DeflateProps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\DmgHandler.cpp
 # End Source File
 # Begin Source File
@@ -2191,6 +2211,10 @@ SOURCE=..\..\Archive\FatHandler.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\Archive\FlvHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\GzHandler.cpp
 # End Source File
 # Begin Source File
@@ -2215,6 +2239,10 @@ SOURCE=..\..\Archive\MbrHandler.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\Archive\MslzHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\MubHandler.cpp
 # End Source File
 # Begin Source File
@@ -2235,6 +2263,10 @@ SOURCE=..\..\Archive\SplitHandler.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\Archive\SwfHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\VhdHandler.cpp
 # End Source File
 # Begin Source File
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -1,23 +1,25 @@
 PROG = 7z.dll
 DEF_FILE = ../../Archive/Archive2.def
-LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DEXTERNAL_CODECS \
  -DCOMPRESS_MT \
  -DCOMPRESS_BZIP2_MT \
  -DCOMPRESS_MF_MT \
-  -D_7ZIP_LARGE_PAGES \
+
+!IFNDEF UNDER_CE
+CFLAGS = $(CFLAGS) -D_7ZIP_LARGE_PAGES
+!ENDIF

 COMMON_OBJS = \
  $O\CRC.obj \
  $O\IntToString.obj \
-  $O\NewHandler.obj \
  $O\MyMap.obj \
  $O\MyString.obj \
+  $O\MyVector.obj \
  $O\MyXml.obj \
+  $O\NewHandler.obj \
  $O\StringConvert.obj \
  $O\StringToInt.obj \
-  $O\MyVector.obj \
  $O\UTFConvert.obj \
  $O\Wildcard.obj \

@@ -32,16 +34,16 @@ WIN_OBJS = \
  $O\Time.obj \

 7ZIP_COMMON_OBJS = \
-  $O\InBuffer.obj \
-  $O\InOutTempBuffer.obj \
  $O\CreateCoder.obj \
  $O\CWrappers.obj \
+  $O\InBuffer.obj \
+  $O\InOutTempBuffer.obj \
  $O\FilterCoder.obj \
  $O\LimitedStreams.obj \
  $O\LockedStream.obj \
+  $O\MemBlocks.obj \
  $O\MethodId.obj \
  $O\MethodProps.obj \
-  $O\MemBlocks.obj \
  $O\OffsetStream.obj \
  $O\OutBuffer.obj \
  $O\OutMemStream.obj \
@@ -59,19 +61,23 @@ AR_OBJS = \
  $O\Bz2Handler.obj \
  $O\CpioHandler.obj \
  $O\DebHandler.obj \
+  $O\DeflateProps.obj \
  $O\DmgHandler.obj \
  $O\ElfHandler.obj \
  $O\FatHandler.obj \
+  $O\FlvHandler.obj \
  $O\GzHandler.obj \
  $O\LzhHandler.obj \
  $O\LzmaHandler.obj \
  $O\MachoHandler.obj \
  $O\MbrHandler.obj \
+  $O\MslzHandler.obj \
  $O\MubHandler.obj \
  $O\NtfsHandler.obj \
  $O\PeHandler.obj \
  $O\RpmHandler.obj \
  $O\SplitHandler.obj \
+  $O\SwfHandler.obj \
  $O\VhdHandler.obj \
  $O\XarHandler.obj \
  $O\XzHandler.obj \
@@ -230,6 +236,7 @@ COMPRESS_OBJS = \
  $O\RarCodecsRegister.obj \
  $O\ShrinkDecoder.obj \
  $O\ZlibDecoder.obj \
+  $O\ZlibEncoder.obj \
  $O\ZDecoder.obj \

 CRYPTO_OBJS = \
--- a/CPP/7zip/Bundles/Format7zF/resource.rc
+++ b/CPP/7zip/Bundles/Format7zF/resource.rc
@@ -32,5 +32,5 @@ MY_VERSION_INFO_DLL("7z Standalone Plugin", "7za")

 STRINGTABLE
 BEGIN
-  100 "7z:0 zip:1 bz2:2 bzip2:2 tbz2:2 tbz:2 rar:3 arj:4 z:5 taz:5 lzh:6 lha:6 cab:7 iso:8 split:9 rpm:10 deb:11 cpio:12 tar:13 gz:14 gzip:14 tgz:14 tpz:14 wim:15 swm:15 lzma:16 dmg:17 hfs:18 xar:19 vhd:20 fat:21 ntfs:22 xz:23"
+  100 "7z:0 zip:1 bz2:2 bzip2:2 tbz2:2 tbz:2 rar:3 arj:4 z:5 taz:5 lzh:6 lha:6 cab:7 iso:8 001:9 rpm:10 deb:11 cpio:12 tar:13 gz:14 gzip:14 tgz:14 tpz:14 wim:15 swm:15 lzma:16 dmg:17 hfs:18 xar:19 vhd:20 fat:21 ntfs:22 xz:23"
 END
--- a/CPP/7zip/Bundles/Format7zR/makefile
+++ b/CPP/7zip/Bundles/Format7zR/makefile
@@ -1,6 +1,5 @@
 PROG = 7zra.dll
 DEF_FILE = ../../Archive/Archive2.def
-LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DCOMPRESS_MT \
  -DCOMPRESS_MF_MT \
--- a/CPP/7zip/Bundles/SFXCon/Main.cpp
+++ b/CPP/7zip/Bundles/SFXCon/Main.cpp
@@ -191,7 +191,7 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
    const UString &name, bool include, NRecursedType::EEnum type)
 {
  /*
-  if(!IsWildCardFilePathLegal(name))
+  if (!IsWildCardFilePathLegal(name))
    return false;
  */
  bool isWildCard = DoesNameContainWildCard(name);
@@ -229,12 +229,12 @@ void AddToCensorFromNonSwitchesStrings(NWildcard::CCensor &wildcardCensor,


 #ifndef _WIN32
-static void GetArguments(int numArguments, const char *arguments[], UStringVector &parts)
+static void GetArguments(int numArgs, const char *args[], UStringVector &parts)
 {
  parts.Clear();
-  for(int i = 0; i < numArguments; i++)
+  for (int i = 0; i < numArgs; i++)
  {
-    UString s = MultiByteToUnicodeString(arguments[i]);
+    UString s = MultiByteToUnicodeString(args[i]);
    parts.Add(s);
  }
 }
@@ -242,11 +242,11 @@ static void GetArguments(int numArguments, const char *arguments[], UStringVecto

 int Main2(
  #ifndef _WIN32
-  int numArguments, const char *arguments[]
+  int numArgs, const char *args[]
  #endif
 )
 {
-  #ifdef _WIN32
+  #if defined(_WIN32) && !defined(UNDER_CE)
  SetFileApisToOEM();
  #endif
  
@@ -256,7 +256,7 @@ int Main2(
  #ifdef _WIN32
  NCommandLineParser::SplitCommandLine(GetCommandLineW(), commandStrings);
  #else
-  GetArguments(numArguments, arguments, commandStrings);
+  GetArguments(numArgs, args, commandStrings);
  #endif

  #ifdef _WIN32
--- a/CPP/7zip/Bundles/SFXCon/makefile
+++ b/CPP/7zip/Bundles/SFXCon/makefile
@@ -1,5 +1,5 @@
 PROG = 7zCon.sfx
-LIBS = $(LIBS) user32.lib oleaut32.lib
+MY_CONSOLE = 1
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DEXTRACT_ONLY \
  -DNO_READ_FROM_CODER \
--- a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp
+++ b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.cpp
@@ -36,7 +36,7 @@ void CExtractCallbackImp::Init(IInArchive *archiveHandler,
 HRESULT CExtractCallbackImp::Open_CheckBreak()
 {
  #ifndef _NO_PROGRESS
-  return ProgressDialog.ProgressSynch.ProcessStopAndPause();
+  return ProgressDialog.Sync.ProcessStopAndPause();
  #else
  return S_OK;
  #endif
@@ -50,7 +50,7 @@ HRESULT CExtractCallbackImp::Open_SetTotal(const UInt64 * /* numFiles */, const
 HRESULT CExtractCallbackImp::Open_SetCompleted(const UInt64 * /* numFiles */, const UInt64 * /* numBytes */)
 {
  #ifndef _NO_PROGRESS
-  return ProgressDialog.ProgressSynch.ProcessStopAndPause();
+  return ProgressDialog.Sync.ProcessStopAndPause();
  #else
  return S_OK;
  #endif
@@ -59,7 +59,7 @@ HRESULT CExtractCallbackImp::Open_SetCompleted(const UInt64 * /* numFiles */, co
 STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 size)
 {
  #ifndef _NO_PROGRESS
-  ProgressDialog.ProgressSynch.SetProgress(size, 0);
+  ProgressDialog.Sync.SetProgress(size, 0);
  #endif
  return S_OK;
 }
@@ -67,9 +67,9 @@ STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 size)
 STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *completeValue)
 {
  #ifndef _NO_PROGRESS
-  RINOK(ProgressDialog.ProgressSynch.ProcessStopAndPause());
+  RINOK(ProgressDialog.Sync.ProcessStopAndPause());
  if (completeValue != NULL)
-    ProgressDialog.ProgressSynch.SetPos(*completeValue);
+    ProgressDialog.Sync.SetPos(*completeValue);
  #endif
  return S_OK;
 }
@@ -89,7 +89,7 @@ STDMETHODIMP CExtractCallbackImp::GetStream(UInt32 index,
    ISequentialOutStream **outStream, Int32 askExtractMode)
 {
  #ifndef _NO_PROGRESS
-  if (ProgressDialog.ProgressSynch.GetStopped())
+  if (ProgressDialog.Sync.GetStopped())
    return E_ABORT;
  #endif
  _outFileStream.Release();
--- a/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h
+++ b/CPP/7zip/Bundles/SFXSetup/ExtractCallback.h
@@ -1,7 +1,7 @@
 // ExtractCallback.h

-#ifndef __EXTRACTCALLBACK_H
-#define __EXTRACTCALLBACK_H
+#ifndef __EXTRACT_CALLBACK_H
+#define __EXTRACT_CALLBACK_H

 #include "resource.h"

@@ -66,9 +66,9 @@ public:
    UInt32 defaultAttributes);

  #ifndef _NO_PROGRESS
-  HRESULT StartProgressDialog(const UString &title)
+  HRESULT StartProgressDialog(const UString &title, NWindows::CThread &thread)
  {
-    ProgressDialog.Create(title, 0);
+    ProgressDialog.Create(title, thread, 0);
    {
      #ifdef LANG
      ProgressDialog.SetText(LangLoadString(IDS_PROGRESS_EXTRACTING, 0x02000890));
--- a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp
+++ b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp
@@ -19,9 +19,6 @@ static LPCWSTR kCantOpenArchive = L"Can not open the file as archive";

 struct CThreadExtracting
 {
-  #ifndef _NO_PROGRESS
-  bool ShowProgress;
-  #endif
  CCodecs *Codecs;
  UString FileName;
  UString DestFolder;
@@ -33,7 +30,7 @@ struct CThreadExtracting
  HRESULT Result;
  UString ErrorMessage;

-  void Process()
+  void Process2()
  {
    NFile::NFind::CFileInfoW fi;
    if (!fi.Find(FileName))
@@ -67,15 +64,19 @@ struct CThreadExtracting

    ExtractCallbackSpec->Init(ArchiveLink.GetArchive(), dirPath, L"Default", fi.MTime, 0);

-    #ifndef _NO_PROGRESS
-    if (ShowProgress)
-      ExtractCallbackSpec->ProgressDialog.WaitCreating();
-    #endif
    Result = ArchiveLink.GetArchive()->Extract(0, (UInt32)-1 , BoolToInt(false), ExtractCallback);
-    #ifndef _NO_PROGRESS
-    if (ShowProgress)
-      ExtractCallbackSpec->ProgressDialog.MyClose();
-    #endif
+  }
+
+  void Process()
+  {
+    try
+    {
+      #ifndef _NO_PROGRESS
+      CProgressCloser closer(ExtractCallbackSpec->ProgressDialog);
+      #endif
+      Process2();
+    }
+    catch(...) { Result = E_FAIL; }
  }
  
  static THREAD_FUNC_DECL MyThreadFunction(void *param)
@@ -100,9 +101,9 @@ HRESULT ExtractArchive(CCodecs *codecs,const UString &fileName, const UString &d
  
  #ifndef _NO_PROGRESS

-  t.ShowProgress = showProgress;
  if (showProgress)
  {
+    t.ExtractCallbackSpec->ProgressDialog.IconID = IDI_ICON;
    NWindows::CThread thread;
    RINOK(thread.Create(CThreadExtracting::MyThreadFunction, &t));
    
@@ -112,13 +113,13 @@ HRESULT ExtractArchive(CCodecs *codecs,const UString &fileName, const UString &d
    #else
    title = NWindows::MyLoadStringW(IDS_PROGRESS_EXTRACTING);
    #endif
-    t.ExtractCallbackSpec->StartProgressDialog(title);
+    t.ExtractCallbackSpec->StartProgressDialog(title, thread);
  }
  else

  #endif
  {
-    t.Process();
+    t.Process2();
  }

  errorMessage = t.ErrorMessage;
--- a/CPP/7zip/Bundles/SFXSetup/Main.cpp
+++ b/CPP/7zip/Bundles/SFXSetup/Main.cpp
@@ -2,7 +2,7 @@

 #include "StdAfx.h"

-#include <initguid.h>
+#include "Common/MyInitGuid.h"

 #include "Common/CommandLineParser.h"
 #include "Common/StringConvert.h"
@@ -12,6 +12,7 @@
 #include "Windows/FileDir.h"
 #include "Windows/FileFind.h"
 #include "Windows/FileIO.h"
+#include "Windows/NtCheck.h"
 #include "Windows/ResourceString.h"

 #include "../../UI/Explorer/MyMessages.h"
@@ -38,8 +39,8 @@ static bool ReadDataString(LPCWSTR fileName, LPCSTR startID,
  const int kBufferSize = (1 << 12);

  Byte buffer[kBufferSize];
-  int signatureStartSize = lstrlenA(startID);
-  int signatureEndSize = lstrlenA(endID);
+  int signatureStartSize = MyStringLen(startID);
+  int signatureEndSize = MyStringLen(endID);
  
  UInt32 numBytesPrev = 0;
  bool writeMode = false;
@@ -103,37 +104,32 @@ public:
 } g_CInstallIDInit;


+#ifndef UNDER_CE
 class CCurrentDirRestorer
 {
  CSysString m_CurrentDirectory;
 public:
-  CCurrentDirRestorer()
-    { NFile::NDirectory::MyGetCurrentDirectory(m_CurrentDirectory); }
-  ~CCurrentDirRestorer()
-    { RestoreDirectory();}
-  bool RestoreDirectory()
-    { return BOOLToBool(::SetCurrentDirectory(m_CurrentDirectory)); }
+  CCurrentDirRestorer() { NFile::NDirectory::MyGetCurrentDirectory(m_CurrentDirectory); }
+  ~CCurrentDirRestorer() { RestoreDirectory();}
+  bool RestoreDirectory() { return BOOLToBool(::SetCurrentDirectory(m_CurrentDirectory)); }
 };
-
-#ifndef _UNICODE
-bool g_IsNT = false;
-static inline bool IsItWindowsNT()
-{
-  OSVERSIONINFO versionInfo;
-  versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
-  if (!::GetVersionEx(&versionInfo))
-    return false;
-  return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
-}
 #endif

-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR /* lpCmdLine */,int /* nCmdShow */)
+#define NT_CHECK_FAIL_ACTION ShowErrorMessage(L"Unsupported Windows version"); return 1;
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
+    #ifdef UNDER_CE
+    LPWSTR
+    #else
+    LPSTR
+    #endif
+    /* lpCmdLine */,int /* nCmdShow */)
 {
  g_hInstance = (HINSTANCE)hInstance;
-  #ifndef _UNICODE
-  g_IsNT = IsItWindowsNT();
-  #endif
-  InitCommonControls();
+
+  NT_CHECK
+
+  // InitCommonControls();

  UString archiveName, switches;
  #ifdef _SHELL_EXECUTE
@@ -235,10 +231,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR /
    }
  }

+  #ifndef UNDER_CE
  CCurrentDirRestorer currentDirRestorer;
-
  if (!SetCurrentDirectory(tempDir.GetPath()))
    return 1;
+  #endif
  
  HANDLE hProcess = 0;
 #ifdef _SHELL_EXECUTE
@@ -247,7 +244,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR /
    CSysString filePath = GetSystemString(executeFile);
    SHELLEXECUTEINFO execInfo;
    execInfo.cbSize = sizeof(execInfo);
-    execInfo.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_DDEWAIT;
+    execInfo.fMask = SEE_MASK_NOCLOSEPROCESS
+      #ifndef UNDER_CE
+      | SEE_MASK_FLAG_DDEWAIT
+      #endif
+      ;
    execInfo.hwnd = NULL;
    execInfo.lpVerb = NULL;
    execInfo.lpFile = filePath;
--- a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
+++ b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
@@ -619,18 +619,6 @@ SOURCE=..\..\UI\Common\OpenArchive.h
 # Begin Group "File Manager"

 # PROP Default_Filter ""
-# Begin Group "Dialog"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\UI\FileManager\ProgressDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\UI\FileManager\ProgressDialog.h
-# End Source File
-# End Group
 # Begin Source File

 SOURCE=..\..\UI\FileManager\FormatUtils.cpp
@@ -639,6 +627,14 @@ SOURCE=..\..\UI\FileManager\FormatUtils.cpp

 SOURCE=..\..\UI\FileManager\FormatUtils.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\UI\FileManager\ProgressDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\UI\FileManager\ProgressDialog.h
+# End Source File
 # End Group
 # Begin Group "C"

--- a/CPP/7zip/Bundles/SFXSetup/makefile
+++ b/CPP/7zip/Bundles/SFXSetup/makefile
@@ -1,5 +1,4 @@
 PROG = 7zS.sfx
-LIBS = $(LIBS) user32.lib oleaut32.lib shell32.lib ole32.lib comctl32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DNO_REGISTRY \
  -DEXTRACT_ONLY \
--- a/CPP/7zip/Bundles/SFXSetup/resource.h
+++ b/CPP/7zip/Bundles/SFXSetup/resource.h
@@ -1,4 +1,4 @@
-#define IDI_ICON3                       159
+#define IDI_ICON                        1

 #define IDS_EXTRACTION_ERROR_TITLE      7
 #define IDS_EXTRACTION_ERROR_MESSAGE    8
--- a/CPP/7zip/Bundles/SFXSetup/resource.rc
+++ b/CPP/7zip/Bundles/SFXSetup/resource.rc
@@ -3,7 +3,7 @@

 MY_VERSION_INFO_APP("7z Setup SFX", "7zS.sfx")

-IDI_ICON3  ICON "setup.ico"
+IDI_ICON  ICON "setup.ico"

 STRINGTABLE
 BEGIN
--- a/CPP/7zip/Bundles/SFXWin/Main.cpp
+++ b/CPP/7zip/Bundles/SFXWin/Main.cpp
@@ -2,7 +2,7 @@

 #include "StdAfx.h"

-#include <initguid.h>
+#include "Common/MyInitGuid.h"

 #include "Common/CommandLineParser.h"
 #include "Common/StringConvert.h"
@@ -11,6 +11,7 @@
 #include "Windows/Error.h"
 #include "Windows/FileDir.h"
 #include "Windows/FileName.h"
+#include "Windows/NtCheck.h"
 #include "Windows/ResourceString.h"

 #include "../../ICoder.h"
@@ -23,28 +24,16 @@
 #include "../../UI/GUI/ExtractRes.h"

 HINSTANCE g_hInstance;
-#ifndef _UNICODE
-bool g_IsNT = false;
-static inline bool IsItWindowsNT()
-{
-  OSVERSIONINFO versionInfo;
-  versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
-  if (!::GetVersionEx(&versionInfo))
-    return false;
-  return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
-}
+
+#ifdef UNDER_CE
+bool g_LVN_ITEMACTIVATE_Support = true;
 #endif

 static const wchar_t *kUnknownExceptionMessage = L"ERROR: Unknown Error!";

 void ErrorMessageForHRESULT(HRESULT res)
 {
-  UString s;
-  if (res == E_OUTOFMEMORY)
-    s = NWindows::MyLoadStringW(IDS_MEM_ERROR);
-  else
-    s = NWindows::NError::MyFormatMessageW(res);
-  ShowErrorMessage(s);
+  ShowErrorMessage(HResultToMessage(res));
 }

 int APIENTRY WinMain2()
@@ -53,11 +42,17 @@ int APIENTRY WinMain2()
  bool assumeYes = false;
  bool outputFolderDefined = false;
  UString outputFolder;
-  UStringVector subStrings;
-  NCommandLineParser::SplitCommandLine(GetCommandLineW(), subStrings);
-  for (int i = 1; i < subStrings.Size(); i++)
+  UStringVector commandStrings;
+  NCommandLineParser::SplitCommandLine(GetCommandLineW(), commandStrings);
+
+  #ifndef UNDER_CE
+  if (commandStrings.Size() > 0)
+    commandStrings.Delete(0);
+  #endif
+
+  for (int i = 0; i < commandStrings.Size(); i++)
  {
-    const UString &s = subStrings[i];
+    const UString &s = commandStrings[i];
    if (s.CompareNoCase(L"-y") == 0)
      assumeYes = true;
    else if (s.Left(2).CompareNoCase(L"-o") == 0)
@@ -122,32 +117,44 @@ int APIENTRY WinMain2()
  NWildcard::CCensorNode wildcardCensor;
  wildcardCensor.AddItem(true, L"*", true, true, true);

+  bool messageWasDisplayed = false;
  result = ExtractGUI(codecs, CIntVector(), v1, v2,
-    wildcardCensor, eo, (assumeYes ? false: true), ecs);
+      wildcardCensor, eo, (assumeYes ? false: true), messageWasDisplayed, ecs);

  if (result == S_OK)
  {
-    if (ecs->Messages.Size() > 0 || ecs->NumArchiveErrors != 0)
+    if (!ecs->IsOK())
      return NExitCode::kFatalError;
    return 0;
  }
  if (result == E_ABORT)
    return NExitCode::kUserBreak;
-  if (result == S_FALSE)
-    ShowErrorMessage(L"Error in archive");
-  else
-    ErrorMessageForHRESULT(result);
+  if (!messageWasDisplayed)
+  {
+    if (result == S_FALSE)
+      ShowErrorMessage(L"Error in archive");
+    else
+      ErrorMessageForHRESULT(result);
+  }
  if (result == E_OUTOFMEMORY)
    return NExitCode::kMemoryError;
  return NExitCode::kFatalError;
 }

-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR /* lpCmdLine */, int /* nCmdShow */)
+#define NT_CHECK_FAIL_ACTION ShowErrorMessage(L"Unsupported Windows version"); return NExitCode::kFatalError;
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
+  #ifdef UNDER_CE
+  LPWSTR
+  #else
+  LPSTR
+  #endif
+  /* lpCmdLine */, int /* nCmdShow */)
 {
  g_hInstance = (HINSTANCE)hInstance;
-  #ifndef _UNICODE
-  g_IsNT = IsItWindowsNT();
-  #endif
+
+  NT_CHECK
+
  try
  {
    return WinMain2();
--- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
+++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
@@ -337,11 +337,11 @@ SOURCE=..\..\UI\FileManager\PasswordDialog.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\UI\FileManager\ProgressDialog.cpp
+SOURCE=..\..\UI\FileManager\ProgressDialog2.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\UI\FileManager\ProgressDialog.h
+SOURCE=..\..\UI\FileManager\ProgressDialog2.h
 # End Source File
 # End Group
 # Begin Group "7zip Common"
--- a/CPP/7zip/Bundles/SFXWin/makefile
+++ b/CPP/7zip/Bundles/SFXWin/makefile
@@ -1,11 +1,16 @@
 PROG = 7z.sfx
-LIBS = $(LIBS) user32.lib oleaut32.lib shell32.lib ole32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
  -DNO_REGISTRY \
  -DEXTRACT_ONLY \
  -DNO_READ_FROM_CODER \
  -D_SFX \

+!IFDEF UNDER_CE
+LIBS = $(LIBS) ceshell.lib Commctrl.lib
+!ELSE
+LIBS = $(LIBS) comctl32.lib comdlg32.lib
+!ENDIF
+
 SFX_WIN_OBJS = \
  $O\Main.obj \

@@ -68,10 +73,15 @@ UI_COMMON_OBJS = \
 FM_OBJS = \
  $O\ExtractCallback.obj \
  $O\FormatUtils.obj \
-  $O\MessagesDialog.obj \
  $O\OverwriteDialog.obj \
  $O\PasswordDialog.obj \
-  $O\ProgressDialog.obj \
+  $O\ProgressDialog2.obj \
+
+!IFDEF UNDER_CE
+FM_OBJS = $(FM_OBJS) \
+  $O\BrowseDialog.obj \
+  $O\SysIconUtils.obj \
+!ENDIF

 AR_COMMON_OBJS = \
  $O\CoderMixer2.obj \
--- a/CPP/7zip/Bundles/SFXWin/resource.h
+++ b/CPP/7zip/Bundles/SFXWin/resource.h
@@ -1,7 +1 @@
-#define IDD_DIALOG_EXTRACT              137
-
-#define IDI_ICON3                       159
-
-#define IDC_STATIC_EXTRACT_EXTRACT_TO   1020
-#define IDC_EXTRACT_COMBO_PATH          1021
-#define IDC_EXTRACT_BUTTON_SET_PATH     1022
+#define IDI_ICON                        1
--- a/CPP/7zip/Bundles/SFXWin/resource.rc
+++ b/CPP/7zip/Bundles/SFXWin/resource.rc
@@ -1,34 +1,43 @@
 #include "../../MyVersionInfo.rc"
 #include "../../GuiCommon.rc"
+#include "../../UI/GUI/ExtractDialogRes.h"
 #include "resource.h"

 MY_VERSION_INFO_APP("7z SFX", "7z.sfx")

-#define xSize2 214
-#define ySize2 64
+#define xc 240
+#define yc 64

-#define xSize (xSize2 + marg + marg)
-#define ySize (ySize2 + marg + marg)
+IDI_ICON ICON "7z.ico"

-#define bYPos (ySize - marg - bYSize)
-#define bXPos1 (xSize - marg - bXSize)
-#define bXPos2 (bXPos1 - 10 - bXSize)
-
-IDI_ICON3 ICON "7z.ico"
-
-IDD_DIALOG_EXTRACT  DIALOG  0, 0, xSize, ySize  MY_MODAL_DIALOG_STYLE
+IDD_DIALOG_EXTRACT  MY_DIALOG
 CAPTION "7-Zip self-extracting archive"
-MY_FONT
 BEGIN
-  LTEXT          "E&xtract to:", IDC_STATIC_EXTRACT_EXTRACT_TO, marg, marg, xSize2, 8
-  EDITTEXT       IDC_EXTRACT_COMBO_PATH, marg, 21, xSize2 - bDotsSize - 13, 14, ES_AUTOHSCROLL
-  PUSHBUTTON     "...", IDC_EXTRACT_BUTTON_SET_PATH, xSize - marg - bDotsSize, 20, bDotsSize, bYSize, WS_GROUP
-  DEFPUSHBUTTON  "Extract", IDOK, ,  bXPos2, bYPos, bXSize, bYSize, WS_GROUP
-  PUSHBUTTON     "Cancel", IDCANCEL, bXPos1, bYPos, bXSize, bYSize
+  LTEXT          "E&xtract to:", IDC_STATIC_EXTRACT_EXTRACT_TO, m, m, xc, 8
+  EDITTEXT       IDC_EXTRACT_COMBO_PATH, m, 21, xc - bxsDots - 12, 14, ES_AUTOHSCROLL
+  PUSHBUTTON     "...", IDC_EXTRACT_BUTTON_SET_PATH, xs - m - bxsDots, 20, bxsDots, bys, WS_GROUP
+  DEFPUSHBUTTON  "Extract", IDOK, bx2, by, bxs, bys, WS_GROUP
+  PUSHBUTTON     "Cancel", IDCANCEL, bx1, by, bxs, bys
 END

-#include "../../UI/FileManager/MessagesDialog.rc"
+#ifdef UNDER_CE
+
+#undef xc
+#define xc 144
+
+IDD_DIALOG_EXTRACT_2  MY_DIALOG
+CAPTION "7-Zip self-extracting archive"
+BEGIN
+  LTEXT          "E&xtract to:", IDC_STATIC_EXTRACT_EXTRACT_TO, m, m, xc - bxsDots - 12, 8
+  EDITTEXT       IDC_EXTRACT_COMBO_PATH, m, m + bys + 4, xc, 14, ES_AUTOHSCROLL
+  PUSHBUTTON     "...", IDC_EXTRACT_BUTTON_SET_PATH, xs - m - bxsDots, m, bxsDots, bys, WS_GROUP
+  DEFPUSHBUTTON  "Extract", IDOK, bx2, by, bxs, bys, WS_GROUP
+  PUSHBUTTON     "Cancel", IDCANCEL, bx1, by, bxs, bys
+END
+
+#endif
+
 #include "../../UI/FileManager/OverwriteDialog.rc"
 #include "../../UI/FileManager/PasswordDialog.rc"
-#include "../../UI/FileManager/ProgressDialog.rc"
+#include "../../UI/FileManager/ProgressDialog2.rc"
 #include "../../UI/GUI/Extract.rc"
--- a/CPP/7zip/Bundles/makefile
+++ b/CPP/7zip/Bundles/makefile
@@ -1,6 +1,7 @@
 DIRS = \
  Alone\~ \
  Alone7z\~ \
+  Fm\~ \
  Format7z\~ \
  Format7zF\~ \
  Format7zR\~ \