Changeset 68502 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 22, 2017 12:01:40 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuestR3Lib: Fixed clipboard and guest control breakage since r117608.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• VBoxGuestR3LibGuestCtrl.cpp (modified) (1 diff)
• VBoxGuestR3LibHGCM.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp

@@ -81 +81 @@
     VbglHGCMParmUInt32Set(&Msg.formats, 0);
 
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    int rc = VbglR3HGCMCallRaw(&Msg.hdr, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1974 +1974 @@
     }
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = VbglR3HGCMCallRaw(&Msg.hdr, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -89 +89 @@
     VbglHGCMParmUInt32Set(&Msg.num_parms, 0);
 
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    int rc = VbglR3HGCMCallRaw(&Msg.hdr, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHGCM.cpp

@@ -82 +82 @@
 }
 
+
+/**
+ * Makes a fully prepared HGCM call, but don't return the result.
+ *
+ * @returns VBox status code.
+ * @param   pInfo           Fully prepared HGCM call info.
+ * @param   cbInfo          Size of the info.  This may sometimes be larger than
+ *                          what the parameter count indicates because of
+ *                          parameter changes between versions and such.
+ */
+VBGLR3DECL(int) VbglR3HGCMCallRaw(VBoxGuestHGCMCallInfo *pInfo, size_t cbInfo)
+{
+    /* Expect caller to have filled in pInfo. */
+    Assert(sizeof(*pInfo) + pInfo->cParms * sizeof(HGCMFunctionParameter) <= cbInfo);
+    Assert(pInfo->u32ClientID != 0);
+
+    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(cbInfo), pInfo, cbInfo);
+}
+
 /**
  * Makes a fully prepared HGCM call.
@@ -93 +112 @@
 VBGLR3DECL(int) VbglR3HGCMCall(VBoxGuestHGCMCallInfo *pInfo, size_t cbInfo)
 {
-    /* Expect caller to have filled in pInfo. */
-    Assert(sizeof(*pInfo) + pInfo->cParms * sizeof(HGCMFunctionParameter) <= cbInfo);
-    Assert(pInfo->u32ClientID != 0);
-
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(cbInfo), pInfo, cbInfo);
+    int rc = VbglR3HGCMCallRaw(pInfo, cbInfo);
     if (RT_SUCCESS(rc))
         rc = pInfo->result;