Changeset 37760 in vbox for trunk

Timestamp:

Jul 4, 2011 12:14:22 PM (13 years ago)

Author:

vboxsync

Message:

WDDM/3D: fix windows expirience index crashed on win7 with ati cards

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Wine/wined3d/surface_base.c (modified) (4 diffs)
• common/crOpenGL/pack/packspu_misc.c (modified) (1 diff)
• common/crOpenGL/pack/packspu_special (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_base.c

@@ -1154 +1154 @@
     if (Src == This)
     {
-        IWineD3DSurface_LockRect(iface, &dlock, NULL, 0);
+        ret = IWineD3DSurface_LockRect(iface, &dlock, NULL, 0);
+        if (FAILED(ret))
+        {
+            goto error;
+        }
         slock = dlock;
         sEntry = This->resource.format_desc;
@@ -1173 +1177 @@
                 }
             }
-            IWineD3DSurface_LockRect((IWineD3DSurface *) Src, &slock, NULL, WINED3DLOCK_READONLY);
+            ret = IWineD3DSurface_LockRect((IWineD3DSurface *) Src, &slock, NULL, WINED3DLOCK_READONLY);
+            if (FAILED(ret))
+            {
+                goto error;
+            }
             sEntry = Src->resource.format_desc;
         }
@@ -1180 +1188 @@
             sEntry = dEntry;
         }
+
         if (DestRect)
-            IWineD3DSurface_LockRect(iface, &dlock, &xdst, 0);
+            ret = IWineD3DSurface_LockRect(iface, &dlock, &xdst, 0);
         else
-            IWineD3DSurface_LockRect(iface, &dlock, NULL, 0);
+            ret = IWineD3DSurface_LockRect(iface, &dlock, NULL, 0);
+
+        if (FAILED(ret))
+        {
+            goto error;
+        }
     }
 
@@ -1886 +1900 @@
           This, pRect, Flags, pLockedRect, This->resource.allocatedMemory);
 
+    if (!This->resource.allocatedMemory)
+    {
+        ERR("Can't LockRect, This->resource.allocatedMemory is NULL\n");
+        return WINED3DERR_NOTAVAILABLE;
+    }
+
     pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface);
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -369 +369 @@
             crNetRecv();
     }
+}
+
+void PACKSPU_APIENTRY packspu_ChromiumParameteriCR(GLenum target, GLint value)
+{
+    if (GL_SHARE_CONTEXT_RESOURCES_CR==target)
+    {
+        crStateShareContext(value);
+    }
+    crPackChromiumParameteriCR(target, value);
 }
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -107 +107 @@
 VBoxPackAttachThread
 VBoxPackDetachThread
+ChromiumParameteriCR