Changeset 35304 in vbox

Timestamp:

Dec 22, 2010 3:43:32 PM (14 years ago)

Author:

vboxsync

Message:

Main/Display, VBoxTray: removed obsolete code.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/Makefile.kmk (modified) (1 diff)
• Additions/WINNT/VBoxTray/VBoxSeamless.cpp (modified) (3 diffs)
• Main/DisplayImpl.cpp (modified) (2 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/VMMDevInterface.cpp (modified) (2 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -25 +25 @@
 endif
 VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
-#temporary define
-VBoxTray_DEFS    += MMSEAMLESS
 VBoxTray_INCS     = ../include
 VBoxTray_SOURCES  = \

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -42 +42 @@
     HDC     hdc;
     HRGN    hrgn;
-#ifndef MMSEAMLESS
-    RECT    rect;
-#endif
 } VBOX_ENUM_PARAM, *PVBOX_ENUM_PARAM;
 
@@ -155 +152 @@
     Log(("VBoxTray: VBoxEnumFunc %x\n", hwnd));
     /* Only visible windows that are present on the desktop are interesting here */
-#ifndef MMSEAMLESS
-    if (    GetWindowRect(hwnd, &rectWindow)
-        &&  IntersectRect(&rectVisible, &lpParam->rect, &rectWindow))
-    {
-#else
     if (GetWindowRect(hwnd, &rectWindow))
     {
         rectVisible = rectWindow;
-#endif
+
         char szWindowText[256];
         szWindowText[0] = 0;
@@ -223 +215 @@
     param.hrgn      = 0;
 
-#ifndef MMSEAMLESS
-    GetWindowRect(GetDesktopWindow(), &param.rect);
-    Log(("VBoxTray: VBoxRecheckVisibleWindows desktop=%x rect (%d,%d) (%d,%d)\n", GetDesktopWindow(), param.rect.left, param.rect.top, param.rect.right, param.rect.bottom));
-#endif
     EnumWindows(VBoxEnumFunc, (LPARAM)&param);
 

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -977 +977 @@
 }
 
-#ifdef MMSEAMLESS
 static bool displayIntersectRect(RTRECT *prectResult,
                                  const RTRECT *prect1,
@@ -1106 +1105 @@
     return VERR_NOT_SUPPORTED;
 }
-#endif
 
 typedef struct _VBVADIRTYREGION

trunk/src/VBox/Main/Makefile.kmk

@@ -593 +593 @@
 VBoxC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
 
-#temporary define
-VBoxC_DEFS += MMSEAMLESS
-
 VBoxC_INCS          = \
         include \

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -466 +466 @@
     if (!cRect)
         return VERR_INVALID_PARAMETER;
-#ifdef MMSEAMLESS
+
     /* Forward to Display, which calls corresponding framebuffers. */
     pConsole->getDisplay()->handleSetVisibleRegion(cRect, pRect);
-#else
-    IFramebuffer *framebuffer = pConsole->getDisplay()->getFramebuffer();
-    if (framebuffer)
-    {
-        framebuffer->SetVisibleRegion((BYTE *)pRect, cRect);
-#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
-        {
-            BOOL is3denabled;
-
-            pConsole->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
-
-            if (is3denabled)
-            {
-                VBOXHGCMSVCPARM parms[2];
-
-                parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
-                parms[0].u.pointer.addr = pRect;
-                parms[0].u.pointer.size = 0;  /* We don't actually care. */
-                parms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
-                parms[1].u.uint32 = cRect;
-
-                if (pDrv->pVMMDev)
-                    return pDrv->pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VISIBLE_REGION, 2, &parms[0]);
-            }
-        }
-#endif
-    }
-#endif
 
     return VINF_SUCCESS;
@@ -506 +478 @@
     Console *pConsole = pDrv->pVMMDev->getParent();
 
-#ifdef MMSEAMLESS
     /* Forward to Display, which calls corresponding framebuffers. */
     pConsole->getDisplay()->handleQueryVisibleRegion(pcRect, pRect);
-#else
-    IFramebuffer *framebuffer = pConsole->getDisplay()->getFramebuffer();
-    if (framebuffer)
-    {
-        ULONG cRect = 0;
-        framebuffer->GetVisibleRegion((BYTE *)pRect, cRect, &cRect);
-
-        *pcRect = cRect;
-    }
-#endif
 
     return VINF_SUCCESS;

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

@@ -145 +145 @@
     void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2,
                                   int32_t *py2);
-#ifdef MMSEAMLESS
+
     int handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect);
-#endif
 
     int VideoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory);