19.00

CPP/7zip/UI/Console/Console.dsp

@@ -417,6 +417,10 @@ SOURCE=..\..\..\Common\MyBuffer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Common\MyBuffer2.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
@@ -843,6 +847,15 @@ SOURCE=..\..\..\..\C\CpuArch.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\Sort.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File

CPP/7zip/UI/Console/Console.mak

@@ -1,3 +1,9 @@
+MY_CONSOLE = 1
+
+!IFNDEF UNDER_CE
+CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -D_7ZIP_LARGE_PAGES -DSUPPORT_DEVICE_FILE
+!ENDIF
+
 CONSOLE_OBJS = \
   $O\BenchCon.obj \
   $O\ConsoleClose.obj \
@@ -33,4 +39,5 @@ UI_COMMON_OBJS = \
   $O\UpdatePair.obj \
   $O\UpdateProduce.obj \
 
-#
+C_OBJS = $(C_OBJS) \
+  $O\DllSecur.obj \

CPP/7zip/UI/Console/Main.cpp

@@ -87,7 +87,7 @@ static const char * const kHelpString =
     "a"
 #endif
 #endif
-    " <command> [<switches>...] <archive_name> [<file_names>...]\n"
+    " <command> [<switches>...] <archive_name> [<file_names>...] [@listfile]\n"
     "\n"
     "<Commands>\n"
     "  a : Add files to archive\n"
@@ -103,8 +103,7 @@ static const char * const kHelpString =
     "  x : eXtract files with full paths\n"
     "\n"
     "<Switches>\n"
-    "  -- : Stop switches parsing\n"
-    "  @listfile : set path to listfile that contains file names\n"
+    "  -- : Stop switches and @listfile parsing\n"
     "  -ai[r[-|0]]{@listfile|!wildcard} : Include archives\n"
     "  -ax[r[-|0]]{@listfile|!wildcard} : eXclude archives\n"
     "  -ao{a|s|t|u} : set Overwrite mode\n"

CPP/7zip/UI/Console/MainAr.cpp

@@ -2,6 +2,10 @@
 
 #include "StdAfx.h"
 
+#ifdef _WIN32
+#include "../../../../C/DllSecur.h"
+#endif
+
 #include "../../../Common/MyException.h"
 #include "../../../Common/StdOutStream.h"
 
@@ -63,6 +67,10 @@ int MY_CDECL main
   
   try
   {
+    #ifdef _WIN32
+    My_SetDefaultDllDirectories();
+    #endif
+
     res = Main2(
     #ifndef _WIN32
     numArgs, args

CPP/7zip/UI/Console/makefile

@@ -1,12 +1,7 @@
 PROG = 7z.exe
-MY_CONSOLE = 1
 CFLAGS = $(CFLAGS)  \
   -DEXTERNAL_CODECS \
 
-!IFNDEF UNDER_CE
-CFLAGS = $(CFLAGS) -DWIN_LONG_PATH -D_7ZIP_LARGE_PAGES -DSUPPORT_DEVICE_FILE
-!ENDIF
-
 COMMON_OBJS = \
   $O\CommandLineParser.obj \
   $O\CRC.obj \
@@ -57,7 +52,7 @@ AR_COMMON_OBJS = \
 COMPRESS_OBJS = \
   $O\CopyCoder.obj \
 
-C_OBJS = \
+C_OBJS = $(C_OBJS) \
   $O\Alloc.obj \
   $O\CpuArch.obj \
   $O\Sort.obj \