15.0715.07

2 files changed, 76 insertions, 8 deletions

diff --git a/CPP/7zip/Bundles/Format7zF/Arc.mak b/CPP/7zip/Bundles/Format7zF/Arc.mak
index a1221c61..3ea45b5d 100644
--- a/CPP/7zip/Bundles/Format7zF/Arc.mak
+++ b/CPP/7zip/Bundles/Format7zF/Arc.mak
@@ -64,6 +64,8 @@ AR_OBJS = \
   $O\FatHandler.obj \
   $O\FlvHandler.obj \
   $O\GzHandler.obj \
+  $O\GptHandler.obj \
+  $O\HandlerCont.obj \
   $O\HfsHandler.obj \
   $O\IhexHandler.obj \
   $O\LzhHandler.obj \
@@ -75,12 +77,15 @@ AR_OBJS = \
   $O\NtfsHandler.obj \
   $O\PeHandler.obj \
   $O\PpmdHandler.obj \
+  $O\QcowHandler.obj \
   $O\RpmHandler.obj \
   $O\SplitHandler.obj \
   $O\SquashfsHandler.obj \
   $O\SwfHandler.obj \
   $O\UefiHandler.obj \
+  $O\VdiHandler.obj \
   $O\VhdHandler.obj \
+  $O\VmdkHandler.obj \
   $O\XarHandler.obj \
   $O\XzHandler.obj \
   $O\ZHandler.obj \
@@ -201,8 +206,8 @@ COMPRESS_OBJS = \
   $O\LzmaDecoder.obj \
   $O\LzmaEncoder.obj \
   $O\LzmaRegister.obj \
+  $O\LzmsDecoder.obj \
   $O\LzOutWindow.obj \
-  $O\Lzx86Converter.obj \
   $O\LzxDecoder.obj \
   $O\PpmdDecoder.obj \
   $O\PpmdEncoder.obj \
@@ -219,6 +224,7 @@ COMPRESS_OBJS = \
   $O\ZlibDecoder.obj \
   $O\ZlibEncoder.obj \
   $O\ZDecoder.obj \
+  $O\XPressDecoder.obj \
 
 CRYPTO_OBJS = \
   $O\7zAes.obj \
diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
index 169d9f0e..f22d746e 100644
--- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp
+++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp
@@ -756,15 +756,17 @@ SOURCE=..\..\Compress\Lzx.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compress\Lzx86Converter.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\Compress\LzxDecoder.cpp
 
-SOURCE=..\..\Compress\Lzx86Converter.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "7z - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
+
+!ENDIF 
 
-SOURCE=..\..\Compress\LzxDecoder.cpp
 # End Source File
 # Begin Source File
 
@@ -793,6 +795,24 @@ SOURCE=..\..\Compress\LzhDecoder.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compress\LzmsDecoder.cpp
+
+!IF  "$(CFG)" == "7z - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\LzmsDecoder.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\LzOutWindow.cpp
 # End Source File
 # Begin Source File
@@ -801,6 +821,24 @@ SOURCE=..\..\Compress\LzOutWindow.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compress\XpressDecoder.cpp
+
+!IF  "$(CFG)" == "7z - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Compress\XpressDecoder.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\ZDecoder.cpp
 # End Source File
 # Begin Source File
@@ -2401,10 +2439,22 @@ SOURCE=..\..\Archive\FlvHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\GptHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\GzHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\HandlerCont.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Archive\HandlerCont.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\HfsHandler.cpp
 # End Source File
 # Begin Source File
@@ -2463,6 +2513,10 @@ SOURCE=..\..\Archive\PpmdHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\QcowHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\RpmHandler.cpp
 # End Source File
 # Begin Source File
@@ -2483,10 +2537,18 @@ SOURCE=..\..\Archive\UefiHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\VdiHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\VhdHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\VmdkHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\XarHandler.cpp
 # End Source File
 # Begin Source File