Changeset 70389 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib

Timestamp:

Dec 29, 2017 4:52:03 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuestR3LibGuestCtrl.cpp: Fixed some size assertions in VbglR3HGCMCall.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -480 +480 @@
     VbglHGCMParmUInt32Set(&Msg.flags, 0);
 
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    int rc = VbglR3HGCMCall(&Msg.hdr, RT_UOFFSETOF(HGCMMsgProcOutput, data));
     if (RT_SUCCESS(rc))
     {
@@ -852 +852 @@
     VbglHGCMParmUInt32Set(&Msg.u.open.handle, uFileHandle);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSET_AFTER(HGCMReplyFileNotify, u.open));
 }
 
@@ -867 +867 @@
     VbglHGCMParmUInt32Set(&Msg.rc, uRc);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSETOF(HGCMReplyFileNotify, u));
 }
 
@@ -881 +881 @@
     VbglHGCMParmUInt32Set(&Msg.rc, uRc);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSETOF(HGCMReplyFileNotify, u));
 }
 
@@ -898 +898 @@
     VbglHGCMParmPtrSet(&Msg.u.read.data, pvData, cbData);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSET_AFTER(HGCMReplyFileNotify, u.read));
 }
 
@@ -914 +914 @@
     VbglHGCMParmUInt32Set(&Msg.u.write.written, uWritten);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSET_AFTER(HGCMReplyFileNotify, u.write));
 }
 
@@ -930 +930 @@
     VbglHGCMParmUInt64Set(&Msg.u.seek.offset, uOffActual);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSET_AFTER(HGCMReplyFileNotify, u.seek));
 }
 
@@ -946 +946 @@
     VbglHGCMParmUInt64Set(&Msg.u.tell.offset, uOffActual);
 
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    return VbglR3HGCMCall(&Msg.hdr, RT_UOFFSET_AFTER(HGCMReplyFileNotify, u.tell));
 }