1 files changed, 39 insertions, 9 deletions

diff --git a/CPP/7zip/UI/GUI/ExtractDialog.h b/CPP/7zip/UI/GUI/ExtractDialog.h
index b0636c72..33349ffc 100755..100644
--- a/CPP/7zip/UI/GUI/ExtractDialog.h
+++ b/CPP/7zip/UI/GUI/ExtractDialog.h
@@ -5,16 +5,17 @@
 
 #include "ExtractDialogRes.h"
 
-#include "Windows/Control/Edit.h"
-#include "Windows/Control/ComboBox.h"
+#include "../../../Windows/Control/ComboBox.h"
+#include "../../../Windows/Control/Edit.h"
 
-#ifndef  NO_REGISTRY
-#include "../Common/ZipRegistry.h"
-#endif
 #include "../Common/ExtractMode.h"
 
 #include "../FileManager/DialogSize.h"
 
+#ifndef NO_REGISTRY
+#include "../Common/ZipRegistry.h"
+#endif
+
 namespace NExtractionDialog
 {
   /*
@@ -37,8 +38,9 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   #else
   NWindows::NControl::CComboBox _path;
   #endif
-  
+
   #ifndef _SFX
+  NWindows::NControl::CEdit _pathName;
   NWindows::NControl::CEdit _passwordControl;
   NWindows::NControl::CComboBox _pathMode;
   NWindows::NControl::CComboBox _overwriteMode;
@@ -51,24 +53,44 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
   
   void OnButtonSetPath();
 
+  void CheckButton_TwoBools(UINT id, const CBoolPair &b1, const CBoolPair &b2);
+  void GetButton_Bools(UINT id, CBoolPair &b1, CBoolPair &b2);
   virtual bool OnInit();
   virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
   virtual void OnOK();
-  #ifndef  NO_REGISTRY
+  
+  #ifndef NO_REGISTRY
+
   virtual void OnHelp();
+
+  NExtract::CInfo _info;
+  
   #endif
+  
+  bool IsShowPasswordChecked() const { return IsButtonCheckedBool(IDX_PASSWORD_SHOW); }
 public:
   // bool _enableSelectedFilesButton;
   // bool _enableFilesButton;
   // NExtractionDialog::NFilesMode::EEnum FilesMode;
 
-  UString DirectoryPath;
+  UString DirPath;
+  UString ArcPath;
+
   #ifndef _SFX
   UString Password;
   #endif
+  bool PathMode_Force;
+  bool OverwriteMode_Force;
   NExtract::NPathMode::EEnum PathMode;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
 
+  #ifndef _SFX
+  // CBoolPair AltStreams;
+  CBoolPair NtSecurity;
+  #endif
+
+  CBoolPair ElimDup;
+
   INT_PTR Create(HWND aWndParent = 0)
   {
     #ifdef _SFX
@@ -76,8 +98,16 @@ public:
     #else
     BIG_DIALOG_SIZE(300, 160);
     #endif
-    return CModalDialog::Create(SIZED_DIALOG(IDD_DIALOG_EXTRACT), aWndParent);
+    return CModalDialog::Create(SIZED_DIALOG(IDD_EXTRACT), aWndParent);
   }
+
+  CExtractDialog():
+    PathMode_Force(false),
+    OverwriteMode_Force(false)
+  {
+    ElimDup.Val = true;
+  }
+
 };
 
 #endif