Index: /trunk/include/VBox/VBoxVideo.h =================================================================== --- /trunk/include/VBox/VBoxVideo.h (revision 33047) +++ /trunk/include/VBox/VBoxVideo.h (revision 33048) @@ -30,7 +30,5 @@ #include -#ifdef VBOX_WITH_HGSMI #include -#endif /* VBOX_WITH_HGSMI */ /* @@ -86,8 +84,4 @@ /* The size of the information. */ -#ifndef VBOX_WITH_HGSMI -#define VBOX_VIDEO_ADAPTER_INFORMATION_SIZE 4096 -#define VBOX_VIDEO_DISPLAY_INFORMATION_SIZE 4096 -#else /* * The minimum HGSMI heap size is PAGE_SIZE (4096 bytes) and is a restriction of the @@ -102,5 +96,4 @@ #endif #define VBVA_MIN_BUFFER_SIZE (64*_1K) -#endif /* VBOX_WITH_HGSMI */ @@ -256,5 +249,5 @@ #pragma pack() -# ifdef VBOX_WITH_VIDEOHWACCEL +#ifdef VBOX_WITH_VIDEOHWACCEL #pragma pack(1) @@ -790,7 +783,5 @@ #pragma pack() -# endif /* #ifdef VBOX_WITH_VIDEOHWACCEL */ - -#ifdef VBOX_WITH_HGSMI +#endif /* #ifdef VBOX_WITH_VIDEOHWACCEL */ /* All structures are without alignment. */ @@ -843,11 +834,11 @@ /* host->guest commands */ -# define VBVAHG_EVENT 1 -# define VBVAHG_DISPLAY_CUSTOM 2 +#define VBVAHG_EVENT 1 +#define VBVAHG_DISPLAY_CUSTOM 2 #ifdef VBOX_WITH_VDMA -# define VBVAHG_SHGSMI_COMPLETION 3 +#define VBVAHG_SHGSMI_COMPLETION 3 #endif -# ifdef VBOX_WITH_VIDEOHWACCEL +#ifdef VBOX_WITH_VIDEOHWACCEL #define VBVAHG_DCUSTOM_VHWA_CMDCOMPLETE 1 #pragma pack(1) @@ -857,5 +848,5 @@ }VBVAHOSTCMDVHWACMDCOMPLETE; #pragma pack() -# endif /* # ifdef VBOX_WITH_VIDEOHWACCEL */ +#endif /* # ifdef VBOX_WITH_VIDEOHWACCEL */ #pragma pack(1) @@ -1056,6 +1047,4 @@ #pragma pack() - -#endif /* VBOX_WITH_HGSMI */ #ifdef VBOX_WITH_WDDM Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (revision 33048) @@ -57,11 +57,6 @@ VBoxDisp_LIBS = \ $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \ - $(VBOX_LIB_IPRT_GUEST_R0) - -ifdef VBOX_WITH_HGSMI -VBoxDisp_LIBS += \ + $(VBOX_LIB_IPRT_GUEST_R0) \ $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) -VBoxDisp_DEFS += VBOX_WITH_HGSMI -endif ifdef VBOX_WITH_WDDM Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c (revision 33048) @@ -1245,27 +1245,4 @@ DISPDBG((0, "%d,%d %dx%d\n", pDev->ddLock.rArea.left, pDev->ddLock.rArea.top, pDev->ddLock.rArea.right - pDev->ddLock.rArea.left, pDev->ddLock.rArea.bottom - pDev->ddLock.rArea.top)); -#ifndef VBOX_WITH_HGSMI - if (pDev->pInfo && vboxHwBufferBeginUpdate (pDev)) - { - vbvaReportDirtyRect (pDev, &pDev->ddLock.rArea); - - if ( pDev->pInfo->hostEvents.fu32Events - & VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET) - { - vrdpReset (pDev); - - pDev->pInfo->hostEvents.fu32Events &= - ~VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET; - } - - if (pDev->vbva.pVbvaMemory->fu32ModeFlags - & VBVA_F_MODE_VRDP) - { - vrdpReportDirtyRect (pDev, &pDev->ddLock.rArea); - } - - vboxHwBufferEndUpdate (pDev); - } -#else if (pDev->bHGSMISupported && vboxHwBufferBeginUpdate (pDev)) { @@ -1289,5 +1266,4 @@ vboxHwBufferEndUpdate (pDev); } -#endif /* VBOX_WITH_HGSMI */ pDev->ddLock.bLocked = FALSE; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h (revision 33048) @@ -168,8 +168,4 @@ FLONG flHooks; -#ifndef VBOX_WITH_HGSMI - VBVAENABLERESULT vbva; - uint32_t u32VRDPResetFlag; -#endif /* !VBOX_WITH_HGSMI */ BOOL fHwBufferOverflow; VBVARECORD *pRecord; @@ -179,8 +175,4 @@ SSB aSSB[4]; // LIFO type stack for saved screen areas. -#ifndef VBOX_WITH_HGSMI - VBOXDISPLAYINFO *pInfo; - BOOLEAN bVBoxVideoSupported; -#endif /* !VBOX_WITH_HGSMI */ ULONG iDevice; VRAMLAYOUT layout; @@ -199,5 +191,4 @@ #endif /* VBOX_WITH_DDRAW */ -#ifdef VBOX_WITH_HGSMI BOOLEAN bHGSMISupported; HGSMIHEAP hgsmiDisplayHeap; @@ -212,5 +203,4 @@ PVOID pVideoPortContext; VBOXVIDEOPORTPROCS VideoPortProcs; -#endif /* VBOX_WITH_HGSMI */ #ifdef VBOX_WITH_VIDEOHWACCEL @@ -228,8 +218,4 @@ #endif -#ifndef VBOX_WITH_HGSMI -/* The global semaphore handle for all driver instances. */ -extern HSEMAPHORE ghsemHwBuffer; -#endif /* !VBOX_WITH_HGSMI */ @@ -291,8 +277,7 @@ void drvLoadEng (void); -#ifdef VBOX_WITH_HGSMI void vboxVBVAHostCommandComplete(PPDEV ppdev, VBVAHOSTCMD * pCmd); - #ifdef VBOX_WITH_VIDEOHWACCEL +#ifdef VBOX_WITH_VIDEOHWACCEL DECLINLINE(uint64_t) vboxVHWAVramOffsetFromPDEV(PPDEV pDev, ULONG_PTR offPdev) @@ -397,5 +382,4 @@ int vboxVHWADisable(PPDEV ppdev); - #endif #endif Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c (revision 33048) @@ -101,34 +101,4 @@ } -#ifndef VBOX_WITH_HGSMI -#define VBVA_OPERATION(__psoDest, __fn, __a) do { \ - if (bIsScreenSurface(__psoDest)) \ - { \ - PPDEV ppdev = (PPDEV)__psoDest->dhpdev; \ - \ - if (ppdev->pInfo && vboxHwBufferBeginUpdate (ppdev)) \ - { \ - vbva##__fn __a; \ - \ - if ( ppdev->pInfo->hostEvents.fu32Events \ - & VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET) \ - { \ - vrdpReset (ppdev); \ - \ - ppdev->pInfo->hostEvents.fu32Events &= \ - ~VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET; \ - } \ - \ - if (ppdev->vbva.pVbvaMemory->fu32ModeFlags \ - & VBVA_F_MODE_VRDP) \ - { \ - vrdp##__fn __a; \ - } \ - \ - vboxHwBufferEndUpdate (ppdev); \ - } \ - } \ -} while (0) -#else #define VBVA_OPERATION(__psoDest, __fn, __a) do { \ if (bIsScreenSurface(__psoDest)) \ @@ -159,5 +129,4 @@ } \ } while (0) -#endif /* VBOX_WITH_HGSMI */ //#undef VBVA_OPERATION @@ -351,17 +320,8 @@ PPDEV ppdev = (PPDEV)psoDest->dhpdev; -#ifndef VBOX_WITH_HGSMI - VBVAMEMORY *pVbvaMemory = ppdev->vbva.pVbvaMemory; - - DISPDBG((1, "offscreen->screen\n")); - - if ( pVbvaMemory - && (pVbvaMemory->fu32ModeFlags & VBVA_F_MODE_ENABLED)) -#else DISPDBG((1, "offscreen->screen\n")); if ( ppdev->pVBVA && (ppdev->pVBVA->hostFlags.u32HostEvents & VBVA_F_MODE_ENABLED)) -#endif /* VBOX_WITH_HGSMI */ { if ( (psoSrc->fjBitmap & BMF_DONTCACHE) != 0 @@ -769,24 +729,4 @@ PPDEV ppdev = (PPDEV)psoTarget->dhpdev; -#ifndef VBOX_WITH_HGSMI - if ( ppdev->vbva.pVbvaMemory - && (ppdev->vbva.pVbvaMemory->fu32ModeFlags & VBVA_F_MODE_ENABLED)) - { - if (ppdev->vbva.pVbvaMemory->fu32ModeFlags - & VBVA_F_MODE_VRDP_RESET) - { - vrdpReset (ppdev); - - ppdev->vbva.pVbvaMemory->fu32ModeFlags &= - ~VBVA_F_MODE_VRDP_RESET; - } - - if (ppdev->vbva.pVbvaMemory->fu32ModeFlags - & VBVA_F_MODE_VRDP) - { - bRc = vrdpRealizeBrush (pbo, psoTarget, psoPattern, psoMask, pxlo, iHatch); - } - } -#else if ( ppdev->pVBVA && (ppdev->pVBVA->hostFlags.u32HostEvents & VBVA_F_MODE_ENABLED)) @@ -807,5 +747,4 @@ } } -#endif /* VBOX_WITH_HGSMI */ } Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c (revision 33048) @@ -126,29 +126,14 @@ ULONG ret = 0; -#ifndef VBOX_WITH_HGSMI - if (ppdev && ppdev->pInfo && vboxHwBufferBeginUpdate (ppdev)) - { - if (ppdev->vbva.pVbvaMemory->fu32ModeFlags - & VBVA_F_MODE_VRDP) + if (ppdev && ppdev->pVBVA) + { + if (ppdev->pVBVA->hostFlags.u32HostEvents & VBVA_F_MODE_VRDP) { ret = 1; } - DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> %d (%x)\n", ret, ppdev->vbva.pVbvaMemory->fu32ModeFlags)); - vboxHwBufferEndUpdate (ppdev); + DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> %d (%x)\n", ret, ppdev->pVBVA->hostFlags.u32HostEvents)); } else DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> 0\n")); -#else - if (ppdev && ppdev->pVBVA) - { - if (ppdev->pVBVA->hostFlags.u32HostEvents & VBVA_F_MODE_VRDP) - { - ret = 1; - } - DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> %d (%x)\n", ret, ppdev->pVBVA->hostFlags.u32HostEvents)); - } - else - DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> 0\n")); -#endif /* VBOX_WITH_HGSMI */ return ret; } @@ -326,7 +311,4 @@ #define HOOKS_BMF32BPP gflHooks -#ifndef VBOX_WITH_HGSMI -HSEMAPHORE ghsemHwBuffer = 0; -#endif /* !VBOX_WITH_HGSMI */ /******************************Public*Routine******************************\ @@ -379,10 +361,4 @@ DDI_DRIVER_VERSION_NT4; -#ifndef VBOX_WITH_HGSMI - if (!ghsemHwBuffer) - { - ghsemHwBuffer = EngCreateSemaphore (); - } -#endif /* !VBOX_WITH_HGSMI */ return(TRUE); @@ -401,11 +377,4 @@ DISPDBG((0, "VBoxDisp::DrvDisableDriver called.\n")); -#ifndef VBOX_WITH_HGSMI - if (ghsemHwBuffer) - { - EngDeleteSemaphore (ghsemHwBuffer); - ghsemHwBuffer = NULL; - } -#endif /* !VBOX_WITH_HGSMI */ return; @@ -939,8 +908,6 @@ #endif -#ifdef VBOX_WITH_HGSMI /* Free the driver's VBVA resources. */ vboxVbvaDisable ((PPDEV) dhpdev); -#endif // @@ -1141,16 +1108,4 @@ { case DN_DEVICE_ORIGIN: -#ifndef VBOX_WITH_HGSMI - ppdev->ptlDevOrg = *(PPOINTL)pvData; - DISPDBG((3, "DN_DEVICE_ORIGIN: %d, %d (PSO = %p, pInfo = %p)\n", ppdev->ptlDevOrg.x, - ppdev->ptlDevOrg.y, pso, ppdev->pInfo)); - if (ppdev->pInfo) - { - ppdev->pInfo->screen.xOrigin = ppdev->ptlDevOrg.x; - ppdev->pInfo->screen.yOrigin = ppdev->ptlDevOrg.y; - VBoxProcessDisplayInfo(ppdev); - } - break; -#else { POINTL ptlDevOrg = *(PPOINTL)pvData; @@ -1163,5 +1118,4 @@ } } break; -#endif /* VBOX_WITH_HGSMI */ case DN_DRAWING_BEGIN: DISPDBG((3, "DN_DRAWING_BEGIN (PSO = %p)\n", pso)); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c (revision 33048) @@ -27,10 +27,8 @@ #include "driver.h" -#ifdef VBOX_WITH_HGSMI #include #include #include #include -#endif #define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE,L"System"} @@ -68,22 +66,4 @@ uint32_t u32MinVBVABufferSize; -#ifndef VBOX_WITH_HGSMI - QUERYDISPLAYINFORESULT DispInfo; - RtlZeroMemory(&DispInfo, sizeof (DispInfo)); - - ppdev->bVBoxVideoSupported = !EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_QUERY_DISPLAY_INFO, - NULL, - 0, - &DispInfo, - sizeof(DispInfo), - &returnedDataLength); - if (ppdev->bVBoxVideoSupported) - { - iDevice = DispInfo.iDevice; - u32DisplayInfoSize = DispInfo.u32DisplayInfoSize; - u32MinVBVABufferSize = 0; /* In old mode the buffer is not used at all. */ - } -#else QUERYHGSMIRESULT info; RtlZeroMemory(&info, sizeof (info)); @@ -166,13 +146,7 @@ } } -#endif /* VBOX_WITH_HGSMI */ - -#ifndef VBOX_WITH_HGSMI - if (ppdev->bVBoxVideoSupported) - { -#else + if (ppdev->bHGSMISupported) { -#endif /* VBOX_WITH_HGSMI */ ppdev->iDevice = iDevice; @@ -186,9 +160,5 @@ if (cbAvailable <= u32DisplayInfoSize) { -#ifndef VBOX_WITH_HGSMI - ppdev->bVBoxVideoSupported = FALSE; -#else ppdev->bHGSMISupported = FALSE; -#endif /* VBOX_WITH_HGSMI */ } else @@ -201,9 +171,5 @@ /* Use minimum 64K and maximum the cbFrameBuffer for the VBVA buffer. */ for (ppdev->layout.cbVBVABuffer = ppdev->layout.cbFrameBuffer; -#ifndef VBOX_WITH_HGSMI - ppdev->layout.cbVBVABuffer >= 0x10000; -#else ppdev->layout.cbVBVABuffer >= u32MinVBVABufferSize; -#endif /* VBOX_WITH_HGSMI */ ppdev->layout.cbVBVABuffer /= 2) { @@ -216,9 +182,5 @@ if (ppdev->layout.cbVBVABuffer >= cbAvailable) { -#ifndef VBOX_WITH_HGSMI - ppdev->bVBoxVideoSupported = FALSE; -#else ppdev->bHGSMISupported = FALSE; -#endif /* VBOX_WITH_HGSMI */ } else @@ -235,9 +197,5 @@ } -#ifndef VBOX_WITH_HGSMI - if (!ppdev->bVBoxVideoSupported) -#else if (!ppdev->bHGSMISupported) -#endif /* VBOX_WITH_HGSMI */ { ppdev->iDevice = 0; @@ -258,5 +216,4 @@ ppdev->layout.cbDisplayInformation = 0; } -#ifdef VBOX_WITH_HGSMI else { @@ -285,5 +242,4 @@ } } -#endif /* VBOX_WITH_HGSMI */ DISPDBG((0, "vboxInitVBoxVideo:\n" @@ -310,61 +266,4 @@ -#ifndef VBOX_WITH_HGSMI -/* Setup display information after remapping. */ -static void vboxSetupDisplayInfo (PPDEV ppdev, VIDEO_MEMORY_INFORMATION *pMemoryInformation) -{ - VBOXDISPLAYINFO *pInfo; - uint8_t *pu8; - - pu8 = (uint8_t *)ppdev->pjScreen + ppdev->layout.offDisplayInformation; - - pInfo = (VBOXDISPLAYINFO *)pu8; - pu8 += sizeof (VBOXDISPLAYINFO); - - pInfo->hdrLink.u8Type = VBOX_VIDEO_INFO_TYPE_LINK; - pInfo->hdrLink.u8Reserved = 0; - pInfo->hdrLink.u16Length = sizeof (VBOXVIDEOINFOLINK); - pInfo->link.i32Offset = 0; - - pInfo->hdrScreen.u8Type = VBOX_VIDEO_INFO_TYPE_SCREEN; - pInfo->hdrScreen.u8Reserved = 0; - pInfo->hdrScreen.u16Length = sizeof (VBOXVIDEOINFOSCREEN); - DISPDBG((1, "Setup: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y)); - pInfo->screen.xOrigin = ppdev->ptlDevOrg.x; - pInfo->screen.yOrigin = ppdev->ptlDevOrg.y; - pInfo->screen.u32LineSize = 0; - pInfo->screen.u16Width = 0; - pInfo->screen.u16Height = 0; - pInfo->screen.bitsPerPixel = 0; - pInfo->screen.u8Flags = VBOX_VIDEO_INFO_SCREEN_F_NONE; - - pInfo->hdrHostEvents.u8Type = VBOX_VIDEO_INFO_TYPE_HOST_EVENTS; - pInfo->hdrHostEvents.u8Reserved = 0; - pInfo->hdrHostEvents.u16Length = sizeof (VBOXVIDEOINFOHOSTEVENTS); - pInfo->hostEvents.fu32Events = VBOX_VIDEO_INFO_HOST_EVENTS_F_NONE; - - pInfo->hdrEnd.u8Type = VBOX_VIDEO_INFO_TYPE_END; - pInfo->hdrEnd.u8Reserved = 0; - pInfo->hdrEnd.u16Length = 0; - - ppdev->pInfo = pInfo; -} - - -static void vboxUpdateDisplayInfo (PPDEV ppdev) -{ - if (ppdev->pInfo) - { - ppdev->pInfo->screen.u32LineSize = ppdev->lDeltaScreen; - ppdev->pInfo->screen.u16Width = (uint16_t)ppdev->cxScreen; - ppdev->pInfo->screen.u16Height = (uint16_t)ppdev->cyScreen; - ppdev->pInfo->screen.bitsPerPixel = (uint8_t)ppdev->ulBitCount; - ppdev->pInfo->screen.u8Flags = VBOX_VIDEO_INFO_SCREEN_F_ACTIVE; - - DISPDBG((1, "Update: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y)); - VBoxProcessDisplayInfo(ppdev); - } -} -#endif /* !VBOX_WITH_HGSMI */ @@ -494,11 +393,4 @@ vboxInitVBoxVideo (ppdev, &videoMemoryInformation); -#ifndef VBOX_WITH_HGSMI - if (ppdev->bVBoxVideoSupported) - { - /* Setup the display information. */ - vboxSetupDisplayInfo (ppdev, &videoMemoryInformation); - } -#endif /* !VBOX_WITH_HGSMI */ } @@ -510,11 +402,4 @@ || ppdev->ulBitCount == 32) { -#ifndef VBOX_WITH_HGSMI - if (ppdev->pInfo) /* Do not use VBVA on old hosts. */ - { - /* Enable VBVA for this video mode. */ - vboxVbvaEnable (ppdev); - } -#else if (ppdev->bHGSMISupported) { @@ -523,17 +408,11 @@ LogRel(("VBoxDisp[%d]: VBVA %senabled\n", ppdev->iDevice, ppdev->bHGSMISupported? "": "not ")); } -#endif /* VBOX_WITH_HGSMI */ } DISPDBG((1, "DISP bInitSURF success\n")); -#ifndef VBOX_WITH_HGSMI - /* Update the display information. */ - vboxUpdateDisplayInfo (ppdev); -#else /* Inform the host about this screen layout. */ DISPDBG((1, "bInitSURF: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y)); VBoxProcessDisplayInfo (ppdev); -#endif /* VBOX_WITH_HGSMI */ #ifdef VBOX_WITH_VIDEOHWACCEL Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c (revision 33048) @@ -41,300 +41,4 @@ static BOOL vboxHwBufferWrite (PPDEV ppdev, const void *p, uint32_t cb); -#ifndef VBOX_WITH_HGSMI -/* - * Public hardware buffer methods. - */ -BOOL vboxVbvaEnable (PPDEV ppdev) -{ - BOOL bRc = FALSE; - - ULONG returnedDataLength; - ULONG ulEnable = TRUE; - - DISPDBG((1, "VBoxDisp::vboxVbvaEnable called\n")); - - if (!ghsemHwBuffer) - { - return FALSE; - } - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_VBVA_ENABLE, - &ulEnable, - sizeof (ulEnable), - &ppdev->vbva, - sizeof (ppdev->vbva), - &returnedDataLength) == 0) - { - DISPDBG((1, "VBoxDisp::vboxVbvaEnable: vbva: pVbvaMemory = %p, pfnFlush = %p, pvFlush = %p.\n", - ppdev->vbva.pVbvaMemory, ppdev->vbva.pfnFlush, ppdev->vbva.pvFlush)); - - if (ppdev->vbva.pVbvaMemory - && ppdev->vbva.pfnFlush - && ppdev->vbva.pvFlush) - { - ppdev->fHwBufferOverflow = FALSE; - ppdev->pRecord = NULL; - - /* All have been initialized. */ - bRc = TRUE; - } - } - - if (!bRc) - { - vboxVbvaDisable (ppdev); - } - - return bRc; -} - -void vboxVbvaDisable (PPDEV ppdev) -{ - DISPDBG((1, "VBoxDisp::vbvaDisable called.\n")); - - RtlZeroMemory (&ppdev->vbva, sizeof (ppdev->vbva)); - - ppdev->fHwBufferOverflow = FALSE; - ppdev->pRecord = NULL; - - return; -} - -BOOL vboxHwBufferBeginUpdate (PPDEV ppdev) -{ - BOOL bRc = FALSE; - - VBVAMEMORY *pVbvaMemory = ppdev->vbva.pVbvaMemory; - - DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate called flags = 0x%08X\n", pVbvaMemory? pVbvaMemory->fu32ModeFlags: -1)); - - if ( pVbvaMemory - && (pVbvaMemory->fu32ModeFlags & VBVA_F_MODE_ENABLED)) - { - uint32_t indexRecordNext; - - EngAcquireSemaphore (ghsemHwBuffer); - - VBVA_ASSERT (!ppdev->fHwBufferOverflow); - VBVA_ASSERT (ppdev->pRecord == NULL); - - indexRecordNext = (pVbvaMemory->indexRecordFree + 1) % VBVA_MAX_RECORDS; - - if (indexRecordNext == pVbvaMemory->indexRecordFirst) - { - /* All slots in the records queue are used. */ - vboxHwBufferFlush (ppdev); - } - - if (indexRecordNext == pVbvaMemory->indexRecordFirst) - { - /* Even after flush there is no place. Fail the request. */ - DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate no space in the queue of records!!! first %d, last %d\n", - pVbvaMemory->indexRecordFirst, pVbvaMemory->indexRecordFree)); - EngReleaseSemaphore (ghsemHwBuffer); - } - else - { - /* Initialize the record. */ - VBVARECORD *pRecord = &pVbvaMemory->aRecords[pVbvaMemory->indexRecordFree]; - - pRecord->cbRecord = VBVA_F_RECORD_PARTIAL; - - pVbvaMemory->indexRecordFree = indexRecordNext; - - DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate indexRecordNext = %d\n", indexRecordNext)); - - /* Remember which record we are using. */ - ppdev->pRecord = pRecord; - - bRc = TRUE; - } - } - - return bRc; -} - -void vboxHwBufferEndUpdate (PPDEV ppdev) -{ - VBVAMEMORY *pVbvaMemory; - VBVARECORD *pRecord; - - DISPDBG((1, "VBoxDisp::vboxHwBufferEndUpdate called\n")); - - pVbvaMemory = ppdev->vbva.pVbvaMemory; - VBVA_ASSERT(pVbvaMemory); - - pRecord = ppdev->pRecord; - VBVA_ASSERT (pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL)); - - /* Mark the record completed. */ - pRecord->cbRecord &= ~VBVA_F_RECORD_PARTIAL; - - ppdev->fHwBufferOverflow = FALSE; - ppdev->pRecord = NULL; - - EngReleaseSemaphore (ghsemHwBuffer); - - return; -} - -/* - * Private operations. - */ -static uint32_t vboxHwBufferAvail (VBVAMEMORY *pVbvaMemory) -{ - int32_t i32Diff = pVbvaMemory->off32Data - pVbvaMemory->off32Free; - - return i32Diff > 0? i32Diff: VBVA_RING_BUFFER_SIZE + i32Diff; -} - -static void vboxHwBufferFlush (PPDEV ppdev) -{ - VBVAMEMORY *pVbvaMemory = ppdev->vbva.pVbvaMemory; - - VBVA_ASSERT (pVbvaMemory); - - ppdev->vbva.pfnFlush (ppdev->vbva.pvFlush); - - return; -} - -static void vboxHwBufferPlaceDataAt (PPDEV ppdev, void *p, uint32_t cb, uint32_t offset) -{ - VBVAMEMORY *pVbvaMemory = ppdev->vbva.pVbvaMemory; - - uint32_t u32BytesTillBoundary = VBVA_RING_BUFFER_SIZE - offset; - uint8_t *dst = &pVbvaMemory->au8RingBuffer[offset]; - int32_t i32Diff = cb - u32BytesTillBoundary; - - if (i32Diff <= 0) - { - /* Chunk will not cross buffer boundary. */ - memcpy (dst, p, cb); - } - else - { - /* Chunk crosses buffer boundary. */ - memcpy (dst, p, u32BytesTillBoundary); - memcpy (&pVbvaMemory->au8RingBuffer[0], (uint8_t *)p + u32BytesTillBoundary, i32Diff); - } - - return; -} - -static BOOL vboxHwBufferWrite (PPDEV ppdev, const void *p, uint32_t cb) -{ - VBVAMEMORY *pVbvaMemory; - VBVARECORD *pRecord; - uint32_t cbHwBufferAvail; - - uint32_t cbWritten = 0; - - VBVA_ASSERT(ppdev); - - if (ppdev->fHwBufferOverflow) - { - return FALSE; - } - - pVbvaMemory = ppdev->vbva.pVbvaMemory; - VBVA_ASSERT (pVbvaMemory->indexRecordFirst != pVbvaMemory->indexRecordFree); - - pRecord = ppdev->pRecord; - VBVA_ASSERT (pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL)); - - DISPDBG((1, "VW %d\n", cb)); - - cbHwBufferAvail = vboxHwBufferAvail (pVbvaMemory); - - while (cb > 0) - { - uint32_t cbChunk = cb; - -// DISPDBG((1, "VBoxDisp::vboxHwBufferWrite pVbvaMemory->off32Free %d, pRecord->cbRecord 0x%08X, cbHwBufferAvail %d, cb %d, cbWritten %d\n", pVbvaMemory->off32Free, pRecord->cbRecord, cbHwBufferAvail, cb, cbWritten)); - - if (cbChunk >= cbHwBufferAvail) - { - DISPDBG((1, "VBoxDisp::vboxHwBufferWrite 1) avail %d, chunk %d\n", cbHwBufferAvail, cbChunk)); - - vboxHwBufferFlush (ppdev); - - cbHwBufferAvail = vboxHwBufferAvail (pVbvaMemory); - - if (cbChunk >= cbHwBufferAvail) - { - DISPDBG((1, "VBoxDisp::vboxHwBufferWrite: no place for %d bytes. Only %d bytes available after flush. Going to partial writes.\n", cb, cbHwBufferAvail)); - - if (cbHwBufferAvail <= VBVA_RING_BUFFER_THRESHOLD) - { - DISPDBG((1, "VBoxDisp::vboxHwBufferWrite: Buffer overflow!!!\n")); - ppdev->fHwBufferOverflow = TRUE; - VBVA_ASSERT(FALSE); - return FALSE; - } - - cbChunk = cbHwBufferAvail - VBVA_RING_BUFFER_THRESHOLD; - } - } - - VBVA_ASSERT(cbChunk <= cb); - VBVA_ASSERT(cbChunk <= vboxHwBufferAvail (pVbvaMemory)); - - vboxHwBufferPlaceDataAt (ppdev, (uint8_t *)p + cbWritten, cbChunk, pVbvaMemory->off32Free); - - pVbvaMemory->off32Free = (pVbvaMemory->off32Free + cbChunk) % VBVA_RING_BUFFER_SIZE; - pRecord->cbRecord += cbChunk; - cbHwBufferAvail -= cbChunk; - - cb -= cbChunk; - cbWritten += cbChunk; - } - - return TRUE; -} - -/* - * Public writer to hardware buffer. - */ -BOOL vboxWrite (PPDEV ppdev, const void *pv, uint32_t cb) -{ - return vboxHwBufferWrite (ppdev, pv, cb); -} - -BOOL vboxOrderSupported (PPDEV ppdev, unsigned code) -{ - VBVAMEMORY *pVbvaMemory; - - pVbvaMemory = ppdev->vbva.pVbvaMemory; - - if (pVbvaMemory->fu32ModeFlags & VBVA_F_MODE_VRDP_ORDER_MASK) - { - /* Order masking enabled. */ - if (pVbvaMemory->fu32SupportedOrders & (1 << code)) - { - return TRUE; - } - } - - return FALSE; -} - -void VBoxProcessDisplayInfo(PPDEV ppdev) -{ - DWORD returnedDataLength; - - DISPDBG((1, "Process: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y)); - - EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_INTERPRET_DISPLAY_MEMORY, - NULL, - 0, - NULL, - 0, - &returnedDataLength); -} - -#else /* VBOX_WITH_HGSMI */ static void vboxHGSMIBufferSubmit (PPDEV ppdev, void *p) @@ -700,5 +404,5 @@ } -# ifdef VBOX_WITH_VIDEOHWACCEL +#ifdef VBOX_WITH_VIDEOHWACCEL VBOXVHWACMD* vboxVHWACommandCreate (PPDEV ppdev, VBOXVHWACMD_TYPE enmCmd, VBOXVHWACMD_LENGTH cbCmd) @@ -758,5 +462,5 @@ switch(pCmd->customOpCode) { -# ifdef VBOX_WITH_VIDEOHWACCEL +# ifdef VBOX_WITH_VIDEOHWACCEL /** @todo why is this ifdef nested within itself? */ case VBVAHG_DCUSTOM_VHWA_CMDCOMPLETE: { @@ -1087,5 +791,5 @@ } -# endif +#endif void vboxVBVAHostCommandComplete(PPDEV ppdev, VBVAHOSTCMD * pCmd) @@ -1094,3 +798,2 @@ } -#endif /* VBOX_WITH_HGSMI */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp (revision 33048) @@ -321,78 +321,2 @@ } -#ifndef VBOX_WITH_HGSMI -/** - * Sends the pointer shape to the VMMDev - * - * @returns success indicator - * @param pointerAttr pointer description - */ -BOOLEAN vboxUpdatePointerShape(PVIDEO_POINTER_ATTRIBUTES pointerAttr, uint32_t cbLength) -{ - uint32_t cbData = 0; - - if (pointerAttr->Enable & VBOX_MOUSE_POINTER_SHAPE) - { - cbData = ((((pointerAttr->Width + 7) / 8) * pointerAttr->Height + 3) & ~3) - + pointerAttr->Width * 4 * pointerAttr->Height; - } - - if (cbData > cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES)) - { - dprintf(("vboxUpdatePointerShape: calculated pointer data size is too big (%d bytes, limit %d)\n", - cbData, cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES))); - return FALSE; - } - - BOOLEAN bRC = FALSE; - - VMMDevReqMousePointer *req = NULL; - - int rc = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevReqMousePointer) + cbData, VMMDevReq_SetPointerShape); - - if (RT_FAILURE(rc)) - { - dprintf(("VBoxVideo::vboxUpdatePointerShape: ERROR allocating request, rc = %Rrc\n", rc)); - } - else - { - /* Activate next line only when really needed; floods the log very quickly! */ - /*dprintf(("VBoxVideo::vboxUpdatePointerShape: req->u32Version = %08X\n", req->header.version));*/ - - /* We have our custom flags in the field */ - req->fFlags = pointerAttr->Enable & 0xFFFF; - - /* Even if pointer is invisible, we have to pass following data, - * so host could create the pointer with initial status - invisible - */ - req->xHot = (pointerAttr->Enable >> 16) & 0xFF; - req->yHot = (pointerAttr->Enable >> 24) & 0xFF; - req->width = pointerAttr->Width; - req->height = pointerAttr->Height; - - if (req->fFlags & VBOX_MOUSE_POINTER_SHAPE) - { - /* copy the actual pointer data */ - memcpy (req->pointerData, pointerAttr->Pixels, cbData); - } - - rc = VbglGRPerform (&req->header); - - if (RT_SUCCESS(rc)) - { - bRC = TRUE; - } - else - { - dprintf(("VBoxVideo::vboxUpdatePointerShape: ERROR querying mouse capabilities from VMMDev. " - "rc = %Rrc\n", rc)); - } - - dprintf(("VBoxVideo::vboxUpdatePointerShape: req->u32Version = %08X\n", req->header.version)); - - VbglGRFree (&req->header); - } - - return bRC; -} -#endif /* VBOX_WITH_HGSMI */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.h (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.h (revision 33048) @@ -37,7 +37,4 @@ BOOLEAN vboxQueryHostWantsAbsolute(); winVersion_t vboxQueryWinVersion(); -#ifndef VBOX_WITH_HGSMI -BOOLEAN vboxUpdatePointerShape(PVIDEO_POINTER_ATTRIBUTES pointerAttr, uint32_t cbLength); -#endif /* !VBOX_WITH_HGSMI */ #include "vboxioctl.h" @@ -48,5 +45,5 @@ /* debug printf */ -# define OSDBGPRINT(a) DbgPrint a +#define OSDBGPRINT(a) DbgPrint a /* dprintf */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (revision 33048) @@ -32,7 +32,4 @@ endif VBoxVideo_DEFS = LOG_TO_BACKDOOR VBOX_WITH_8BPP_MODES -ifdef VBOX_WITH_HGSMI - VBoxVideo_DEFS += VBOX_WITH_HGSMI -endif ifdef VBOX_WITH_VIDEOHWACCEL VBoxVideo_DEFS += VBOX_WITH_VIDEOHWACCEL @@ -47,9 +44,6 @@ Helper.cpp \ VBoxVideo.def \ - VBoxVideo.rc -ifdef VBOX_WITH_HGSMI - VBoxVideo_SOURCES += \ + VBoxVideo.rc \ VBoxVideoHGSMI.cpp -endif VBoxVideo_LIBS.x86 = \ $(PATH_SDK_W2K3DDK_LIB)/exsup.lib @@ -59,9 +53,6 @@ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ $(VBOX_LIB_VBGL_R0) \ - $(VBOX_LIB_IPRT_GUEST_R0_NT4) -ifdef VBOX_WITH_HGSMI - VBoxVideo_LIBS += \ + $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) -endif @@ -79,5 +70,5 @@ VBoxVideoWddm_SDKS=WINDDKWLH VBoxVideoWddm_DEFS += VBOX_WITH_8BPP_MODES - VBoxVideoWddm_DEFS += VBOX_WITH_HGSMI VBOX_WITH_WDDM + VBoxVideoWddm_DEFS += VBOX_WITH_WDDM ifdef VBOX_WITH_VIDEOHWACCEL VBoxVideoWddm_DEFS += VBOX_WITH_VIDEOHWACCEL Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (revision 33048) @@ -70,5 +70,5 @@ InitData.HwFindAdapter = VBoxVideoFindAdapter; InitData.HwInitialize = VBoxVideoInitialize; -#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL) +#ifdef VBOX_WITH_VIDEOHWACCEL InitData.HwInterrupt = VBoxVideoInterrupt; #else @@ -1341,13 +1341,7 @@ void VBoxComputeFrameBufferSizes (PDEVICE_EXTENSION PrimaryExtension) { -#ifndef VBOX_WITH_HGSMI - ULONG ulAvailable = commonFromDeviceExt(PrimaryExtension)->cbVRAM - - commonFromDeviceExt(PrimaryExtension)->cbMiniportHeap - - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE; -#else ULONG ulAvailable = commonFromDeviceExt(PrimaryExtension)->cbVRAM - commonFromDeviceExt(PrimaryExtension)->cbMiniportHeap - VBVA_ADAPTER_INFORMATION_SIZE; -#endif /* VBOX_WITH_HGSMI */ /* Size of a framebuffer. */ @@ -1363,22 +1357,7 @@ ulAvailable - ulSize * PrimaryExtension->u.primary.cDisplays)); -#ifndef VBOX_WITH_HGSMI - if (ulSize > VBOX_VIDEO_DISPLAY_INFORMATION_SIZE) - { - /* Compute the size of the framebuffer. */ - ulSize -= VBOX_VIDEO_DISPLAY_INFORMATION_SIZE; - } - else - { - /* Should not really get here. But still do it safely. */ - ulSize = 0; - } -#endif /* !VBOX_WITH_HGSMI */ /* Update the primary info. */ PrimaryExtension->u.primary.ulMaxFrameBufferSize = ulSize; -#ifndef VBOX_WITH_HGSMI - PrimaryExtension->u.primary.ulDisplayInformationSize = VBOX_VIDEO_DISPLAY_INFORMATION_SIZE; -#endif /* !VBOX_WITH_HGSMI */ /* Update the per extension info. */ @@ -1394,10 +1373,5 @@ Extension->iDevice, ulFrameBufferOffset)); -#ifndef VBOX_WITH_HGSMI - ulFrameBufferOffset += PrimaryExtension->u.primary.ulMaxFrameBufferSize - + PrimaryExtension->u.primary.ulDisplayInformationSize; -#else ulFrameBufferOffset += PrimaryExtension->u.primary.ulMaxFrameBufferSize; -#endif /* VBOX_WITH_HGSMI */ Extension = Extension->pNext; @@ -1509,293 +1483,4 @@ } -#ifndef VBOX_WITH_HGSMI - -# ifdef VBOX_WITH_WDDM -/* sanity check */ -# error WDDM is supported only for HGSMI-based driver -# endif - -static void vboxQueryConf (PDEVICE_EXTENSION PrimaryExtension, uint32_t u32Index, ULONG *pulValue) -{ - dprintf(("VBoxVideo::vboxQueryConf: u32Index = %d\n", u32Index)); - - typedef struct _VBOXVIDEOQCONF32 - { - VBOXVIDEOINFOHDR hdrQuery; - VBOXVIDEOINFOQUERYCONF32 query; - VBOXVIDEOINFOHDR hdrEnd; - } VBOXVIDEOQCONF32; - - VBOXVIDEOQCONF32 *p = (VBOXVIDEOQCONF32 *)commonFromDeviceExt(PrimaryExtension)->pvAdapterInformation; - - p->hdrQuery.u8Type = VBOX_VIDEO_INFO_TYPE_QUERY_CONF32; - p->hdrQuery.u8Reserved = 0; - p->hdrQuery.u16Length = sizeof (VBOXVIDEOINFOQUERYCONF32); - - p->query.u32Index = u32Index; - p->query.u32Value = 0; - - p->hdrEnd.u8Type = VBOX_VIDEO_INFO_TYPE_END; - p->hdrEnd.u8Reserved = 0; - p->hdrEnd.u16Length = 0; - - /* Let the host to process the commands. */ - VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO); - VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_ADAPTER_MEMORY); - - *pulValue = (ULONG)p->query.u32Value; - - dprintf(("VBoxVideo::vboxQueryConf: u32Value = %d\n", p->query.u32Value)); -} - -static void vboxSetupAdapterInfo (PDEVICE_EXTENSION PrimaryExtension) -{ - dprintf(("VBoxVideo::vboxSetupAdapterInfo\n")); - - VBOXVIDEOINFOHDR *pHdr; - - uint8_t *pu8 = (uint8_t *)PrimaryExtension->u.primary.pvAdapterInformation; - - PDEVICE_EXTENSION Extension = PrimaryExtension; - while (Extension) - { - pHdr = (VBOXVIDEOINFOHDR *)pu8; - pu8 += sizeof (VBOXVIDEOINFOHDR); - - pHdr->u8Type = VBOX_VIDEO_INFO_TYPE_DISPLAY; - pHdr->u8Reserved = 0; - pHdr->u16Length = sizeof (VBOXVIDEOINFODISPLAY); - - VBOXVIDEOINFODISPLAY *pDisplay = (VBOXVIDEOINFODISPLAY *)pu8; - pu8 += sizeof (VBOXVIDEOINFODISPLAY); - - pDisplay->u32Index = Extension->iDevice; - pDisplay->u32Offset = Extension->ulFrameBufferOffset; - pDisplay->u32FramebufferSize = PrimaryExtension->u.primary.ulMaxFrameBufferSize; - pDisplay->u32InformationSize = PrimaryExtension->u.primary.ulDisplayInformationSize; - - Extension = Extension->pNext; - } - - - /* The heap description. */ - pHdr = (VBOXVIDEOINFOHDR *)pu8; - pu8 += sizeof (VBOXVIDEOINFOHDR); - - pHdr->u8Type = VBOX_VIDEO_INFO_TYPE_NV_HEAP; - pHdr->u8Reserved = 0; - pHdr->u16Length = sizeof (VBOXVIDEOINFONVHEAP); - - VBOXVIDEOINFONVHEAP *pHeap = (VBOXVIDEOINFONVHEAP *)pu8; - pu8 += sizeof (VBOXVIDEOINFONVHEAP); - - pHeap->u32HeapOffset = PrimaryExtension->u.primary.cbVRAM - - PrimaryExtension->u.primary.cbMiniportHeap - - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE; - pHeap->u32HeapSize = PrimaryExtension->u.primary.cbMiniportHeap; - - - /* The END marker. */ - pHdr = (VBOXVIDEOINFOHDR *)pu8; - pu8 += sizeof (VBOXVIDEOINFOHDR); - - pHdr->u8Type = VBOX_VIDEO_INFO_TYPE_END; - pHdr->u8Reserved = 0; - pHdr->u16Length = 0; - - /* Inform the host about the display configuration. */ - VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO); - VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_ADAPTER_MEMORY); - - dprintf(("VBoxVideo::vboxSetupAdapterInfo finished\n")); -} - -/** - * Helper function to register secondary displays (DualView). Note that this will not - * be available on pre-XP versions, and some editions on XP will fail because they are - * intentionally crippled. - */ -VOID VBoxSetupDisplays(PDEVICE_EXTENSION PrimaryExtension, PVIDEO_PORT_CONFIG_INFO pConfigInfo, ULONG AdapterMemorySize) -{ - VP_STATUS rc = NO_ERROR; - - dprintf(("VBoxVideo::VBoxSetupDisplays: PrimaryExtension = %p\n", - PrimaryExtension)); - - /* Preinitialize the primary extension. */ - PrimaryExtension->pNext = NULL; - PrimaryExtension->pPrimary = PrimaryExtension; - PrimaryExtension->iDevice = 0; - PrimaryExtension->ulFrameBufferOffset = 0; - PrimaryExtension->ulFrameBufferSize = 0; - PrimaryExtension->u.primary.ulVbvaEnabled = 0; - PrimaryExtension->u.primary.bVBoxVideoSupported = FALSE; - PrimaryExtension->u.primary.cDisplays = 1; - PrimaryExtension->u.primary.cbVRAM = AdapterMemorySize; - PrimaryExtension->u.primary.cbMiniportHeap = 0; - PrimaryExtension->u.primary.pvMiniportHeap = NULL; - PrimaryExtension->u.primary.pvAdapterInformation = NULL; - PrimaryExtension->u.primary.ulMaxFrameBufferSize = 0; - PrimaryExtension->u.primary.ulDisplayInformationSize = 0; - - /* Verify whether the HW supports VirtualBox extensions. */ - VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); - VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID_VBOX_VIDEO); - - if (VideoPortReadPortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA) == VBE_DISPI_ID_VBOX_VIDEO) - { - PrimaryExtension->u.primary.bVBoxVideoSupported = TRUE; - } - - dprintf(("VBoxVideo::VBoxSetupDisplays: bVBoxVideoSupported = %d\n", - PrimaryExtension->u.primary.bVBoxVideoSupported)); - - if (PrimaryExtension->u.primary.bVBoxVideoSupported) - { - /* Map the adapter information. It will be needed to query some configuration values. */ - rc = VBoxMapAdapterMemory (PrimaryExtension, - &PrimaryExtension->u.primary.pvAdapterInformation, - PrimaryExtension->u.primary.cbVRAM - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE, - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE - ); - if (rc != NO_ERROR) - { - dprintf(("VBoxVideo::VBoxSetupDisplays: VBoxMapAdapterMemory pvAdapterInfoirrmation failed rc = %d\n", - rc)); - - PrimaryExtension->u.primary.bVBoxVideoSupported = FALSE; - } - } - - /* Setup the non-volatile heap and the adapter memory. */ - if (PrimaryExtension->u.primary.bVBoxVideoSupported) - { - /* Query the size of the non-volatile heap. */ - ULONG cbMiniportHeap = 0; - vboxQueryConf (PrimaryExtension, VBOX_VIDEO_QCI32_OFFSCREEN_HEAP_SIZE, &cbMiniportHeap); - - /* Do not allow too big heap. 50% of VRAM should be enough. */ - ULONG cbMiniportHeapMaxSize = AdapterMemorySize / 2 - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE; - - if (cbMiniportHeap > cbMiniportHeapMaxSize) - { - cbMiniportHeap = cbMiniportHeapMaxSize; - } - - /* Round up to 4096. */ - PrimaryExtension->u.primary.cbMiniportHeap = (cbMiniportHeap + 0xFFF) & ~0xFFF; - - dprintf(("VBoxVideo::VBoxSetupDisplays: cbMiniportHeap = 0x%08X, PrimaryExtension->u.primary.cbMiniportHeap = 0x%08X, cbMiniportHeapMaxSize = 0x%08X\n", - cbMiniportHeap, PrimaryExtension->u.primary.cbMiniportHeap, cbMiniportHeapMaxSize)); - - /* Map the heap region and the adapter information area. - * - * Note: the heap will be used by display drivers, possibly by a few instances - * in multimonitor configuration, but the memory is mapped here ones. - * It is assumed that all display drivers and the miniport has the SAME - * virtual address space. - * - */ - rc = VBoxMapAdapterMemory (PrimaryExtension, - &PrimaryExtension->u.primary.pvMiniportHeap, - PrimaryExtension->u.primary.cbVRAM - - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE - - PrimaryExtension->u.primary.cbMiniportHeap, - PrimaryExtension->u.primary.cbMiniportHeap - ); - - if (rc != NO_ERROR) - { - PrimaryExtension->u.primary.cbMiniportHeap = 0; - PrimaryExtension->u.primary.bVBoxVideoSupported = FALSE; - } - } - - /* Check whether the guest supports multimonitors. */ - if (PrimaryExtension->u.primary.bVBoxVideoSupported) - { - typedef VP_STATUS (*PFNCREATESECONDARYDISPLAY)(PVOID, PVOID *, ULONG); - PFNCREATESECONDARYDISPLAY pfnCreateSecondaryDisplay = NULL; - - /* Dynamically query the VideoPort import to be binary compatible across Windows versions */ - if (vboxQueryWinVersion() > WINNT4) - { - /* This bluescreens on NT4, hence the above version check */ - pfnCreateSecondaryDisplay = (PFNCREATESECONDARYDISPLAY)(pConfigInfo->VideoPortGetProcAddress) - (PrimaryExtension, - (PUCHAR)"VideoPortCreateSecondaryDisplay"); - } - - if (pfnCreateSecondaryDisplay != NULL) - { - /* Query the configured number of displays. */ - ULONG cDisplays = 0; - vboxQueryConf (PrimaryExtension, VBOX_VIDEO_QCI32_MONITOR_COUNT, &cDisplays); - - dprintf(("VBoxVideo::VBoxSetupDisplays: cDisplays = %d\n", - cDisplays)); - - if (cDisplays == 0 || cDisplays > VBOX_VIDEO_MAX_SCREENS) - { - /* Host reported some bad value. Continue in the 1 screen mode. */ - cDisplays = 1; - } - - PDEVICE_EXTENSION pPrev = PrimaryExtension; - - ULONG iDisplay; - for (iDisplay = 1; iDisplay < cDisplays; iDisplay++) - { - PDEVICE_EXTENSION SecondaryExtension = NULL; - rc = pfnCreateSecondaryDisplay (PrimaryExtension, (PVOID*)&SecondaryExtension, VIDEO_DUALVIEW_REMOVABLE); - - dprintf(("VBoxVideo::VBoxSetupDisplays: VideoPortCreateSecondaryDisplay returned %#x, SecondaryExtension = %p\n", - rc, SecondaryExtension)); - - if (rc != NO_ERROR) - { - break; - } - - SecondaryExtension->pNext = NULL; - SecondaryExtension->pPrimary = PrimaryExtension; - SecondaryExtension->iDevice = iDisplay; - SecondaryExtension->ulFrameBufferOffset = 0; - SecondaryExtension->ulFrameBufferSize = 0; - SecondaryExtension->u.secondary.bEnabled = FALSE; - - /* Update the list pointers. */ - pPrev->pNext = SecondaryExtension; - pPrev = SecondaryExtension; - - /* Take the successfully created display into account. */ - PrimaryExtension->u.primary.cDisplays++; - } - - /* Failure to create secondary displays is not fatal */ - rc = NO_ERROR; - } - } - - /* Now when the number of monitors is known and extensions are created, - * calculate the layout of framebuffers. - */ - VBoxComputeFrameBufferSizes (PrimaryExtension); - - if (PrimaryExtension->u.primary.bVBoxVideoSupported) - { - /* Setup the information for the host. */ - vboxSetupAdapterInfo (PrimaryExtension); - } - else - { - /* Unmap the memory if VBoxVideo is not supported. */ - VBoxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvMiniportHeap, PrimaryExtension->u.primary.cbMiniportHeap); - VBoxUnmapAdapterInformation (PrimaryExtension); - } - - dprintf(("VBoxVideo::VBoxSetupDisplays: finished\n")); -} -#endif /* !VBOX_WITH_HGSMI */ void vboxVideoInitCustomVideoModes(PDEVICE_EXTENSION pDevExt) @@ -1916,7 +1601,5 @@ dprintf(("VBoxVideo::VBoxVideoFindAdapter %p\n", HwDeviceExtension)); -#ifdef VBOX_WITH_HGSMI VBoxSetupVideoPortFunctions((PDEVICE_EXTENSION)HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.VideoPortProcs, ConfigInfo); -#endif VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); @@ -1968,9 +1651,7 @@ dprintf(("VBoxVideo::VBoxVideoFindAdapter: calling VideoPortGetAccessRanges\n")); -#ifdef VBOX_WITH_HGSMI /* pPrimary is not yet set */ ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.commonInfo.IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST; ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.commonInfo.IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST; -#endif /* VBOX_WITH_HGSMI */ VIDEO_ACCESS_RANGE tmpRanges[4]; @@ -2014,8 +1695,4 @@ dprintf(("VBoxVideo::VBoxVideoFindAdapter: VbglInit returned 0x%x\n", rc)); -#ifndef VBOX_WITH_HGSMI - /* Setup the Device Extension and if possible secondary displays. */ - VBoxSetupDisplays((PDEVICE_EXTENSION)HwDeviceExtension, ConfigInfo, AdapterMemorySize); -#else /* Guest supports only HGSMI, the old VBVA via VMMDev is not supported. Old * code will be ifdef'ed and later removed. @@ -2029,5 +1706,4 @@ LogRel(("VBoxVideo: using HGSMI\n")); } -#endif /* VBOX_WITH_HGSMI */ // pretend success to make the driver work. @@ -2062,5 +1738,5 @@ } -# if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL) +# ifdef VBOX_WITH_VIDEOHWACCEL BOOLEAN VBoxVideoInterrupt(PVOID HwDeviceExtension) @@ -2089,5 +1765,5 @@ return FALSE; } -# endif /* #if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL) */ +# endif /* #ifdef VBOX_WITH_VIDEOHWACCEL */ #endif /* #ifndef VBOX_WITH_WDDM */ /** @@ -2116,9 +1792,5 @@ PointerAttributes.Enable = VBOX_MOUSE_POINTER_VISIBLE; -#ifndef VBOX_WITH_HGSMI - Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes)); -#else Result = vboxUpdatePointerShape(PrimaryExtension, &PointerAttributes, sizeof (PointerAttributes)); -#endif /* VBOX_WITH_HGSMI */ if (Result) @@ -2368,9 +2040,5 @@ PointerAttributes.Enable = 0; -#ifndef VBOX_WITH_HGSMI - Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes)); -#else Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes)); -#endif /* VBOX_WITH_HGSMI */ if (Result) @@ -2417,9 +2085,5 @@ dprintf(("\tBytes attached: %d\n", RequestPacket->InputBufferLength - sizeof(VIDEO_POINTER_ATTRIBUTES))); #endif -#ifndef VBOX_WITH_HGSMI - Result = vboxUpdatePointerShape(pPointerAttributes, RequestPacket->InputBufferLength); -#else Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, pPointerAttributes, RequestPacket->InputBufferLength); -#endif /* VBOX_WITH_HGSMI */ if (!Result) dprintf(("VBoxVideo::VBoxVideoStartIO: Could not set hardware pointer -> fallback\n")); @@ -2553,28 +2217,4 @@ } -#ifndef VBOX_WITH_HGSMI - case IOCTL_VIDEO_QUERY_DISPLAY_INFO: - { - dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_QUERY_DISPLAY_INFO\n")); - - if (RequestPacket->OutputBufferLength < sizeof(QUERYDISPLAYINFORESULT)) - { - dprintf(("VBoxVideo::VBoxVideoStartIO: Output buffer too small: %d needed: %d!!!\n", - RequestPacket->OutputBufferLength, sizeof(QUERYDISPLAYINFORESULT))); - RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; - return FALSE; - } - - QUERYDISPLAYINFORESULT *pDispInfo = (QUERYDISPLAYINFORESULT *)RequestPacket->OutputBuffer; - - pDispInfo->iDevice = pDevExt->iDevice; - pDispInfo->u32DisplayInfoSize = pDevExt->pPrimary->u.primary.ulDisplayInformationSize; - - RequestPacket->StatusBlock->Information = sizeof(QUERYDISPLAYINFORESULT); - Result = TRUE; - - break; - } -#endif /* !VBOX_WITH_HGSMI */ case IOCTL_VIDEO_VBVA_ENABLE: @@ -2663,5 +2303,4 @@ } -#ifdef VBOX_WITH_HGSMI case IOCTL_VIDEO_QUERY_HGSMI_INFO: { @@ -2818,5 +2457,4 @@ } # endif -#endif /* VBOX_WITH_HGSMI */ default: dprintf(("VBoxVideo::VBoxVideoStartIO: Unsupported %p, fn %d(0x%x)\n", @@ -3072,10 +2710,5 @@ MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; -#ifndef VBOX_WITH_HGSMI - MapInformation->VideoRamLength = DeviceExtension->pPrimary->u.primary.ulMaxFrameBufferSize - + DeviceExtension->pPrimary->u.primary.ulDisplayInformationSize; -#else MapInformation->VideoRamLength = DeviceExtension->pPrimary->u.primary.ulMaxFrameBufferSize; -#endif /* VBOX_WITH_HGSMI */ Status = VideoPortMapMemory(DeviceExtension, FrameBuffer, @@ -3093,10 +2726,8 @@ /* Save the new framebuffer size */ DeviceExtension->ulFrameBufferSize = MapInformation->FrameBufferLength; -#ifdef VBOX_WITH_HGSMI HGSMIAreaInitialize (&DeviceExtension->areaDisplay, MapInformation->FrameBufferBase, MapInformation->FrameBufferLength, DeviceExtension->ulFrameBufferOffset); -#endif /* VBOX_WITH_HGSMI */ return TRUE; } @@ -3115,7 +2746,5 @@ { dprintf(("VBoxVideo::VBoxVideoUnmapVideoMemory\n")); -#ifdef VBOX_WITH_HGSMI HGSMIAreaClear (&DeviceExtension->areaDisplay); -#endif /* VBOX_WITH_HGSMI */ VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress, NULL); return TRUE; Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h (revision 33048) @@ -20,5 +20,4 @@ #include -#ifdef VBOX_WITH_HGSMI //#include @@ -26,5 +25,4 @@ #include #include "VBoxHGSMI.h" -#endif /* VBOX_WITH_HGSMI */ RT_C_DECLS_BEGIN @@ -89,7 +87,5 @@ /* The VBOX interface id. Indicates support for VBE_DISPI_INDEX_VBOX_VIDEO. */ #define VBE_DISPI_ID_VBOX_VIDEO 0xBE00 -#ifdef VBOX_WITH_HGSMI #define VBE_DISPI_ID_HGSMI 0xBE01 -#endif /* VBOX_WITH_HGSMI */ #define VBE_DISPI_DISABLED 0x00 #define VBE_DISPI_ENABLED 0x01 @@ -100,8 +96,6 @@ #define VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES (VBE_DISPI_TOTAL_VIDEO_MEMORY_KB * 1024) -#ifdef VBOX_WITH_HGSMI #define VGA_PORT_HGSMI_HOST 0x3b0 #define VGA_PORT_HGSMI_GUEST 0x3d0 -#endif /* VBOX_WITH_HGSMI */ /* common API types */ @@ -211,9 +205,7 @@ * This is mapped by miniport separately. */ -#ifdef VBOX_WITH_HGSMI volatile HGSMIHOSTFLAGS * pHostFlags; /* HGSMI host flags */ volatile bool bHostCmdProcessing; VBOXVCMNSPIN_LOCK pSynchLock; -#endif PVOID pvAdapterInformation; /* The pointer to the last 4K of VRAM. @@ -221,5 +213,4 @@ */ -#ifdef VBOX_WITH_HGSMI BOOLEAN bHGSMI; /* Whether HGSMI is enabled. */ @@ -235,5 +226,4 @@ /* The IO Port Number for guest commands. */ RTIOPORT IOPortGuest; -#endif } VBOXVIDEO_COMMON, *PVBOXVIDEO_COMMON; @@ -283,22 +273,15 @@ BOOLEAN fMouseHidden; /* Has the mouse cursor been hidden by the guest? */ -#ifndef VBOX_WITH_HGSMI - ULONG ulDisplayInformationSize; /* The size of the Display information, which is at offset: - * ulFrameBufferOffset + ulMaxFrameBufferSize. - */ -#endif /* !VBOX_WITH_HGSMI */ VBOXVIDEO_COMMON commonInfo; -#ifdef VBOX_WITH_HGSMI -# ifndef VBOX_WITH_WDDM +#ifndef VBOX_WITH_WDDM /* Video Port API dynamically picked up at runtime for binary backwards compatibility with older NT versions */ VBOXVIDEOPORTPROCS VideoPortProcs; -# else +#else /* committed VidPn handle */ D3DKMDT_HVIDPN hCommittedVidPn; /* Display Port handle and callbacks */ DXGKRNL_INTERFACE DxgkInterface; -# endif -#endif /* VBOX_WITH_HGSMI */ +#endif } primary; @@ -309,7 +292,5 @@ } u; -#ifdef VBOX_WITH_HGSMI HGSMIAREA areaDisplay; /* Entire VRAM chunk for this display device. */ -#endif /* VBOX_WITH_HGSMI */ #ifdef VBOX_WITH_WDDM @@ -510,5 +491,5 @@ PVIDEO_REQUEST_PACKET RequestPacket); -#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL) +#ifdef VBOX_WITH_VIDEOHWACCEL BOOLEAN VBoxVideoInterrupt(PVOID HwDeviceExtension); #endif @@ -863,5 +844,4 @@ void VBoxComputeFrameBufferSizes (PDEVICE_EXTENSION PrimaryExtension); -#ifdef VBOX_WITH_HGSMI /* @@ -918,5 +898,4 @@ void HGSMIClearIrq (PVBOXVIDEO_COMMON pCommon); -#endif /* VBOX_WITH_HGSMI */ } /* extern "C" */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/vboxioctl.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/vboxioctl.h (revision 33047) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/vboxioctl.h (revision 33048) @@ -23,8 +23,6 @@ #include -#ifdef VBOX_WITH_HGSMI #include #include "VBoxHGSMI.h" -#endif /* VBOX_WITH_HGSMI */ #define IOCTL_VIDEO_INTERPRET_DISPLAY_MEMORY \ @@ -44,5 +42,4 @@ CTL_CODE(FILE_DEVICE_VIDEO, 0x400, METHOD_BUFFERED, FILE_ANY_ACCESS) -#ifdef VBOX_WITH_HGSMI #define IOCTL_VIDEO_QUERY_HGSMI_INFO \ CTL_CODE(FILE_DEVICE_VIDEO, 0x430, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -63,5 +60,4 @@ CTL_CODE(FILE_DEVICE_VIDEO, 0x435, METHOD_BUFFERED, FILE_ANY_ACCESS) -#endif /* VBOX_WITH_HGSMI */ #pragma pack(1) @@ -102,5 +98,4 @@ } QUERYDISPLAYINFORESULT; -#ifdef VBOX_WITH_HGSMI /** * Data returned by IOCTL_VIDEO_QUERY_HGSMI_INFO. @@ -166,12 +161,11 @@ } HGSMIHANDLERDISABLE; -# ifdef VBOX_WITH_VIDEOHWACCEL +#ifdef VBOX_WITH_VIDEOHWACCEL typedef struct _VHWAQUERYINFO { ULONG_PTR offVramBase; } VHWAQUERYINFO; -# endif +#endif -#endif /* VBOX_WITH_HGSMI */ #pragma pack()