VirtualBox

Changeset 21227 in vbox


Ignore:
Timestamp:
Jul 5, 2009 7:50:18 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
49547
Message:

VBoxGuest.h/VMMDev.h/VBoxGuestLib.h usage cleanup.

Location:
trunk
Files:
2 added
59 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/HostServices/GuestPropertySvc.h

    r14352 r21227  
    3333
    3434#include <VBox/types.h>
    35 #include <VBox/VBoxGuest.h>
     35#include <VBox/VMMDev.h>
     36#include <VBox/VBoxGuest2.h>
    3637#include <VBox/hgcmsvc.h>
    3738#include <VBox/log.h>

  • trunk/include/VBox/HostServices/VBoxClipboardSvc.h

    r9435 r21227  
    3333
    3434#include <VBox/types.h>
    35 #include <VBox/VBoxGuest.h>
     35#include <VBox/VMMDev.h>
     36#include <VBox/VBoxGuest2.h>
    3637#include <VBox/hgcmsvc.h>
    3738

  • trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

    r18637 r21227  
    3333
    3434#include <VBox/types.h>
    35 #include <VBox/VBoxGuest.h>
     35#include <VBox/VMMDev.h>
     36#include <VBox/VBoxGuest2.h>
    3637#include <VBox/hgcmsvc.h>
    3738
    … …  
    102103     */
    103104    HGCMFunctionParameter   cbWriteback;
    104    
     105
    105106} CRVBOXHGCMWRITEREAD;
    106107

  • trunk/include/VBox/VBoxGuest.h

    r21226 r21227  
    3636#include <VBox/types.h>
    3737#include <iprt/assert.h>
     38#include <VBox/VMMDev2.h>
     39#include <VBox/VBoxGuest2.h>
     40#if 0
    3841#include <VBox/VMMDev.h> /* Temporarily. */
     42#endif
    3943
    4044
    … …  
    209213
    210214#pragma pack(4)
    211 typedef struct _VBoxGuestPortInfo
     215typedef struct VBoxGuestPortInfo
    212216{
    213217    uint32_t portAddress;
    214     VMMDevMemory *pVMMDevMemory;
     218    struct VMMDevMemory *pVMMDevMemory;
    215219} VBoxGuestPortInfo;
    216220
    … …  
    286290# define VBOXGUEST_IOCTL_HGCM_CONNECT               VBOXGUEST_IOCTL_CODE(16, sizeof(VBoxGuestHGCMConnectInfo))
    287291
    288 # pragma pack(1) /* explicit packing for good measure. */
    289 typedef struct VBoxGuestHGCMConnectInfo
    290 {
    291     int32_t result;           /**< OUT */
    292     HGCMServiceLocation Loc;  /**< IN */
    293     uint32_t u32ClientID;     /**< OUT */
    294 } VBoxGuestHGCMConnectInfo;
    295 AssertCompileSize(VBoxGuestHGCMConnectInfo, 4+4+128+4);
    296 # pragma pack()
    297 
    298 
    299292/** IOCTL to VBoxGuest to disconnect from a HGCM service. */
    300 # define VBOXGUEST_IOCTL_HGCM_DISCONNECT          VBOXGUEST_IOCTL_CODE(17, sizeof(VBoxGuestHGCMDisconnectInfo))
    301 typedef struct VBoxGuestHGCMDisconnectInfo
    302 {
    303     int32_t result;           /**< OUT */
    304     uint32_t u32ClientID;     /**< IN */
    305 } VBoxGuestHGCMDisconnectInfo;
    306 AssertCompileSize(VBoxGuestHGCMDisconnectInfo, 8);
    307 
    308 
    309 /** IOCTL to VBoxGuest to make a call to a HGCM service. */
    310 # define VBOXGUEST_IOCTL_HGCM_CALL(Size)          VBOXGUEST_IOCTL_CODE(18, (Size))
    311 typedef struct VBoxGuestHGCMCallInfo
    312 {
    313     int32_t result;           /**< OUT Host HGCM return code.*/
    314     uint32_t u32ClientID;     /**< IN  The id of the caller. */
    315     uint32_t u32Function;     /**< IN  Function number. */
    316     uint32_t cParms;          /**< IN  How many parms. */
    317     /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
    318 } VBoxGuestHGCMCallInfo;
    319 AssertCompileSize(VBoxGuestHGCMCallInfo, 16);
    320 
     293# define VBOXGUEST_IOCTL_HGCM_DISCONNECT            VBOXGUEST_IOCTL_CODE(17, sizeof(VBoxGuestHGCMDisconnectInfo))
     294
     295/** IOCTL to VBoxGuest to make a call to a HGCM service.
     296 * @see VBoxGuestHGCMCallInfo */
     297# define VBOXGUEST_IOCTL_HGCM_CALL(Size)            VBOXGUEST_IOCTL_CODE(18, (Size))
    321298
    322299/** IOCTL to VBoxGuest to make a timed call to a HGCM service. */
    323 # define VBOXGUEST_IOCTL_HGCM_CALL_TIMED(Size)    VBOXGUEST_IOCTL_CODE(20, (Size))
    324 # pragma pack(1) /* explicit packing for good measure. */
    325 typedef struct VBoxGuestHGCMCallInfoTimed
    326 {
    327     uint32_t u32Timeout;         /**< IN  How long to wait for completion before cancelling the call. */
    328     uint32_t fInterruptible;     /**< IN  Is this request interruptible? */
    329     VBoxGuestHGCMCallInfo info;  /**< IN/OUT The rest of the call information.  Placed after the timeout
    330                                   * so that the parameters follow as they would for a normal call. */
    331     /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
    332 } VBoxGuestHGCMCallInfoTimed;
    333 AssertCompileSize(VBoxGuestHGCMCallInfoTimed, 8+16);
    334 # pragma pack()
     300# define VBOXGUEST_IOCTL_HGCM_CALL_TIMED(Size)      VBOXGUEST_IOCTL_CODE(20, (Size))
    335301
    336302# ifdef RT_ARCH_AMD64
    … …  
    431397
    432398
    433 #ifdef IN_RING3
     399#if 0 /*def IN_RING3*/
    434400# include <VBox/VBoxGuestLib.h> /** @todo eliminate this. */
    435401#endif /* IN_RING3 */

  • trunk/include/VBox/VBoxGuestLib.h

    r21211 r21227  
    3131#define ___VBox_VBoxGuestLib_h
    3232
     33#include <VBox/types.h>
     34#include <VBox/VMMDev2.h>
    3335#ifdef IN_RING0
    34 # include <VBox/VBoxGuest.h> /** @todo Try stop including <VBox/VBoxGuest.h> in ring-0. */
    35 # include <VBox/err.h>       /** @todo Why is this here?? */
     36# include <VBox/VMMDev.h>     /* grumble */
     37# include <VBox/VBoxGuest2.h>
    3638#endif
    37 #include <VBox/types.h>
    3839
    3940
    … …  
    99100 * @return VBox status code.
    100101 */
    101 DECLVBGL(int) VbglInit (VBGLIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory);
     102DECLVBGL(int) VbglInit (VBGLIOPORT portVMMDev, struct VMMDevMemory *pVMMDevMemory);
    102103
    103104# else
    … …  
    392393 * @{ */
    393394VBGLR3DECL(int)     VbglR3SeamlessSetCap(bool fState);
    394 # ifdef VBOX_MOUSE_POINTER_SHAPE /** @todo Move common structures/enums out of VBoxGuest.h or/and the externalize the IOCtl interface... Whatever works, just try keep the amout of lowevel mess exposed here to a minimum. */
    395395VBGLR3DECL(int)     VbglR3SeamlessWaitEvent(VMMDevSeamlessMode *pMode);
    396 # endif
    397396VBGLR3DECL(int)     VbglR3SeamlessSendRects(uint32_t cRects, PRTRECT pRects);
    398397/** @}  */
    … …  
    409408VBGLR3DECL(int)     VbglR3VideoAccelFlush(void);
    410409VBGLR3DECL(int)     VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbImg);
    411 # ifdef VBOX_MOUSE_POINTER_SHAPE /** @todo Move common structures/enums out of VBoxGuest.h or/and the externalize the IOCtl interface... Whatever works, just try keep the amout of lowevel mess exposed here to a minimum. */
    412 VBGLR3DECL(int)     VbglR3SetPointerShapeReq(VMMDevReqMousePointer *pReq);
    413 # endif
     410VBGLR3DECL(int)     VbglR3SetPointerShapeReq(struct VMMDevReqMousePointer *pReq);
    414411/** @}  */
    415412

  • trunk/include/VBox/VMMDev.h

    r21226 r21227  
    3636#include <VBox/err.h>
    3737#include <VBox/ostypes.h>
     38#include <VBox/VMMDev2.h>
    3839#include <iprt/assert.h>
    3940
    … …  
    5051
    5152/** Size of VMMDev RAM region accessible by guest.
    52  *  Must be big enough to contain VMMDevMemory structure (see VBoxGuest.h)
    53  *  For now: 4 megabyte.
     53 * Must be big enough to contain VMMDevMemory structure (see further down).
     54 * For now: 4 megabyte.
    5455 */
    5556#define VMMDEV_RAM_SIZE                                     (4 * 256 * PAGE_SIZE)
    … …  
    200201    /** IN: Size of the structure in bytes (including body). */
    201202    uint32_t size;
    202     /** IN: Version of the structure.*/
     203    /** IN: Version of the structure.  */
    203204    uint32_t version;
    204205    /** IN: Type of the request. */
    … …  
    259260 * Used by VMMDevReq_SetPointerShape. The size is variable.
    260261 */
    261 typedef struct
     262typedef struct VMMDevReqMousePointer
    262263{
    263264    /** Header. */
    … …  
    740741
    741742/**
    742  * Seamless mode.
    743  *
    744  * Used by VbglR3SeamlessWaitEvent
    745  *
    746  * @todo DARN! DARN! DARN! Who forgot to do the 32-bit hack here???
    747  *       FIXME! XXX!
    748  *
    749  *       We will now have to carefully check how our compilers have treated this
    750  *       flag. If any are compressing it into a byte type, we'll have to check
    751  *       how the request memory is initialized. If we are 104% sure it's ok to
    752  *       expand it, we'll expand it. If not, we must redefine the field to a
    753  *       uint8_t and a 3 byte padding.
    754  *  */
    755 typedef enum
    756 {
    757     VMMDev_Seamless_Disabled         = 0,     /**< normal mode; entire guest desktop displayed. */
    758     VMMDev_Seamless_Visible_Region   = 1,     /**< visible region mode; only top-level guest windows displayed. */
    759     VMMDev_Seamless_Host_Window      = 2      /**< windowed mode; each top-level guest window is represented in a host window. */
    760 } VMMDevSeamlessMode;
    761 
    762 /**
    763743 * Seamless mode change request structure.
    764744 *
    … …  
    954934#pragma pack()
    955935
    956 /**
    957  * VBVA command header.
    958  */
    959 #pragma pack(1) /* unnecessary */
    960 typedef struct _VBVACMDHDR
    961 {
    962    /** Coordinates of affected rectangle. */
    963    int16_t x;
    964    int16_t y;
    965    uint16_t w;
    966    uint16_t h;
    967 } VBVACMDHDR;
    968 #pragma pack()
    969 
    970 /** @name VBVA ring defines.
    971  *
    972  * The VBVA ring buffer is suitable for transferring large (< 2GB) amount of
    973  * data. For example big bitmaps which do not fit to the buffer.
    974  *
    975  * Guest starts writing to the buffer by initializing a record entry in the
    976  * aRecords queue. VBVA_F_RECORD_PARTIAL indicates that the record is being
    977  * written. As data is written to the ring buffer, the guest increases off32End
    978  * for the record.
    979  *
    980  * The host reads the aRecords on flushes and processes all completed records.
    981  * When host encounters situation when only a partial record presents and
    982  * cbRecord & ~VBVA_F_RECORD_PARTIAL >= VBVA_RING_BUFFER_SIZE -
    983  * VBVA_RING_BUFFER_THRESHOLD, the host fetched all record data and updates
    984  * off32Head. After that on each flush the host continues fetching the data
    985  * until the record is completed.
    986  *
    987  */
    988 #define VBVA_RING_BUFFER_SIZE        (_4M - _1K)
    989 #define VBVA_RING_BUFFER_THRESHOLD   (4 * _1K)
    990 
    991 #define VBVA_MAX_RECORDS (64)
    992 
    993 #define VBVA_F_MODE_ENABLED         (0x00000001)
    994 #define VBVA_F_MODE_VRDP            (0x00000002)
    995 #define VBVA_F_MODE_VRDP_RESET      (0x00000004)
    996 #define VBVA_F_MODE_VRDP_ORDER_MASK (0x00000008)
    997 
    998 #define VBVA_F_RECORD_PARTIAL       (0x80000000)
    999 /** @} */
    1000 
    1001 typedef struct
    1002 {
    1003     /** The length of the record. Changed by guest. */
    1004     uint32_t cbRecord;
    1005 } VBVARECORD;
    1006 AssertCompileSize(VBVARECORD, 4);
    1007 
    1008 /**
    1009  * VBVA memory layout.
    1010  */
    1011 #pragma pack(1) /* paranoia */
    1012 typedef struct VBVAMEMORY
    1013 {
    1014     /** VBVA_F_MODE_*. */
    1015     uint32_t fu32ModeFlags;
    1016 
    1017     /** The offset where the data start in the buffer. */
    1018     uint32_t off32Data;
    1019     /** The offset where next data must be placed in the buffer. */
    1020     uint32_t off32Free;
    1021 
    1022     /** The ring buffer for data. */
    1023     uint8_t  au8RingBuffer[VBVA_RING_BUFFER_SIZE];
    1024 
    1025     /** The queue of record descriptions. */
    1026     VBVARECORD aRecords[VBVA_MAX_RECORDS];
    1027     uint32_t indexRecordFirst;
    1028     uint32_t indexRecordFree;
    1029 
    1030     /** RDP orders supported by the client. The guest reports only them
    1031      * and falls back to DIRTY rects for not supported ones.
    1032      *
    1033      * (1 << VBVA_VRDP_*)
    1034      */
    1035     uint32_t fu32SupportedOrders;
    1036 
    1037 } VBVAMEMORY;
    1038 #pragma pack()
    1039 AssertCompileSize(VBVAMEMORY, 12 + (_4M-_1K) + 4*64 + 12);
    1040 
    1041 
    1042936
    1043937#ifdef VBOX_WITH_HGCM
    … …  
    1067961} VMMDevHGCMRequestHeader;
    1068962AssertCompileSize(VMMDevHGCMRequestHeader, 24+8);
    1069 
    1070 /**
    1071  * HGCM service location types.
    1072  */
    1073 typedef enum
    1074 {
    1075     VMMDevHGCMLoc_Invalid    = 0,
    1076     VMMDevHGCMLoc_LocalHost  = 1,
    1077     VMMDevHGCMLoc_LocalHost_Existing = 2,
    1078     VMMDevHGCMLoc_SizeHack   = 0x7fffffff
    1079 } HGCMServiceLocationType;
    1080 AssertCompileSize(HGCMServiceLocationType, 4);
    1081 
    1082 /**
    1083  * HGCM host service location.
    1084  */
    1085 typedef struct
    1086 {
    1087     char achName[128]; /**< This is really szName. */
    1088 } HGCMServiceLocationHost;
    1089 AssertCompileSize(HGCMServiceLocationHost, 128);
    1090 
    1091 /**
    1092  * HGCM service location.
    1093  */
    1094 typedef struct HGCMSERVICELOCATION
    1095 {
    1096     /** Type of the location. */
    1097     HGCMServiceLocationType type;
    1098 
    1099     union
    1100     {
    1101         HGCMServiceLocationHost host;
    1102     } u;
    1103 } HGCMServiceLocation;
    1104 AssertCompileSize(HGCMServiceLocation, 128+4);
    1105963
    1106964/**
    … …  
    15411399
    15421400/**
     1401 * VBVA command header.
     1402 *
     1403 * @todo Where does this fit in?
     1404 */
     1405#pragma pack(1) /* unnecessary */
     1406typedef struct VBVACMDHDR
     1407{
     1408   /** Coordinates of affected rectangle. */
     1409   int16_t x;
     1410   int16_t y;
     1411   uint16_t w;
     1412   uint16_t h;
     1413} VBVACMDHDR;
     1414#pragma pack()
     1415
     1416/** @name VBVA ring defines.
     1417 *
     1418 * The VBVA ring buffer is suitable for transferring large (< 2GB) amount of
     1419 * data. For example big bitmaps which do not fit to the buffer.
     1420 *
     1421 * Guest starts writing to the buffer by initializing a record entry in the
     1422 * aRecords queue. VBVA_F_RECORD_PARTIAL indicates that the record is being
     1423 * written. As data is written to the ring buffer, the guest increases off32End
     1424 * for the record.
     1425 *
     1426 * The host reads the aRecords on flushes and processes all completed records.
     1427 * When host encounters situation when only a partial record presents and
     1428 * cbRecord & ~VBVA_F_RECORD_PARTIAL >= VBVA_RING_BUFFER_SIZE -
     1429 * VBVA_RING_BUFFER_THRESHOLD, the host fetched all record data and updates
     1430 * off32Head. After that on each flush the host continues fetching the data
     1431 * until the record is completed.
     1432 *
     1433 */
     1434#define VBVA_RING_BUFFER_SIZE        (_4M - _1K)
     1435#define VBVA_RING_BUFFER_THRESHOLD   (4 * _1K)
     1436
     1437#define VBVA_MAX_RECORDS (64)
     1438
     1439#define VBVA_F_MODE_ENABLED         (0x00000001)
     1440#define VBVA_F_MODE_VRDP            (0x00000002)
     1441#define VBVA_F_MODE_VRDP_RESET      (0x00000004)
     1442#define VBVA_F_MODE_VRDP_ORDER_MASK (0x00000008)
     1443
     1444#define VBVA_F_RECORD_PARTIAL       (0x80000000)
     1445/** @} */
     1446
     1447/**
     1448 * VBVA record.
     1449 */
     1450typedef struct
     1451{
     1452    /** The length of the record. Changed by guest. */
     1453    uint32_t cbRecord;
     1454} VBVARECORD;
     1455AssertCompileSize(VBVARECORD, 4);
     1456
     1457
     1458/**
     1459 * VBVA memory layout.
     1460 *
     1461 * This is a subsection of the VMMDevMemory structure.
     1462 */
     1463#pragma pack(1) /* paranoia */
     1464typedef struct VBVAMEMORY
     1465{
     1466    /** VBVA_F_MODE_*. */
     1467    uint32_t fu32ModeFlags;
     1468
     1469    /** The offset where the data start in the buffer. */
     1470    uint32_t off32Data;
     1471    /** The offset where next data must be placed in the buffer. */
     1472    uint32_t off32Free;
     1473
     1474    /** The ring buffer for data. */
     1475    uint8_t  au8RingBuffer[VBVA_RING_BUFFER_SIZE];
     1476
     1477    /** The queue of record descriptions. */
     1478    VBVARECORD aRecords[VBVA_MAX_RECORDS];
     1479    uint32_t indexRecordFirst;
     1480    uint32_t indexRecordFree;
     1481
     1482    /** RDP orders supported by the client. The guest reports only them
     1483     * and falls back to DIRTY rects for not supported ones.
     1484     *
     1485     * (1 << VBVA_VRDP_*)
     1486     */
     1487    uint32_t fu32SupportedOrders;
     1488
     1489} VBVAMEMORY;
     1490#pragma pack()
     1491AssertCompileSize(VBVAMEMORY, 12 + (_4M-_1K) + 4*64 + 12);
     1492
     1493
     1494/**
    15431495 * The layout of VMMDEV RAM region that contains information for guest.
    15441496 */
    15451497#pragma pack(1) /* paranoia */
    1546 typedef struct
    1547 {
    1548     /** size */
     1498typedef struct VMMDevMemory
     1499{
     1500    /** The size of this structure. */
    15491501    uint32_t u32Size;
    1550     /** version */
     1502    /** The structure version. (VMMDEV_MEMORY_VERSION) */
    15511503    uint32_t u32Version;
    15521504
    1553     union {
    1554         /** Flag telling that VMMDev set the IRQ and acknowlegment is required */
    1555         struct {
     1505    union
     1506    {
     1507        struct
     1508        {
     1509            /** Flag telling that VMMDev set the IRQ and acknowlegment is required */
    15561510            bool fHaveEvents;
    15571511        } V1_04;
    15581512
    1559         struct {
     1513        struct
     1514        {
    15601515            /** Pending events flags, set by host. */
    15611516            uint32_t u32HostEvents;

  • trunk/include/VBox/shflsvc.h

    r21217 r21227  
    3232
    3333#include <VBox/types.h>
    34 #include <VBox/VBoxGuest.h>
     34#include <VBox/VBoxGuest2.h>
     35#include <VBox/VMMDev.h>
    3536#include <VBox/hgcmsvc.h>
    3637#include <iprt/fs.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/pointer.c

    r18246 r21227  
    3131#include "driver.h"
    3232
    33 #include <VBox/VBoxGuest.h> /* for VBOX_MOUSE_POINTER_* flags */
     33#include <VBox/VMMDev.h> /* for VMMDEV_MOUSE_POINTER_* flags */
    3434
    3535#ifndef SPS_ALPHA
    … …  
    165165
    166166    DISPDBG((0, "DISP bSetHardwarePointerShape SPS_ALPHA = %d\n", fl & SPS_ALPHA));
    167    
     167
    168168    // We don't use the exclusion rectangle because we only support
    169169    // hardware Pointers. If we were doing our own Pointer simulations
    … …  
    279279     * High word will contain hot spot info and low word - flags.
    280280     */
    281    
     281
    282282    pPointerAttributes->Enable |= (ppdev->ptlHotSpot.y & 0xFF) << 24;
    283283    pPointerAttributes->Enable |= (ppdev->ptlHotSpot.x & 0xFF) << 16;
    284    
     284
    285285    if (fl & SPS_ALPHA)
    286286    {
    287287        pPointerAttributes->Enable |= VBOX_MOUSE_POINTER_ALPHA;
    288288    }
    289    
     289
    290290    //
    291291    // set animate flags
    … …  
    297297        pPointerAttributes->Flags |= VIDEO_MODE_ANIMATE_UPDATE;
    298298    }
    299    
     299
    300300
    301301    //
    … …  
    314314        return(FALSE);
    315315    }
    316    
     316
    317317    //
    318318    // Set new pointer position
    319319    //
    320    
     320
    321321    if (x != -1) {
    322322        VIDEO_POINTER_POSITION vpp;
    323        
     323
    324324        vpp.Column = pPointerAttributes->Column;
    325325        vpp.Row = pPointerAttributes->Row;
    326        
     326
    327327        if (EngDeviceIoControl(ppdev->hDriver,
    328328                               IOCTL_VIDEO_SET_POINTER_POSITION,
    … …  
    332332                               0,
    333333                               &returnedDataLength)) {
    334            
     334
    335335            // Should never fail, informational message.
    336336            DISPDBG((1, "DISP:Failed IOCTL_VIDEO_SET_POINTER_POSITION call\n"));
    337         }   
    338     }
    339    
     337        }
     338    }
     339
    340340    return(TRUE);
    341341}
    … …  
    356356{
    357357    PBYTE pjSrc = NULL;
    358    
     358
    359359    ULONG cy = 0;
    360    
     360
    361361    PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = ppdev->pPointerAttributes;
    362    
     362
    363363    PBYTE pjDstAnd = pPointerAttributes->Pixels;
    364364    ULONG cjAnd = 0;
    … …  
    367367    ULONG cxSrc = psoMask->sizlBitmap.cx;
    368368    ULONG cySrc = psoMask->sizlBitmap.cy / 2; /* /2 because both masks are in there */
    369    
     369
    370370    // Make sure the new pointer isn't too big to handle,
    371371    // strip the size to 64x64 if necessary
    … …  
    374374        cxSrc = ppdev->PointerCapabilities.MaxWidth;
    375375    }
    376    
     376
    377377    if (cySrc > ppdev->PointerCapabilities.MaxHeight)
    378378    {
    … …  
    382382    /* Size of AND mask in bytes */
    383383    cjAnd = ((cxSrc + 7) / 8) * cySrc;
    384    
     384
    385385    /* Pointer to XOR mask is 4-bytes aligned */
    386386    pjDstXor += (cjAnd + 3) & ~3;
    387    
     387
    388388    pPointerAttributes->Width = cxSrc;
    389389    pPointerAttributes->Height = cySrc;
    390390    pPointerAttributes->WidthInBytes = cxSrc * 4;
    391    
     391
    392392    /* Init AND mask to 1 */
    393393    RtlFillMemory (pjDstAnd, cjAnd, 0xFF);
    394    
    395     /* 
     394
     395    /*
    396396     * Copy AND mask.
    397397     */
    398          
     398
    399399    DISPDBG((0, "DISP bCopyMonoPointer going to copy AND mask\n"));
    400        
     400
    401401    pjSrc = (PBYTE)psoMask->pvScan0;
    402        
     402
    403403    for (cy = 0; cy < cySrc; cy++)
    404404    {
    405405        RtlCopyMemory (pjDstAnd, pjSrc, (cxSrc + 7) / 8);
    406    
     406
    407407        // Point to next source and dest scans
    408408        pjSrc += psoMask->lDelta;
    409409        pjDstAnd += (cxSrc + 7) / 8;
    410410    }
    411        
     411
    412412    DISPDBG((0, "DISP bCopyMonoPointer AND mask copied\n"));
    413        
     413
    414414    DISPDBG((0, "DISP bCopyMonoPointer going to create RGB0 XOR mask\n"));
    415    
     415
    416416    for (cy = 0; cy < cySrc; ++cy)
    417417    {
    418418        ULONG cx;
    419        
     419
    420420        UCHAR bitmask = 0x80;
    421                        
     421
    422422        for (cx = 0; cx < cxSrc; cx++, bitmask >>= 1)
    423423        {
    … …  
    426426                bitmask = 0x80;
    427427            }
    428        
     428
    429429            if (pjSrc[cx / 8] & bitmask)
    430430            {
    … …  
    441441        pjDstXor += cxSrc * 4;
    442442    }
    443    
     443
    444444    DISPDBG((0, "DISP bCopyMonoPointer created RGB0 XOR mask\n"));
    445445
    … …  
    473473     *
    474474     */
    475      
     475
    476476    /* To simplify this function we use the following method:
    477477     *   for pointers with alpha channel
    … …  
    481481     *     copy AND mask and new BGR0 XOR mask to pPointerAttributes->Pixels
    482482     */
    483    
     483
    484484    HSURF hsurf32bpp  = NULL;
    485485    SURFOBJ *pso32bpp = NULL;
    … …  
    487487    PBYTE pjSrcAnd = NULL;
    488488    PBYTE pjSrcXor = NULL;
    489    
     489
    490490    ULONG cy = 0;
    491    
     491
    492492    PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = ppdev->pPointerAttributes;
    493    
     493
    494494    PBYTE pjDstAnd = pPointerAttributes->Pixels;
    495495    ULONG cjAnd = 0;
    … …  
    498498    ULONG cxSrc = psoColor->sizlBitmap.cx;
    499499    ULONG cySrc = psoColor->sizlBitmap.cy;
    500    
     500
    501501    // Make sure the new pointer isn't too big to handle,
    502502    // strip the size to 64x64 if necessary
    … …  
    505505        cxSrc = ppdev->PointerCapabilities.MaxWidth;
    506506    }
    507    
     507
    508508    if (cySrc > ppdev->PointerCapabilities.MaxHeight)
    509509    {
    … …  
    513513    /* Size of AND mask in bytes */
    514514    cjAnd = ((cxSrc + 7) / 8) * cySrc;
    515    
     515
    516516    /* Pointer to XOR mask is 4-bytes aligned */
    517517    pjDstXor += (cjAnd + 3) & ~3;
    518    
     518
    519519    pPointerAttributes->Width = cxSrc;
    520520    pPointerAttributes->Height = cySrc;
    521521    pPointerAttributes->WidthInBytes = cxSrc * 4;
    522    
     522
    523523    /* Init AND mask to 1 */
    524524    RtlFillMemory (pjDstAnd, cjAnd, 0xFF);
    … …  
    527527    {
    528528        PBYTE pjSrcAlpha = (PBYTE)psoColor->pvScan0;
    529        
     529
    530530        DISPDBG((0, "DISP bCopyColorPointer SPS_ALPHA\n"));
    531        
     531
    532532        pso32bpp = psoColor;
    533        
    534         /* 
    535          * Emulate AND mask to provide viewable mouse pointer for 
     533
     534        /*
     535         * Emulate AND mask to provide viewable mouse pointer for
    536536         * hardware which does not support alpha channel.
    537537         */
    538        
     538
    539539        DISPDBG((0, "DISP bCopyColorPointer going to emulate AND mask\n"));
    540        
     540
    541541        for (cy = 0; cy < cySrc; cy++)
    542542        {
    543543            ULONG cx;
    544            
     544
    545545            UCHAR bitmask = 0x80;
    546            
     546
    547547            for (cx = 0; cx < cxSrc; cx++, bitmask >>= 1)
    548548            {
    … …  
    551551                    bitmask = 0x80;
    552552                }
    553                
     553
    554554                if (pjSrcAlpha[cx * 4 + 3] > 0x7f)
    555555                {
    … …  
    557557                }
    558558            }
    559    
     559
    560560            // Point to next source and dest scans
    561561            pjSrcAlpha += pso32bpp->lDelta;
    562562            pjDstAnd += (cxSrc + 7) / 8;
    563563        }
    564        
     564
    565565        DISPDBG((0, "DISP bCopyColorPointer AND mask emulated\n"));
    566566    }
    … …  
    572572            return (FALSE);
    573573        }
    574        
    575         /* 
     574
     575        /*
    576576         * Copy AND mask.
    577577         */
    578          
     578
    579579        DISPDBG((0, "DISP bCopyColorPointer going to copy AND mask\n"));
    580        
     580
    581581        pjSrcAnd = (PBYTE)psoMask->pvScan0;
    582        
     582
    583583        for (cy = 0; cy < cySrc; cy++)
    584584        {
    585585            RtlCopyMemory (pjDstAnd, pjSrcAnd, (cxSrc + 7) / 8);
    586    
     586
    587587            // Point to next source and dest scans
    588588            pjSrcAnd += psoMask->lDelta;
    589589            pjDstAnd += (cxSrc + 7) / 8;
    590590        }
    591        
     591
    592592        DISPDBG((0, "DISP bCopyColorPointer AND mask copied\n"));
    593        
    594         /* 
     593
     594        /*
    595595         * Convert given psoColor to 32 bit BGR0.
    596596         */
    597          
     597
    598598        DISPDBG((0, "DISP bCopyColorPointer psoScreen t = %d, f = %d, psoColor t = %d, f = %d, pxlo = %p, psoColor->lDelta = %d, ->cx = %d\n",
    599599                 psoScreen->iType, psoScreen->iBitmapFormat, psoColor->iType, psoColor->iBitmapFormat, pxlo, psoColor->lDelta, psoColor->sizlBitmap.cx));
    600        
     600
    601601        if (psoColor->iType == STYPE_BITMAP
    602602            && psoColor->iBitmapFormat == BMF_32BPP)
    … …  
    610610            HSURF hsurfBitmap  = NULL;
    611611            SURFOBJ *psoBitmap = NULL;
    612            
     612
    613613            SIZEL sizl = psoColor->sizlBitmap;
    614            
     614
    615615            if ((pxlo != NULL && pxlo->flXlate != XO_TRIVIAL)
    616616                || (psoColor->iType != STYPE_BITMAP))
    617617            {
    618618                /* Convert the unknown format to a screen format bitmap. */
    619                
     619
    620620                RECTL rclDst;
    621621                POINTL ptlSrc;
    622            
     622
    623623                DISPDBG((0, "DISP bCopyColorPointer going to convert XOR mask to bitmap\n"));
    624            
     624
    625625                hsurfBitmap = (HSURF)EngCreateBitmap (sizl, 0, psoScreen->iBitmapFormat, BMF_TOPDOWN, NULL);
    626            
     626
    627627                if (hsurfBitmap == NULL)
    628628                {
    629629                    return FALSE;
    630630                }
    631              
     631
    632632                psoBitmap = EngLockSurface (hsurfBitmap);
    633            
     633
    634634                if (psoBitmap == NULL)
    635635                {
    … …  
    637637                    return FALSE;
    638638                }
    639            
     639
    640640                /* Now do the bitmap conversion using EngCopyBits(). */
    641            
     641
    642642                rclDst.left = 0;
    643643                rclDst.top = 0;
    644644                rclDst.right = sizl.cx;
    645645                rclDst.bottom = sizl.cy;
    646            
     646
    647647                ptlSrc.x = 0;
    648648                ptlSrc.y = 0;
    649                
     649
    650650                if (!EngCopyBits (psoBitmap, psoColor, NULL, pxlo, &rclDst, &ptlSrc))
    651651                {
    … …  
    654654                    return FALSE;
    655655                }
    656            
     656
    657657                DISPDBG((0, "DISP bCopyColorPointer XOR mask converted to bitmap\n"));
    658658            }
    … …  
    662662                psoBitmap = psoColor;
    663663            }
    664            
     664
    665665            /* Create 32 bpp surface for XOR mask */
    666666            hsurf32bpp = (HSURF)EngCreateBitmap (sizl, 0, BMF_32BPP, BMF_TOPDOWN, NULL);
    667            
     667
    668668            if (hsurf32bpp != NULL)
    669669            {
    670670                pso32bpp = EngLockSurface (hsurf32bpp);
    671            
     671
    672672                if (pso32bpp == NULL)
    673673                {
    … …  
    676676                }
    677677            }
    678            
     678
    679679            if (pso32bpp)
    680680            {
    … …  
    684684                    PBYTE src = (PBYTE)psoBitmap->pvScan0;
    685685                    PBYTE dst = (PBYTE)pso32bpp->pvScan0;
    686                    
     686
    687687                    PPALETTEENTRY pPal = ppdev->pPal;
    688688                    ULONG cPalette = 256; /* 256 is hardcoded in the driver in palette.c */
    689                    
     689
    690690                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 8 bpp to 32 bpp palette: %d entries\n", cPalette));
    691                    
     691
    692692                    for (cy = 0; cy < (ULONG)sizl.cy; cy++)
    693693                    {
    694694                        ULONG cx;
    695                        
     695
    696696                        PBYTE d = dst;
    697                        
     697
    698698                        for (cx = 0; cx < (ULONG)sizl.cx; cx++)
    699699                        {
    700700                            BYTE index = src[cx];
    701                            
     701
    702702                            *d++ = pPal[index].peBlue;  /* B */
    703703                            *d++ = pPal[index].peGreen; /* G */
    … …  
    710710                        dst += pso32bpp->lDelta;
    711711                    }
    712                    
     712
    713713                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 8 bpp to 32 bpp completed\n"));
    714714                }
    … …  
    717717                    PBYTE src = (PBYTE)psoBitmap->pvScan0;
    718718                    PBYTE dst = (PBYTE)pso32bpp->pvScan0;
    719                    
     719
    720720                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 16 bpp to 32 bpp\n"));
    721                    
     721
    722722                    for (cy = 0; cy < (ULONG)sizl.cy; cy++)
    723723                    {
    724724                        ULONG cx;
    725                    
     725
    726726                        PBYTE d = dst;
    727                        
     727
    728728                        for (cx = 0; cx < (ULONG)sizl.cx; cx++)
    729729                        {
    730730                            USHORT usSrc = *(USHORT *)&src[cx * 2];
    731                            
     731
    732732                            *d++ = (BYTE)( usSrc        << 3); /* B */
    733733                            *d++ = (BYTE)((usSrc >> 5)  << 2); /* G */
    … …  
    740740                        dst += pso32bpp->lDelta;
    741741                    }
    742                    
     742
    743743                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 16 bpp to 32 bpp completed\n"));
    744744                }
    … …  
    747747                    PBYTE src = (PBYTE)psoBitmap->pvScan0;
    748748                    PBYTE dst = (PBYTE)pso32bpp->pvScan0;
    749                    
     749
    750750                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 24 bpp to 32 bpp\n"));
    751                    
     751
    752752                    for (cy = 0; cy < (ULONG)sizl.cy; cy++)
    753753                    {
    754754                        ULONG cx;
    755                        
     755
    756756                        PBYTE s = src;
    757757                        PBYTE d = dst;
    758                        
     758
    759759                        for (cx = 0; cx < (ULONG)sizl.cx; cx++)
    760760                        {
    … …  
    769769                        dst += pso32bpp->lDelta;
    770770                    }
    771                    
     771
    772772                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 24 bpp to 32 bpp completed\n"));
    773773                }
    … …  
    775775                {
    776776                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 32 bpp to 32 bpp, pso32bpp->cjBits = %d, psoBitmap->cjBits = %d\n", pso32bpp->cjBits, psoBitmap->cjBits));
    777                    
     777
    778778                    RtlCopyMemory (pso32bpp->pvBits, psoBitmap->pvBits, min(pso32bpp->cjBits, psoBitmap->cjBits));
    779                    
     779
    780780                    DISPDBG((0, "DISP bCopyColorPointer XOR mask conv 32 bpp to 32 bpp completed\n"));
    781781                }
    … …  
    783783                {
    784784                    DISPDBG((0, "DISP bCopyColorPointer XOR mask unsupported bpp\n"));
    785                    
     785
    786786                    EngUnlockSurface (pso32bpp);
    787787                    pso32bpp = NULL;
    … …  
    790790                }
    791791            }
    792            
     792
    793793            if (hsurfBitmap)
    794794            {
    … …  
    800800        }
    801801    }
    802    
     802
    803803    if (!pso32bpp)
    804804    {
    805805         return (FALSE);
    806806    }
    807    
    808     /* 
    809      * pso is 32 bit BGRX bitmap. Copy it to Pixels 
     807
     808    /*
     809     * pso is 32 bit BGRX bitmap. Copy it to Pixels
    810810     */
    811    
     811
    812812    pjSrcXor = (PBYTE)pso32bpp->pvScan0;
    813    
     813
    814814    for (cy = 0; cy < cySrc; cy++)
    815815    {
    816816        /* 32 bit bitmap is being copied */
    817         RtlCopyMemory (pjDstXor, pjSrcXor, cxSrc * 4); 
     817        RtlCopyMemory (pjDstXor, pjSrcXor, cxSrc * 4);
    818818
    819819        /* Point to next source and dest scans */
    … …  
    821821        pjDstXor += pPointerAttributes->WidthInBytes;
    822822    }
    823    
     823
    824824    if (pso32bpp != psoColor)
    825825    {
    … …  
    828828        EngDeleteSurface (hsurf32bpp);
    829829    }
    830    
     830
    831831    return (TRUE);
    832832}
    … …  
    893893       pdevinfo->flGraphicsCaps &= ~GCAPS_ASYNCMOVE;
    894894    }
    895    
     895
    896896    /* VBOX supports pointers with alpha channel */
    897897    pdevinfo->flGraphicsCaps2 |= GCAPS2_ALPHACURSOR;

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

    r20653 r21227  
     1/* $Id$ */
    12/** @file
    2  *
    3  * VBoxGuest -- VirtualBox Win 2000/XP guest display driver
    4  *
    5  * VBox support functions.
    6  *
     3 * Display - VirtualBox Win 2000/XP guest display driver, support functions.
     4 */
     5
     6/*
    77 * Copyright (C) 2006-2007 Sun Microsystems, Inc.
    88 *
    … …  
    2222#include "driver.h"
    2323
     24#include <VBox/VMMDev.h>
    2425#include <VBox/VBoxGuest.h>
    2526#include <VBox/err.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/vboxioctl.h

    r20478 r21227  
    11/** @file
    2  *
    3  * VBoxGuest -- VirtualBox Win 2000/XP guest video driver
     2 * VBoxGraphics - VirtualBox Win 2000/XP guest video driver.
    43 *
    54 * Display driver entry points.
    6  *
     5 */
     6
     7/*
    78 * Copyright (C) 2006-2007 Sun Microsystems, Inc.
    89 *
    … …  
    2324#define __VBOXIOCTL__H
    2425
     26#include <VBox/VMMDev.h>
    2527#include <VBox/VBoxGuest.h>
    2628

  • trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

    r21226 r21227  
    2626// VBOX start
    2727#include <VBox/err.h>
    28 #include <VBox/VBoxGuest.h>
    2928#include <VBox/VBoxGuestLib.h>
    3029// VBOX end

  • trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.h

    r20374 r21227  
    11/** @file
     2 * VBoxMouse - VirtualBox Win32 guest mouse filter driver
    23 *
    3  * VBoxGuest -- VirtualBox Win32 guest mouse filter driver
    4  *
    5  * Based on a Microsoft DDK sample
    6  *
     4 * Based on a Microsoft DDK sample.
     5 */
     6
     7/*
    78 * Copyright (C) 2006-2007 Sun Microsystems, Inc.
    89 *
    … …  
    3132#include <ntdd8042.h>
    3233RT_C_DECLS_END
    33 #include <VBox/VBoxGuest.h>
     34#include <VBox/VMMDev.h>
    3435
    3536#define VBOXMOUSE_POOL_TAG (ULONG) 'oMBV'

  • trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp

    r13837 r21227  
    2424
    2525#include <VBox/VBoxGuest.h>
     26#include <VBox/VMMDev.h>
    2627#include <iprt/string.h>
    2728

  • trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.h

    r16138 r21227  
    2424#include <iprt/log.h>
    2525
    26 #include <VBox/VBoxGuest.h>
    2726#include <VBox/Log.h>
    2827

  • trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest_Internal.h

    r20374 r21227  
    2828#include <iprt/cdefs.h>
    2929
     30/** @todo Use the-nt-kernel.h and keep the messy stuff all in one place? */
    3031#ifdef IN_RING0
    3132# if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
    … …  
    5354#include <iprt/spinlock.h>
    5455
     56#include <VBox/VMMDev.h>
    5557#include <VBox/VBoxGuest.h>
     58
    5659
    5760/*******************************************************************************
    5861*   Defined Constants And Macros                                               *
    5962*******************************************************************************/
    60 
    6163
    6264/* debug printf */

  • trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp

    r10552 r21227  
    1717 * additional information or have any questions.
    1818 */
    19 #include <windows.h>
     19#include <Windows.h>
    2020#include <VBoxHook.h>
    2121#include <stdio.h>
    2222
    23 #pragma data_seg("SHARED") 
    24 static HWINEVENTHOOK    hEventHook[2]    = {0}; 
    25 #pragma data_seg() 
    26 #pragma comment(linker, "/section:SHARED,RWS") 
     23#pragma data_seg("SHARED")
     24static HWINEVENTHOOK    hEventHook[2]    = {0};
     25#pragma data_seg()
     26#pragma comment(linker, "/section:SHARED,RWS")
    2727
    2828static HANDLE   hNotifyEvent = 0;
    … …  
    3636
    3737
    38 void CALLBACK VBoxHandleWinEvent(HWINEVENTHOOK hook, DWORD event, HWND hwnd, 
    39                                  LONG idObject, LONG idChild, 
     38void CALLBACK VBoxHandleWinEvent(HWINEVENTHOOK hook, DWORD event, HWND hwnd,
     39                                 LONG idObject, LONG idChild,
    4040                                 DWORD dwEventThread, DWORD dwmsEventTime)
    4141{
    … …  
    128128#ifdef DEBUG
    129129#include <VBox/VBoxGuest.h>
     130#include <VBox/VMMDev.h>
    130131
    131132static char LogBuffer[1024];

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

    r10801 r21227  
    11/* $Id$ */
    22/** @file
    3  * VBoxService - Guest Additions Service, Internal Header.
     3 * VBoxTray - Guest Additions Tray, Internal Header.
    44 */
    55
    … …  
    3333
    3434#include <VBox/version.h>
    35 #include <VBox/VBoxGuest.h>
    3635#include <VBox/Log.h>
    3736

  • trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/tstSessionHack.cpp

    r21219 r21227  
    2121#define _WIN32_WINNT 0x0500
    2222#include <Windows.h>
    23 #include <VBox/VMMDev.h>
    2423#include <VBox/VBoxGuest.h>
    2524#include <VBoxGuestInternal.h>

  • trunk/src/VBox/Additions/WINNT/i8042prt/i8042prt.h

    r1 r21227  
    2929
    3030//VBOX begin
     31#include <VBox/VMMDev.h>
    3132#include <VBox/VBoxGuest.h>
    3233#include <VBox/VBoxGuestLib.h>
    … …  
    251252//
    252253
    253 #define ACKNOWLEDGE         0xFA       
     254#define ACKNOWLEDGE         0xFA
    254255#define RESEND              0xFE
    255256
    … …  
    682683    // Keep track of last byte of data received from mouse so we can detect
    683684    // the two-byte string which indicates a potential reset
    684     // 
     685    //
    685686
    686687    UCHAR LastByteReceived;

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

    r21219 r21227  
    5555
    5656#include "VBoxGuestInternal.h"
    57 #include <VBox/VMMDev.h>                /* VMMDEV_RAM_SIZE */
    58 #include <VBox/VBoxGuest.h>
    5957#include <VBox/version.h>
    6058#include <iprt/initterm.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

    r21170 r21227  
    2626#include <iprt/semaphore.h>
    2727#include <iprt/spinlock.h>
     28#include <VBox/VMMDev.h>
    2829#include <VBox/VBoxGuest.h>
    2930#include <VBox/VBoxGuestLib.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

    r21219 r21227  
    5454    ${PATH_ROOT}/include/VBox/ostypes.h=>include/VBox/ostypes.h \
    5555    ${PATH_ROOT}/include/VBox/VMMDev.h=>include/VBox/VMMDev.h \
     56    ${PATH_ROOT}/include/VBox/VMMDev2.h=>include/VBox/VMMDev2.h \
    5657    ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
     58    ${PATH_ROOT}/include/VBox/VBoxGuest2.h=>include/VBox/VBoxGuest2.h \
    5759    ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \
    5860    ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp=>VBoxGuest.c \

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

    r21211 r21227  
    2020 */
    2121
    22 #ifndef __VBoxGuestLib_VBGLInternal_h
    23 #define __VBoxGuestLib_VBGLInternal_h
     22#ifndef ___VBoxGuestLib_VBGLInternal_h
     23#define ___VBoxGuestLib_VBGLInternal_h
    2424
    25 /* I have added this include here as
    26    a) This file is always included before VBGLInternal and
    27    b) It contains a definition for VBGLHGCMHANDLE, so we definitely do not
    28       need to redefine that here.  The C (without ++) compiler was complaining
    29       that it was defined twice.
    30 */
     25#include <VBox/VMMDev.h>
     26#include <VBox/VBoxGuest.h>
    3127#include <VBox/VBoxGuestLib.h>
    3228
    … …  
    110106
    111107#ifdef VBOX_WITH_HGCM
    112 #ifndef VBGL_VBOXGUEST
     108# ifndef VBGL_VBOXGUEST
    113109/* Initialize HGCM subsystem. */
    114110int vbglHGCMInit (void);
    115111/* Terminate HGCM subsystem. */
    116112int vbglHGCMTerminate (void);
    117 #endif
    118 #endif
     113# endif
     114#endif /* VBOX_WITH_HGCM */
    119115
    120 #endif /* !__VBoxGuestLib_VBGLInternal_h */
     116#endif /* !___VBoxGuestLib_VBGLInternal_h */
    121117

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

    r21211 r21227  
    2626# include <Windows.h>
    2727#endif
     28#include <VBox/VMMDev.h>
    2829#include <VBox/VBoxGuest.h>
    2930#include <VBox/VBoxGuestLib.h>

  • trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

    r19374 r21227  
    2525*******************************************************************************/
    2626#include <iprt/assert.h>
    27 #include <VBox/VBoxGuest.h>
     27#include <VBox/VBoxGuestLib.h>
    2828#include "VBoxServiceInternal.h"
    2929
    … …  
    224224    }
    225225    else
    226     { 
     226    {
    227227        DWORD dwRes = VBoxServiceWinAddAceToObjectsSecurityDescriptor (TEXT("\\\\.\\VBoxMiniRdrDN"),
    228228                                                                       SE_FILE_OBJECT,
    … …  
    338338        }
    339339    }
    340     else 
     340    else
    341341    {
    342342        VBoxServiceVerbose(2, "Service control handler registered.\n");

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

    r21150 r21227  
    2121
    2222
    23 
    2423/*******************************************************************************
    2524*   Header Files                                                               *
    … …  
    3736#include <iprt/system.h>
    3837#include <iprt/time.h>
    39 #include <VBox/VBoxGuest.h>
     38#include <VBox/VBoxGuestLib.h>
    4039#include "VBoxServiceInternal.h"
    4140#include "VBoxServiceUtils.h"
    … …  
    340339    rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
    341340    if ((rc != ERROR_SUCCESS) && (rc != ERROR_FILE_NOT_FOUND))
    342     { 
     341    {
    343342        /* New path does not exist, check the old one ... */
    344343        rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);

  • trunk/src/VBox/Additions/linux/module/files_vboxadd

    r21219 r21227  
    4646    ${PATH_ROOT}/include/VBox/ostypes.h=>include/VBox/ostypes.h \
    4747    ${PATH_ROOT}/include/VBox/VMMDev.h=>include/VBox/VMMDev.h \
     48    ${PATH_ROOT}/include/VBox/VMMDev2.h=>include/VBox/VMMDev2.h \
    4849    ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
     50    ${PATH_ROOT}/include/VBox/VBoxGuest2.h=>include/VBox/VBoxGuest2.h \
    4951    ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \
    5052    ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp=>GenericRequest.c \

  • trunk/src/VBox/Additions/linux/module/vboxmod.h

    r17857 r21227  
     1/* $Revision$ */
    12/** @file
    2  *
    3  * vboxadd -- VirtualBox Guest Additions for Linux
     3 * vboxadd - VirtualBox Guest Additions for Linux.
    44 */
    55
    … …  
    2323#define VBOXMOD_H
    2424
     25#include <VBox/VMMDev.h>
    2526#include <VBox/VBoxGuest.h>
    2627#include <VBox/VBoxGuestLib.h>

  • trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFInit.cpp

    r20374 r21227  
    1 /** $Id$ */
     1/* $Id$ */
    22/** @file
    33 * VBoxSF - OS/2 Shared Folders, Initialization.
    … …  
    3636#include "VBoxSFInternal.h"
    3737
    38 #include <VBox/VBoxGuest.h>
    3938#include <VBox/VBoxGuestLib.h>
    4039#include <VBox/log.h>

  • trunk/src/VBox/Additions/x11/VBoxClient/autoresize.cpp

    r21218 r21227  
     1/* $Id$ */
    12/** @file
    2  *
    3  * Guest client: display auto-resize.
     3 * X11 guest client - display auto-resize.
    44 */
    55
    … …  
    3333#include <iprt/thread.h>
    3434#include <VBox/log.h>
    35 #include <VBox/VBoxGuest.h>
     35#include <VBox/VMMDev.h>
    3636#include <VBox/VBoxGuestLib.h>
    3737

  • trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

    r21043 r21227  
    3333
    3434#include <VBox/log.h>
     35#include <VBox/VBoxGuestLib.h>
    3536#include <VBox/HostServices/VBoxClipboardSvc.h>
    3637#include <VBox/GuestHost/SharedClipboard.h>

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp

    r21218 r21227  
    11/** @file
    2  *
    3  * Seamless mode:
    4  * Linux guest.
     2 * X11 Guest client - seamless mode, missing proper description while using the
     3 * potentially confusing word 'host'.
    54 */
    65
    … …  
    2423*   Header files                                                             *
    2524*****************************************************************************/
    26 
    2725#include <VBox/log.h>
    28 #include <VBox/VBoxGuest.h>
     26#include <VBox/VMMDev.h>
     27#include <VBox/VBoxGuestLib.h>
    2928#include <iprt/err.h>
    3029

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.h

    r21218 r21227  
    11/** @file
    2  *
    3  * Guest client: seamless mode.
     2 * X11 Guest client - seamless mode, missing proper description while using the
     3 * potentially confusing word 'host'.
    44 */
    55

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

    r21216 r21227  
    11/** @file
    2  *
    3  * Seamless mode:
    4  * Linux guest.
     2 * X11 Seamless mode.
    53 */
    64
    … …  
    2826#include <iprt/assert.h>
    2927#include <VBox/log.h>
    30 #include <VBox/VBoxGuest.h>
    3128
    3229#include "seamless-guest.h"
    … …  
    277274
    278275/**
    279  * Waits for a position or shape-related event from guest windows 
     276 * Waits for a position or shape-related event from guest windows
    280277 *
    281278 * @note Called from the guest event thread.

  • trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

    r21216 r21227  
    3131#include <iprt/stream.h>
    3232#include <iprt/string.h>
    33 #include <VBox/VBoxGuest.h>
    3433
    3534#include "../seamless.h"

  • trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

    r21218 r21227  
    2424#include <iprt/initterm.h>
    2525#include <iprt/semaphore.h>
    26 #include <VBox/VBoxGuest.h>
    2726#include <VBox/VBoxGuestLib.h>
    2827

  • trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c

    r21226 r21227  
    2121
    2222#include <iprt/assert.h>
    23 #include <VBox/VBoxGuest.h>
     23#include <iprt/err.h>
     24#include <VBox/VMMDev.h>
    2425#include <VBox/VBoxGuestLib.h>
    2526#include "VBoxUtils.h"

  • trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c

    r21226 r21227  
    2121
    2222#include <iprt/assert.h>
     23#include <VBox/VMMDev.h>
    2324#include <VBox/VBoxGuest.h>
    2425#include <VBox/VBoxGuestLib.h>
    … …  
    3132
    3233#ifndef RT_OS_SOLARIS
    33 #include <asm/ioctl.h>
     34# include <asm/ioctl.h>
    3435#endif
    3536

  • trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

    r21226 r21227  
    4848 */
    4949
    50 #include <VBox/VBoxGuest.h>
     50#include <VBox/VMMDev.h>
    5151#include <VBox/VBoxGuestLib.h>
     52#include <iprt/err.h>
    5253#include <xf86.h>
    5354#include <xf86Xinput.h>

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

    r21226 r21227  
    2020
    2121#include <VBox/VMMDev.h>
    22 #include <VBox/VBoxGuest.h>
    2322#include <VBox/VBoxGuestLib.h>
    2423

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxutils_68.c

    r21226 r21227  
    11/** @file
    2  *
    32 * Linux Additions X11 graphics driver helper module
    43 */

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

    r20550 r21227  
    9393#define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
    9494
    95 #include <VBox/VBoxGuest.h>
     95#include <VBox/VMMDev.h>
    9696
    9797/* All drivers should typically include these */

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_68.h

    r16701 r21227  
    5757#define _VBOXVIDEO_H_
    5858
    59 #include <VBox/VBoxGuest.h>
     59#include <VBox/VMMDev.h>
    6060
    6161/* All drivers should typically include these */
    … …  
    154154    Bool useVbva;
    155155    int viewportX, viewportY;
    156     VMMDevVideoAccelFlush *reqf; 
    157     VMMDevVideoAccelEnable *reqe; 
     156    VMMDevVideoAccelFlush *reqf;
     157    VMMDevVideoAccelEnable *reqe;
    158158    VMMDevMemory *pVMMDevMemory;
    159159    VBVAMEMORY *pVbvaMemory;

  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r21188 r21227  
    131131#include <iprt/string.h>
    132132
    133 #include <VBox/VBoxGuest.h>
     133#include <VBox/VMMDev.h>
    134134#include <VBox/VBoxVideo.h>
    135135#include <VBox/bioslogo.h>

  • trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

    r21226 r21227  
    2929#define LOG_GROUP LOG_GROUP_DEV_VMM
    3030#include <VBox/VMMDev.h>
    31 #include <VBox/VBoxGuest.h>
    3231#include <VBox/log.h>
    3332#include <VBox/param.h>

  • trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.h

    r20731 r21227  
    2323#define ___VMMDev_VMMDevHGCM_h
    2424
    25 #include <VBox/cdefs.h>
    26 #include <VBox/types.h>
    27 
    28 #include <VBox/VBoxGuest.h>
    29 
    3025#include "VMMDevState.h"
    3126

  • trunk/src/VBox/Devices/VMMDev/VMMDevState.h

    r21062 r21227  
    2323#define ___VMMDev_VMMDevState_h
    2424
    25 #include <VBox/cdefs.h>
    26 #include <VBox/types.h>
    27 
     25#include <VBox/VMMDev.h>
    2826#include <VBox/pdmdev.h>
    2927#include <VBox/pdmifs.h>

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

    r19817 r21227  
    3434#include <iprt/thread.h>
    3535#include <VBox/pdm.h>
    36 #include <VBox/VBoxGuest.h>
     36#include <VBox/VMMDev.h>
    3737#include <VBox/cfgm.h>
    3838#include <VBox/err.h>

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

    r21226 r21227  
    2828
    2929#include "Framebuffer.h"
    30 struct _VBVACMDHDR;
     30struct VBVACMDHDR;
    3131
    3232class VMDisplay
    … …  
    9898    uint32_t   mcbVbvaPartial;
    9999
    100     bool vbvaFetchCmd (struct _VBVACMDHDR **ppHdr, uint32_t *pcbCmd);
    101     void vbvaReleaseCmd (struct _VBVACMDHDR *pHdr, int32_t cbCmd);
     100    bool vbvaFetchCmd (struct VBVACMDHDR **ppHdr, uint32_t *pcbCmd);
     101    void vbvaReleaseCmd (struct VBVACMDHDR *pHdr, int32_t cbCmd);
    102102
    103103    void handleResizeCompletedEMT (void);

  • trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp

    r13837 r21227  
    4141#include <iprt/thread.h>
    4242
    43 #include <VBox/VBoxGuest.h>
    4443
    4544/**

  • trunk/src/VBox/Frontends/VBoxBFE/HGCM.h

    r20374 r21227  
    2626#include <VBox/types.h>
    2727#include <VBox/pdm.h>
    28 
    29 #include <VBox/VBoxGuest.h>
    3028#include <VBox/hgcmsvc.h>
    3129

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

    r21226 r21227  
    3030#include <VBox/pdm.h>
    3131#include <VBox/VMMDev.h>
    32 #include <VBox/VBoxGuest.h>
    3332#include <VBox/cfgm.h>
    3433#include <VBox/err.h>

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

    r20928 r21227  
    5252#endif
    5353
    54 #include <VBox/VBoxGuest.h>
     54#include <VBox/VMMDev.h> /** @todo @bugref{4084} */
    5555
    5656#if defined(Q_WS_X11)
    … …  
    36023602        .arg (RT_HIWORD (version)).arg (RT_LOWORD (version));
    36033603    QString expectedStr = QString ("%1.%2")
    3604         .arg (VMMDEV_VERSION_MAJOR).arg (VMMDEV_VERSION_MINOR);
     3604        .arg (VMMDEV_VERSION_MAJOR).arg (VMMDEV_VERSION_MINOR); /** @todo r=bird: This isn't want we want! We want the VirtualBox version of the additions, all three numbers. See @bugref{4084}.*/
    36053605
    36063606    if (RT_HIWORD (version) < VMMDEV_VERSION_MAJOR)

  • trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

    r21225 r21227  
    4141#include "net_internals.h"
    4242
    43 #include <VBox/VBoxGuest.h>
     43#if 1 /** @todo Try use the Vbgl interface instead of talking directly to the driver? */
     44# include <VBox/VBoxGuest.h>
     45#else
     46# include <VBox/VBoxGuestLib.h>
     47#endif
    4448#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
    4549
    … …  
    147151 * @param   cbData      Data size
    148152 */
    149 /*@todo use vbglR3DoIOCtl here instead */
     153/** @todo use vbglR3DoIOCtl here instead */
    150154static int crVBoxHGCMCall(void *pvData, unsigned cbData)
    151155{

  • trunk/src/VBox/Main/VMMDevInterface.cpp

    r21226 r21227  
    11/** @file
    2  *
    3  * VirtualBox Driver Interface to VMM device
     2 * VirtualBox Driver Interface to VMM device.
    43 */
    54
    … …  
    2928#include <VBox/pdmdrv.h>
    3029#include <VBox/VMMDev.h>
    31 #include <VBox/VBoxGuest.h>
    3230#include <VBox/shflsvc.h>
    3331#include <iprt/asm.h>

  • trunk/src/VBox/Main/hgcm/HGCM.cpp

    r14215 r21227  
    4141#include <iprt/thread.h>
    4242
    43 #include <VBox/VBoxGuest.h>
     43#include <VBox/VMMDev.h>
    4444
    4545/**

  • trunk/src/VBox/Main/include/DisplayImpl.h

    r20814 r21227  
    3030#include <iprt/semaphore.h>
    3131#include <VBox/pdmdrv.h>
    32 #include <VBox/VBoxGuest.h>
     32#include <VBox/VMMDev.h>
    3333#include <VBox/VBoxVideo.h>
    3434

  • trunk/src/VBox/Main/include/hgcm/HGCM.h

    r20374 r21227  
    11/** @file
    2  *
    3  * HGCM - Host-Guest Communication Manager
     2 * HGCM - Host-Guest Communication Manager.
    43 */
    54
    … …  
    2726#include <VBox/pdm.h>
    2827
    29 #include <VBox/VBoxGuest.h>
     28#include <VBox/VMMDev.h>
    3029#include <VBox/hgcmsvc.h>
    3130

  • trunk/src/VBox/Runtime/VBox/logbackdoor.cpp

    r19120 r21227  
    3636#include <iprt/string.h>
    3737#ifdef IN_GUEST_R3
    38 # include <VBox/VBoxGuest.h>
     38# include <VBox/VBoxGuestLib.h>
    3939#endif
    4040
Note: See TracChangeset for help on using the changeset viewer.

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