Changeset 22848 in vbox

Timestamp:

Sep 8, 2009 8:55:36 PM (15 years ago)

Author:

vboxsync

Message:

win guest video: get rid of >= XP functions

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/screen.c (modified) (1 diff)
• Miniport/VBoxHGSMI.h (modified) (4 diffs)
• Miniport/VBoxVideoHGSMI.cpp (modified) (4 diffs)

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

@@ -151 +151 @@
                         0,
                         &returnedDataLength);
+#ifdef DEBUG_misha
                 Assert(!err);
+#endif
+                /* this is not fatal, just means Video 2D acceleration will not be supported */
+                err = 0;
             }
         }

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxHGSMI.h

@@ -60 +60 @@
 typedef union _LARGE_INTEGER *VBOXPLARGE_INTEGER;
 
+typedef enum VBOXVP_POOL_TYPE
+{
+    VBoxVpNonPagedPool,
+    VBoxVpPagedPool,
+    VBoxVpNonPagedPoolCacheAligned = 4,
+    VBoxVpPagedPoolCacheAligned
+} VBOXVP_POOL_TYPE;
+
 #define VBOXNOTIFICATION_EVENT 0x00000001UL
 
@@ -79 +87 @@
 typedef void (*PFNRELEASESPINLOCKFROMDPCLEVEL) (void*  HwDeviceExtension, VBOXPSPIN_LOCK  SpinLock);
 
+typedef void* (*PFNALLOCATEPOOL) (void*  HwDeviceExtension, VBOXVP_POOL_TYPE PoolType, size_t NumberOfBytes, unsigned long Tag);
+typedef void (*PFNFREEPOOL) (void*  HwDeviceExtension, void*  Ptr);
 
 /* pfn*SpinLock* functions are available */
@@ -84 +94 @@
 /* pfn*Event and pfnWaitForSingleObject functions are available */
 #define VBOXVIDEOPORTPROCS_EVENT    0x00000002
+/* pfn*Pool functions are available */
+#define VBOXVIDEOPORTPROCS_POOL     0x00000004
 
 typedef struct VBOXVIDEOPORTPROCS
@@ -103 +115 @@
     PFNACQUIRESPINLOCKATDPCLEVEL pfnAcquireSpinLockAtDpcLevel;
     PFNRELEASESPINLOCKFROMDPCLEVEL pfnReleaseSpinLockFromDpcLevel;
+
+    PFNALLOCATEPOOL pfnAllocatePool;
+    PFNFREEPOOL pfnFreePool;
 } VBOXVIDEOPORTPROCS;
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp

@@ -461 +461 @@
 }
 
+PVOID vboxAllocatePoolVoid(IN PVOID  HwDeviceExtension, IN VBOXVP_POOL_TYPE  PoolType, IN size_t  NumberOfBytes, IN ULONG  Tag)
+{
+    return NULL;
+}
+
+VOID vboxFreePoolVoid(IN PVOID  HwDeviceExtension, IN PVOID  Ptr)
+{
+}
+
 void VBoxSetupVideoPortFunctions(PDEVICE_EXTENSION PrimaryExtension, VBOXVIDEOPORTPROCS *pCallbacks, PVIDEO_PORT_CONFIG_INFO pConfigInfo)
 {
@@ -562 +571 @@
     }
 
+    pCallbacks->pfnAllocatePool = (PFNALLOCATEPOOL)(pConfigInfo->VideoPortGetProcAddress)
+            (PrimaryExtension,
+             (PUCHAR)"VideoPortAllocatePool");
+    Assert(pCallbacks->pfnAllocatePool);
+
+    pCallbacks->pfnFreePool = (PFNFREEPOOL)(pConfigInfo->VideoPortGetProcAddress)
+            (PrimaryExtension,
+             (PUCHAR)"VideoPortFreePool");
+    Assert(pCallbacks->pfnFreePool);
+
+    if(pCallbacks->pfnAllocatePool
+            && pCallbacks->pfnFreePool)
+    {
+        pCallbacks->fSupportedTypes |= VBOXVIDEOPORTPROCS_POOL;
+    }
+    else
+    {
+        pCallbacks->pfnAllocatePool = vboxAllocatePoolVoid;
+        pCallbacks->pfnFreePool = vboxFreePoolVoid;
+    }
+
+#ifdef DEBUG_misha
     Assert(pCallbacks->fSupportedTypes & VBOXVIDEOPORTPROCS_EVENT);
     Assert(pCallbacks->fSupportedTypes & VBOXVIDEOPORTPROCS_SPINLOCK);
+#endif
 }
 
@@ -977 +1009 @@
 static int vboxVBVADeleteChannelContexts(PDEVICE_EXTENSION PrimaryExtension, VBVA_CHANNELCONTEXTS * pContext)
 {
-    VideoPortFreePool(PrimaryExtension,pContext);
+    PrimaryExtension->u.primary.VideoPortProcs.pfnFreePool(PrimaryExtension,pContext);
         return VINF_SUCCESS;
 }
@@ -985 +1017 @@
         uint32_t cDisplays = (uint32_t)PrimaryExtension->u.primary.cDisplays;
         const size_t size = RT_OFFSETOF(VBVA_CHANNELCONTEXTS, aContexts[cDisplays]);
-        VBVA_CHANNELCONTEXTS * pContext = (VBVA_CHANNELCONTEXTS*)VideoPortAllocatePool(PrimaryExtension,
-                VpNonPagedPool,
+        VBVA_CHANNELCONTEXTS * pContext = (VBVA_CHANNELCONTEXTS*)PrimaryExtension->u.primary.VideoPortProcs.pfnAllocatePool(PrimaryExtension,
+                VBoxVpNonPagedPool,
                 size,
                 MEM_TAG);