Changeset 33048 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c

Timestamp:

Oct 11, 2010 8:57:20 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66572

Message:

Additions/WINNT/Graphics: make VBOX_WITH_HGSMI conditional code unconditional

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c

@@ -101 +101 @@
 }
 
-#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 +129 @@
     }                                                                  \
 } while (0)
-#endif /* VBOX_WITH_HGSMI */
 
 //#undef VBVA_OPERATION
@@ -351 +320 @@
         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 +729 @@
         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 +747 @@
             }
         }
-#endif /* VBOX_WITH_HGSMI */
     }