Changeset 42551 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 2, 2012 4:44:39 PM (13 years ago)

Author:

vboxsync

Message:

Main: big API naming cleanup, use all caps acronyms everywhere, including SDK docs
Frontends/VBoxManage: implement guestcontrol execute for new API, disabled by default

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManage/VBoxManageGuestCtrl.cpp (modified) (60 diffs)
• VBoxManage/VBoxManageHostonly.cpp (modified) (4 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (9 diffs)
• VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (26 diffs)
• VBoxManage/VBoxManageStorageController.cpp (modified) (1 diff)
• VirtualBox/src/selector/UIVMItem.cpp (modified) (2 diffs)
• VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (modified) (5 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (3 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (modified) (3 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (modified) (3 diffs)
• VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -495 +495 @@
                 break;
             }
-            CHECK_ERROR(adapter, COMGETTER(NatDriver)(engine.asOutParam()));
+            CHECK_ERROR(adapter, COMGETTER(NATEngine)(engine.asOutParam()));
             if (!engine)
             {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -59 +59 @@
 
 using namespace com;
+
+#undef VBOX_WITH_GUEST_CONTROL2
 
 /**
@@ -225 +227 @@
                  "                            --image <path to program> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
+                 "                            [--domain <domain>] [--verbose] [--timeout <msec>]\n"
                  "                            [--environment \"<NAME>=<VALUE> [<NAME>=<VALUE>]\"]\n"
-                 "                            [--verbose] [--timeout <msec>]\n"
                  "                            [--wait-exit] [--wait-stdout] [--wait-stderr]\n"
                  "                            [--dos2unix] [--unix2dos]\n"
@@ -236 +238 @@
                  "                            <guest source> <host dest> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--dryrun] [--follow] [--recursive] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--dryrun] [--follow] [--recursive]\n"
                  "\n"
                  "                            copyto|cp\n"
                  "                            <host source> <guest dest> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--dryrun] [--follow] [--recursive] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--dryrun] [--follow] [--recursive]\n"
                  "\n"
                  "                            createdir[ectory]|mkdir|md\n"
                  "                            <guest directory>... --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--parents] [--mode <mode>] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--parents] [--mode <mode>]\n"
                  "\n"
                  "                            stat\n"
                  "                            <file>... --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
                  "\n"
                  "                            updateadditions\n"
@@ -296 +301 @@
 }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
 /**
  * Translates a process status to a human readable
@@ -363 +369 @@
     return rc;
 }
+#else
+/**
+ * Translates a process status to a human readable
+ * string.
+ */
+static const char *ctrlExecProcessStatusToText(ProcessStatus_T enmStatus)
+{
+    switch (enmStatus)
+    {
+        case ProcessStatus_Starting:
+            return "starting";
+        case ProcessStatus_Started:
+            return "started";
+        case ProcessStatus_Paused:
+            return "paused";
+        case ProcessStatus_Terminating:
+            return "terminating";
+        case ProcessStatus_TerminatedNormally:
+            return "successfully terminated";
+        case ProcessStatus_TerminatedSignal:
+            return "terminated by signal";
+        case ProcessStatus_TerminatedAbnormally:
+            return "abnormally aborted";
+        case ProcessStatus_TimedOutKilled:
+            return "timed out";
+        case ProcessStatus_TimedOutAbnormally:
+            return "timed out, hanging";
+        case ProcessStatus_Down:
+            return "killed";
+        case ProcessStatus_Error:
+            return "error";
+        default:
+            break;
+    }
+    return "unknown";
+}
+
+static int ctrlExecProcessStatusToExitCode(ProcessStatus_T enmStatus, ULONG uExitCode)
+{
+    int rc = EXITCODEEXEC_SUCCESS;
+    switch (enmStatus)
+    {
+        case ProcessStatus_Starting:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Started:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Paused:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Terminating:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_TerminatedNormally:
+            rc = !uExitCode ? EXITCODEEXEC_SUCCESS : EXITCODEEXEC_CODE;
+            break;
+        case ProcessStatus_TerminatedSignal:
+            rc = EXITCODEEXEC_TERM_SIGNAL;
+            break;
+        case ProcessStatus_TerminatedAbnormally:
+            rc = EXITCODEEXEC_TERM_ABEND;
+            break;
+        case ProcessStatus_TimedOutKilled:
+            rc = EXITCODEEXEC_TIMEOUT;
+            break;
+        case ProcessStatus_TimedOutAbnormally:
+            rc = EXITCODEEXEC_TIMEOUT;
+            break;
+        case ProcessStatus_Down:
+            /* Service/OS is stopping, process was killed, so
+             * not exactly an error of the started process ... */
+            rc = EXITCODEEXEC_DOWN;
+            break;
+        case ProcessStatus_Error:
+            rc = EXITCODEEXEC_FAILED;
+            break;
+        default:
+            AssertMsgFailed(("Unknown exit code (%u) from guest process returned!\n", enmStatus));
+            break;
+    }
+    return rc;
+}
+#endif
 
 static int ctrlPrintError(com::ErrorInfo &errorInfo)
@@ -482 +572 @@
 }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
 /**
  * Prints the desired guest output to a stream.
@@ -493 +584 @@
 static int ctrlExecPrintOutput(IGuest *pGuest, ULONG uPID,
                                PRTSTREAM pStrmOutput, uint32_t fOutputFlags,
-                               uint32_t cMsTimeout)
+                               RTMSINTERVAL cMsTimeout)
 {
     AssertPtrReturn(pGuest, VERR_INVALID_POINTER);
@@ -565 +656 @@
     return vrc;
 }
+#else
+/**
+ * Prints the desired guest output to a stream.
+ *
+ * @return  IPRT status code.
+ * @param   pProcess        Pointer to appropriate process object.
+ * @param   pStrmOutput     Where to write the data.
+ * @param   hStream         Where to read the data from.
+ */
+static int ctrlExecPrintOutput(IProcess *pProcess, PRTSTREAM pStrmOutput,
+                               ULONG uHandle)
+{
+    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStrmOutput, VERR_INVALID_POINTER);
+
+    int vrc = VINF_SUCCESS;
+
+    SafeArray<BYTE> aOutputData;
+    HRESULT rc = pProcess->Read(uHandle, _64K, 1 /* timeout */,
+                                ComSafeArrayAsOutParam(aOutputData));
+    if (FAILED(rc))
+        vrc = ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+    else
+    {
+        /** @todo implement the dos2unix/unix2dos conversions */
+        vrc = RTStrmWrite(pStrmOutput, aOutputData.raw(), aOutputData.size());
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to write output, rc=%Rrc\n", vrc);
+    }
+
+    return vrc;
+}
+#endif
 
 /**
@@ -572 +696 @@
  * @return  RTMSINTERVAL    Time left (in ms).
  * @param   u64StartMs      Start time (in ms).
- * @param   u32TimeoutMs    Timeout value (in ms).
- */
-inline RTMSINTERVAL ctrlExecGetRemainingTime(uint64_t u64StartMs, uint32_t u32TimeoutMs)
-{
-    if (!u32TimeoutMs) /* If no timeout specified, wait forever. */
+ * @param   cMsTimeout      Timeout value (in ms).
+ */
+inline RTMSINTERVAL ctrlExecGetRemainingTime(uint64_t u64StartMs, RTMSINTERVAL cMsTimeout)
+{
+    if (!cMsTimeout || cMsTimeout == RT_INDEFINITE_WAIT) /* If no timeout specified, wait forever. */
         return RT_INDEFINITE_WAIT;
 
     uint64_t u64ElapsedMs = RTTimeMilliTS() - u64StartMs;
-    if (u64ElapsedMs >= u32TimeoutMs)
+    if (u64ElapsedMs >= cMsTimeout)
         return 0;
 
-    return u32TimeoutMs - u64ElapsedMs;
+    return cMsTimeout - u64ElapsedMs;
 }
 
@@ -605 +729 @@
         { "--image",                        'i',                                      RTGETOPT_REQ_STRING  },
         { "--no-profile",                   GETOPTDEF_EXEC_NO_PROFILE,                RTGETOPT_REQ_NOTHING },
+        { "--username",                     'u',                                      RTGETOPT_REQ_STRING  },
         { "--passwordfile",                 'p',                                      RTGETOPT_REQ_STRING  },
         { "--password",                     GETOPTDEF_EXEC_PASSWORD,                  RTGETOPT_REQ_STRING  },
+        { "--domain",                       'd',                                      RTGETOPT_REQ_STRING  },
         { "--timeout",                      't',                                      RTGETOPT_REQ_UINT32  },
         { "--unix2dos",                     GETOPTDEF_EXEC_UNIX2DOS,                  RTGETOPT_REQ_NOTHING },
-        { "--username",                     'u',                                      RTGETOPT_REQ_STRING  },
         { "--verbose",                      'v',                                      RTGETOPT_REQ_NOTHING },
         { "--wait-exit",                    GETOPTDEF_EXEC_WAITFOREXIT,               RTGETOPT_REQ_NOTHING },
@@ -621 +746 @@
     RTGetOptInit(&GetState, pArg->argc, pArg->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0);
 
-    Utf8Str                 Utf8Cmd;
+    Utf8Str                 strCmd;
+#ifndef VBOX_WITH_GUEST_CONTROL2
     uint32_t                fExecFlags      = ExecuteProcessFlag_None;
+#else
+    com::SafeArray<ProcessCreateFlag_T> aCreateFlags;
+    com::SafeArray<ProcessWaitForFlag_T> aWaitFlags;
+#endif
     com::SafeArray<IN_BSTR> args;
     com::SafeArray<IN_BSTR> env;
-    Utf8Str                 Utf8UserName;
-    Utf8Str                 Utf8Password;
-    uint32_t                cMsTimeout      = 0;
+    Utf8Str                 strUserName;
+    Utf8Str                 strPassword;
+    Utf8Str                 strDomain;
+    RTMSINTERVAL            cMsTimeout      = 0;
     OUTPUTTYPE              eOutputType     = OUTPUTTYPE_UNDEFINED;
-    bool                    fOutputBinary   = false;
     bool                    fWaitForExit    = false;
     bool                    fVerbose        = false;
@@ -662 +792 @@
 
             case GETOPTDEF_EXEC_IGNOREORPHANEDPROCESSES:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_IgnoreOrphanedProcesses;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_IgnoreOrphanedProcesses);
+#endif
                 break;
 
             case GETOPTDEF_EXEC_NO_PROFILE:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_NoProfile;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_NoProfile);
+#endif
                 break;
 
             case 'i':
-                Utf8Cmd = ValueUnion.psz;
+                strCmd = ValueUnion.psz;
                 break;
 
             /** @todo Add a hidden flag. */
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_EXEC_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
                 break;
             }
+
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
+                break;
 
             case 't': /* Timeout */
@@ -697 +843 @@
                 break;
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
-                break;
-
             case 'v': /* Verbose */
                 fVerbose = true;
@@ -706 +848 @@
 
             case GETOPTDEF_EXEC_WAITFOREXIT:
+#ifndef VBOX_WITH_GUEST_CONTROL2
+#else
+                aWaitFlags.push_back(ProcessWaitForFlag_Terminate);
+#endif
                 fWaitForExit = true;
                 break;
 
             case GETOPTDEF_EXEC_WAITFORSTDOUT:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_WaitForStdOut;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdOut);
+                aWaitFlags.push_back(ProcessWaitForFlag_StdOut);
+#endif
                 fWaitForExit = true;
                 break;
 
             case GETOPTDEF_EXEC_WAITFORSTDERR:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_WaitForStdErr;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdErr);
+                aWaitFlags.push_back(ProcessWaitForFlag_StdErr);
+#endif
                 fWaitForExit = true;
                 break;
@@ -721 +877 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                if (args.size() == 0 && Utf8Cmd.isEmpty())
-                    Utf8Cmd = ValueUnion.psz;
+                if (args.size() == 0 && strCmd.isEmpty())
+                    strCmd = ValueUnion.psz;
                 else
                     args.push_back(Bstr(ValueUnion.psz).raw());
@@ -733 +889 @@
     }
 
-    if (Utf8Cmd.isEmpty())
+    if (strCmd.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No command to execute specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -744 +900 @@
 
     /*
-     * <missing comment indicating that we're done parsing args and started doing something else>
+     * Start with the real work.
      */
     HRESULT rc = S_OK;
@@ -755 +911 @@
     }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
     /* Get current time stamp to later calculate rest of timeout left. */
     uint64_t u64StartMS = RTTimeMilliTS();
 
-    /* Execute the process. */
-    int rcExit = RTEXITCODE_FAILURE;
-    ComPtr<IProgress> progress;
+    /*
+     * Execute the process.
+     */
+    ComPtr<IProgress> pProgress;
     ULONG uPID = 0;
-    rc = pGuest->ExecuteProcess(Bstr(Utf8Cmd).raw(),
+    rc = pGuest->ExecuteProcess(Bstr(strCmd).raw(),
                                fExecFlags,
                                ComSafeArrayAsInParam(args),
                                ComSafeArrayAsInParam(env),
-                               Bstr(Utf8UserName).raw(),
-                               Bstr(Utf8Password).raw(),
+                               Bstr(strUserName).raw(),
+                               Bstr(strPassword).raw(),
                                cMsTimeout,
                                &uPID,
-                               progress.asOutParam());
+                               pProgress.asOutParam());
     if (FAILED(rc))
-        return ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+    {
+        ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+        return RTEXITCODE_FAILURE;
+    }
 
     if (fVerbose)
-        RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.c_str(), uPID);
+        RTPrintf("Process '%s' (PID: %u) started\n", strCmd.c_str(), uPID);
     if (fWaitForExit)
     {
@@ -795 +956 @@
 
         /* Setup signal handling if cancelable. */
-        ASSERT(progress);
+        ASSERT(pProgress);
         bool fCanceledAlready = false;
         BOOL fCancelable;
-        HRESULT hrc = progress->COMGETTER(Cancelable)(&fCancelable);
+        HRESULT hrc = pProgress->COMGETTER(Cancelable)(&fCancelable);
         if (FAILED(hrc))
             fCancelable = FALSE;
@@ -814 +975 @@
         BOOL fCompleted    = FALSE;
         BOOL fCanceled     = FALSE;
-        while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
+        while (   SUCCEEDED(pProgress->COMGETTER(Completed(&fCompleted)))
                && !fCompleted)
         {
             /* Do we need to output stuff? */
-            uint32_t cMsTimeLeft;
+            RTMSINTERVAL cMsTimeLeft;
             if (fExecFlags & ExecuteProcessFlag_WaitForStdOut)
             {
@@ -840 +1001 @@
             if (g_fGuestCtrlCanceled && !fCanceledAlready)
             {
-                hrc = progress->Cancel();
+                hrc = pProgress->Cancel();
                 if (SUCCEEDED(hrc))
                     fCanceledAlready = TRUE;
@@ -848 +1009 @@
 
             /* Progress canceled by Main API? */
-            if (   SUCCEEDED(progress->COMGETTER(Canceled(&fCanceled)))
+            if (   SUCCEEDED(pProgress->COMGETTER(Canceled(&fCanceled)))
                 && fCanceled)
                 break;
@@ -856 +1017 @@
                 && RTTimeMilliTS() - u64StartMS > cMsTimeout)
             {
-                progress->Cancel();
+                pProgress->Cancel();
                 break;
             }
@@ -870 +1031 @@
             if (fVerbose)
                 RTPrintf("Process execution canceled!\n");
-            rcExit = EXITCODEEXEC_CANCELED;
+            return EXITCODEEXEC_CANCELED;
         }
         else if (   fCompleted
@@ -876 +1037 @@
         {
             LONG iRc;
-            CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
+            CHECK_ERROR_RET(pProgress, COMGETTER(ResultCode)(&iRc), rc);
             if (FAILED(iRc))
-                vrc = ctrlPrintProgressError(progress);
+                vrc = ctrlPrintProgressError(pProgress);
             else
             {
@@ -888 +1049 @@
                     if (fVerbose)
                         RTPrintf("Exit code=%u (Status=%u [%s], Flags=%u)\n", uRetExitCode, retStatus, ctrlExecProcessStatusToText(retStatus), uRetFlags);
-                    rcExit = ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
+                    return ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
                 }
                 else
                 {
                     ctrlPrintError(pGuest, COM_IIDOF(IGuest));
-                    rcExit = RTEXITCODE_FAILURE;
+                    return RTEXITCODE_FAILURE;
                 }
             }
@@ -901 +1062 @@
             if (fVerbose)
                 RTPrintf("Process execution aborted!\n");
-            rcExit = EXITCODEEXEC_TERM_ABEND;
-        }
-    }
-
-    if (RT_FAILURE(vrc) || FAILED(rc))
+            return EXITCODEEXEC_TERM_ABEND;
+        }
+    }
+#else
+    ComPtr<IGuestSession> pGuestSession;
+    rc = pGuest->CreateSession(Bstr(strUserName).raw(),
+                               Bstr(strPassword).raw(),
+                               Bstr(strDomain).raw(),
+                               Bstr("guest exec").raw(),
+                               pGuestSession.asOutParam());
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pGuest, COM_IIDOF(IGuest));
         return RTEXITCODE_FAILURE;
-    return rcExit;
+    }
+
+    /* Get current time stamp to later calculate rest of timeout left. */
+    uint64_t u64StartMS = RTTimeMilliTS();
+
+    /*
+     * Execute the process.
+     */
+    ComPtr<IGuestProcess> pProcess;
+    rc = pGuestSession->ProcessCreate(Bstr(strCmd).raw(),
+                                      ComSafeArrayAsInParam(args),
+                                      ComSafeArrayAsInParam(env),
+                                      ComSafeArrayAsInParam(aCreateFlags),
+                                      cMsTimeout,
+                                      pProcess.asOutParam());
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pGuestSession, COM_IIDOF(IGuestSession));
+        return RTEXITCODE_FAILURE;
+    }
+    ULONG uPID = 0;
+    rc = pProcess->COMGETTER(PID)(&uPID);
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+        return RTEXITCODE_FAILURE;
+    }
+
+    if (fVerbose)
+        RTPrintf("Process '%s' (PID: %u) started\n", strCmd.c_str(), uPID);
+
+    if (fWaitForExit)
+    {
+        if (fVerbose)
+        {
+            if (cMsTimeout) /* Wait with a certain timeout. */
+            {
+                /* Calculate timeout value left after process has been started.  */
+                uint64_t u64Elapsed = RTTimeMilliTS() - u64StartMS;
+                /* Is timeout still bigger than current difference? */
+                if (cMsTimeout > u64Elapsed)
+                    RTPrintf("Waiting for process to exit (%ums left) ...\n", cMsTimeout - u64Elapsed);
+                else
+                    RTPrintf("No time left to wait for process!\n"); /** @todo a bit misleading ... */
+            }
+            else /* Wait forever. */
+                RTPrintf("Waiting for process to exit ...\n");
+        }
+
+        /** @todo does this need signal handling? there's no progress object etc etc */
+
+        vrc = RTStrmSetMode(g_pStdOut, 1 /* Binary mode */, -1 /* Code set, unchanged */);
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to set stdout's binary mode, rc=%Rrc\n", vrc);
+        vrc = RTStrmSetMode(g_pStdErr, 1 /* Binary mode */, -1 /* Code set, unchanged */);
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to set stderr's binary mode, rc=%Rrc\n", vrc);
+
+        /* Wait for process to exit ... */
+        RTMSINTERVAL cMsTimeLeft = 1;
+        bool fCompleted = false;
+        while (!fCompleted && cMsTimeLeft != 0)
+        {
+            cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
+            ProcessWaitResult_T waitResult;
+            rc = pProcess->WaitForArray(ComSafeArrayAsInParam(aWaitFlags), cMsTimeLeft, &waitResult);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+
+            switch (waitResult)
+            {
+                case ProcessWaitResult_StdOut:
+                    /* Do we need to fetch stdout data? */
+                    vrc = ctrlExecPrintOutput(pProcess, g_pStdOut, 1 /* StdOut */);
+                    break;
+                case ProcessWaitResult_StdErr:
+                    /* Do we need to fetch stderr data? */
+                    vrc = ctrlExecPrintOutput(pProcess, g_pStdErr, 2 /* StdErr */);
+                    break;
+                case ProcessWaitResult_Terminate:
+                    /* Process terminated, we're done */
+                    fCompleted = true;
+                    break;
+                default:
+                    /* Ignore all other results, let the timeout expire */;
+            }
+        } /* while */
+
+        /* Report status back to the user. */
+        if (fCompleted)
+        {
+            ProcessStatus_T status;
+            rc = pProcess->COMGETTER(Status)(&status);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+            LONG exitCode;
+            rc = pProcess->COMGETTER(ExitCode)(&exitCode);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+            if (fVerbose)
+                RTPrintf("Exit code=%u (Status=%u [%s])\n", exitCode, status, ctrlExecProcessStatusToText(status));
+            return ctrlExecProcessStatusToExitCode(status, exitCode);
+        }
+        else
+        {
+            if (fVerbose)
+                RTPrintf("Process execution aborted!\n");
+            return EXITCODEEXEC_TERM_ABEND;
+        }
+    }
+#endif
+
+    return RT_FAILURE(vrc) || FAILED(rc) ? RTEXITCODE_FAILURE : RTEXITCODE_SUCCESS;
 }
 
@@ -1322 +1612 @@
 
     int vrc = VINF_SUCCESS;
-    ComPtr<IProgress> progress;
+    ComPtr<IProgress> pProgress;
     HRESULT rc;
     if (pContext->fHostToGuest)
@@ -1328 +1618 @@
         rc = pContext->pGuest->CopyToGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                            Bstr(pContext->pszUsername).raw(), Bstr(pContext->pszPassword).raw(),
-                                           fFlags, progress.asOutParam());
+                                           fFlags, pProgress.asOutParam());
     }
     else
@@ -1334 +1624 @@
         rc = pContext->pGuest->CopyFromGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                              Bstr(pContext->pszUsername).raw(), Bstr(pContext->pszPassword).raw(),
-                                             fFlags, progress.asOutParam());
+                                             fFlags, pProgress.asOutParam());
     }
 
@@ -1342 +1632 @@
     {
         if (pContext->fVerbose)
-            rc = showProgress(progress);
+            rc = showProgress(pProgress);
         else
-            rc = progress->WaitForCompletion(-1 /* No timeout */);
+            rc = pProgress->WaitForCompletion(-1 /* No timeout */);
         if (SUCCEEDED(rc))
-            CHECK_PROGRESS_ERROR(progress, ("File copy failed"));
-        vrc = ctrlPrintProgressError(progress);
+            CHECK_PROGRESS_ERROR(pProgress, ("File copy failed"));
+        vrc = ctrlPrintProgressError(pProgress);
     }
 
@@ -1591 +1881 @@
                     if (pContext->fVerbose)
                     {
-                        Utf8Str Utf8Dir(strName);
-                        RTPrintf("Directory: %s\n", Utf8Dir.c_str());
+                        Utf8Str strDir(strName);
+                        RTPrintf("Directory: %s\n", strDir.c_str());
                     }
 
@@ -1820 +2110 @@
         { "--dryrun",              GETOPTDEF_COPY_DRYRUN,           RTGETOPT_REQ_NOTHING },
         { "--follow",              GETOPTDEF_COPY_FOLLOW,           RTGETOPT_REQ_NOTHING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_COPY_PASSWORD,         RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--recursive",           'R',                             RTGETOPT_REQ_NOTHING },
         { "--target-directory",    GETOPTDEF_COPY_TARGETDIR,        RTGETOPT_REQ_STRING  },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -1834 +2125 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8Source;
-    Utf8Str Utf8Dest;
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strSource;
+    Utf8Str strDest;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
     uint32_t fFlags = CopyFileFlag_None;
     bool fVerbose = false;
@@ -1859 +2151 @@
                 break;
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_COPY_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -1871 +2167 @@
             }
 
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
+                break;
+
             case 'R': /* Recursive processing */
                 fFlags |= CopyFileFlag_Recursive;
@@ -1876 +2176 @@
 
             case GETOPTDEF_COPY_TARGETDIR:
-                Utf8Dest = ValueUnion.psz;
-                break;
-
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+                strDest = ValueUnion.psz;
                 break;
 
@@ -1893 +2189 @@
                  * (= last) argument as destination. */
                 if (   pArg->argc == GetState.iNext
-                    && Utf8Dest.isEmpty())
+                    && strDest.isEmpty())
                 {
-                    Utf8Dest = ValueUnion.psz;
+                    strDest = ValueUnion.psz;
                 }
                 else
@@ -1914 +2210 @@
                            "No source(s) specified!");
 
-    if (Utf8Dest.isEmpty())
+    if (strDest.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No destination specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No user name specified!");
@@ -1939 +2235 @@
     PCOPYCONTEXT pContext;
     vrc = ctrlCopyContextCreate(guest, fVerbose, fDryRun, fHostToGuest,
-                                Utf8UserName.c_str(), Utf8Password.c_str(),
+                                strUserName.c_str(), strPassword.c_str(),
                                 &pContext);
     if (RT_FAILURE(vrc))
@@ -1948 +2244 @@
 
     /* If the destination is a path, (try to) create it. */
-    const char *pszDest = Utf8Dest.c_str();
+    const char *pszDest = strDest.c_str();
     if (!RTPathFilename(pszDest))
     {
@@ -2028 +2324 @@
                     char *pszDestFile;
                     vrc = ctrlCopyTranslatePath(pszSourceRoot, pszSource,
-                                                Utf8Dest.c_str(), &pszDestFile);
+                                                strDest.c_str(), &pszDestFile);
                     if (RT_SUCCESS(vrc))
                     {
@@ -2043 +2339 @@
                     /* Directory (with filter?). */
                     vrc = ctrlCopyDirToDest(pContext, pszSource, pszFilter,
-                                            Utf8Dest.c_str(), fFlags);
+                                            strDest.c_str(), fFlags);
                 }
             }
@@ -2088 +2384 @@
         { "--mode",                'm',                             RTGETOPT_REQ_UINT32  },
         { "--parents",             'P',                             RTGETOPT_REQ_NOTHING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_MKDIR_PASSWORD,        RTGETOPT_REQ_STRING  },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -2100 +2397 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
     uint32_t fFlags = DirectoryCreateFlag_None;
     uint32_t fDirMode = 0; /* Default mode. */
@@ -2121 +2419 @@
                 break;
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_MKDIR_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -2133 +2435 @@
             }
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
                 break;
 
@@ -2156 +2458 @@
         return errorSyntax(USAGE_GUESTCONTROL, "No directory to create specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -2173 +2475 @@
 
         hrc = guest->DirectoryCreate(Bstr(it->first).raw(),
-                                     Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                     Bstr(strUserName).raw(), Bstr(strPassword).raw(),
                                      fDirMode, fFlags);
         if (FAILED(hrc))
@@ -2196 +2498 @@
         { "--file-system",         'f',                             RTGETOPT_REQ_NOTHING },
         { "--format",              'c',                             RTGETOPT_REQ_STRING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_STAT_PASSWORD,         RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--terse",               't',                             RTGETOPT_REQ_NOTHING },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -2209 +2512 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
 
     bool fVerbose = false;
@@ -2220 +2524 @@
         switch (ch)
         {
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_STAT_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -2232 +2540 @@
             }
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
                 break;
 
@@ -2263 +2571 @@
         return errorSyntax(USAGE_GUESTCONTROL, "No element(s) to check specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -2279 +2587 @@
         BOOL fExists;
         hrc = guest->FileExists(Bstr(it->first).raw(),
-                                Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                Bstr(strUserName).raw(), Bstr(strPassword).raw(),
                                 &fExists);
         if (FAILED(hrc))
@@ -2316 +2624 @@
      * arguments.
      */
-    Utf8Str Utf8Source;
+    Utf8Str strSource;
     bool fVerbose = false;
 
@@ -2337 +2645 @@
         {
             case 's':
-                Utf8Source = ValueUnion.psz;
+                strSource = ValueUnion.psz;
                 break;
 
@@ -2353 +2661 @@
 
 #ifdef DEBUG_andy
-    if (Utf8Source.isEmpty())
-        Utf8Source = "c:\\Downloads\\VBoxGuestAdditions-r67158.iso";
+    if (strSource.isEmpty())
+        strSource = "c:\\Downloads\\VBoxGuestAdditions-r67158.iso";
 #endif
 
     /* Determine source if not set yet. */
-    if (Utf8Source.isEmpty())
+    if (strSource.isEmpty())
     {
         char strTemp[RTPATH_MAX];
         vrc = RTPathAppPrivateNoArch(strTemp, sizeof(strTemp));
         AssertRC(vrc);
-        Utf8Str Utf8Src1 = Utf8Str(strTemp).append("/VBoxGuestAdditions.iso");
+        Utf8Str strSrc1 = Utf8Str(strTemp).append("/VBoxGuestAdditions.iso");
 
         vrc = RTPathExecDir(strTemp, sizeof(strTemp));
         AssertRC(vrc);
-        Utf8Str Utf8Src2 = Utf8Str(strTemp).append("/additions/VBoxGuestAdditions.iso");
+        Utf8Str strSrc2 = Utf8Str(strTemp).append("/additions/VBoxGuestAdditions.iso");
 
         /* Check the standard image locations */
-        if (RTFileExists(Utf8Src1.c_str()))
-            Utf8Source = Utf8Src1;
-        else if (RTFileExists(Utf8Src2.c_str()))
-            Utf8Source = Utf8Src2;
+        if (RTFileExists(strSrc1.c_str()))
+            strSource = strSrc1;
+        else if (RTFileExists(strSrc2.c_str()))
+            strSource = strSrc2;
         else
         {
@@ -2380 +2688 @@
         }
     }
-    else if (!RTFileExists(Utf8Source.c_str()))
-    {
-        RTMsgError("Source \"%s\" does not exist!\n", Utf8Source.c_str());
+    else if (!RTFileExists(strSource.c_str()))
+    {
+        RTMsgError("Source \"%s\" does not exist!\n", strSource.c_str());
         vrc = VERR_FILE_NOT_FOUND;
     }
@@ -2389 +2697 @@
     {
         if (fVerbose)
-            RTPrintf("Using source: %s\n", Utf8Source.c_str());
+            RTPrintf("Using source: %s\n", strSource.c_str());
 
         HRESULT rc = S_OK;
         ComPtr<IProgress> pProgress;
-        CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(Utf8Source).raw(),
+        CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
                                                 /* Wait for whole update process to complete. */
                                                 AdditionsUpdateFlag_None,

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -225 +225 @@
     if (bDhcp)
     {
-        CHECK_ERROR(hif, EnableDynamicIpConfig ());
+        CHECK_ERROR(hif, EnableDynamicIPConfig ());
     }
     else if (pIp)
@@ -232 +232 @@
             pNetmask = "255.255.255.0"; /* ?? */
 
-        CHECK_ERROR(hif, EnableStaticIpConfig(Bstr(pIp).raw(),
+        CHECK_ERROR(hif, EnableStaticIPConfig(Bstr(pIp).raw(),
                                               Bstr(pNetmask).raw()));
     }
@@ -250 +250 @@
 
         Bstr ipv6str(pIpv6);
-        CHECK_ERROR(hif, EnableStaticIpConfigV6(ipv6str.raw(),
+        CHECK_ERROR(hif, EnableStaticIPConfigV6(ipv6str.raw(),
                                                 (ULONG)uNetmasklengthv6));
     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -923 +923 @@
                     {
                         Bstr strNetwork;
-                        ComPtr<INATEngine> driver;
-                        nic->COMGETTER(NatDriver)(driver.asOutParam());
-                        driver->COMGETTER(Network)(strNetwork.asOutParam());
+                        ComPtr<INATEngine> engine;
+                        nic->COMGETTER(NATEngine)(engine.asOutParam());
+                        engine->COMGETTER(Network)(strNetwork.asOutParam());
                         com::SafeArray<BSTR> forwardings;
-                        driver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(forwardings));
+                        engine->COMGETTER(Redirects)(ComSafeArrayAsOutParam(forwardings));
                         strNatForwardings = "";
                         for (size_t i = 0; i < forwardings.size(); ++i)
@@ -1000 +1000 @@
                         ULONG tcpSnd = 0;
                         ULONG tcpRcv = 0;
-                        driver->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv);
+                        engine->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv);
 
                         if (details == VMINFO_MACHINEREADABLE)
@@ -1176 +1176 @@
 
     /* Pointing device information */
-    PointingHidType_T aPointingHid;
-    const char *pszHid = "Unknown";
-    const char *pszMrHid = "unknown";
-    machine->COMGETTER(PointingHidType)(&aPointingHid);
-    switch (aPointingHid)
-    {
-        case PointingHidType_None:
-            pszHid = "None";
-            pszMrHid = "none";
+    PointingHIDType_T aPointingHID;
+    const char *pszHID = "Unknown";
+    const char *pszMrHID = "unknown";
+    machine->COMGETTER(PointingHIDType)(&aPointingHID);
+    switch (aPointingHID)
+    {
+        case PointingHIDType_None:
+            pszHID = "None";
+            pszMrHID = "none";
             break;
-        case PointingHidType_PS2Mouse:
-            pszHid = "PS/2 Mouse";
-            pszMrHid = "ps2mouse";
+        case PointingHIDType_PS2Mouse:
+            pszHID = "PS/2 Mouse";
+            pszMrHID = "ps2mouse";
             break;
-        case PointingHidType_USBMouse:
-            pszHid = "USB Mouse";
-            pszMrHid = "usbmouse";
+        case PointingHIDType_USBMouse:
+            pszHID = "USB Mouse";
+            pszMrHID = "usbmouse";
             break;
-        case PointingHidType_USBTablet:
-            pszHid = "USB Tablet";
-            pszMrHid = "usbtablet";
+        case PointingHIDType_USBTablet:
+            pszHID = "USB Tablet";
+            pszMrHID = "usbtablet";
             break;
-        case PointingHidType_ComboMouse:
-            pszHid = "USB Tablet and PS/2 Mouse";
-            pszMrHid = "combomouse";
+        case PointingHIDType_ComboMouse:
+            pszHID = "USB Tablet and PS/2 Mouse";
+            pszMrHID = "combomouse";
             break;
         default:
@@ -1206 +1206 @@
     }
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("hidpointing=\"%s\"\n", pszMrHid);
+        RTPrintf("hidpointing=\"%s\"\n", pszMrHID);
     else
-        RTPrintf("Pointing Device: %s\n", pszHid);
+        RTPrintf("Pointing Device: %s\n", pszHID);
 
     /* Keyboard device information */
-    KeyboardHidType_T aKeyboardHid;
-    machine->COMGETTER(KeyboardHidType)(&aKeyboardHid);
-    pszHid = "Unknown";
-    pszMrHid = "unknown";
-    switch (aKeyboardHid)
-    {
-        case KeyboardHidType_None:
-            pszHid = "None";
-            pszMrHid = "none";
+    KeyboardHIDType_T aKeyboardHID;
+    machine->COMGETTER(KeyboardHIDType)(&aKeyboardHID);
+    pszHID = "Unknown";
+    pszMrHID = "unknown";
+    switch (aKeyboardHID)
+    {
+        case KeyboardHIDType_None:
+            pszHID = "None";
+            pszMrHID = "none";
             break;
-        case KeyboardHidType_PS2Keyboard:
-            pszHid = "PS/2 Keyboard";
-            pszMrHid = "ps2kbd";
+        case KeyboardHIDType_PS2Keyboard:
+            pszHID = "PS/2 Keyboard";
+            pszMrHID = "ps2kbd";
             break;
-        case KeyboardHidType_USBKeyboard:
-            pszHid = "USB Keyboard";
-            pszMrHid = "usbkbd";
+        case KeyboardHIDType_USBKeyboard:
+            pszHID = "USB Keyboard";
+            pszMrHID = "usbkbd";
             break;
-        case KeyboardHidType_ComboKeyboard:
-            pszHid = "USB and PS/2 Keyboard";
-            pszMrHid = "combokbd";
+        case KeyboardHIDType_ComboKeyboard:
+            pszHID = "USB and PS/2 Keyboard";
+            pszMrHID = "combokbd";
             break;
         default:
@@ -1237 +1237 @@
     }
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("hidkeyboard=\"%s\"\n", pszMrHid);
+        RTPrintf("hidkeyboard=\"%s\"\n", pszMrHID);
     else
-        RTPrintf("Keyboard Device: %s\n", pszHid);
+        RTPrintf("Keyboard Device: %s\n", pszHID);
 
     ComPtr<ISystemProperties> sysProps;
@@ -1713 +1713 @@
     {
         BOOL fEnabled;
-        BOOL fEhciEnabled;
+        BOOL fEHCIEnabled;
         rc = USBCtl->COMGETTER(Enabled)(&fEnabled);
         if (FAILED(rc))
@@ -1722 +1722 @@
             RTPrintf("USB:             %s\n", fEnabled ? "enabled" : "disabled");
 
-        rc = USBCtl->COMGETTER(EnabledEhci)(&fEhciEnabled);
+        rc = USBCtl->COMGETTER(EnabledEHCI)(&fEHCIEnabled);
         if (FAILED(rc))
-            fEhciEnabled = false;
+            fEHCIEnabled = false;
         if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("ehci=\"%s\"\n", fEhciEnabled ? "on" : "off");
+            RTPrintf("ehci=\"%s\"\n", fEHCIEnabled ? "on" : "off");
         else
-            RTPrintf("EHCI:            %s\n", fEhciEnabled ? "enabled" : "disabled");
+            RTPrintf("EHCI:            %s\n", fEHCIEnabled ? "enabled" : "disabled");
 
         SafeIfaceArray <IUSBDeviceFilter> Coll;
@@ -1998 +1998 @@
     /* Host PCI passthrough devices */
     {
-         SafeIfaceArray <IPciDeviceAttachment> assignments;
-         rc = machine->COMGETTER(PciDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
+         SafeIfaceArray <IPCIDeviceAttachment> assignments;
+         rc = machine->COMGETTER(PCIDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
          if (SUCCEEDED(rc))
          {
@@ -2009 +2009 @@
              for (size_t index = 0; index < assignments.size(); ++index)
              {
-                 ComPtr<IPciDeviceAttachment> Assignment = assignments[index];
-                 char szHostPciAddress[32], szGuestPciAddress[32];
-                 LONG iHostPciAddress = -1, iGuestPciAddress = -1;
+                 ComPtr<IPCIDeviceAttachment> Assignment = assignments[index];
+                 char szHostPCIAddress[32], szGuestPCIAddress[32];
+                 LONG iHostPCIAddress = -1, iGuestPCIAddress = -1;
                  Bstr DevName;
 
                  Assignment->COMGETTER(Name)(DevName.asOutParam());
-                 Assignment->COMGETTER(HostAddress)(&iHostPciAddress);
-                 Assignment->COMGETTER(GuestAddress)(&iGuestPciAddress);
-                 PciBusAddress().fromLong(iHostPciAddress).format(szHostPciAddress, sizeof(szHostPciAddress));
-                 PciBusAddress().fromLong(iGuestPciAddress).format(szGuestPciAddress, sizeof(szGuestPciAddress));
+                 Assignment->COMGETTER(HostAddress)(&iHostPCIAddress);
+                 Assignment->COMGETTER(GuestAddress)(&iGuestPCIAddress);
+                 PCIBusAddress().fromLong(iHostPCIAddress).format(szHostPCIAddress, sizeof(szHostPCIAddress));
+                 PCIBusAddress().fromLong(iGuestPCIAddress).format(szGuestPCIAddress, sizeof(szGuestPCIAddress));
 
                  if (details == VMINFO_MACHINEREADABLE)
-                     RTPrintf("AttachedHostPci=%s,%s\n", szHostPciAddress, szGuestPciAddress);
+                     RTPrintf("AttachedHostPCI=%s,%s\n", szHostPCIAddress, szGuestPCIAddress);
                  else
-                     RTPrintf("   Host device %ls at %s attached as %s\n", DevName.raw(), szHostPciAddress, szGuestPciAddress);
+                     RTPrintf("   Host device %ls at %s attached as %s\n", DevName.raw(), szHostPCIAddress, szGuestPCIAddress);
              }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -489 +489 @@
                 networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
                 RTPrintf("GUID:            %ls\n", interfaceGuid.raw());
-                BOOL bDhcpEnabled;
-                networkInterface->COMGETTER(DhcpEnabled)(&bDhcpEnabled);
-                RTPrintf("Dhcp:            %s\n", bDhcpEnabled ? "Enabled" : "Disabled");
+                BOOL bDHCPEnabled;
+                networkInterface->COMGETTER(DHCPEnabled)(&bDHCPEnabled);
+                RTPrintf("DHCP:            %s\n", bDHCPEnabled ? "Enabled" : "Disabled");
 
                 Bstr IPAddress;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1395 +1395 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
 
                 const char *psz = ValueUnion.psz;
@@ -1406 +1406 @@
                     psz = "";
 
-                CHECK_ERROR(driver, COMSETTER(Network)(Bstr(psz).raw()));
+                CHECK_ERROR(engine, COMSETTER(Network)(Bstr(psz).raw()));
                 break;
             }
@@ -1413 +1413 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(HostIP)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(HostIP)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1442 +1442 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
+                ComPtr<INATEngine> engine;
                 char *strMtu;
                 char *strSockSnd;
@@ -1463 +1463 @@
                 ASSERT(nic);
 
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, SetNetworkSettings(RTStrToUInt32(strMtu), RTStrToUInt32(strSockSnd), RTStrToUInt32(strSockRcv),
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, SetNetworkSettings(RTStrToUInt32(strMtu), RTStrToUInt32(strSockSnd), RTStrToUInt32(strSockRcv),
                                     RTStrToUInt32(strTcpSnd), RTStrToUInt32(strTcpRcv)));
                 break;
@@ -1473 +1473 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
                 /* format name:proto:hostip:hostport:guestip:guestport*/
                 if (RTStrCmp(ValueUnion.psz, "delete") != 0)
@@ -1512 +1512 @@
                         break;
                     }
-                    CHECK_ERROR(driver, AddRedirect(Bstr(strName).raw(), proto,
+                    CHECK_ERROR(engine, AddRedirect(Bstr(strName).raw(), proto,
                                         Bstr(strHostIp).raw(),
                                         RTStrToUInt16(strHostPort),
@@ -1525 +1525 @@
                     if (RT_FAILURE(vrc))
                         return errorSyntax(USAGE_MODIFYVM, "Not enough parameters");
-                    CHECK_ERROR(driver, RemoveRedirect(Bstr(ValueUnion.psz).raw()));
+                    CHECK_ERROR(engine, RemoveRedirect(Bstr(ValueUnion.psz).raw()));
                 }
                 break;
@@ -1533 +1533 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
+                ComPtr<INATEngine> engine;
                 uint32_t aliasMode = 0;
 
@@ -1539 +1539 @@
                 ASSERT(nic);
 
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
                 if (RTStrCmp(ValueUnion.psz,"default") == 0)
                 {
@@ -1561 +1561 @@
                     }
                 }
-                CHECK_ERROR(driver, COMSETTER(AliasMode)(aliasMode));
+                CHECK_ERROR(engine, COMSETTER(AliasMode)(aliasMode));
                 break;
             }
@@ -1568 +1568 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpPrefix)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPPrefix)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1581 +1581 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpBootFile)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPBootFile)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1594 +1594 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpNextServer)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPNextServer)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1606 +1606 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsPassDomain)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSPassDomain)(ValueUnion.f));
                 break;
             }
@@ -1619 +1619 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsProxy)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSProxy)(ValueUnion.f));
                 break;
             }
@@ -1632 +1632 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsUseHostResolver)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSUseHostResolver)(ValueUnion.f));
                 break;
             }
@@ -1665 +1665 @@
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_PS2Mouse));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_PS2Mouse));
                 }
                 else if (!strcmp(ValueUnion.psz, "usb"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBMouse));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_USBMouse));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -1675 +1675 @@
                 else if (!strcmp(ValueUnion.psz, "usbtablet"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBTablet));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_USBTablet));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -1707 +1707 @@
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_PS2Keyboard));
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHIDType)(KeyboardHIDType_PS2Keyboard));
                 }
                 else if (!strcmp(ValueUnion.psz, "usb"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_USBKeyboard));
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHIDType)(KeyboardHIDType_USBKeyboard));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -2229 +2229 @@
                 CHECK_ERROR(machine, COMGETTER(USBController)(UsbCtl.asOutParam()));
                 if (SUCCEEDED(rc))
-                    CHECK_ERROR(UsbCtl, COMSETTER(EnabledEhci)(ValueUnion.f));
+                    CHECK_ERROR(UsbCtl, COMSETTER(EnabledEHCI)(ValueUnion.f));
                 break;
             }
@@ -2355 +2355 @@
             case MODIFYVM_HPET:
             {
-                CHECK_ERROR(machine, COMSETTER(HpetEnabled)(ValueUnion.f));
+                CHECK_ERROR(machine, COMSETTER(HPETEnabled)(ValueUnion.f));
                 break;
             }
@@ -2361 +2361 @@
             case MODIFYVM_IOCACHE:
             {
-                CHECK_ERROR(machine, COMSETTER(IoCacheEnabled)(ValueUnion.f));
+                CHECK_ERROR(machine, COMSETTER(IOCacheEnabled)(ValueUnion.f));
                 break;
             }
@@ -2367 +2367 @@
             case MODIFYVM_IOCACHESIZE:
             {
-                CHECK_ERROR(machine, COMSETTER(IoCacheSize)(ValueUnion.u32));
+                CHECK_ERROR(machine, COMSETTER(IOCacheSize)(ValueUnion.u32));
                 break;
             }
@@ -2445 +2445 @@
                 else
                 {
-                    CHECK_ERROR(machine, AttachHostPciDevice(iHostAddr, iGuestAddr, TRUE));
+                    CHECK_ERROR(machine, AttachHostPCIDevice(iHostAddr, iGuestAddr, TRUE));
                 }
 
@@ -2462 +2462 @@
                 else
                 {
-                    CHECK_ERROR(machine, DetachHostPciDevice(iHostAddr));
+                    CHECK_ERROR(machine, DetachHostPCIDevice(iHostAddr));
                 }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp

@@ -649 +649 @@
             if (pMedium2Mount && (fSetNewUuid || fSetNewParentUuid))
             {
-                CHECK_ERROR(pMedium2Mount, SetIDs(fSetNewUuid, bstrNewUuid.raw(),
+                CHECK_ERROR(pMedium2Mount, SetIds(fSetNewUuid, bstrNewUuid.raw(),
                                                   fSetNewParentUuid, bstrNewParentUuid.raw()));
                 if (FAILED(rc))

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -250 +250 @@
         else
         {
-            m_pid = m_machine.GetSessionPid();
+            m_pid = m_machine.GetSessionPID();
     /// @todo Remove. See @c todo in #switchTo() below.
 #if 0

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -323 +323 @@
             if (data.m_interface.m_fDhcpClientEnabled)
             {
-                iface.EnableDynamicIpConfig();
+                iface.EnableDynamicIPConfig();
             }
             else
@@ -333 +333 @@
                           QHostAddress(data.m_interface.m_strInterfaceMask).protocol() == QAbstractSocket::IPv4Protocol,
                           ("Interface IPv4 network mask must be empty or IPv4-valid!\n"));
-                iface.EnableStaticIpConfig(data.m_interface.m_strInterfaceAddress, data.m_interface.m_strInterfaceMask);
+                iface.EnableStaticIPConfig(data.m_interface.m_strInterfaceAddress, data.m_interface.m_strInterfaceMask);
                 if (iface.GetIPV6Supported())
                 {
@@ -339 +339 @@
                               QHostAddress(data.m_interface.m_strInterfaceAddress6).protocol() == QAbstractSocket::IPv6Protocol,
                               ("Interface IPv6 address must be empty or IPv6-valid!\n"));
-                    iface.EnableStaticIpConfigV6(data.m_interface.m_strInterfaceAddress6, data.m_interface.m_strInterfaceMaskLength6.toULong());
+                    iface.EnableStaticIPConfigV6(data.m_interface.m_strInterfaceAddress6, data.m_interface.m_strInterfaceMaskLength6.toULong());
                 }
             }
@@ -554 +554 @@
     /* Host-only interface settings */
     data.m_interface.m_strName = iface.GetName();
-    data.m_interface.m_fDhcpClientEnabled = iface.GetDhcpEnabled();
+    data.m_interface.m_fDhcpClientEnabled = iface.GetDHCPEnabled();
     data.m_interface.m_strInterfaceAddress = iface.GetIPAddress();
     data.m_interface.m_strInterfaceMask = iface.GetNetworkMask();

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -790 +790 @@
 
             /* Gather redirect options: */
-            QVector<QString> redirects = adapter.GetNatDriver().GetRedirects();
+            QVector<QString> redirects = adapter.GetNATEngine().GetRedirects();
             for (int i = 0; i < redirects.size(); ++i)
             {
@@ -922 +922 @@
                         adapter.SetCableConnected(adapterData.m_fCableConnected);
                         /* Redirect options: */
-                        QVector<QString> oldRedirects = adapter.GetNatDriver().GetRedirects();
+                        QVector<QString> oldRedirects = adapter.GetNATEngine().GetRedirects();
                         for (int i = 0; i < oldRedirects.size(); ++i)
-                            adapter.GetNatDriver().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
+                            adapter.GetNATEngine().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
                         UIPortForwardingDataList newRedirects = adapterData.m_redirects;
                         for (int i = 0; i < newRedirects.size(); ++i)
                         {
                             UIPortForwardingData newRedirect = newRedirects[i];
-                            adapter.GetNatDriver().AddRedirect(newRedirect.name, newRedirect.protocol,
+                            adapter.GetNATEngine().AddRedirect(newRedirect.name, newRedirect.protocol,
                                                                newRedirect.hostIp, newRedirect.hostPort.value(),
                                                                newRedirect.guestIp, newRedirect.guestPort.value());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -238 +238 @@
     systemData.m_fEFIEnabled = m_machine.GetFirmwareType() >= KFirmwareType_EFI && m_machine.GetFirmwareType() <= KFirmwareType_EFIDUAL;
     systemData.m_fUTCEnabled = m_machine.GetRTCUseUTC();
-    systemData.m_fUseAbsHID = m_machine.GetPointingHidType() == KPointingHidType_USBTablet;
+    systemData.m_fUseAbsHID = m_machine.GetPointingHIDType() == KPointingHIDType_USBTablet;
     systemData.m_fPAEEnabled = m_machine.GetCPUProperty(KCPUPropertyType_PAE);
     systemData.m_fHwVirtExEnabled = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled);
@@ -363 +363 @@
             m_machine.SetFirmwareType(systemData.m_fEFIEnabled ? KFirmwareType_EFI : KFirmwareType_BIOS);
             m_machine.SetRTCUseUTC(systemData.m_fUTCEnabled);
-            m_machine.SetPointingHidType(systemData.m_fUseAbsHID ? KPointingHidType_USBTablet : KPointingHidType_PS2Mouse);
+            m_machine.SetPointingHIDType(systemData.m_fUseAbsHID ? KPointingHIDType_USBTablet : KPointingHIDType_PS2Mouse);
             /* Processor tab: */
             m_machine.SetCPUCount(systemData.m_cCPUCount);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -309 +309 @@
                 /* Gather USB values: */
                 usbData.m_fUSBEnabled = controller.GetEnabled();
-                usbData.m_fEHCIEnabled = controller.GetEnabledEhci();
+                usbData.m_fEHCIEnabled = controller.GetEnabledEHCI();
 
                 /* For each USB filter: */
@@ -506 +506 @@
                     {
                         controller.SetEnabled(usbData.m_fUSBEnabled);
-                        controller.SetEnabledEhci(usbData.m_fEHCIEnabled);
+                        controller.SetEnabledEHCI(usbData.m_fEHCIEnabled);
                     }
                     /* Store USB filters data: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp

@@ -49 +49 @@
     const CGuestOSType &osType = vbox.GetGuestOSType(m_machine.GetOSTypeId());
     /* Determine recommended controller's 'bus' & 'type': */
-    KStorageBus dvdCtrBus = osType.GetRecommendedDvdStorageBus();
-    KStorageControllerType dvdCtrType = osType.GetRecommendedDvdStorageController();
+    KStorageBus dvdCtrBus = osType.GetRecommendedDVDStorageBus();
+    KStorageControllerType dvdCtrType = osType.GetRecommendedDVDStorageController();
     /* Declare null 'dvd' attachment: */
     CMediumAttachment cda;
@@ -132 +132 @@
     const CGuestOSType &osType = vbox.GetGuestOSType(machine.GetOSTypeId());
     /* Determine recommended controller's 'bus' & 'type': */
-    KStorageBus hdCtrBus = osType.GetRecommendedHdStorageBus();
-    KStorageControllerType hdCtrType = osType.GetRecommendedHdStorageController();
+    KStorageBus hdCtrBus = osType.GetRecommendedHDStorageBus();
+    KStorageControllerType hdCtrType = osType.GetRecommendedHDStorageController();
     /* Enumerate attachments vector: */
     const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -91 +91 @@
     /* Enable the OHCI and EHCI controller by default for new VMs. (new in 2.2): */
     CUSBController usbController = m_machine.GetUSBController();
-    if (!usbController.isNull() && type.GetRecommendedUsb() && usbController.GetProxyAvailable())
+    if (!usbController.isNull() && type.GetRecommendedUSB() && usbController.GetProxyAvailable())
     {
         usbController.SetEnabled(true);
@@ -101 +101 @@
         CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
         if (manager.IsExtPackUsable(GUI_ExtPackName))
-            usbController.SetEnabledEhci(true);
+            usbController.SetEnabledEHCI(true);
     }
 
@@ -114 +114 @@
 
     /* Create recommended DVD storage controller: */
-    KStorageBus strDvdBus = type.GetRecommendedDvdStorageBus();
-    QString strDvdName = getNextControllerName(strDvdBus);
-    m_machine.AddStorageController(strDvdName, strDvdBus);
+    KStorageBus strDVDBus = type.GetRecommendedDVDStorageBus();
+    QString strDVDName = getNextControllerName(strDVDBus);
+    m_machine.AddStorageController(strDVDName, strDVDBus);
 
     /* Set recommended DVD storage controller type: */
-    CStorageController dvdCtr = m_machine.GetStorageControllerByName(strDvdName);
-    KStorageControllerType dvdStorageControllerType = type.GetRecommendedDvdStorageController();
+    CStorageController dvdCtr = m_machine.GetStorageControllerByName(strDVDName);
+    KStorageControllerType dvdStorageControllerType = type.GetRecommendedDVDStorageController();
     dvdCtr.SetControllerType(dvdStorageControllerType);
 
     /* Create recommended HD storage controller if it's not the same as the DVD controller: */
-    KStorageBus ctrHdBus = type.GetRecommendedHdStorageBus();
-    KStorageControllerType hdStorageControllerType = type.GetRecommendedHdStorageController();
+    KStorageBus ctrHDBus = type.GetRecommendedHDStorageBus();
+    KStorageControllerType hdStorageControllerType = type.GetRecommendedHDStorageController();
     CStorageController hdCtr;
-    QString strHdName;
-    if (ctrHdBus != strDvdBus || hdStorageControllerType != dvdStorageControllerType)
-    {
-        strHdName = getNextControllerName(ctrHdBus);
-        m_machine.AddStorageController(strHdName, ctrHdBus);
-        hdCtr = m_machine.GetStorageControllerByName(strHdName);
+    QString strHDName;
+    if (ctrHDBus != strDVDBus || hdStorageControllerType != dvdStorageControllerType)
+    {
+        strHDName = getNextControllerName(ctrHDBus);
+        m_machine.AddStorageController(strHDName, ctrHDBus);
+        hdCtr = m_machine.GetStorageControllerByName(strHDName);
         hdCtr.SetControllerType(hdStorageControllerType);
 
@@ -143 +143 @@
         /* The HD controller is the same as DVD: */
         hdCtr = dvdCtr;
-        strHdName = strDvdName;
+        strHDName = strDVDName;
     }
 
     /* Turn on PAE, if recommended: */
-    m_machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPae());
+    m_machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPAE());
 
     /* Set recommended firmware type: */
@@ -154 +154 @@
 
     /* Set recommended human interface device types: */
-    if (type.GetRecommendedUsbHid())
-    {
-        m_machine.SetKeyboardHidType(KKeyboardHidType_USBKeyboard);
-        m_machine.SetPointingHidType(KPointingHidType_USBMouse);
+    if (type.GetRecommendedUSBHID())
+    {
+        m_machine.SetKeyboardHIDType(KKeyboardHIDType_USBKeyboard);
+        m_machine.SetPointingHIDType(KPointingHIDType_USBMouse);
         if (!usbController.isNull())
             usbController.SetEnabled(true);
     }
 
-    if (type.GetRecommendedUsbTablet())
-    {
-        m_machine.SetPointingHidType(KPointingHidType_USBTablet);
+    if (type.GetRecommendedUSBTablet())
+    {
+        m_machine.SetPointingHIDType(KPointingHIDType_USBTablet);
         if (!usbController.isNull())
             usbController.SetEnabled(true);
@@ -170 +170 @@
 
     /* Set HPET flag: */
-    m_machine.SetHpetEnabled(type.GetRecommendedHpet());
+    m_machine.SetHPETEnabled(type.GetRecommendedHPET());
 
     /* Set UTC flags: */
-    m_machine.SetRTCUseUTC(type.GetRecommendedRtcUseUtc());
+    m_machine.SetRTCUseUTC(type.GetRecommendedRTCUseUTC());
 
     /* Set graphic bits: */
@@ -205 +205 @@
                 UIMedium vmedium = vboxGlobal().findMedium(strId);
                 CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
-                machine.AttachDevice(strHdName, 0, 0, KDeviceType_HardDisk, medium);
+                machine.AttachDevice(strHDName, 0, 0, KDeviceType_HardDisk, medium);
                 if (!machine.isOk())
                     msgCenter().cannotAttachDevice(machine, UIMediumType_HardDisk, field("virtualDiskLocation").toString(),
-                                                   StorageSlot(ctrHdBus, 0, 0), this);
+                                                   StorageSlot(ctrHDBus, 0, 0), this);
             }
 
             /* Attach empty CD/DVD ROM Device */
-            machine.AttachDevice(strDvdName, 1, 0, KDeviceType_DVD, CMedium());
+            machine.AttachDevice(strDVDName, 1, 0, KDeviceType_DVD, CMedium());
             if (!machine.isOk())
-                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDvdBus, 1, 0), this);
+                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDVDBus, 1, 0), this);