Changeset 3397 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jul 3, 2007 4:49:25 PM (18 years ago)

Author:

vboxsync

Message:

Disabled all ddraw features that are not mandatory. Enabled DirectDraw.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• Makefile.kmk (modified) (1 diff)
• dd.c (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -31 +31 @@
 VBoxDisp_SDKS        = W2K3DDKX86 WINPSDKINCS
 VBoxDisp_SYSSUFF     = .dll
-VBoxDisp_DEFS        = _WIN32_WINNT=0x0501 LOG_TO_BACKDOOR
+VBoxDisp_DEFS        = _WIN32_WINNT=0x0501 LOG_TO_BACKDOOR VBOX_WITH_DDRAW
 #VBoxDisp_DEFS        += LOG_ENABLED
 #VBoxDisp_DEFS        += STAT_sunlover

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

@@ -121 +121 @@
     pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
 
+#if 0 /* not mandatory */
     /* DX5 and up */
     pHalInfo->GetDriverInfo = DdGetDriverInfo;
     pHalInfo->dwFlags |= DDHALINFO_GETDRIVERINFOSET;
+#endif
 
 #if 0
@@ -168 +170 @@
     /* Fill in the HAL Callback pointers */
     pCallBacks->dwSize                = sizeof(DD_CALLBACKS);
+    pCallBacks->dwFlags               = 0;
+
+    /*
     pCallBacks->dwFlags               = DDHAL_CB32_CREATESURFACE | DDHAL_CB32_CANCREATESURFACE;
     pCallBacks->CreateSurface         = DdCreateSurface;
     pCallBacks->CanCreateSurface      = DdCanCreateSurface;
-
-    /*
     pCallBacks->WaitForVerticalBlank  = DdWaitForVerticalBlank;
     pCallBacks->GetScanLine           = DdGetScanLine;
@@ -182 +185 @@
     /* Fill in the Surface Callback pointers */
     pSurfaceCallBacks->dwSize           = sizeof(DD_SURFACECALLBACKS);
+    pSurfaceCallBacks->dwFlags          = 0;
+
+    /*
     pSurfaceCallBacks->dwFlags          = DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_LOCK; // DDHAL_SURFCB32_UNLOCK;
     pSurfaceCallBacks->DestroySurface   = DdDestroySurface;
-//    pSurfaceCallBacks->Lock             = DdLock;
+    pSurfaceCallBacks->Lock             = DdLock;
     pSurfaceCallBacks->Unlock           = DdUnlock;
-
-    /*
     pSurfaceCallBacks->Flip             = DdFlip;
     pSurfaceCallBacks->GetBltStatus     = DdGetBltStatus;
@@ -692 +696 @@
 // can boot those allocations out of memory to make room for DirectDraw.
 //
-// We implement this function in the P2 driver because we have DirectDraw
-// entirely manage our off-screen heap, and we use HeapVidMemAllocAligned
-// to put GDI device-bitmaps in off-screen memory.  DirectDraw applications
-// have a higher priority for getting stuff into video memory, though, and
-// so this function is used to boot those GDI surfaces out of memory in
-// order to make room for DirectDraw.
-//
 //-----------------------------------------------------------------------------
 
@@ -707 +704 @@
 
     lpFreeDriverMemory->ddRVal = DDERR_OUTOFMEMORY;
-    return (DDHAL_DRIVER_HANDLED);
+    return DDHAL_DRIVER_HANDLED;
 }