Changeset 43705 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 22, 2012 4:35:12 PM (12 years ago)

Author:

vboxsync

Message:

wine: converted resources fixes

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

@@ -5532 +5532 @@
      * loading. */
     d3dfmt_get_conv(dst_impl, FALSE, TRUE, &dummy_desc, &convert);
-    if (convert != NO_CONVERSION)
+    if (convert != NO_CONVERSION || dummy_desc.convert)
         return IWineD3DSurface_BltFast(dst_surface, dst_x, dst_y, src_surface, src_rect, 0);
 

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

@@ -2865 +2865 @@
 #endif
 
-    if (!(This->Flags & SFLAG_DONOTFREE)) {
+    if (!(This->Flags & SFLAG_DONOTFREE) && !This->resource.format_desc->convert) {
         HeapFree(GetProcessHeap(), 0, This->resource.heapMemory);
         This->resource.allocatedMemory = NULL;