4.26 beta

7zip/Bundles/SFXWin/Main.cpp

@@ -27,6 +27,7 @@ int APIENTRY WinMain(
   int nCmdShow)
 {
   g_hInstance = (HINSTANCE)hInstance;
+  UString password;
   bool assumeYes = false;
   bool outputFolderDefined = false;
   UString outputFolder;
@@ -43,6 +44,10 @@ int APIENTRY WinMain(
       NWindows::NFile::NName::NormalizeDirPathPrefix(outputFolder);
       outputFolderDefined = !outputFolder.IsEmpty();
     }
+    else if (s.Left(2).CompareNoCase(L"-p") == 0)
+    {
+      password = s.Mid(2);
+    }
   }
 
   UString path;
@@ -58,9 +63,14 @@ int APIENTRY WinMain(
 
   COpenCallbackGUI openCallback;
 
+  openCallback.PasswordIsDefined = !password.IsEmpty();
+  openCallback.Password = password;
+
   CExtractCallbackImp *ecs = new CExtractCallbackImp;
   CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs;
   ecs->Init();
+  ecs->PasswordIsDefined = !password.IsEmpty();
+  ecs->Password = password;
   
   CExtractOptions eo;
   eo.OutputDir = outputFolderDefined ? outputFolder : 

7zip/Bundles/SFXWin/SFXWin.dsp

@@ -526,14 +526,6 @@ SOURCE=..\..\FileManager\FormatUtils.cpp
 
 SOURCE=..\..\FileManager\FormatUtils.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\OpenCallback.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\FileManager\OpenCallback.h
-# End Source File
 # End Group
 # Begin Group "Windows"
 

7zip/Bundles/SFXWin/makefile

@@ -74,7 +74,6 @@ UI_COMMON_OBJS = \
 FM_OBJS = \
   $O\ExtractCallback.obj \
   $O\FormatUtils.obj \
-  $O\OpenCallback.obj \
 
 AR_COMMON_OBJS = \
   $O\CoderMixer2.obj \