Changeset 37423 in vbox
- Timestamp:
- Jun 12, 2011 6:37:56 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 72222
- Location:
- trunk
- Files:
-
- 61 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/RemoteDesktop/VRDE.h
r36435 r37423 48 48 struct VRDEServer; 49 49 typedef struct VRDEServerType *HVRDESERVER; 50 #endif /* __cplusplus */50 #endif /* !__cplusplus */ 51 51 52 52 /* Callback based VRDE server interface declarations. */ … … 1118 1118 1119 1119 1120 /* Indexes for VRDECallbackProperty. 1120 /* Indexes for VRDECallbackProperty. 1121 1121 * *_QP_* queries a property. 1122 1122 * *_SP_* sets a property. -
trunk/include/VBox/usblib-win.h
r36959 r37423 263 263 typedef struct 264 264 { 265 USBSUP_DEVIDDevId;266 charszName[512];267 USBDEVICESTATEenmState;268 bool fHiSpeed;265 USBSUP_DEVID DevId; 266 char szName[512]; 267 USBDEVICESTATE enmState; 268 bool fHiSpeed; 269 269 } USBSUP_DEVINFO, *PUSBSUP_DEVINFO; 270 270 271 271 typedef struct 272 272 { 273 int rc;274 uint32_t cDevices;275 USBSUP_DEVINFO aDevices[1];273 int rc; 274 uint32_t cDevices; 275 USBSUP_DEVINFO aDevices[1]; 276 276 } USBSUP_GET_DEVICES, *PUSBSUP_GET_DEVICES; 277 277 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoPortAPI.h
r36867 r37423 78 78 79 79 PFNQUEUEDPC pfnQueueDpc; 80 80 81 81 PFNCREATESECONDARYDISPLAY pfnCreateSecondaryDisplay; 82 82 } VBOXVIDEOPORTPROCS; -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp
r37216 r37423 4955 4955 * for some reason we're getting pSurf->SysMemPitch as if took 4x1 column from this block, 4956 4956 * which leads us to having 4x times bigger pitch than actual line takes. 4957 * Simply trying to read here provided pointer 4957 * Simply trying to read here provided pointer 4958 4958 * at (byte*)pSurf->pSysMem + pSurf->pSurf->SysMemPitch*pSurf->Height - 1 causes access violation. 4959 4959 */ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.h
r36867 r37423 102 102 HANDLE hDriver; /* Display device handle which was passed to VBoxDispDrvEnablePDEV */ 103 103 HDEV hDevGDI; /* GDI's handle for PDEV created in VBoxDispDrvEnablePDEV */ 104 104 105 105 VBOXDISPCURRENTMODE mode; /* Current device mode */ 106 106 ULONG iDevice; /* Miniport's device index */ … … 152 152 VOID APIENTRY VBoxDispDrvDisableSurface(DHPDEV dhpdev); 153 153 154 BOOL APIENTRY VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 154 BOOL APIENTRY VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 155 155 LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix); 156 156 BOOL APIENTRY VBoxDispDrvStrokePath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, XFORMOBJ *pxo, … … 171 171 COLORADJUSTMENT *pca, POINTL *pptlHTOrg, RECTL *prclDest, RECTL *prclSrc, 172 172 POINTL *pptlMask, ULONG iMode); 173 BOOL APIENTRY VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 173 BOOL APIENTRY VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 174 174 RECTL *prclDest, POINTL *pptlSrc); 175 175 … … 192 192 193 193 #ifdef VBOX_WITH_DDRAW 194 BOOL APIENTRY VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 194 BOOL APIENTRY VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 195 195 VIDEOMEMORY *pvmList, DWORD *pdwNumFourCCCodes, DWORD *pdwFourCC); 196 BOOL APIENTRY VBoxDispDrvEnableDirectDraw(DHPDEV dhpdev, DD_CALLBACKS *pCallBacks, 196 BOOL APIENTRY VBoxDispDrvEnableDirectDraw(DHPDEV dhpdev, DD_CALLBACKS *pCallBacks, 197 197 DD_SURFACECALLBACKS *pSurfaceCallBacks, 198 198 DD_PALETTECALLBACKS *pPaletteCallBacks); … … 217 217 return pso; 218 218 } 219 219 220 220 #endif /*VBOXDISP_H*/ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDraw.cpp
r36867 r37423 248 248 } 249 249 250 /* Called to destroy DirectDraw surface, 250 /* Called to destroy DirectDraw surface, 251 251 * in particular we should free vhwa resources allocated on VBoxDispDDCreateSurface. 252 252 * Note: we're always returning DDHAL_DRIVER_NOTHANDLED because we rely on DirectDraw memory manager. … … 499 499 VBoxVBVABufferEndUpdate(&pDev->vbvaCtx); 500 500 } 501 else if ((pSurf->ddsCaps.dwCaps & DDSCAPS_VISIBLE) 501 else if ((pSurf->ddsCaps.dwCaps & DDSCAPS_VISIBLE) 502 502 || ((pSurf->ddsCaps.dwCaps & DDSCAPS_OVERLAY) && pDesc->bVisible)) 503 503 { -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDrawVHWA.cpp
r36867 r37423 59 59 if (VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_BLT)) 60 60 { 61 /* we only support simple dst=src copy 61 /* we only support simple dst=src copy 62 62 * Note: search "ternary raster operations" on msdn for more info 63 63 */ … … 540 540 { 541 541 PVBOXVHWASURFDESC pDstDesc = (PVBOXVHWASURFDESC) pDstSurf->lpGbl->dwReserved1; 542 542 543 543 if (!pDstDesc) 544 544 { -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDrawCmd.cpp
r36867 r37423 285 285 */ 286 286 287 BOOL APIENTRY 287 BOOL APIENTRY 288 288 VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, LONG x1, LONG y1, LONG x2, LONG y2, 289 289 RECTL *prclBounds, MIX mix) … … 300 300 } 301 301 302 BOOL APIENTRY 302 BOOL APIENTRY 303 303 VBoxDispDrvStrokePath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, XFORMOBJ *pxo, 304 304 BRUSHOBJ *pbo, POINTL *pptlBrushOrg, LINEATTRS *plineattrs, MIX mix) … … 315 315 } 316 316 317 BOOL APIENTRY 317 BOOL APIENTRY 318 318 VBoxDispDrvFillPath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, BRUSHOBJ *pbo, POINTL *pptlBrushOrg, 319 319 MIX mix, FLONG flOptions) … … 343 343 } 344 344 345 BOOL APIENTRY 345 BOOL APIENTRY 346 346 VBoxDispDrvTextOut(SURFOBJ *pso, STROBJ *pstro, FONTOBJ *pfo, CLIPOBJ *pco, 347 347 RECTL *prclExtra, RECTL *prclOpaque, BRUSHOBJ *pboFore, … … 498 498 } 499 499 500 BOOL APIENTRY 500 BOOL APIENTRY 501 501 VBoxDispDrvBitBlt(SURFOBJ *psoTrg, SURFOBJ *psoSrc, SURFOBJ *psoMask, CLIPOBJ *pco, XLATEOBJ *pxlo, 502 502 RECTL *prclTrg, POINTL *pptlSrc, POINTL *pptlMask, BRUSHOBJ *pbo, POINTL *pptlBrush, ROP4 rop4) … … 509 509 "pptlMask = %p, pbo = %p, pptlBrush = %p, rop4 = %08X", 510 510 psoTrg, psoSrc, psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4)); 511 511 512 512 bRc = EngBitBlt(getSurfObj(psoTrg), getSurfObj(psoSrc), psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4); 513 513 VBVA_OPERATION(psoTrg, BitBlt, … … 537 537 538 538 BOOL APIENTRY 539 VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 539 VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 540 540 RECTL *prclDest, POINTL *pptlSrc) 541 541 { -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp
r36867 r37423 63 63 /* Called to get supported DirectDraw caps */ 64 64 BOOL APIENTRY 65 VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 65 VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 66 66 VIDEOMEMORY *pvmList, DWORD *pdwNumFourCCCodes, DWORD *pdwFourCC) 67 67 { … … 181 181 pSurfaceCallBacks->dwFlags |= DDHAL_SURFCB32_UPDATEOVERLAY|DDHAL_SURFCB32_SETOVERLAYPOSITION; 182 182 } 183 } 183 } 184 184 #endif 185 185 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMini.cpp
r36867 r37423 58 58 59 59 /* Allocate temp buffer */ 60 pMiniportModes = (PVIDEO_MODE_INFORMATION) 60 pMiniportModes = (PVIDEO_MODE_INFORMATION) 61 61 EngAllocMem(0, numModes.NumModes*numModes.ModeInformationLength, MEM_ALLOC_TAG); 62 62 … … 75 75 VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR); 76 76 } 77 77 78 78 /* Check which of miniport modes are supprted by display driver. 79 79 * Note: size of VIDEO_MODE_INFORMATION is returned by miniport driver in numModes.ModeInformationLength, … … 111 111 112 112 /* Allocate and zero output buffer */ 113 *ppModesTable = (PVIDEO_MODE_INFORMATION) 113 *ppModesTable = (PVIDEO_MODE_INFORMATION) 114 114 EngAllocMem(FL_ZERO_MEMORY, cSupportedModes*sizeof(VIDEO_MODE_INFORMATION), MEM_ALLOC_TAG); 115 115 … … 121 121 } 122 122 123 /* Copy supported modes to output buffer */ 123 /* Copy supported modes to output buffer */ 124 124 pMode = pMiniportModes; 125 125 for (j=0, i=0; i<numModes.NumModes; ++i) … … 238 238 239 239 memset(pInfo, 0, sizeof(QUERYHGSMIRESULT)); 240 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_QUERY_HGSMI_INFO, NULL, 0, 240 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_QUERY_HGSMI_INFO, NULL, 0, 241 241 pInfo, sizeof(QUERYHGSMIRESULT), &cbReturned); 242 242 VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR); … … 343 343 Assert(pDev->pointer.pAttrs); 344 344 345 dwrc = EngDeviceIoControl(pDev->hDriver, IOCTL_VIDEO_SET_POINTER_ATTR, pDev->pointer.pAttrs, pDev->pointer.cbAttrs, 345 dwrc = EngDeviceIoControl(pDev->hDriver, IOCTL_VIDEO_SET_POINTER_ATTR, pDev->pointer.pAttrs, pDev->pointer.cbAttrs, 346 346 NULL, 0, &cbReturned); 347 347 VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR); … … 384 384 LOGF_ENTER(); 385 385 386 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_SHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 386 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_SHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 387 387 pSMemInfo, sizeof(VIDEO_SHARE_MEMORY_INFORMATION), &cbReturned); 388 388 VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR); 389 VBOX_WARN_IOCTLCB_RETRC("IOCTL_VIDEO_SHARE_VIDEO_MEMORY", cbReturned, 389 VBOX_WARN_IOCTLCB_RETRC("IOCTL_VIDEO_SHARE_VIDEO_MEMORY", cbReturned, 390 390 sizeof(VIDEO_SHARE_MEMORY_INFORMATION), VERR_DEV_IO_ERROR); 391 391 … … 400 400 LOGF_ENTER(); 401 401 402 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 402 dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 403 403 NULL, 0, &cbReturned); 404 404 VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMouse.cpp
r36867 r37423 206 206 { 207 207 LOG(("BMF_32BPP")); 208 memcpy(psoRes->pvBits, psoBitmap->pvBits, min(psoRes->cjBits, psoBitmap->cjBits)); 208 memcpy(psoRes->pvBits, psoBitmap->pvBits, min(psoRes->cjBits, psoBitmap->cjBits)); 209 209 } 210 210 else … … 495 495 pDev->pointer.pAttrs->Enable |= VBOX_MOUSE_POINTER_VISIBLE; 496 496 } 497 497 498 498 if (fl & SPS_ALPHA) 499 499 { -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp
r36867 r37423 323 323 { 324 324 pDev->hgsmi.bSupported = TRUE; 325 325 326 326 pDev->hgsmi.mp = callbacks; 327 327 pDev->vpAPI = portProcs; … … 398 398 } 399 399 400 /* Setup HGSMI heap in the display information area. 400 /* Setup HGSMI heap in the display information area. 401 401 * The area has some space reserved for HGSMI event flags in the beginning. 402 402 */ … … 561 561 */ 562 562 563 void vbvaDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 563 void vbvaDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 564 564 LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix) 565 565 { … … 620 620 } 621 621 622 void vbvaDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 622 void vbvaDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 623 623 RECTL *prclDest, POINTL *pptlSrc) 624 624 { -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVRDP.cpp
r36867 r37423 929 929 */ 930 930 931 void vrdpDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 931 void vrdpDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 932 932 LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix) 933 933 { … … 1231 1231 WARN(("unsupported: pstro->pwszOrg=%p, prclExtra=%p, pfo->flFontType & FO_TYPE_RASTER = 0x%08X, " 1232 1232 "pstro->cGlyphs = %d, pboOpaque->iSolidColor %p, pfo->iUniq = %p", 1233 pstro->pwszOrg, prclExtra, pfo->flFontType & FO_TYPE_RASTER, pstro->cGlyphs, 1233 pstro->pwszOrg, prclExtra, pfo->flFontType & FO_TYPE_RASTER, pstro->cGlyphs, 1234 1234 pboOpaque? pboOpaque->iSolidColor: 0, pfo->iUniq)); 1235 1235 vrdpReportDirtyRects(pDev, &clipRects); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp
r37207 r37423 38 38 39 39 /* Fills given video mode BPP related fields */ 40 static void 41 VBoxFillVidModeBPP(VIDEO_MODE_INFORMATION *pMode, ULONG bitsR, ULONG bitsG, ULONG bitsB, 40 static void 41 VBoxFillVidModeBPP(VIDEO_MODE_INFORMATION *pMode, ULONG bitsR, ULONG bitsG, ULONG bitsB, 42 42 ULONG maskR, ULONG maskG, ULONG maskB) 43 43 { … … 51 51 52 52 /* Fills given video mode structure */ 53 static void 53 static void 54 54 VBoxFillVidModeInfo(VIDEO_MODE_INFORMATION *pMode, ULONG xres, ULONG yres, ULONG bpp, ULONG index, ULONG yoffset) 55 55 { … … 327 327 } 328 328 329 /* Check registry for manually added modes, up to 128 entries is supported 329 /* Check registry for manually added modes, up to 128 entries is supported 330 330 * Give up on the first error encountered. 331 331 */ … … 537 537 uint32_t xres=0, yres=0, bpp=0, display=0; 538 538 539 /* Check if there's a pending display change request for this display */ 539 /* Check if there's a pending display change request for this display */ 540 540 if (VBoxQueryDisplayRequest(&xres, &yres, &bpp, &display) && (xres || yres || bpp)) 541 541 { … … 720 720 721 721 /* Add special mode to the table 722 * Note: Y offset isn't used for a host-supplied modes 722 * Note: Y offset isn't used for a host-supplied modes 723 723 */ 724 724 specialMode.ModeIndex = g_NumVideoModes+1; … … 728 728 /* Save special mode in the custom modes table */ 729 729 memcpy(&g_CustomVideoModes[pExt->iDevice], &specialMode, sizeof(VIDEO_MODE_INFORMATION)); 730 731 730 731 732 732 /* Make sure we've added 2nd mode if necessary to maintain table size */ 733 733 if (VBoxMPIsStartingUp(pExt, pExt->iDevice)) … … 793 793 794 794 static void 795 VBoxWddmBuildResolutionTable(PVIDEO_MODE_INFORMATION pModesTable, size_t tableSize, 795 VBoxWddmBuildResolutionTable(PVIDEO_MODE_INFORMATION pModesTable, size_t tableSize, 796 796 SIZE *pResolutions, uint32_t * pcResolutions) 797 797 { … … 836 836 static void 837 837 VBoxWddmBuildVideoModesInfo(PVBOXMP_DEVEXT pExt, D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId, 838 PVBOXWDDM_VIDEOMODES_INFO pModes, VIDEO_MODE_INFORMATION *paAddlModes, 838 PVBOXWDDM_VIDEOMODES_INFO pModes, VIDEO_MODE_INFORMATION *paAddlModes, 839 839 UINT cAddlModes) 840 840 { … … 897 897 UINT bpp=8; 898 898 #else 899 UINT bpp=16; 899 UINT bpp=16; 900 900 #endif 901 901 for (; bpp<=32; bpp+=8) -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp
r36867 r37423 81 81 pMapInfo->VideoRamLength = pExt->pPrimary->u.primary.ulMaxFrameBufferSize; 82 82 83 pStatus->Status = VideoPortMapMemory(pExt, framebuffer, &pMapInfo->VideoRamLength, 83 pStatus->Status = VideoPortMapMemory(pExt, framebuffer, &pMapInfo->VideoRamLength, 84 84 &inIoSpace, &pMapInfo->VideoRamBase); 85 85 … … 157 157 pStatus->Information = sizeof(VIDEO_SHARE_MEMORY_INFORMATION); 158 158 } 159 159 160 160 VBOXMPIOCTL_UNHIDE(); 161 161 LOGF_LEAVE(); … … 200 200 } 201 201 202 LOG(("width %d, height %d, bpp %d", 202 LOG(("width %d, height %d, bpp %d", 203 203 pModeInfo->VisScreenWidth, pModeInfo->VisScreenHeight, pModeInfo->BitsPerPlane)); 204 204 … … 216 216 217 217 /* Perform actual mode switch */ 218 VBoxVideoSetModeRegisters((USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->VisScreenHeight, 218 VBoxVideoSetModeRegisters((USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->VisScreenHeight, 219 219 (USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->BitsPerPlane, 0, 0, 0); 220 220 … … 241 241 242 242 /* Called for IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES. 243 * Returns count of supported video modes and structure size in bytes, 243 * Returns count of supported video modes and structure size in bytes, 244 244 * used by the following IOCTL_VIDEO_QUERY_AVAIL_MODES. 245 245 */ … … 342 342 343 343 /* Visible and No Shape means show the pointer, 0 means hide pointer. 344 * It's enough to init only this field. 344 * It's enough to init only this field. 345 345 */ 346 346 attrs.Enable = bEnable ? VBOX_MOUSE_POINTER_VISIBLE:0; … … 612 612 bRC=FALSE; 613 613 } 614 614 615 615 LOGF_LEAVE(); 616 616 return bRC; -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp
r36867 r37423 112 112 { 113 113 LOGF_ENTER(); 114 114 115 115 PVBOXMP_COMMON pCommon = VBoxCommonFromDeviceExt(pExt); 116 116 VBOXVIDEOPORTPROCS *pAPI = &pExt->u.primary.VideoPortProcs; … … 315 315 VbglGRFree(&req->header); 316 316 } 317 else 317 else 318 318 { 319 319 WARN(("VbglGRAlloc(VMMDevVideoAccelEnable) rc = %#xrc", rc)); … … 431 431 } 432 432 433 WARN(("Failed to allocate %d bytes", size)); 433 WARN(("Failed to allocate %d bytes", size)); 434 434 return VERR_GENERAL_FAILURE; 435 435 } … … 445 445 PVBOXMP_DEVEXT pExt = VBoxCommonToPrimaryExt(pCommon); 446 446 PEVENT pEvent = (PEVENT)pvEvent; 447 pExt->u.primary.VideoPortProcs.pfnSetEvent(pExt, pEvent); 447 pExt->u.primary.VideoPortProcs.pfnSetEvent(pExt, pEvent); 448 448 } 449 449 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPVideoPortAPI.cpp
r36896 r37423 64 64 } 65 65 66 static BOOLEAN 66 static BOOLEAN 67 67 vboxQueueDpcVoid(IN PVOID HwDeviceExtension, IN PMINIPORT_DPC_ROUTINE CallbackRoutine, IN PVOID Context) 68 68 { -
trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
r37225 r37423 36 36 #define IOCTL_INTERNAL_MOUSE_CONNECT CTL_CODE(FILE_DEVICE_MOUSE, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS) 37 37 38 typedef VOID (*PFNSERVICECB)(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 38 typedef VOID (*PFNSERVICECB)(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 39 39 PMOUSE_INPUT_DATA InputDataEnd, PULONG InputDataConsumed); 40 40 -
trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFDriver.cpp
r37225 r37423 145 145 146 146 static void 147 VBoxServiceCB(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 147 VBoxServiceCB(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 148 148 PMOUSE_INPUT_DATA InputDataEnd, PULONG InputDataConsumed) 149 149 { -
trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp
r37226 r37423 366 366 367 367 LOG(("Number of descriptors: %d", pResourceList->Count)); 368 368 369 369 /* Check if device claims IO port 0x60 or int12 */ 370 370 for (ULONG i=0; i<pResourceList->Count; ++i) … … 429 429 { 430 430 LOGF_ENTER(); 431 431 432 432 if (!vboxIsVBGLInited()) 433 433 { … … 486 486 } 487 487 } 488 488 489 489 LOGF_LEAVE(); 490 490 } -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
r37422 r37423 524 524 if (ghSeamlessNotifyEvent) 525 525 { 526 526 CloseHandle(ghSeamlessNotifyEvent); 527 527 ghSeamlessNotifyEvent = NULL; 528 528 } -
trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp
r37291 r37423 209 209 VBOXGUEST_UPDATE_DEVSTATE(pDevExt, SURPRISEREMOVED); 210 210 211 /* Do nothing here actually. Cleanup is done in IRP_MN_REMOVE_DEVICE. 211 /* Do nothing here actually. Cleanup is done in IRP_MN_REMOVE_DEVICE. 212 212 * This request is not expected for VBoxGuest. 213 213 */ -
trunk/src/VBox/Additions/solaris/Installer/postinstall.sh
r37372 r37423 54 54 # VBox Xorg Video drivers 55 55 uncompress_file "$1" "vboxvideo_drv_13.so" 56 uncompress_file "$1" "vboxvideo_drv_14.so" 57 uncompress_file "$1" "vboxvideo_drv_15.so" 58 uncompress_file "$1" "vboxvideo_drv_16.so" 59 uncompress_file "$1" "vboxvideo_drv_17.so" 60 uncompress_file "$1" "vboxvideo_drv_18.so" 61 uncompress_file "$1" "vboxvideo_drv_19.so" 56 uncompress_file "$1" "vboxvideo_drv_14.so" 57 uncompress_file "$1" "vboxvideo_drv_15.so" 58 uncompress_file "$1" "vboxvideo_drv_16.so" 59 uncompress_file "$1" "vboxvideo_drv_17.so" 60 uncompress_file "$1" "vboxvideo_drv_18.so" 61 uncompress_file "$1" "vboxvideo_drv_19.so" 62 62 uncompress_file "$1" "vboxvideo_drv_110.so" 63 uncompress_file "$1" "vboxvideo_drv_70.so" 64 uncompress_file "$1" "vboxvideo_drv_71.so" 63 uncompress_file "$1" "vboxvideo_drv_70.so" 64 uncompress_file "$1" "vboxvideo_drv_71.so" 65 65 66 66 # VBox Xorg Mouse drivers 67 uncompress_file "$1" "vboxmouse_drv_13.so" 68 uncompress_file "$1" "vboxmouse_drv_14.so" 69 uncompress_file "$1" "vboxmouse_drv_15.so" 70 uncompress_file "$1" "vboxmouse_drv_16.so" 71 uncompress_file "$1" "vboxmouse_drv_17.so" 72 uncompress_file "$1" "vboxmouse_drv_18.so" 73 uncompress_file "$1" "vboxmouse_drv_19.so" 67 uncompress_file "$1" "vboxmouse_drv_13.so" 68 uncompress_file "$1" "vboxmouse_drv_14.so" 69 uncompress_file "$1" "vboxmouse_drv_15.so" 70 uncompress_file "$1" "vboxmouse_drv_16.so" 71 uncompress_file "$1" "vboxmouse_drv_17.so" 72 uncompress_file "$1" "vboxmouse_drv_18.so" 73 uncompress_file "$1" "vboxmouse_drv_19.so" 74 74 uncompress_file "$1" "vboxmouse_drv_110.so" 75 75 uncompress_file "$1" "vboxmouse_drv_70.so" -
trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
r36195 r37423 46 46 vboxfs_prov.c 47 47 vboxfs_LIBS = \ 48 $(VBOX_LIB_VBGL_R0) 48 $(VBOX_LIB_VBGL_R0) 49 49 vboxfs_LDFLAGS += -N drv/vboxguest 50 50 -
trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
r37173 r37423 453 453 { 454 454 RTRECT *pRect; 455 455 456 456 pRect = RectListPushBack(pRects); 457 457 if (!pRect) -
trunk/src/VBox/Additions/x11/VBoxClient/vector.h
r36805 r37423 33 33 * RTVEC_DECL(TopLevels, Window *) 34 34 * without a semi-colon. This macro will define a structure (struct TopLevels) 35 * which contains a dynamically resizeable array of Window * elements. It 35 * which contains a dynamically resizeable array of Window * elements. It 36 36 * will also define a number of inline methods for manipulating the structure, 37 37 * such as … … 39 39 * which adds a new element to the end of the array and returns it, optionally 40 40 * reallocating the array if there is not enough space for the new element. 41 * (This particular method prototype differs from the STL equivalent - 41 * (This particular method prototype differs from the STL equivalent - 42 42 * push_back - more than most of the other methods). 43 * 43 * 44 44 * To create a vector, one simply needs to declare the structure, in this case 45 45 * struct TopLevels = RTVEC_INITIALIZER; … … 59 59 * compiler makes its own decisions about whether to actually 60 60 * inline a function. 61 * @note since vector structures must be explicitly instanciated unlike the 61 * @note since vector structures must be explicitly instanciated unlike the 62 62 * C++ vector template, care must be taken not to instanciate a 63 63 * particular type twice, e.g. once in a header and once in a code file. … … 138 138 } 139 139 140 /** 140 /** 141 141 * Generic method - return a pointer to one past the last element in the 142 142 * vector. … … 196 196 } 197 197 198 /** 198 /** 199 199 * Generic method - reset a vector to empty. 200 200 * @note This function does not free any memory … … 226 226 } 227 227 228 /** 228 /** 229 229 * Generic method - detach the array contained inside a vector and reset the 230 230 * vector to empty. -
trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c
r35840 r37423 136 136 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 137 137 , Absolute 138 # endif 138 # endif 139 139 ); 140 140 … … 147 147 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 148 148 , Absolute 149 # endif 149 # endif 150 150 ); 151 151 #endif -
trunk/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c
r36020 r37423 74 74 } 75 75 76 static struct 76 static struct 77 77 { 78 78 PHGSMIGUESTCOMMANDCONTEXT pCtx; -
trunk/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
r35628 r37423 39 39 } 40 40 41 -
trunk/src/VBox/Devices/Bus/MsixCommon.cpp
r36663 r37423 170 170 Assert(!pciDevIsPassthrough(pDev)); 171 171 172 uint16_t cVectors = pMsiReg->cMsixVectors; 172 uint16_t cVectors = pMsiReg->cMsixVectors; 173 173 uint8_t iCapOffset = pMsiReg->iMsixCapOffset; 174 174 uint8_t iNextOffset = pMsiReg->iMsixNextOffset; -
trunk/src/VBox/Devices/Bus/PCIInternal.h
r36562 r37423 91 91 /** Flag whether the device is capable of MSI using 64-bit address. */ 92 92 PCIDEV_FLAG_MSI64_CAPABLE = 1<<6 93 93 94 94 }; 95 95 -
trunk/src/VBox/Devices/Network/slirp/socket.c
r35923 r37423 921 921 /* Don't care what port we get */ 922 922 /* 923 * > nmap -sV -T4 -O -A -v -PU3483 255.255.255.255 923 * > nmap -sV -T4 -O -A -v -PU3483 255.255.255.255 924 924 * generates bodyless messages, annoying memmory management system. 925 925 */ -
trunk/src/VBox/Devices/PC/DevDMA.cpp
r36228 r37423 71 71 * left by one, including the control registers addresses. The DMA register 72 72 * offsets (except for the page registers) are therefore "double spaced". 73 * 73 * 74 74 * Due to the address shifting, the DMA controller decodes more addresses 75 75 * than are usually documented, with aliasing. See the ICH8 datasheet. … … 418 418 return VINF_SUCCESS; 419 419 } 420 else 420 else 421 421 return VERR_IOM_IOPORT_UNUSED; 422 422 } 423 423 424 /* DMA page registers. There are 16 R/W page registers for compatibility with 424 /* DMA page registers. There are 16 R/W page registers for compatibility with 425 425 * the IBM PC/AT; only some of those registers are used for DMA. The page register 426 426 * accessible via port 80h may be read to insert small delays or used as a scratch … … 430 430 uint32_t *pu32, unsigned cb) 431 431 { 432 if (cb == 1) 432 if (cb == 1) 433 433 { 434 434 DMAControl *dc = (DMAControl *)pvUser; … … 437 437 reg = port & 7; 438 438 *pu32 = dc->au8Page[reg]; 439 Log2(("Read %#x to from page register %#x (channel %d)\n", 439 Log2(("Read %#x to from page register %#x (channel %d)\n", 440 440 *pu32, port, DMAPG2CX(reg))); 441 441 return VINF_SUCCESS; … … 475 475 uint32_t *pu32, unsigned cb) 476 476 { 477 if (cb == 1) 477 if (cb == 1) 478 478 { 479 479 DMAControl *dc = (DMAControl *)pvUser; … … 482 482 reg = port & 7; 483 483 *pu32 = dc->au8PageHi[reg]; 484 Log2(("Read %#x to from high page register %#x (channel %d)\n", 484 Log2(("Read %#x to from high page register %#x (channel %d)\n", 485 485 *pu32, port, DMAPG2CX(reg))); 486 486 return VINF_SUCCESS; … … 501 501 reg = port & 7; 502 502 dc->au8PageHi[reg] = u32; 503 Log2(("Wrote %#x to high page register %#x (channel %d)\n", 503 Log2(("Wrote %#x to high page register %#x (channel %d)\n", 504 504 u32, port, DMAPG2CX(reg))); 505 505 } … … 563 563 PFNDMATRANSFERHANDLER handler, void *pvUser) 564 564 { 565 DMAState *s = PDMINS_2_DATA(pDevIns, DMAState *); 565 DMAState *s = PDMINS_2_DATA(pDevIns, DMAState *); 566 566 DMAChannel *ch = &s->DMAC[DMACH2C(channel)].ChState[channel & 3]; 567 567 … … 682 682 683 683 chidx = channel & 3; 684 if (level) 684 if (level) 685 685 dc->u8Status |= 1 << (chidx + 4); 686 686 else … … 764 764 765 765 /* ...and all four of its channels. */ 766 for (chidx = 0; chidx < 4; ++chidx) 766 for (chidx = 0; chidx < 4; ++chidx) 767 767 { 768 768 DMAChannel *ch = &dc->ChState[chidx]; … … 796 796 } 797 797 798 for (chidx = 0; chidx < 4; ++chidx) 798 for (chidx = 0; chidx < 4; ++chidx) 799 799 { 800 800 DMAChannel *ch = &dc->ChState[chidx]; -
trunk/src/VBox/Devices/PC/DevPIC.cpp
r37159 r37423 786 786 pPic->poll, pPic->special_mask, pPic->init_state); 787 787 pHlp->pfnPrintf(pHlp, " AEOI:%02x Rotate:%02x FNest :%02x Ini4:%02x\n", 788 pPic->auto_eoi, pPic->rotate_on_auto_eoi, 788 pPic->auto_eoi, pPic->rotate_on_auto_eoi, 789 789 pPic->special_fully_nested_mode, pPic->init4); 790 790 pHlp->pfnPrintf(pHlp, " ELCR:%02x ELMask:%02x\n", pPic->elcr, pPic->elcr_mask); -
trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
r35741 r37423 717 717 718 718 719 #ifdef RT_OS_WINDOWS 719 #ifdef RT_OS_WINDOWS 720 720 // Required for ATL 721 721 static CComModule _Module; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp
r35638 r37423 94 94 QPainter painter(m_pMachineView->viewport()); 95 95 96 96 97 97 if ((ulong)r.width() < m_width * 2 / 3) 98 98 { -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
r37367 r37423 1358 1358 return true; 1359 1359 } 1360 1360 1361 1361 /* This must come before host key handling */ 1362 1362 keyEventHandleCapturing(uScan, fFlags, uScreenId); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp
r35796 r37423 599 599 p.setFont(font()); 600 600 p.drawText(QRect(margin, margin + osTypeSize.height() + space, s.width() - 2 * margin, nameSize.height()), Qt::AlignCenter, name); 601 601 /* Transparent icons are not supported on all platforms. */ 602 602 #if defined(Q_WS_MAC) || defined(Q_WS_WIN) 603 603 p.setCompositionMode(QPainter::CompositionMode_DestinationIn); -
trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
r35824 r37423 354 354 PVBOXNETADP pNew; 355 355 Log(("VBoxNetAdpDarwinIOCtl: szName=%s\n", pReq->szName)); 356 rc = vboxNetAdpCreate(&pNew, 356 rc = vboxNetAdpCreate(&pNew, 357 357 pReq->szName[0] && RTStrEnd(pReq->szName, RT_MIN(cbReq, sizeof(pReq->szName))) ? 358 358 pReq->szName : NULL); -
trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
r36385 r37423 84 84 85 85 /** Netgraph node type */ 86 #define NG_VBOXNETFLT_NODE_TYPE "vboxnetflt"86 #define NG_VBOXNETFLT_NODE_TYPE "vboxnetflt" 87 87 /** Netgraph message cookie */ 88 #define NGM_VBOXNETFLT_COOKIE 0x56424f5888 #define NGM_VBOXNETFLT_COOKIE 0x56424f58 89 89 90 90 /** Input netgraph hook name */ 91 #define NG_VBOXNETFLT_HOOK_IN "input"91 #define NG_VBOXNETFLT_HOOK_IN "input" 92 92 /** Output netgraph hook name */ 93 #define NG_VBOXNETFLT_HOOK_OUT "output"93 #define NG_VBOXNETFLT_HOOK_OUT "output" 94 94 95 95 /** mbuf tag identifier */ 96 #define MTAG_VBOX 0x56424f5896 #define MTAG_VBOX 0x56424f58 97 97 /** mbuf packet tag */ 98 #define PACKET_TAG_VBOX 12898 #define PACKET_TAG_VBOX 128 99 99 100 100 #if defined(__FreeBSD_version) && __FreeBSD_version >= 800500 … … 102 102 # include <net/vnet.h> 103 103 104 # define VBOXCURVNET_SET(arg) 105 # define VBOXCURVNET_SET_FROM_UCRED() 106 # define VBOXCURVNET_RESTORE() 104 # define VBOXCURVNET_SET(arg) CURVNET_SET_QUIET(arg) 105 # define VBOXCURVNET_SET_FROM_UCRED() VBOXCURVNET_SET(CRED_TO_VNET(curthread->td_ucred)) 106 # define VBOXCURVNET_RESTORE() CURVNET_RESTORE() 107 107 108 108 #else /* !defined(__FreeBSD_version) || __FreeBSD_version < 800500 */ … … 128 128 static struct ng_type ng_vboxnetflt_typestruct = 129 129 { 130 .version =NG_ABI_VERSION,131 .name =NG_VBOXNETFLT_NODE_TYPE,132 .mod_event =vboxnetflt_modevent,133 .constructor =ng_vboxnetflt_constructor,134 .rcvmsg =ng_vboxnetflt_rcvmsg,135 .shutdown =ng_vboxnetflt_shutdown,136 .newhook =ng_vboxnetflt_newhook,137 .rcvdata =ng_vboxnetflt_rcvdata,138 .disconnect = 139 .cmdlist =ng_vboxnetflt_cmdlist,130 .version = NG_ABI_VERSION, 131 .name = NG_VBOXNETFLT_NODE_TYPE, 132 .mod_event = vboxnetflt_modevent, 133 .constructor= ng_vboxnetflt_constructor, 134 .rcvmsg = ng_vboxnetflt_rcvmsg, 135 .shutdown = ng_vboxnetflt_shutdown, 136 .newhook = ng_vboxnetflt_newhook, 137 .rcvdata = ng_vboxnetflt_rcvdata, 138 .disconnect = ng_vboxnetflt_disconnect, 139 .cmdlist = ng_vboxnetflt_cmdlist, 140 140 }; 141 141 NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); -
trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
r36717 r37423 74 74 return NULL; 75 75 } 76 DECLINLINE(int) vboxPciDevLock(PVBOXRAWPCIINS pThis, 76 DECLINLINE(int) vboxPciDevLock(PVBOXRAWPCIINS pThis, 77 77 PRTSPINLOCKTMP pTmp) 78 78 { … … 80 80 RTSpinlockAcquireNoInts(pThis->hSpinlock, pTmp); 81 81 return VINF_SUCCESS; 82 #else 82 #else 83 83 int rc = RTSemFastMutexRequest(pThis->hFastMtx); 84 84 … … 261 261 uint64_t *pu64RegionSize, 262 262 bool *pfPresent, 263 263 uint32_t *pfFlags) 264 264 { 265 265 PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort); … … 284 284 RTHCPHYS RegionStart, 285 285 uint64_t u64RegionSize, 286 287 286 int32_t fFlags, 287 RTR0PTR *pRegionBase) 288 288 { 289 289 PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort); … … 307 307 RTHCPHYS RegionStart, 308 308 uint64_t u64RegionSize, 309 309 RTR0PTR RegionBase) 310 310 { 311 311 PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort); … … 325 325 * @copydoc RAWPCIDEVPORT:: pfnPciCfgRead 326 326 */ 327 static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, 328 uint32_t Register, 327 static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, 328 uint32_t Register, 329 329 PCIRAWMEMLOC *pValue) 330 330 { … … 345 345 * @copydoc RAWPCIDEVPORT:: pfnPciCfgWrite 346 346 */ 347 static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, 348 uint32_t Register, 347 static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, 348 uint32_t Register, 349 349 PCIRAWMEMLOC *pValue) 350 350 { … … 362 362 } 363 363 364 static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, 365 PFNRAWPCIISR pfnHandler, 366 void* pIrqContext, 364 static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, 365 PFNRAWPCIISR pfnHandler, 366 void* pIrqContext, 367 367 PCIRAWISRHANDLE *phIsr) 368 368 { … … 398 398 } 399 399 400 static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, 400 static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, 401 401 PCIRAWISRHANDLE hIsr) 402 402 { … … 422 422 } 423 423 424 static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, 425 PCIRAWPOWERSTATE aState, 424 static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, 425 PCIRAWPOWERSTATE aState, 426 426 uint64_t *pu64Param) 427 427 { -
trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h
r37009 r37423 44 44 typedef struct VBOXRAWPCIINS *PVBOXRAWPCIINS; 45 45 46 typedef struct VBOXRAWPCIISRDESC 46 typedef struct VBOXRAWPCIISRDESC 47 47 { 48 48 /** Handler function. */ -
trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
r36959 r37423 35 35 USBLib_DEFS = IN_USBLIB 36 36 USBLib_DEFS.os2 = STATIC_USBCALLS 37 USBLib_DEFS.win = _WIN32_WINNT=0x0500 37 USBLib_DEFS.win = _WIN32_WINNT=0x0500 38 38 USBLib_SOURCES = \ 39 39 USBLib.cpp \ -
trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk
r36941 r37423 102 102 $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ 103 103 $(TARGET_VBoxDrvCfg) 104 104 105 105 106 106 # … … 135 135 $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ 136 136 $(TARGET_VBoxDrvCfg) 137 137 138 138 # 139 139 # Install the INF files. -
trunk/src/VBox/Installer/linux/installer-utils.sh
r37124 r37423 98 98 ;; 99 99 esac 100 100 101 101 fi 102 102 ;; -
trunk/src/VBox/Installer/solaris/vboxconfig.sh
r37371 r37423 757 757 postinstall() 758 758 { 759 infoprint "Detected Solaris $HOST_OS_MAJORVERSION Version $HOST_OS_MINORVERSION" 759 infoprint "Detected Solaris $HOST_OS_MAJORVERSION Version $HOST_OS_MINORVERSION" 760 760 infoprint "Loading VirtualBox kernel modules..." 761 761 install_drivers -
trunk/src/VBox/Main/include/VirtualBoxBase.h
r36451 r37423 658 658 #ifdef RT_OS_WINDOWS 659 659 return CoCreateFreeThreadedMarshaler(this, //GetControllingUnknown(), 660 660 &m_pUnkMarshaler.p); 661 661 #else 662 662 return S_OK; -
trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp
r36630 r37423 406 406 dev.createObject(); 407 407 com::Bstr devname(it->second.szDevName); 408 dev->init(NULL, devname, 409 it->second.HostAddress.valid() ? it->second.HostAddress.asLong() : -1, 408 dev->init(NULL, devname, 409 it->second.HostAddress.valid() ? it->second.HostAddress.asLong() : -1, 410 410 it->first.asLong(), it->second.HostAddress.valid()); 411 411 result.setElement(iIndex++, dev); -
trunk/src/VBox/Main/src-client/SessionImpl.cpp
r36991 r37423 58 58 59 59 HRESULT rc = init(); 60 61 BaseFinalConstruct(); 62 60 61 BaseFinalConstruct(); 62 63 63 return rc; 64 64 } … … 69 69 70 70 uninit(); 71 71 72 72 BaseFinalRelease(); 73 73 } … … 190 190 rc = mConsole->machine().queryInterfaceTo(aMachine); 191 191 else 192 rc = mRemoteMachine.queryInterfaceTo(aMachine); 192 rc = mRemoteMachine.queryInterfaceTo(aMachine); 193 193 if (FAILED(rc)) 194 194 { -
trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
r35638 r37423 52 52 { 53 53 uninit(); 54 54 55 55 BaseFinalRelease(); 56 56 } -
trunk/src/VBox/Main/src-server/MediumFormatImpl.cpp
r35638 r37423 38 38 { 39 39 uninit(); 40 40 41 41 BaseFinalRelease(); 42 42 } -
trunk/src/VBox/Main/src-server/PerformanceImpl.cpp
r36842 r37423 217 217 BaseMetricList::iterator it; 218 218 for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();) 219 220 221 222 223 224 225 219 if ((*it)->isUnregistered()) 220 { 221 delete *it; 222 it = m.baseMetrics.erase(it); 223 } 224 else 225 ++it; 226 226 Assert(m.baseMetrics.size() == 0); 227 227 /* -
trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
r35817 r37423 357 357 switch (aType) 358 358 { 359 case NetworkAttachmentType_NAT: 359 case NetworkAttachmentType_NAT: 360 360 case NetworkAttachmentType_Internal: 361 361 /* chipset default is OK */ -
trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp
r35785 r37423 128 128 129 129 int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox, 130 IHostNetworkInterface **aHostNetworkInterface, 130 IHostNetworkInterface **aHostNetworkInterface, 131 131 IProgress **aProgress, 132 132 const char *pcszName) -
trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp
r36958 r37423 64 64 while (pDevice) 65 65 { 66 const char *pcszState = 66 const char *pcszState = 67 67 pDevice->enmState == USBDEVICESTATE_UNSUPPORTED ? "UNSUPPORTED" 68 68 : pDevice->enmState == USBDEVICESTATE_USED_BY_HOST ? "USED_BY_HOST" -
trunk/src/VBox/Main/testcase/tstUSBProxyLinux.cpp
r37086 r37423 73 73 } 74 74 75 static struct 75 static struct 76 76 { 77 77 const char *pcszEnvUsb; … … 163 163 } 164 164 165 static struct 165 static struct 166 166 { 167 167 const char *pacszDeviceAddresses[16]; -
trunk/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp
r37270 r37423 480 480 } 481 481 482 DECLHIDDEN(RTDVMFMTOPS) g_rtDvmFmtBsdLbl = 482 DECLHIDDEN(RTDVMFMTOPS) g_rtDvmFmtBsdLbl = 483 483 { 484 484 /* pcszFmt */ -
trunk/src/VBox/Runtime/r0drv/solaris/modulestub-r0drv-solaris.c
r37228 r37423 54 54 } 55 55 56 -
trunk/src/VBox/Runtime/r3/win/dllmain-win.cpp
r36362 r37423 44 44 { 45 45 /* 46 * When attaching to a process, we'd like to make sure IPRT stays put 46 * When attaching to a process, we'd like to make sure IPRT stays put 47 47 * and doesn't get unloaded. 48 48 */ -
trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
r36794 r37423 1900 1900 } 1901 1901 1902 1903 1902 #ifndef IN_RC 1903 1904 1904 /** 1905 1905 * Mapping an MMIO2 page in place of an MMIO page for direct access. … … 1969 1969 } 1970 1970 1971 1971 1972 /** 1972 1973 * Mapping a HC page in place of an MMIO page for direct access. … … 2023 2024 return VINF_SUCCESS; 2024 2025 } 2026 2025 2027 2026 2028 /** … … 2083 2085 return rc; 2084 2086 } 2087 2085 2088 #endif /* !IN_RC */ 2086 2089 -
trunk/src/VBox/VMM/include/IEMInternal.h
r37232 r37423 1003 1003 #endif 1004 1004 1005
Note:
See TracChangeset
for help on using the changeset viewer.