Plugins: Fix a crash on Window XP

[winmerge-jp/winmerge-jp.git] / Src / MergeCmdLineInfo.h

diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index 6d5da5e..7d54398 100644 (file)
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -14,6 +14,7 @@
 #include "UnicodeString.h"
 #include "PathContext.h"
 #include <map>
+#include <optional>
 
 /** 
  * @brief WinMerge's command line handler.
@@ -41,16 +42,28 @@ public:
                MINIMIZE = 6,
        };
 
+       enum CompareMethodType
+       {
+               CONTENT,
+               QUICK_CONTENT,
+               BINARY_CONTENT,
+               DATE,
+               DATE_SIZE,
+               SIZE,
+       };
+
        ShowWindowType m_nCmdShow; /**< Initial state of the application's window. */
 
        bool m_bEscShutdown; /**< Pressing ESC will close the application */
        ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical. */
        bool m_bRecurse; /**< Include sub folder in directories compare. */
+       std::optional<CompareMethodType> m_nCompMethod; /**< Compare method */
        bool m_bNonInteractive; /**< Suppress user's notifications. */
-       bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
+       std::optional<int> m_nSingleInstance; /**< Allow only one instance of WinMerge executable. */
        bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
        int  m_nCodepage;  /**< Codepage. */
        bool m_bNoPrefs; /**< Do not load or remember options (preferences) */   
+       bool m_bSelfCompare; /**< Compares the specified file with a copy of the file */
 
        unsigned m_dwLeftFlags; /**< Left side file's behavior options. */
        unsigned m_dwMiddleFlags; /**< Middle side file's behavior options. */
@@ -62,6 +75,7 @@ public:
 
        String m_sFileFilter; /**< File filter mask. */
        String m_sPreDiffer; /**< Pre-differ name. */
+       String m_sUnpacker; /**< Unpacker name. */
 
        String m_sOutputpath;
        String m_sReportFile;