Changeset 39659 in vbox

Timestamp:

Dec 20, 2011 10:36:53 AM (13 years ago)

Author:

vboxsync

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

75476

Message:

GuestControl: Bugfixes, logging.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)
• Main/src-client/GuestCtrlImpl.cpp (modified) (2 diffs)
• Main/src-client/GuestCtrlImplDir.cpp (modified) (2 diffs)
• Main/src-client/GuestCtrlImplFile.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -282 +282 @@
                                                /* Timelimit */
                                                &uTimeLimitMS);
-
         if (RT_SUCCESS(rc))
         {
-    #ifdef DEBUG
-            VBoxServiceVerbose(3, "Control: Start process szCmd=%s, uFlags=%u, szArgs=%s, szEnv=%s, szUser=%s, szPW=%s, uTimeout=%u\n",
-                               szCmd, uFlags, cArgs ? szArgs : "<None>", cEnvVars ? szEnv : "<None>", szUser, szPassword, uTimeLimitMS);
-    #endif
+            VBoxServiceVerbose(3, "Control: Request to start process szCmd=%s, uFlags=0x%x, szArgs=%s, szEnv=%s, szUser=%s, uTimeout=%u\n",
+                               szCmd, uFlags, cArgs ? szArgs : "<None>", cEnvVars ? szEnv : "<None>", szUser, uTimeLimitMS);
             rc = VBoxServiceControlStartAllowed(&fStartAllowed);
-            if (RT_FAILURE(rc))
-                VBoxServiceError("Control: Error determining whether process can be started or not, rc=%Rrc\n", rc);
-
             if (RT_SUCCESS(rc))
             {

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

@@ -1103 +1103 @@
 
     bool fDirExists;
-    if (ctrlCopyDirExists(pContext, pContext->fHostToGuest, pszDir, &fDirExists))
+    int rc = ctrlCopyDirExists(pContext, pContext->fHostToGuest, pszDir, &fDirExists);
+    if (   RT_SUCCESS(rc)
+        && fDirExists)
     {
         if (pContext->fVerbose)
@@ -1116 +1118 @@
         return VINF_SUCCESS;
 
-    int rc = VINF_SUCCESS;
     if (pContext->fHostToGuest) /* We want to create directories on the guest. */
     {
@@ -1127 +1128 @@
     else /* ... or on the host. */
     {
-        rc = RTDirCreateFullPath(pszDir, 700);
+        rc = RTDirCreateFullPath(pszDir, 0700);
         if (rc == VERR_ALREADY_EXISTS)
             rc = VINF_SUCCESS;

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

@@ -175 +175 @@
                                      LONG64 aSize, ComSafeArrayOut(BYTE, aData), int *pRC);
     HRESULT executeProcessResult(const char *pszCommand, const char *pszUser, ULONG ulTimeout, PCALLBACKDATAEXECSTATUS pExecStatus, ULONG *puPID);
-    HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
+    int     executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
     int     executeStreamDrain(ULONG aPID, ULONG ulFlags, GuestProcessStream &stream);
     int     executeStreamGetNextBlock(ULONG ulPID, ULONG ulFlags, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);

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

@@ -1305 +1305 @@
  * @param   enmAddAttribs
  */
-HRESULT Guest::executeStreamQueryFsObjInfo(IN_BSTR aObjName,
-                                           GuestProcessStreamBlock &streamBlock,
-                                           PRTFSOBJINFO pObjInfo,
-                                           RTFSOBJATTRADD enmAddAttribs)
-{
-    HRESULT rc = S_OK;
+int Guest::executeStreamQueryFsObjInfo(IN_BSTR aObjName,
+                                       GuestProcessStreamBlock &streamBlock,
+                                       PRTFSOBJINFO pObjInfo,
+                                       RTFSOBJATTRADD enmAddAttribs)
+{
     Utf8Str Utf8ObjName(aObjName);
-
     int64_t iVal;
-    int vrc = streamBlock.GetInt64Ex("st_size", &iVal);
-    if (RT_SUCCESS(vrc))
+    int rc = streamBlock.GetInt64Ex("st_size", &iVal);
+    if (RT_SUCCESS(rc))
         pObjInfo->cbObject = iVal;
-    else
-        rc = setError(VBOX_E_IPRT_ERROR,
-                      tr("Unable to retrieve size for \"%s\" (%Rrc)"),
-                      Utf8ObjName.c_str(), vrc);
     /** @todo Add more stuff! */
     return rc;
@@ -2178 +2172 @@
                     {
                         rc = setErrorNoLog(VBOX_E_IPRT_ERROR,
-                                           tr("Unable to retrieve process output data"));
+                                           tr("Unable to retrieve process output data (%Rrc)"), vrc);
                     }
                 }

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

@@ -254 +254 @@
                 break;
 
-            case VERR_NOT_FOUND:
-                rc = setError(VBOX_E_IPRT_ERROR,
-                              Guest::tr("Unable to query directory existence"));
-                break;
-
             default:
-                AssertReleaseMsgFailed(("directoryExistsInternal: Unknown return value (%Rrc)\n", rc));
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              Guest::tr("Unable to query directory existence (%Rrc)"), rc);
                 break;
         }
@@ -509 +505 @@
                     && aObjInfo) /* Do we want object details? */
                 {
-                    hr = executeStreamQueryFsObjInfo(aDirectory, stdOut[0],
+                    rc = executeStreamQueryFsObjInfo(aDirectory, stdOut[0],
                                                      aObjInfo, enmAddAttribs);
                 }
             }
             else
-                rc = VERR_NOT_FOUND;
+                rc = VERR_NO_DATA;
 
             if (pRC)

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

@@ -86 +86 @@
                 break;
 
-            case VERR_NOT_FOUND:
+            default:
                 hr = setError(VBOX_E_IPRT_ERROR,
-                              Guest::tr("Unable to query file existence"));
-                break;
-
-            default:
-                AssertReleaseMsgFailed(("fileExistsInternal: Unknown return value (%Rrc)\n", rc));
+                              Guest::tr("Unable to query file existence (%Rrc)"), rc);
                 break;
         }
@@ -161 +157 @@
                     && aObjInfo) /* Do we want object details? */
                 {
-                    hr = executeStreamQueryFsObjInfo(aFile, stdOut[0],
+                    rc = executeStreamQueryFsObjInfo(aFile, stdOut[0],
                                                      aObjInfo, enmAddAttribs);
                 }
             }
             else
-                rc = VERR_NOT_FOUND;
+                rc = VERR_NO_DATA;
 
             if (pRC)
@@ -223 +219 @@
 
             case VERR_FILE_NOT_FOUND:
-                rc = setError(VBOX_E_IPRT_ERROR,
+                hr = setError(VBOX_E_IPRT_ERROR,
                               Guest::tr("File not found"));
                 break;
 
-            case VERR_NOT_FOUND:
-                rc = setError(VBOX_E_IPRT_ERROR,
-                              Guest::tr("Unable to query file size"));
-                break;
-
             default:
-                AssertReleaseMsgFailed(("fileExistsInternal: Unknown return value (%Rrc)\n", rc));
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              Guest::tr("Unable to query file size (%Rrc)"), rc);
                 break;
         }
     }
-    return rc;
+
+    return hr;
 }
 #endif /* VBOX_WITH_GUEST_CONTROL */