Changeset 71019 in vbox

Timestamp:

Feb 14, 2018 7:17:47 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Fix Win builds

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlConsole.cpp (modified) (1 diff)
• UIGuestControlInterface.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlConsole.cpp

@@ -118 +118 @@
                 if(!m_tCommandHistory.contains(strCommand))
                     m_tCommandHistory.push_back(strCommand);
-                m_uCommandHistoryIndex = m_tCommandHistory.size();
+                m_uCommandHistoryIndex = m_tCommandHistory.size()-1;
                 moveCursor(QTextCursor::End);
                 QPlainTextEdit::keyPressEvent(pEvent);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlInterface.cpp

@@ -48 +48 @@
 #define GCTLCMD_COMMON_OPT_SESSION_NAME     995 /**< The --sessionname option number. */
 #define GCTLCMD_COMMON_OPT_SESSION_ID       994 /**< The --sessionid option number. */
+
+#define GCTLCMD_COMMON_OPTION_DEFS() \
+        { "--username",             GCTLCMD_COMMON_OPT_USER,            RTGETOPT_REQ_STRING  }, \
+        { "--passwordfile",         GCTLCMD_COMMON_OPT_PASSWORD_FILE,   RTGETOPT_REQ_STRING  }, \
+        { "--password",             GCTLCMD_COMMON_OPT_PASSWORD,        RTGETOPT_REQ_STRING  }, \
+        { "--domain",               GCTLCMD_COMMON_OPT_DOMAIN,          RTGETOPT_REQ_STRING  }, \
+        { "--quiet",                'q',                                RTGETOPT_REQ_NOTHING }, \
+        { "--verbose",              'v',                                RTGETOPT_REQ_NOTHING },
+
+
 /** Common option definitions. */
 class CommandData
@@ -241 +251 @@
         { "--quiet",                'q',                                RTGETOPT_REQ_NOTHING },
         { "--verbose",              'v',                                RTGETOPT_REQ_NOTHING },
-        { "--help",                 'h',                                RTGETOPT_REQ_NOTHING }
     };
 
@@ -303 +312 @@
     RTGetOptArgvFromString(&argv, &argc, array.data(), RTGETOPTARGV_CNV_QUOTE_BOURNE_SH, 0);
 
-    static const RTGETOPTDEF s_aOptions[] = {};
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        GCTLCMD_COMMON_OPTION_DEFS()
+    };
 
     int ch;