4.26 beta

7zip/UI/Common/ArchiveCommandLine.cpp

@@ -799,7 +799,11 @@ void CArchiveCommandLineParser::Parse2(CArchiveCommandLineOptions &options)
     UStringVector archivePaths;
     int i;
     for (i = 0; i < dirItems.Size(); i++)
-      archivePaths.Add(dirItems[i].FullPath);
+    {
+      const CDirItem &dirItem = dirItems[i];
+      if (!dirItem.IsDirectory())
+        archivePaths.Add(dirItem.FullPath);
+    }
 
     if (archivePaths.Size() == 0)
       throw "there is no such archive";

7zip/UI/Explorer/ContextMenu.cpp

@@ -418,19 +418,16 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
         UString s;
         FillCommand2(kExtractTo, s, commandMapItem);
         UString folder;
-        folder += UString(L"\"");
         if (_fileNames.Size() == 1)
-          folder += GetSubFolderNameForExtract(fileInfo.Name);
+          folder = GetSubFolderNameForExtract(fileInfo.Name);
         else
-          folder += L'*'; 
-        folder += L"\\\"";
-
+          folder = L'*'; 
         if (_dropMode)
           commandMapItem.Folder = _dropPath;
         else
           commandMapItem.Folder = folderPrefix;
         commandMapItem.Folder += folder;
-        s = MyFormatNew(s, GetReducedString(folder));
+        s = MyFormatNew(s, GetReducedString(UString(L"\"") + folder + UString(L"\\\"")));
         MyInsertMenu(popupMenu, subIndex++, currentCommandID++, GetSystemString(s)); 
         _commandMap.Add(commandMapItem);
       }

7zip/UI/Explorer/resource.rc

@@ -3,7 +3,7 @@
 
 MY_VERSION_INFO_DLL("7-Zip Shell Extension", "7-zip")
 
-1 24 MOVEABLE PURE "7-zip.dll.manifest"
+1 24 "7-zip.dll.manifest"
 
 STRINGTABLE
 BEGIN

7zip/UI/GUI/ExtractDialog.h

@@ -64,7 +64,9 @@ public:
 	// NExtractionDialog::NFilesMode::EEnum FilesMode;
 
   UString DirectoryPath;
+  #ifndef _SFX
   UString Password;
+  #endif
   NExtract::NPathMode::EEnum PathMode;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
 

7zip/UI/GUI/ExtractGUI.cpp

@@ -109,8 +109,10 @@ HRESULT ExtractGUI(
       outputDir = dialog.DirectoryPath;
       options.OverwriteMode = dialog.OverwriteMode;
       options.PathMode = dialog.PathMode;
+      #ifndef _SFX
       openCallback->Password = dialog.Password;
       openCallback->PasswordIsDefined = !dialog.Password.IsEmpty();
+      #endif
     }
     if (!NFile::NDirectory::MyGetFullPathName(outputDir, options.OutputDir))
     {