儲存庫 vbox 的更動 68527

時間撮記:

2017-8-24 下午07:19:22 (7 年 以前)

作者:

vboxsync

訊息:

VbglR3ClipboardGetHostMsg: This shouldn't need to retrieve output parameter values on failure (this isn't VbglR3GuestCtrlMsgWaitFor).

檔案:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp (修改) (2 筆差異)

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

@@ -73 +73 @@
  * @param   pfFormats       Where to store the format(s) the message applies to.
  */
-VBGLR3DECL(int) VbglR3ClipboardGetHostMsg(HGCMCLIENTID idClient, uint32_t *pMsg, uint32_t *pfFormats)
+VBGLR3DECL(int) VbglR3ClipboardGetHostMsg(HGCMCLIENTID idClient, uint32_t *pidMsg, uint32_t *pfFormats)
 {
     VBoxClipboardGetHostMsg Msg;
@@ -81 +81 @@
     VbglHGCMParmUInt32Set(&Msg.formats, 0);
 
-    int rc = VbglR3HGCMCallRaw(&Msg.hdr, sizeof(Msg));
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
-        uint32_t u32Msg;
-        rc = VbglHGCMParmUInt32Get(&Msg.msg, &u32Msg);
+        int rc2 = VbglHGCMParmUInt32Get(&Msg.msg, pidMsg);
         if (RT_SUCCESS(rc))
         {
-            uint32_t fFormats;
-            rc = VbglHGCMParmUInt32Get(&Msg.formats, &fFormats);
-            if (RT_SUCCESS(rc))
-            {
-                *pMsg = u32Msg;
-                *pfFormats = fFormats;
-                return Msg.hdr.result;
-            }
+            rc2 = VbglHGCMParmUInt32Get(&Msg.formats, pfFormats);
+            if (RT_SUCCESS(rc2))
+                return rc;
         }
+        rc = rc2;
     }
-
+    *pidMsg    = UINT32_MAX - 1;
+    *pfFormats = UINT32_MAX;
     return rc;
 }