Changeset 22415 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 24, 2009 2:26:29 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix random crashes/memory corruption when running java apps

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• device.c (modified) (1 diff)
• surface.c (modified) (1 diff)

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

@@ -6642 +6642 @@
         This->stencilBufferTarget = pNewZStencil;
         /* should we be calling the parent or the wined3d surface? */
-        if (NULL != This->stencilBufferTarget) IWineD3DSurface_AddRef(This->stencilBufferTarget);
-        if (NULL != tmp) IWineD3DSurface_Release(tmp);
+        if (NULL != This->stencilBufferTarget) {
+            IUnknown *pParent;
+            IWineD3DSurface_AddRef(This->stencilBufferTarget);
+            IWineD3DSurface_GetParent(This->stencilBufferTarget, &pParent);
+        }
+        if (NULL != tmp) {
+            IUnknown *pParent;
+            IWineD3DSurface_GetParent(This->stencilBufferTarget, &pParent);
+            IUnknown_Release(pParent);
+            IUnknown_Release(pParent);
+            IWineD3DSurface_Release(tmp);
+        }
         hr = WINED3D_OK;
 

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

@@ -324 +324 @@
      * TODO: Track the current active texture per GL context instead of using glGet
      */
-    GLint active_texture;
+    GLint active_texture=GL_TEXTURE0_ARB;
     ENTER_GL();
     glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture);