Changeset 43002 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2012 3:47:19 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80335

Message:

Build fix.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -177 +177 @@
         {
             mProcInfo.mCommand = strDest;
-            mProcInfo.mName = strDest;
+            if (mProcInfo.mName.isEmpty())
+                mProcInfo.mName = strDest;
         }
 
@@ -194 +195 @@
                         Utf8Str const &strFileSource, const Utf8Str &strFileDest,
                         bool fOptional, uint32_t *pcbSize);
-    int runFile(GuestSession *pSession, GuestProcessStartupInfo &procInfo);
+    int runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo);
 
     /** Files to handle. */

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -923 +923 @@
                                  Utf8StrFmt(GuestSession::tr("Guest Additions were not ready within time, giving up")));
 
-    eOSType eOSType;
+    eOSType osType;
     if (RT_SUCCESS(rc))
     {
@@ -951 +951 @@
                 || strOSType.contains("Windows", Utf8Str::CaseInsensitive))
             {
-                eOSType = eOSType_Windows;
+                osType = eOSType_Windows;
             }
             else if (strOSType.contains("Solaris", Utf8Str::CaseInsensitive))
             {
-                eOSType = eOSType_Solaris;
+                osType = eOSType_Solaris;
             }
             else /* Everything else hopefully means Linux :-). */
-                eOSType = eOSType_Linux;
+                osType = eOSType_Linux;
 
 #if 1 /* Only Windows is supported (and tested) at the moment. */
-            if (eOSType != eOSType_Windows)
+            if (osType != eOSType_Windows)
             {
                 hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED,
@@ -989 +989 @@
             /* Set default installation directories. */
             Utf8Str strUpdateDir = "/tmp/";
-            if (eOSType == eOSType_Windows)
+            if (osType == eOSType_Windows)
                  strUpdateDir = "C:\\Temp\\";
 
@@ -1020 +1020 @@
                     if (RT_SUCCESS(rc))
                     {
-                        if (eOSType == eOSType_Windows)
+                        if (osType == eOSType_Windows)
                         {
                             strUpdateDir.findReplace('/', '\\');
@@ -1049 +1049 @@
                 /* Prepare the file(s) we want to copy over to the guest and
                  * (maybe) want to run. */
-                switch (eOSType)
+                switch (osType)
                 {
                     case eOSType_Windows:
@@ -1142 +1142 @@
                         break;
                     default:
-                        AssertReleaseMsgFailed(("Unsupported guest type: %d\n", eOSType));
+                        AssertReleaseMsgFailed(("Unsupported guest type: %d\n", osType));
                         break;
                 }