Changeset 72354 in vbox for trunk/src/VBox

Timestamp:

May 26, 2018 1:19:07 PM (7 years ago)

Author:

vboxsync

Message:

Main, VMMDev: implemented IDisplay::SetScreenLayout, VMMDev multimonitor resize request and VBoxManage controlvm setscreenlayout (attempt to fix linux additions build). bugref:8393

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibVideo.cpp (modified) (4 diffs)

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

@@ -34 +34 @@
 #include <VBox/HostServices/GuestPropertySvc.h>  /* For Save and RetrieveVideoMode */
 #include <iprt/assert.h>
-#if !defined(VBOX_VBGLR3_XFREE86) && !defined(VBOX_VBGLR3_XORG)
-# include <iprt/mem.h>
-#endif
+#include <iprt/mem.h>
 #include <iprt/string.h>
 
@@ -305 +303 @@
     cbDisplays = cDisplaysIn * sizeof(VMMDevDisplayDef);
     cbAlloc = RT_UOFFSETOF(VMMDevDisplayChangeRequestMulti, aDisplays) + cbDisplays;
-    pReq = (VMMDevDisplayChangeRequestMulti *)RTMemAllocZ(cbAlloc);
+    pReq = (VMMDevDisplayChangeRequestMulti *)RTMemTmpAlloc(cbAlloc);
     AssertPtrReturn(pReq, VERR_NO_MEMORY);
 
+    memset(pReq, 0, cbAlloc);
     rc = vmmdevInitRequest(&pReq->header, VMMDevReq_GetDisplayChangeRequestMulti);
-    AssertRCReturnStmt(rc, RTMemFree(pReq), rc);
+    AssertRCReturnStmt(rc, RTMemTmpFree(pReq), rc);
 
     pReq->header.size += (uint32_t)cbDisplays;
@@ -317 +316 @@
 
     rc = vbglR3GRPerform(&pReq->header);
-    AssertRCReturnStmt(rc, RTMemFree(pReq), rc);
+    AssertRCReturnStmt(rc, RTMemTmpFree(pReq), rc);
 
     rc = pReq->header.rc;
@@ -326 +325 @@
     }
 
-    RTMemFree(pReq);
+    RTMemTmpFree(pReq);
     return rc;
 }