Changeset 68436 in vbox

Timestamp:

Aug 17, 2017 10:12:58 AM (7 years ago)

Author:

vboxsync

Message:

VBoxGuestLib/R3: Added VbglR3VrdpGetChangeRequest; build everything on windows; use size_t for vbglR3GRAlloc.

Location:

trunk

Files:

trunk/include/VBox/VBoxGuestLib.h

-              r68103
+              r68436
                                             unsigned *px, unsigned *py, bool *pfEnabled);
 /** @}  */
+/** @name VRDP
+ * @{ */
+VBGLR3DECL(int)     VbglR3VrdpGetChangeRequest(bool *pfActive, uint32_t *puExperienceLevel);
+/** @} */
 /** @name VM Statistics

-              r63108
+              r68436
         VBoxGuestR3LibTime.cpp \
         VBoxGuestR3LibModule.cpp \
+        VBoxGuestR3LibPidFile.cpp
+ifneq ($(KBUILD_TARGET),win) ## @todo get rid of this hack (as soon as it's all implemented / #defined).
+ VBoxGuestR3Lib_SOURCES   += \
+        VBoxGuestR3LibDaemonize.cpp \
+        VBoxGuestR3LibPidFile.cpp \
+        VBoxGuestR3LibVrdp.cpp \
         VBoxGuestR3LibMouse.cpp \
         VBoxGuestR3LibSeamless.cpp \
         VBoxGuestR3LibVideo.cpp
+ifneq ($(KBUILD_TARGET),win)
+ VBoxGuestR3Lib_SOURCES   += \
+        VBoxGuestR3LibDaemonize.cpp
 endif
 ifdef VBOX_WITH_GUEST_PROPS

r62679	r68436
47	47
48	48	int vbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData);
49		int vbglR3GRAlloc(VMMDevRequestHeader **ppReq, ~~uint32~~_t cb, VMMDevRequestType enmReqType);
	49	int vbglR3GRAlloc(VMMDevRequestHeader **ppReq, size_t cb, VMMDevRequestType enmReqType);
50	50	int vbglR3GRPerform(VMMDevRequestHeader *pReq);
51	51	void vbglR3GRFree(VMMDevRequestHeader *pReq);

-              r62521
+              r68436
 int vbglR3GRAlloc(VMMDevRequestHeader **ppReq, uint32_t cb, VMMDevRequestType enmReqType)
+int vbglR3GRAlloc(VMMDevRequestHeader **ppReq, size_t cb, VMMDevRequestType enmReqType)
+{
     VMMDevRequestHeader *pReq;
     AssertPtrReturn(ppReq, VERR_INVALID_PARAMETER);
     AssertMsgReturn(cb >= sizeof(VMMDevRequestHeader), ("%#x vs %#zx\n", cb, sizeof(VMMDevRequestHeader)),
+    AssertMsgReturn(cb >= sizeof(VMMDevRequestHeader) && cb < _1G, ("%#zx vs %#zx\n", cb, sizeof(VMMDevRequestHeader)),
                     VERR_INVALID_PARAMETER);
     pReq = (VMMDevRequestHeader *)RTMemTmpAlloc(cb);
+    if (RT_UNLIKELY(!pReq))
+        return VERR_NO_MEMORY;
+    if (RT_LIKELY(pReq))
+    {
+        pReq->size        = (uint32_t)cb;
+        pReq->version     = VMMDEV_REQUEST_HEADER_VERSION;
+        pReq->requestType = enmReqType;
+        pReq->rc          = VERR_GENERAL_FAILURE;
+        pReq->reserved1   = 0;
+        pReq->reserved2   = 0;
+    pReq->size        = cb;
+    pReq->version     = VMMDEV_REQUEST_HEADER_VERSION;
+    pReq->requestType = enmReqType;
+    pReq->rc          = VERR_GENERAL_FAILURE;
+    pReq->reserved1   = 0;
+    pReq->reserved2   = 0;
+        *ppReq = pReq;
     *ppReq = pReq;
     return VINF_SUCCESS;
+        return VINF_SUCCESS;
+    }
+    return VERR_NO_MEMORY;
+}

-              r64192
+              r68436
                  || cbReq == RT_OFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg,
                  VERR_INVALID_PARAMETER);
+    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq,
+                           VMMDevReq_SetPointerShape);
+    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq, VMMDevReq_SetPointerShape);
     if (RT_SUCCESS(rc))
+    {

Note: See TracChangeset for help on using the changeset viewer.