Changeset 83620 in vbox for trunk/src

Timestamp:

Apr 8, 2020 12:41:52 PM (5 years ago)

Author:

vboxsync

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

137041

Message:

Devices/Graphics: check the resource type, step 2. bugref:9709

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -518 +518 @@
     union
     {
-        IDirect3DSurface9          *pSurface;
         IDirect3DTexture9          *pTexture;
         IDirect3DCubeTexture9      *pCubeTexture;

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -4070 +4070 @@
         {
             Assert(pRenderTarget->idAssociatedContext == cid);
+            AssertReturn(pRenderTarget->enmD3DResType == VMSVGA3D_D3DRESTYPE_SURFACE, VERR_INVALID_PARAMETER);
             hr = pContext->pDevice->SetDepthStencilSurface(pRenderTarget->u.pSurface);
             AssertMsgReturn(hr == D3D_OK, ("SetDepthStencilSurface failed with %x\n", hr), VERR_INTERNAL_ERROR);
@@ -4145 +4146 @@
 
             Assert(pRenderTarget->idAssociatedContext == cid);
-            Assert(pRenderTarget->enmD3DResType == VMSVGA3D_D3DRESTYPE_SURFACE);
+            AssertMsgReturn(pRenderTarget->enmD3DResType == VMSVGA3D_D3DRESTYPE_SURFACE,
+                            ("Invalid render target %#x\n", pRenderTarget->enmD3DResType),
+                            VERR_INVALID_PARAMETER);
             pSurface = pRenderTarget->u.pSurface;
         }
 
-        AssertReturn(pRenderTarget->u.pSurface, VERR_INVALID_PARAMETER);
+        AssertReturn(pSurface, VERR_INVALID_PARAMETER);
         Assert(!pRenderTarget->fDirty);
 
@@ -4357 +4360 @@
                 else
                 {
-                    Assert(   pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_TEXTURE
-                           || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_CUBE_TEXTURE
-                           || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE);
                     /* Must flush the other context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
                     vmsvga3dSurfaceFlush(pSurface);
                 }
+
+                AssertReturn(   pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_TEXTURE
+                             || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_CUBE_TEXTURE
+                             || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE,
+                             VERR_INVALID_PARAMETER);
 
 #ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL