3 files changed, 29 insertions, 43 deletions

diff --git a/CPP/7zip/Bundles/SFXWin/Main.cpp b/CPP/7zip/Bundles/SFXWin/Main.cpp
index 39ca5306..44f37560 100755
--- a/CPP/7zip/Bundles/SFXWin/Main.cpp
+++ b/CPP/7zip/Bundles/SFXWin/Main.cpp
@@ -117,6 +117,8 @@ int APIENTRY WinMain2()
   */
   if (result == S_OK)
   {
+    if (ecs->Messages.Size() > 0 || ecs->NumArchiveErrors != 0)
+      return NExitCode::kFatalError;    
     return 0;
   }
   if (result == E_ABORT)
diff --git a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
index 70de7602..0a78fe4d 100755
--- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
+++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp
@@ -374,14 +374,6 @@ SOURCE=..\..\Crypto\7zAES\MySHA256.h
 
 SOURCE=..\..\Crypto\Hash\RotateDefs.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\Hash\Sha256.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\Hash\Sha256.h
-# End Source File
 # End Group
 # End Group
 # Begin Group "Dialogs"
@@ -835,49 +827,55 @@ SOURCE=..\..\UI\Explorer\MyMessages.h
 # Begin Group "C"
 
 # PROP Default_Filter ""
-# Begin Group "C Branch"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
+SOURCE=..\..\..\..\C\7zCrc.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
+SOURCE=..\..\..\..\C\7zCrc.h
 # End Source File
-# End Group
-# Begin Group "C Crypto"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Crypto\Aes.c
+SOURCE=..\..\..\..\C\Aes.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Crypto\Aes.h
+SOURCE=..\..\..\..\C\Aes.h
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\..\C\7zCrc.c
+SOURCE=..\..\..\..\C\Alloc.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\7zCrc.h
+SOURCE=..\..\..\..\C\Alloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Alloc.c
+SOURCE=..\..\..\..\C\Bra.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Bra86.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Alloc.h
+SOURCE=..\..\..\..\C\LzmaDec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\LzmaDec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Sha256.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile
index 55ebd8c6..a5f39559 100755
--- a/CPP/7zip/Bundles/SFXWin/makefile
+++ b/CPP/7zip/Bundles/SFXWin/makefile
@@ -90,9 +90,9 @@ AR_COMMON_OBJS = \
   $O\7zRegister.obj \
 
 BRANCH_OPT_OBJS = \
-  $O\BranchCoder.obj \
   $O\x86.obj \
   $O\x86_2.obj \
+  $O\BranchCoder.obj \
   $O\BCJRegister.obj \
   $O\BCJ2Register.obj \
 
@@ -118,18 +118,13 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-CRYPTO_HASH_OBJS = \
-  $O\Sha256.obj \
-
 C_OBJS = \
   $O\Alloc.obj \
+  $O\Bra86.obj \
+  $O\LzmaDec.obj \
   $O\Threads.obj \
-
-C_BRANCH_OBJS = \
-  $O\BranchX86.obj \
-
-C_CRYPTO = \
   $O\Aes.obj \
+  $O\Sha256.obj \
 
 !include "../../Crc2.mak"
 
@@ -150,14 +145,11 @@ OBJS = \
   $(LZ_OBJS) \
   $(LZMA_OPT_OBJS) \
   $(PPMD_OPT_OBJS) \
-  $(CRYPTO_HASH_OBJS) \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
   $O\MyMessages.obj \
   $(C_OBJS) \
-  $(C_BRANCH_OBJS) \
   $(CRC_OBJS) \
-  $(C_CRYPTO) \
   $O\resource.res
 
 
@@ -196,8 +188,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
 $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 	$(COMPL)
 
-$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
-	$(COMPL)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL)
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
@@ -206,10 +196,6 @@ $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 $O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
 	$(COMPL)
 $(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O1)
-$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O1)
-$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
-	$(COMPL_O1)
+	$(COMPL_O2)
 
 !include "../../Crc.mak"