VirtualBox

Changeset 6469 in vbox


Ignore:
Timestamp:
Jan 24, 2008 6:44:18 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
27464
Message:

Guest R3 naming fixes. This subsequently fixes the guest
r3 video drv's missing symbol issue.

The OS2 change I hope doesn't break anything. It seems to be
internal.

Location:
trunk/src/VBox/Additions
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h

    r6447 r6469  
    2323__BEGIN_DECLS
    2424
    25 int     vbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData);
    26 int     vbglR3GRAlloc(VMMDevRequestHeader **ppReq, uint32_t cb, VMMDevRequestType enmReqType);
    27 int     vbglR3GRPerform(VMMDevRequestHeader *pReq);
    28 void    vbglR3GRFree(VMMDevRequestHeader *pReq);
     25int     VbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData);
     26int     VbglR3GRAlloc(VMMDevRequestHeader **ppReq, uint32_t cb, VMMDevRequestType enmReqType);
     27int     VbglR3GRPerform(VMMDevRequestHeader *pReq);
     28void    VbglR3GRFree(VMMDevRequestHeader *pReq);
    2929
    3030

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

    r6447 r6469  
    150150 *          while on OS/2 we use the 2nd buffer of the IOCtl.
    151151 */
    152 int vbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData)
     152int VbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData)
    153153{
    154154#ifdef RT_OS_OS2

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

    r6447 r6469  
    4444    strcpy(Info.Loc.u.host.achName, "VBoxSharedClipboard");
    4545
    46     int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_CONNECT, &Info, sizeof(Info));
     46    int rc = VbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_CONNECT, &Info, sizeof(Info));
    4747    if (RT_SUCCESS(rc))
    4848    {
    … …  
    6767    Info.u32ClientID = u32ClientId;
    6868
    69     int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_DISCONNECT, &Info, sizeof(Info));
     69    int rc = VbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_DISCONNECT, &Info, sizeof(Info));
    7070    if (RT_SUCCESS(rc))
    7171        rc = Info.result;
    … …  
    9595    VbglHGCMParmUInt32Set(&Msg.formats, 0);
    9696
    97     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     97    int rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
    9898    if (RT_SUCCESS(rc))
    9999    {
    … …  
    145145    VbglHGCMParmUInt32Set(&Msg.size, 0);
    146146
    147     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     147    int rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
    148148    if (RT_SUCCESS(rc))
    149149    {
    … …  
    183183    VbglHGCMParmUInt32Set(&Msg.formats, fFormats);
    184184
    185     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     185    int rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
    186186    if (RT_SUCCESS(rc))
    187187        rc = Msg.hdr.result;
    … …  
    212212    VbglHGCMParmPtrSet(&Msg.ptr, pv, cb);
    213213
    214     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
    215     if (RT_SUCCESS(rc))
    216         rc = Msg.hdr.result;
    217     return rc;
    218 }
    219 
     214    int rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     215    if (RT_SUCCESS(rc))
     216        rc = Msg.hdr.result;
     217    return rc;
     218}
     219

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp

    r6447 r6469  
    2828
    2929
    30 int vbglR3GRAlloc(VMMDevRequestHeader **ppReq, uint32_t cb, VMMDevRequestType enmReqType)
     30int VbglR3GRAlloc(VMMDevRequestHeader **ppReq, uint32_t cb, VMMDevRequestType enmReqType)
    3131{
    3232    VMMDevRequestHeader *pReq;
    … …  
    5353
    5454
    55 int vbglR3GRPerform(VMMDevRequestHeader *pReq)
     55VBGLR3DECL(int) VbglR3GRPerform(VMMDevRequestHeader *pReq)
    5656{
    57     return vbglR3DoIOCtl(VBOXGUEST_IOCTL_VMMREQUEST(pReq->size), pReq, pReq->size);
     57    return VbglR3DoIOCtl(VBOXGUEST_IOCTL_VMMREQUEST(pReq->size), pReq, pReq->size);
    5858}
    5959
    6060
    61 void vbglR3GRFree(VMMDevRequestHeader *pReq)
     61void VbglR3GRFree(VMMDevRequestHeader *pReq)
    6262{
    6363    RTMemTmpFree(pReq);

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

    r6465 r6469  
    3535VBGLR3DECL(int) VbglR3InterruptEventWaits(void)
    3636{
    37     return vbglR3DoIOCtl(VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS, 0, 0);
     37    return VbglR3DoIOCtl(VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS, 0, 0);
    3838}
    3939
    … …  
    5959    {
    6060        size_t cbStep = RT_MIN(cb - off, STEP);
    61         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_LOG(cbStep), (char *)pch + off, cbStep);
     61        rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_LOG(cbStep), (char *)pch + off, cbStep);
    6262    }
    6363#undef STEP
    … …  
    7878    Info.u32OrMask = fOr;
    7979    Info.u32NotMask = fNot;
    80     return vbglR3DoIOCtl(VBOXGUEST_IOCTL_CTL_FILTER_MASK, &Info, sizeof(Info));
     80    return VbglR3DoIOCtl(VBOXGUEST_IOCTL_CTL_FILTER_MASK, &Info, sizeof(Info));
    8181}
    8282
    … …  
    105105    Req.eventAck = fEventAck;
    106106    Req.display = iDisplay;
    107     int rc = vbglR3GRPerform(&Req.header);
     107    int rc = VbglR3GRPerform(&Req.header);
    108108    if (RT_SUCCESS(rc))
    109109    {

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp

    r6447 r6469  
    3030    Req.pointerXPos = 0;
    3131    Req.pointerYPos = 0;
    32     int rc = vbglR3GRPerform(&Req.header);
     32    int rc = VbglR3GRPerform(&Req.header);
    3333    if (RT_SUCCESS(rc))
    3434    {
    … …  
    5151    Req.pointerXPos = 0;
    5252    Req.pointerYPos = 0;
    53     return vbglR3GRPerform(&Req.header);
     53    return VbglR3GRPerform(&Req.header);
    5454}
    5555

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp

    r6458 r6469  
    4646    vmmdevInitRequest(&vmmreqGuestCaps.header, VMMDevReq_ReportGuestCapabilities);
    4747    vmmreqGuestCaps.caps = fState ? VMMDEV_GUEST_SUPPORTS_SEAMLESS : 0;
    48     rc = vbglR3GRPerform(&vmmreqGuestCaps.header);
     48    rc = VbglR3GRPerform(&vmmreqGuestCaps.header);
    4949#ifdef DEBUG
    5050    if (RT_SUCCESS(rc))
    … …  
    7171    waitEvent.u32TimeoutIn = 0;
    7272    waitEvent.u32EventMaskIn = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
    73     rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent));
     73    rc = VbglR3DoIOCtl(VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent));
    7474    if (RT_SUCCESS(rc))
    7575    {
    … …  
    8282            vmmdevInitRequest(&seamlessChangeRequest.header, VMMDevReq_GetSeamlessChangeRequest);
    8383            seamlessChangeRequest.eventAck = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
    84             rc = vbglR3GRPerform(&seamlessChangeRequest.header);
     84            rc = VbglR3GRPerform(&seamlessChangeRequest.header);
    8585            if (RT_SUCCESS(rc))
    8686            {
    … …  
    102102 * @param   pRects list of visible rectangles on the guest display
    103103 *
    104  * @todo A scatter-gather version of vbglR3GRPerform would be nice, so that we don't have
     104 * @todo A scatter-gather version of VbglR3GRPerform would be nice, so that we don't have
    105105 *       to copy our rectangle and header data into a single structure and perform an
    106106 *       additional allocation.
    … …  
    113113    if (0 == cRects)
    114114        return VINF_SUCCESS;
    115     rc = vbglR3GRAlloc((VMMDevRequestHeader **)&req,
     115    rc = VbglR3GRAlloc((VMMDevRequestHeader **)&req,
    116116                       sizeof(VMMDevVideoSetVisibleRegion) + (cRects - 1) * sizeof(RTRECT),
    117117                       VMMDevReq_VideoSetVisibleRegion);
    … …  
    120120        req->cRect = cRects;
    121121        memcpy(&req->Rect, pRects, cRects * sizeof(RTRECT));
    122         rc = vbglR3GRPerform(&req->header);
    123         vbglR3GRFree(&req->header);
     122        rc = VbglR3GRPerform(&req->header);
     123        VbglR3GRFree(&req->header);
    124124        if (RT_SUCCESS(rc))
    125125        {

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp

    r6447 r6469  
    2929    vmmdevInitRequest(&Req.header, VMMDevReq_GetHostTime);
    3030    Req.time = UINT64_MAX;
    31     int rc = vbglR3GRPerform(&Req.header);
     31    int rc = VbglR3GRPerform(&Req.header);
    3232    if (RT_SUCCESS(rc))
    3333        RTTimeSpecSetMilli(pTime, (int64_t)Req.time);

  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r6361 r6469  
    4141        VBoxServiceClipboard-os2.cpp
    4242VBoxService_LIBS          = \
    43         $(VBOX_LIB_VBGL_R3) \
    44         $(VBOX_LIB_IPRT_GUEST_R3)
     43        $(VBOX_LIB_IPRT_GUEST_R3) \
     44        $(VBOX_LIB_VBGL_R3)
    4545
    4646include $(PATH_KBUILD)/subfooter.kmk

  • trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

    r6459 r6469  
    9090        main.cpp
    9191VBoxClient_LIBS = \
     92        $(VBOX_LIB_IPRT_GUEST_R3) \
    9293        $(VBOX_LIB_VBGL_R3) \
    93         $(VBOX_LIB_IPRT_GUEST_R3) \
    9494        X11 \
    9595        Xt

  • trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

    r6301 r6469  
    138138#ifdef RT_OS_SOLARIS
    139139    uint32_t fFeatures;
     140    NOREF(req);
    140141    rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
    141142    if (VBOX_FAILURE(rc))
    … …  
    419420
    420421#ifdef RT_OS_SOLARIS
     422    NOREF(fd);
    421423    if (pVBox->reqp)
    422424    {
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette