Changeset 75126 in vbox for trunk

Timestamp:

Oct 28, 2018 2:53:12 PM (6 years ago)

Author:

vboxsync

Message:

VBoxGuestR0LibHGCMInternal.cpp: We no longer seems to need alloca.h.

Location:

trunk/src/VBox/Additions/common/VBoxGuest/lib

Files:

• VBoxGuestR0LibHGCMInternal.cpp (modified) (3 diffs)
• VBoxGuestR0LibIdc-os2.cpp (modified) (1 diff)

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

@@ -36 +36 @@
 
 #include "VBoxGuestR0LibInternal.h"
-#include <iprt/alloca.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -537 +536 @@
                     pDstPgLst->flags            = pSrcPgLst->flags;
                     pDstPgLst->offFirstPage     = pSrcPgLst->offFirstPage;
-                    pDstPgLst->cPages           = cPages;
+                    pDstPgLst->cPages           = (uint16_t)cPages;
                     for (iPage = 0; iPage < cPages; iPage++)
                         pDstPgLst->aPages[iPage] = pSrcPgLst->aPages[iPage];
@@ -584 +583 @@
                         else
 #endif
-                            pDstPgLst->offFirstPage = pSrcParm->u.Pointer.u.linearAddr & PAGE_OFFSET_MASK;
-                        pDstPgLst->cPages           = (uint32_t)cPages; Assert(pDstPgLst->cPages == cPages);
+                            pDstPgLst->offFirstPage = (uint16_t)(pSrcParm->u.Pointer.u.linearAddr & PAGE_OFFSET_MASK);
+                        pDstPgLst->cPages           = (uint16_t)cPages; Assert(pDstPgLst->cPages == cPages);
                         for (iPage = 0; iPage < cPages; iPage++)
                         {

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-os2.cpp

@@ -57 +57 @@
         return g_VBoxGuestIDC.pfnServiceEP(g_VBoxGuestIDC.u32Session, VBGL_IOCTL_IDC_CONNECT, &pReq->Hdr, sizeof(*pReq));
     Log(("vbglDriverOpen: failed\n"));
+    RT_NOREF(pHandle);
     return VERR_FILE_NOT_FOUND;
 }