Changeset 75801 in vbox for trunk/src/VBox/HostServices/GuestControl/service.cpp

Timestamp:

Nov 29, 2018 1:54:46 AM (6 years ago)

Author:

vboxsync

Message:

VBoxGuestControl: Optimizing message handling - part 2. bugref:9313

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (2 diffs)

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

@@ -2070 +2070 @@
 
         /*
-         * For all other regular commands we call our hostCallback
-         * function. If the current command does not support notifications,
-         * notifyHost will return VERR_NOT_SUPPORTED.
+         * Stuff the goes to various main objects:
          */
-        default:
+        case GUEST_DISCONNECTED:
+        case GUEST_MSG_REPLY:
+        case GUEST_MSG_PROGRESS_UPDATE:
+        case GUEST_SESSION_NOTIFY:
+        case GUEST_EXEC_OUTPUT:
+        case GUEST_EXEC_STATUS:
+        case GUEST_EXEC_INPUT_STATUS:
+        case GUEST_EXEC_IO_NOTIFY:
+        case GUEST_DIR_NOTIFY:
+        case GUEST_FILE_NOTIFY:
             rc = pThis->hostCallback(idFunction, cParms, paParms);
+            Assert(rc != VINF_HGCM_ASYNC_EXECUTE);
             break;
 
@@ -2101 +2109 @@
             LogFlowFunc(("[Client %RU32] GUEST_MSG_FILTER_UNSET\n", idClient));
             rc = VERR_NOT_IMPLEMENTED;
+            break;
+
+        /*
+         * Anything else shall return fail with invalid function.
+         *
+         * Note! We used to return VINF_SUCCESS for these.  See bugref:9313
+         *       and Guest::i_notifyCtrlDispatcher().
+         */
+        default:
+            ASSERT_GUEST_MSG_FAILED(("idFunction=%d (%#x)\n", idFunction, idFunction));
+            rc = VERR_INVALID_FUNCTION;
             break;
     }