commit 6ac84072da7e96bc59f96b8f220bc724490fd58d
author Lionel Ulmer <lionel.ulmer@free.fr> Mon Dec 16 23:10:27 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 16 23:10:27 2002 +0000
tree 277b296add6dedc59043f95fd20922db787dc024
parent 16fcd747afff2d693cfe200ae86ba8e5cc5f7299

- fix bad TRACE
- fixed computation of memory used by a texture

dlls/ddraw/d3dtexture.c

diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index 488f431..6f3ef21 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -652,8 +652,7 @@
     if (glThis->loaded == FALSE) {
         /* Only check memory for not already loaded texture... */
         mem_used = This->surface_desc.dwHeight *
-	           This->surface_desc.dwHeight *
-	           This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount;
+	           This->surface_desc.u1.lPitch;
 	if (This->ddraw_owner->allocate_memory(This->ddraw_owner, mem_used) < 0) {
 	    TRACE(" out of virtual memory... Warning application.\n");
 	    return D3DERR_TEXTURE_LOAD_FAILED;

dlls/ddraw/ddraw/main.c

diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index b076cb8..a3302b0 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -1115,7 +1115,7 @@
 
     if (TRACE_ON(ddraw)) {
         TRACE(" Asking for memory of type : \n");
-        DDRAW_dump_DDSCAPS2(ddscaps);
+        DDRAW_dump_DDSCAPS2(ddscaps); DPRINTF("\n");
     }
 
     /* We have 16 MB videomemory */