Changeset 80748 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Timestamp:

Sep 12, 2019 9:44:16 AM (6 years ago)

Author:

vboxsync

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

133300

Message:

Additions/WINNT/Graphics: Lots of compilation fixes if VBOX_WITH_VIDEOHWACCE and/or VBOX_WITH_MESA3D is not defined.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm

Files:

• VBoxDispDDraw.cpp (modified) (6 diffs)
• VBoxDispDriverDDraw.cpp (modified) (2 diffs)
• VBoxDispMini.cpp (modified) (2 diffs)
• VBoxDispMini.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDraw.cpp

@@ -24 +24 @@
 DWORD APIENTRY VBoxDispDDCanCreateSurface(PDD_CANCREATESURFACEDATA lpCanCreateSurface)
 {
+    LOGF_ENTER();
+
+    PDD_SURFACEDESC lpDDS = lpCanCreateSurface->lpDDSurfaceDesc;
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
     PVBOXDISPDEV pDev = (PVBOXDISPDEV) lpCanCreateSurface->lpDD->dhpdev;
-    LOGF_ENTER();
-
-    PDD_SURFACEDESC lpDDS = lpCanCreateSurface->lpDDSurfaceDesc;
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
     if(pDev->vhwa.bEnabled)
     {
@@ -118 +118 @@
 DWORD APIENTRY VBoxDispDDCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface)
 {
-    PVBOXDISPDEV pDev = (PVBOXDISPDEV) lpCreateSurface->lpDD->dhpdev;
     LOGF_ENTER();
 
@@ -136 +135 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
+    PVBOXDISPDEV pDev = (PVBOXDISPDEV) lpCreateSurface->lpDD->dhpdev;
     if(pDev->vhwa.bEnabled)
     {
@@ -247 +247 @@
 DWORD APIENTRY VBoxDispDDDestroySurface(PDD_DESTROYSURFACEDATA lpDestroySurface)
 {
+    LOGF_ENTER();
+
+    lpDestroySurface->ddRVal = DD_OK;
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
     PVBOXDISPDEV pDev = (PVBOXDISPDEV) lpDestroySurface->lpDD->dhpdev;
-    LOGF_ENTER();
-
-    lpDestroySurface->ddRVal = DD_OK;
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
     if (pDev->vhwa.bEnabled)
     {
@@ -454 +454 @@
     LOGF_ENTER();
 
-    DD_SURFACE_LOCAL *pSurf = lpUnlock->lpDDSurface;
-
     lpUnlock->ddRVal = DD_OK;
 
@@ -461 +459 @@
     if(pDev->vhwa.bEnabled)
     {
+        DD_SURFACE_LOCAL *pSurf = lpUnlock->lpDDSurface;
         PVBOXVHWASURFDESC pDesc = (PVBOXVHWASURFDESC) pSurf->lpGbl->dwReserved1;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp

@@ -86 +86 @@
         pDev->vhwa.bEnabled = RT_SUCCESS(rc);
     }
+#else
+    RT_NOREF(pdwFourCC);
 #endif
 
@@ -181 +183 @@
         }
     }
+#else
+    RT_NOREF(dhpdev);
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMini.cpp

@@ -278 +278 @@
 }
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
 int VBoxDispMPVHWAQueryInfo(HANDLE hDriver, VHWAQUERYINFO *pInfo)
 {
@@ -293 +294 @@
     return VINF_SUCCESS;
 }
+#endif
 
 int VBoxDispMPSetColorRegisters(HANDLE hDriver, PVIDEO_CLUT pClut, DWORD cbClut)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMini.h

@@ -32 +32 @@
 int VBoxDispMPQueryHGSMICallbacks(HANDLE hDriver, HGSMIQUERYCALLBACKS *pCallbacks);
 int VBoxDispMPHGSMIQueryPortProcs(HANDLE hDriver, HGSMIQUERYCPORTPROCS *pPortProcs);
+#ifdef VBOX_WITH_VIDEOHWACCEL
 int VBoxDispMPVHWAQueryInfo(HANDLE hDriver, VHWAQUERYINFO *pInfo);
+#endif
 int VBoxDispMPSetColorRegisters(HANDLE hDriver, PVIDEO_CLUT pClut, DWORD cbClut);
 int VBoxDispMPDisablePointer(HANDLE hDriver);