vbox的更動 62800 路徑 trunk/src/VBox/HostServices

時間撮記:

2016-8-1 上午09:41:36 (8 年 以前)

作者:

vboxsync

訊息:

GuestCtrl/Service: warnings

位置:

trunk/src/VBox/HostServices/GuestControl

檔案:

• gctrl.cpp (修改) (4 筆差異)
• gctrl.h (修改) (1 筆差異)
• service.cpp (修改) (9 筆差異)
• testcase/tstGuestControlSvc.cpp (修改) (5 筆差異)

trunk/src/VBox/HostServices/GuestControl/gctrl.cpp

@@ -46 +46 @@
 namespace guestControl {
 
+#if 0 /* unused */
 /**
  * Creates the argument list as an array used for executing a program.
  *
  * @returns VBox status code.
- *
- * @todo
- *
- * @todo Respect spaces when quoting for arguments, e.g. "c:\\program files\\".
- * @todo Handle empty ("") arguments.
  */
 int gctrlPrepareExecArgv(char *pszArgs, void **ppvList, uint32_t *pcbList, uint32_t *pcArgs)
 {
     char **ppaArg;
-    int iArgs;
-    int rc = RTGetOptArgvFromString(&ppaArg, &iArgs, pszArgs, RTGETOPTARGV_CNV_QUOTE_BOURNE_SH, NULL);
+    int cArgs;
+    int rc = RTGetOptArgvFromString(&ppaArg, &cArgs, pszArgs, RTGETOPTARGV_CNV_QUOTE_BOURNE_SH, NULL);
     if (RT_SUCCESS(rc))
     {
+        /** @todo calc size first, allocate buffer, copy stuff. */
         char *pszTemp = NULL;
         *pcbList = 0;
-        for (int i=0; i<iArgs; i++)
+        for (int i = 0; i < cArgs; i++)
         {
             if (i > 0) /* Insert space as delimiter. */
+            {
                 rc = RTStrAAppendN(&pszTemp, " ", 1);
-
-            if (RT_FAILURE(rc))
-                break;
-            else
-            {
-                rc = RTStrAAppendN(&pszTemp, ppaArg[i], strlen(ppaArg[i]));
                 if (RT_FAILURE(rc))
                     break;
             }
-        }
+            rc = RTStrAAppendN(&pszTemp, ppaArg[i], strlen(ppaArg[i]));
+            if (RT_FAILURE(rc))
+                break;
+        }
+
         RTGetOptArgvFree(ppaArg);
+
         if (RT_SUCCESS(rc))
         {
             *ppvList = pszTemp;
-            *pcArgs = iArgs;
-            *pcbList = strlen(pszTemp) + 1; /* Include zero termination. */
+            *pcArgs  = cArgs;
+            *pcbList = (uint32_t)(strlen(pszTemp) + 1); /* Include zero termination. */
         }
         else
@@ -91 +88 @@
     return rc;
 }
-
-
+#endif
+
+
+#if 0 /* unused */
 /**
- * Appends environment variables to the environment block. Each var=value pair is separated
- * by NULL (\0) sequence. The whole block will be stored in one blob and disassembled on the
- * guest side later to fit into the HGCM param structure.
+ * Appends environment variables to the environment block.
+ *
+ * Each var=value pair is separated by NULL (\0) sequence. The whole block will
+ * be stored in one blob and disassembled on the guest side later to fit into
+ * the HGCM param structure.
  *
  * @returns VBox status code.
  *
- * @todo
- *
+ * @todo Write proper documentation
+ * @remarks currently not used.
  */
 int gctrlAddToExecEnvv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv)
 {
     int rc = VINF_SUCCESS;
-    uint32_t cbLen = strlen(pszEnv);
+    size_t cchLen = strlen(pszEnv);
     if (*ppvList)
     {
-        uint32_t cbNewLen = *pcbList + cbLen + 1; /* Include zero termination. */
+        size_t cbNewLen = *pcbList + cchLen + 1; /* Include zero termination. */
         char *pvTmp = (char*)RTMemRealloc(*ppvList, cbNewLen);
         if (NULL == pvTmp)
@@ -117 +118 @@
         else
         {
-            memcpy(pvTmp + *pcbList, pszEnv, cbLen);
+            memcpy(pvTmp + *pcbList, pszEnv, cchLen);
             pvTmp[cbNewLen - 1] = '\0'; /* Add zero termination. */
             *ppvList = (void**)pvTmp;
@@ -135 +136 @@
     if (RT_SUCCESS(rc))
     {
-        *pcbList += cbLen + 1; /* Include zero termination. */
-        *pcEnv += 1;           /* Increase env pairs count. */
-    }
-    return rc;
-}
+        *pcbList += (uint32_t)(cchLen + 1); /* Include zero termination. */
+        *pcEnv   += 1;                      /* Increase env pairs count. */
+    }
+    return rc;
+}
+#endif /* unused */
 
 /*

trunk/src/VBox/HostServices/GuestControl/gctrl.h

@@ -23 +23 @@
 namespace guestControl {
 
+//unused: /** @todo write docs! */
+//unused: int gctrlPrepareExecArgv(char *pszArgs, void **ppvList, uint32_t *pcbList, uint32_t *pcArgs);
+//unused: /** @todo write docs! */
+//unused: int gctrlAddToExecEnvv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv);
+#if 0
 /** @todo write docs! */
-int gctrlPrepareExecArgv(char *pszArgs, void **ppvList, uint32_t *pcbList, uint32_t *pcArgs);
-/** @todo write docs! */
-int gctrlAddToExecEnvv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv);
-/** @todo write docs! */
-#if 0
 int gctrlAllocateExecBlock(PVBOXGUESTCTRLEXECBLOCK *ppBlock,
                            const char *pszCmd, uint32_t fFlags,

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -1028 +1028 @@
     int sessionClose(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int uninit(void);
+
+    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(Service);
 };
 
@@ -1039 +1041 @@
 int Service::clientConnect(uint32_t u32ClientID, void *pvClient)
 {
+    RT_NOREF1(pvClient);
     LogFlowFunc(("[Client %RU32] Connected\n", u32ClientID));
 #ifdef VBOX_STRICT
@@ -1066 +1069 @@
 int Service::clientDisconnect(uint32_t u32ClientID, void *pvClient)
 {
+    RT_NOREF1(pvClient);
     LogFlowFunc(("[Client %RU32] Disconnected (%zu clients total)\n",
                  u32ClientID, mClientStateMap.size()));
@@ -1169 +1173 @@
                                    uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    RT_NOREF1(callHandle);
+
     /*
      * Lookup client in our list so that we can assign the context ID of
@@ -1182 +1188 @@
         return VERR_INVALID_PARAMETER;
 
-    uint32_t uValue, uMaskAdd, uMaskRemove;
+    uint32_t uValue;
     int rc = paParms[0].getUInt32(&uValue);
     if (RT_SUCCESS(rc))
+    {
+        uint32_t uMaskAdd;
         rc = paParms[1].getUInt32(&uMaskAdd);
-    if (RT_SUCCESS(rc))
-        rc = paParms[2].getUInt32(&uMaskRemove);
-    /** @todo paParm[3] (flags) not used yet. */
-    if (RT_SUCCESS(rc))
-    {
-        ClientState &clientState = itClientState->second;
-
-        clientState.mFlags |= CLIENTSTATE_FLAG_CONTEXTFILTER;
-        if (uMaskAdd)
-            clientState.mFilterMask |= uMaskAdd;
-        if (uMaskRemove)
-            clientState.mFilterMask &= ~uMaskRemove;
-
-        clientState.mFilterValue = uValue;
-
-        LogFlowFunc(("[Client %RU32] Setting message filterMask=0x%x, filterVal=%RU32 set (flags=0x%x, maskAdd=0x%x, maskRemove=0x%x)\n",
-                     u32ClientID, clientState.mFilterMask, clientState.mFilterValue,
-                     clientState.mFlags, uMaskAdd, uMaskRemove));
+        if (RT_SUCCESS(rc))
+        {
+            uint32_t uMaskRemove;
+            rc = paParms[2].getUInt32(&uMaskRemove);
+            /** @todo paParm[3] (flags) not used yet. */
+            if (RT_SUCCESS(rc))
+            {
+                ClientState &clientState = itClientState->second;
+
+                clientState.mFlags |= CLIENTSTATE_FLAG_CONTEXTFILTER;
+                if (uMaskAdd)
+                    clientState.mFilterMask |= uMaskAdd;
+                if (uMaskRemove)
+                    clientState.mFilterMask &= ~uMaskRemove;
+
+                clientState.mFilterValue = uValue;
+
+                LogFlowFunc(("[Client %RU32] Setting message filterMask=0x%x, filterVal=%RU32 set (flags=0x%x, maskAdd=0x%x, maskRemove=0x%x)\n",
+                             u32ClientID, clientState.mFilterMask, clientState.mFilterValue,
+                             clientState.mFlags, uMaskAdd, uMaskRemove));
+            }
+        }
     }
 
@@ -1212 +1224 @@
                                      uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    RT_NOREF2(callHandle, paParms);
+
     /*
      * Lookup client in our list so that we can assign the context ID of
@@ -1238 +1252 @@
                            uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    RT_NOREF2(callHandle, paParms);
+
     /*
      * Lookup client in our list so that we can assign the context ID of
@@ -1560 +1576 @@
 int Service::sessionClose(uint32_t u32ClientID, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    RT_NOREF2(u32ClientID, callHandle);
     if (cParms < 2)
         return VERR_INVALID_PARAMETER;
@@ -1574 +1591 @@
 
     LogFlowFunc(("Closing guest session ID=%RU32 (from client ID=%RU32) returned with rc=%Rrc\n",
-                 uSessionID, u32ClientID, rc));
+                 uSessionID, u32ClientID, rc)); NOREF(uSessionID);
     return rc;
 }

trunk/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp

@@ -154 +154 @@
     RTTestSub(g_hTest, "Testing host commands ...");
 
-    static VBOXHGCMSVCPARM s_aParms[1];
-    s_aParms[0].setUInt32(1000 /* Context ID */);
-
-    static CMDHOST s_aCmdHostAll[] =
-    {
-        #if 0
+    VBOXHGCMSVCPARM aParms[1];
+    aParms[0].setUInt32(1000 /* Context ID */);
+
+    CMDHOST aCmdHostAll[] =
+    {
+#if 0
         /** No client connected. */
         { 1024 /* Not existing command */, 0, 0, false, VERR_NOT_FOUND },
         { -1 /* Invalid command */, 0, 0, false, VERR_NOT_FOUND },
         { HOST_CANCEL_PENDING_WAITS, 1024, 0, false, VERR_NOT_FOUND },
-        { HOST_CANCEL_PENDING_WAITS, 0, &s_aParms[0], false, VERR_NOT_FOUND },
+        { HOST_CANCEL_PENDING_WAITS, 0, &aParms[0], false, VERR_NOT_FOUND },
 
         /** No client connected, valid command. */
@@ -176 +176 @@
         /** Client connected, valid parameters given. */
         { HOST_CANCEL_PENDING_WAITS, 0, 0, true, VINF_SUCCESS },
-        { HOST_CANCEL_PENDING_WAITS, 1024, &s_aParms[0], true, VINF_SUCCESS },
-        { HOST_CANCEL_PENDING_WAITS, 0, &s_aParms[0], true, VINF_SUCCESS},
-        #endif
+        { HOST_CANCEL_PENDING_WAITS, 1024, &aParms[0], true, VINF_SUCCESS },
+        { HOST_CANCEL_PENDING_WAITS, 0, &aParms[0], true, VINF_SUCCESS},
+#endif
 
         /** Client connected, invalid parameters given. */
@@ -186 +186 @@
 
         /** Client connected, parameters given. */
-        { HOST_CANCEL_PENDING_WAITS, 1, &s_aParms[0], true, VINF_SUCCESS },
-        { HOST_EXEC_CMD, 1, &s_aParms[0], true, VINF_SUCCESS },
-        { HOST_EXEC_SET_INPUT, 1, &s_aParms[0], true, VINF_SUCCESS },
-        { HOST_EXEC_GET_OUTPUT, 1, &s_aParms[0], true, VINF_SUCCESS },
+        { HOST_CANCEL_PENDING_WAITS, 1, &aParms[0], true, VINF_SUCCESS },
+        { HOST_EXEC_CMD, 1, &aParms[0], true, VINF_SUCCESS },
+        { HOST_EXEC_SET_INPUT, 1, &aParms[0], true, VINF_SUCCESS },
+        { HOST_EXEC_GET_OUTPUT, 1, &aParms[0], true, VINF_SUCCESS },
 
         /** Client connected, unknown command + valid parameters given. */
-        { -1, 1, &s_aParms[0], true, VINF_SUCCESS }
+        { -1, 1, &aParms[0], true, VINF_SUCCESS }
     };
 
-    int rc = testHostCmd(pTable, &s_aCmdHostAll[0], RT_ELEMENTS(s_aCmdHostAll));
+    int rc = testHostCmd(pTable, &aCmdHostAll[0], RT_ELEMENTS(aCmdHostAll));
     RTTestSubDone(g_hTest);
     return rc;
@@ -210 +210 @@
 
         /* No commands from host yet. */
-        static VBOXHGCMSVCPARM s_aParmsGuest[8];
-        s_aParmsGuest[0].setUInt32(0 /* Msg type */);
-        s_aParmsGuest[1].setUInt32(0 /* Parameters */);
+        VBOXHGCMSVCPARM aParmsGuest[8];
+        aParmsGuest[0].setUInt32(0 /* Msg type */);
+        aParmsGuest[1].setUInt32(0 /* Parameters */);
         pTable->pfnCall(pTable->pvService, &callHandle, 1 /* Client ID */, NULL /* pvClient */,
-                        GUEST_MSG_WAIT, 2, &s_aParmsGuest[0]);
+                        GUEST_MSG_WAIT, 2, &aParmsGuest[0]);
         RTTEST_CHECK_RC_RET(g_hTest, callHandle.rc, VINF_SUCCESS, callHandle.rc);
 
         /* Host: Add a dummy command. */
-        static VBOXHGCMSVCPARM s_aParmsHost[8];
-        s_aParmsHost[0].setUInt32(1000 /* Context ID */);
-        s_aParmsHost[1].setString("foo.bar");
-        s_aParmsHost[2].setString("baz");
-
-        rc = pTable->pfnHostCall(pTable->pvService, HOST_EXEC_CMD, 3, &s_aParmsHost[0]);
+        VBOXHGCMSVCPARM aParmsHost[8];
+        aParmsHost[0].setUInt32(1000 /* Context ID */);
+        aParmsHost[1].setString("foo.bar");
+        aParmsHost[2].setString("baz");
+
+        rc = pTable->pfnHostCall(pTable->pvService, HOST_EXEC_CMD, 3, &aParmsHost[0]);
         RTTEST_CHECK_RC_RET(g_hTest, rc, VINF_SUCCESS, rc);
 
@@ -239 +239 @@
  * Set environment variable "IPRT_TEST_MAX_LEVEL=all" to get more debug output!
  */
-int main(int argc, char **argv)
+int main()
 {
     RTEXITCODE rcExit  = RTTestInitAndCreate("tstGuestControlSvc", &g_hTest);