Update to 7-Zip 16.03

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

@@ -55,8 +55,7 @@ struct CThreadExtracting
     Result = ArchiveLink.Open2(options, ExtractCallbackSpec);
     if (Result != S_OK)
     {
-      if (Result != S_OK)
-        ErrorMessage = kCantOpenArchive;
+      ErrorMessage = kCantOpenArchive;
       return;
     }
 

CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp

@@ -706,6 +706,15 @@ SOURCE=..\..\..\..\C\Delta.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\DllSecur.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\DllSecur.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\Lzma2Dec.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File

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

@@ -23,6 +23,8 @@
 
 #include "ExtractEngine.h"
 
+#include "../../../../C/DllSecur.h"
+
 #include "resource.h"
 
 using namespace NWindows;
@@ -135,6 +137,10 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
 
   NT_CHECK
 
+  #ifdef _WIN32
+  LoadSecurityDlls();
+  #endif
+
   // InitCommonControls();
 
   UString archiveName, switches;

CPP/7zip/Bundles/SFXSetup/makefile

@@ -100,6 +100,7 @@ C_OBJS = \
   $O\BraIA64.obj \
   $O\CpuArch.obj \
   $O\Delta.obj \
+  $O\DllSecur.obj \
   $O\Lzma2Dec.obj \
   $O\LzmaDec.obj \
   $O\Threads.obj \