Changeset 28833 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 27, 2010 2:42:14 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Bugfixes.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (modified) (2 diffs)

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

@@ -147 +147 @@
                                            szUser, szPassword, uTimeLimitMS);
     }
+
+    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdStartProcess returned with %Rrc\n", rc);
     return rc;
 }
@@ -188 +190 @@
             AssertPtr(pData);
 
-            uint32_t cbRead = _4K; /* Try reading 4k. */
-            uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbRead);
+            uint32_t cbSize = _4K;
+            uint32_t cbRead = cbSize;
+            uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbSize);
             if (pBuf)
             {
-                rc = VBoxServiceControlExecReadPipeBufferContent(&pData->stdOut, pBuf, cbRead, &cbRead);
+                rc = VBoxServiceControlExecReadPipeBufferContent(&pData->stdOut, pBuf, cbSize, &cbRead);
                 if (RT_SUCCESS(rc))
                 {
@@ -208 +211 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
+    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdGetOutput returned with %Rrc\n", rc);
     return rc;
 }

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

@@ -264 +264 @@
      * and that it's now OK to send input to the process.
      */
-    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u\n",
-                       pData->uPID, pThread->uContextID);
+    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u, User=%s, PW=%s\n",
+                       pData->uPID, pThread->uContextID, pData->pszUser, pData->pszPassword);
     rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
                                          pData->uPID, PROC_STS_STARTED, 0 /* u32Flags */,
@@ -545 +545 @@
     }
     else
+    {
         pbBuffer = NULL;
+        *pcbToRead = 0;
+    }
     return VINF_SUCCESS;
 }