15.1015.10

1 files changed, 48 insertions, 56 deletions

diff --git a/CPP/7zip/Bundles/Fm/FM.dsp b/CPP/7zip/Bundles/Fm/FM.dsp
index 057da977..eb1aa103 100644
--- a/CPP/7zip/Bundles/Fm/FM.dsp
+++ b/CPP/7zip/Bundles/Fm/FM.dsp
@@ -211,196 +211,188 @@ SOURCE=..\..\UI\FileManager\Test.bmp
 # Begin Group "Archive"
 
 # PROP Default_Filter ""
-# Begin Group "7z"
+# Begin Group "Archive Common"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zCompressionMode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Archive\7z\7zCompressionMode.h
+SOURCE=..\..\Archive\Common\CoderMixer2.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zDecode.cpp
+SOURCE=..\..\Archive\Common\CoderMixer2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zDecode.h
+SOURCE=..\..\Archive\Common\DummyOutStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zEncode.cpp
+SOURCE=..\..\Archive\Common\DummyOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zEncode.h
+SOURCE=..\..\Archive\Common\FindSignature.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zExtract.cpp
+SOURCE=..\..\Archive\Common\FindSignature.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zFolderInStream.cpp
+SOURCE=..\..\Archive\Common\HandlerOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zFolderInStream.h
+SOURCE=..\..\Archive\Common\HandlerOut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp
+SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zFolderOutStream.h
+SOURCE=..\..\Archive\Common\InStreamWithCRC.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zHandler.cpp
+SOURCE=..\..\Archive\Common\ItemNameUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zHandler.h
+SOURCE=..\..\Archive\Common\ItemNameUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zHandlerOut.cpp
+SOURCE=..\..\Archive\Common\MultiStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zHeader.cpp
+SOURCE=..\..\Archive\Common\MultiStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zHeader.h
+SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zIn.cpp
+SOURCE=..\..\Archive\Common\OutStreamWithCRC.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zIn.h
+SOURCE=..\..\Archive\Common\ParseProperties.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zItem.h
+SOURCE=..\..\Archive\Common\ParseProperties.h
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "7z"
 
-SOURCE=..\..\Archive\7z\7zOut.cpp
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zOut.h
+SOURCE=..\..\Archive\7z\7zCompressionMode.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zProperties.cpp
+SOURCE=..\..\Archive\7z\7zCompressionMode.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zProperties.h
+SOURCE=..\..\Archive\7z\7zDecode.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zRegister.cpp
+SOURCE=..\..\Archive\7z\7zDecode.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zSpecStream.cpp
+SOURCE=..\..\Archive\7z\7zEncode.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zSpecStream.h
+SOURCE=..\..\Archive\7z\7zEncode.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zUpdate.cpp
+SOURCE=..\..\Archive\7z\7zExtract.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\7z\7zUpdate.h
+SOURCE=..\..\Archive\7z\7zFolderInStream.cpp
 # End Source File
-# End Group
-# Begin Group "Archive Common"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2.cpp
+SOURCE=..\..\Archive\7z\7zFolderInStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer2.h
+SOURCE=..\..\Archive\7z\7zHandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.cpp
+SOURCE=..\..\Archive\7z\7zHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\DummyOutStream.h
+SOURCE=..\..\Archive\7z\7zHandlerOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\FindSignature.cpp
+SOURCE=..\..\Archive\7z\7zHeader.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\FindSignature.h
+SOURCE=..\..\Archive\7z\7zHeader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\HandlerOut.cpp
+SOURCE=..\..\Archive\7z\7zIn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\HandlerOut.h
+SOURCE=..\..\Archive\7z\7zIn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp
+SOURCE=..\..\Archive\7z\7zItem.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\InStreamWithCRC.h
+SOURCE=..\..\Archive\7z\7zOut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\ItemNameUtils.cpp
+SOURCE=..\..\Archive\7z\7zOut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\ItemNameUtils.h
+SOURCE=..\..\Archive\7z\7zProperties.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\MultiStream.cpp
+SOURCE=..\..\Archive\7z\7zProperties.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\MultiStream.h
+SOURCE=..\..\Archive\7z\7zRegister.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp
+SOURCE=..\..\Archive\7z\7zSpecStream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\OutStreamWithCRC.h
+SOURCE=..\..\Archive\7z\7zSpecStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\ParseProperties.cpp
+SOURCE=..\..\Archive\7z\7zUpdate.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\ParseProperties.h
+SOURCE=..\..\Archive\7z\7zUpdate.h
 # End Source File
 # End Group
 # Begin Source File