15.06

CPP/7zip/Bundles/Fm/FM.dsp

@@ -332,14 +332,6 @@ SOURCE=..\..\Archive\7z\7zUpdate.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Archive\Common\CoderMixer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Archive\Common\CoderMixer.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Archive\Common\CoderMixer2.cpp
 # End Source File
 # Begin Source File

CPP/7zip/Bundles/Format7zF/Arc.mak

@@ -141,6 +141,7 @@ NSIS_OBJS = \
 
 RAR_OBJS = \
   $O\RarHandler.obj \
+  $O\Rar5Handler.obj \
 
 TAR_OBJS = \
   $O\TarHandler.obj \
@@ -212,6 +213,7 @@ COMPRESS_OBJS = \
   $O\Rar2Decoder.obj \
   $O\Rar3Decoder.obj \
   $O\Rar3Vm.obj \
+  $O\Rar5Decoder.obj \
   $O\RarCodecsRegister.obj \
   $O\ShrinkDecoder.obj \
   $O\ZlibDecoder.obj \
@@ -222,11 +224,13 @@ CRYPTO_OBJS = \
   $O\7zAes.obj \
   $O\7zAesRegister.obj \
   $O\HmacSha1.obj \
+  $O\HmacSha256.obj \
   $O\MyAes.obj \
   $O\MyAesReg.obj \
   $O\Pbkdf2HmacSha1.obj \
   $O\RandGen.obj \
   $O\Rar20Crypto.obj \
+  $O\Rar5Aes.obj \
   $O\RarAes.obj \
   $O\WzAes.obj \
   $O\ZipCrypto.obj \
@@ -239,6 +243,7 @@ C_OBJS = \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bcj2Enc.obj \
+  $O\Blake2s.obj \
   $O\Bra.obj \
   $O\Bra86.obj \
   $O\BraIA64.obj \

CPP/7zip/Bundles/Format7zF/Format7z.dsp

@@ -243,6 +243,10 @@ SOURCE=..\..\..\Common\CrcReg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\Defs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\DynamicBuffer.h
 # End Source File
 # Begin Source File
@@ -452,6 +456,24 @@ SOURCE=..\..\Compress\Rar3Vm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compress\Rar5Decoder.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\Rar5Decoder.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\RarCodecsRegister.cpp
 # End Source File
 # End Group
@@ -821,6 +843,14 @@ SOURCE=..\..\Crypto\HmacSha1.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Crypto\HmacSha256.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Crypto\HmacSha256.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Crypto\MyAes.cpp
 # End Source File
 # Begin Source File
@@ -887,6 +917,14 @@ SOURCE=..\..\Crypto\Rar20Crypto.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Crypto\Rar5Aes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Crypto\Rar5Aes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Crypto\RarAes.cpp
 # End Source File
 # Begin Source File
@@ -1319,6 +1357,26 @@ SOURCE=..\..\..\..\C\Bcj2Enc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\Blake2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Blake2s.c
+
+!IF  "$(CFG)" == "7z - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "7z - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\Bra.c
 
 !IF  "$(CFG)" == "7z - Win32 Release"
@@ -1874,6 +1932,14 @@ SOURCE=..\..\Archive\7z\7zUpdateItem.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\Archive\Rar\Rar5Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Archive\Rar\Rar5Handler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\Rar\RarHandler.cpp
 # End Source File
 # Begin Source File
@@ -1888,6 +1954,10 @@ SOURCE=..\..\Archive\Rar\RarHeader.h
 
 SOURCE=..\..\Archive\Rar\RarItem.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Archive\Rar\RarVol.h
+# End Source File
 # End Group
 # Begin Group "Cab"
 

CPP/7zip/Bundles/LzmaCon/LzmaAlone.cpp

@@ -12,7 +12,7 @@
 #define MY_SET_BINARY_MODE(file)
 #endif
 
-// #include "../../../Common/MyWindows.h"
+#include "../../../Common/MyWindows.h"
 #include "../../../Common/MyInitGuid.h"
 
 #include "../../../../C/7zVersion.h"

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

@@ -2,6 +2,8 @@
 
 #include "StdAfx.h"
 
+#include "../../../Common/MyWindows.h"
+
 #include "../../../Common/MyInitGuid.h"
 
 #include "../../../Common/CommandLineParser.h"

CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp

@@ -2,6 +2,8 @@
 
 #include "StdAfx.h"
 
+#include "../../../Common/MyWindows.h"
+
 #include "../../../Common/MyInitGuid.h"
 
 #include "../../../Common/CommandLineParser.h"

CPP/7zip/Bundles/SFXWin/SfxWin.cpp

@@ -2,6 +2,8 @@
 
 #include "StdAfx.h"
 
+#include "../../../Common/MyWindows.h"
+
 #include <Shlwapi.h>
 
 #include "../../../Common/MyInitGuid.h"